diff --git a/src/axios/fetch.js b/src/axios/fetch.js
index 5ed6c99..9f0c1e0 100644
--- a/src/axios/fetch.js
+++ b/src/axios/fetch.js
@@ -2,9 +2,9 @@ import axios from 'axios'
export const api = axios.create({
// baseURL: 'https://ccb.canary.moe/api/',
- // baseURL: window.location.origin + '/api/',
+ baseURL: window.location.origin + '/api/',
// baseURL: 'https://canary.lacus.site/api/',
- baseURL: 'http://canary.lacus.icu/api/',
+ // baseURL: 'http://canary.lacus.icu/api/',
// baseURL: 'http://beta.lacus.site/api/',
// baseURL: 'http://152.136.99.231:8001' + '/api/',
headers: {
diff --git a/src/utils/language.js b/src/utils/language.js
index 2057b98..d3723c6 100644
--- a/src/utils/language.js
+++ b/src/utils/language.js
@@ -5,10 +5,10 @@ export function lang() {
title: '密码本',
search: '搜索...',
menu: ['按首字母', '按最常使用'],
- drawer: ['账户', '设置', '生成密码', '更新日志', '分享链接', '下载apk', '立即锁定'],
+ drawer: ['账户', '设置', '生成密码', '更新日志', '分享链接', '下载apk', '立即锁定', '加入用户群'],
empty_state: {
label: '创建你的第一个密码',
- description: '创建密码后,您就可以将信息上载到服务器并保存',
+ description: '创建密码后,您就可以将信息上载到学校网盘并保存',
button: '立即创建'
},
unlock_msg: {
@@ -24,7 +24,7 @@ export function lang() {
title: 'Codebook',
search: 'Search...',
menu: ['Alphabetically', 'Recently Used'],
- drawer: ['Account', 'Settings', 'Generate Password', 'Update Log', 'Share', 'Download apk', 'Lock Now'],
+ drawer: ['Account', 'Settings', 'Generate Password', 'Update Log', 'Share', 'Download apk', 'Lock Now', 'Join US'],
empty_state: {
label: 'Create your first code',
description: "Creating code, you'll be able to upload your information to the server and save it.",
@@ -222,29 +222,32 @@ export function lang() {
enter: '提交',
dialog: {
title: '确认提交',
- content: '该密码提交之后不可被修改, 请不要将此密码告诉任何人',
+ content: '密码本加密依赖此密码, 请不要将此密码告诉任何人',
confirm: '同意',
cancel: '不同意'
},
empty_pwd_error: '主密码不能为空',
wrong_pwd_error: '主密码错误',
- match_pwd_error: '两次输入密码不一致'
+ match_pwd_error: '两次输入密码不一致',
+ drivce_error: '设备名不能为空'
},
EN: {
title: ['Create Password','Unlock'],
subheader: ['Create New Password', 'Unlock Canary Codebook'],
pwd_label: ['New Password','Unlock Password'],
repeat_pwd: 'Repeat Password',
+ drivce_label: 'pleace enter drivce name',
enter: 'Enter',
dialog: {
title: 'Confirm you new password?',
- content: 'The password will not be modified after submission, please make sure you don’t tell anyone this password.',
+ content: 'Codebook encryption depends on this password, please make sure you don’t tell anyone this password.',
confirm: 'Agree',
cancel: 'Disagree'
},
empty_pwd_error: 'Password can not be none',
wrong_pwd_error: 'Wrong password',
- match_pwd_error: 'The two passwords do not match'
+ match_pwd_error: 'The two passwords do not match',
+ drivce_error: 'Drivce name can not be none'
}
},
generator: {
@@ -281,6 +284,14 @@ export function lang() {
CHS:{
title: '更新日志',
timeline: [
+ {
+ label: '长理专版密码本改造完成',
+ tag:'功能更新',
+ content: [
+ '获取了操作长理网盘的接口文档,为了用户信息安全性,将用户加密完的密码存放至网盘canary/codebook.txt',
+ '2020-09-01'
+ ]
+ },
{
label: '修复搜索后关闭搜索框密码本内容消失',
tag:'bug修复',
@@ -406,6 +417,14 @@ export function lang() {
EN:{
title: 'Update Log',
timeline: [
+ {
+ label: 'Changli special edition codebook transformation completed',
+ tag:'Feature update',
+ content: [
+ 'Obtained the interface document for operating the Changli network disk, and stored the encrypted password of the user in the network disk for the security of user information canary/codebook.txt',
+ '2020-09-01'
+ ]
+ },
{
label: 'Fixed search box password content disappeared after searching',
tag:'Bug fix',
diff --git a/src/views/Account/Account.vue b/src/views/Account/Account.vue
index 6ff05c2..5011ca9 100644
--- a/src/views/Account/Account.vue
+++ b/src/views/Account/Account.vue
@@ -177,7 +177,7 @@ export default {
};
syncLocal(data)
.then(res => {
- console.log(res.data)
+ // console.log(res.data)
this.manageLoginRes(res.data);
})
.catch(err => {
@@ -256,11 +256,12 @@ export default {
drivce: content.drivce ? content.drivce : (this.settings.is_chinese ? '暂无' : 'unknown')
}
}
- if(!content.drivce) content.drivce = content.drivce ? content.drivce : (this.settings.is_chinese ? '暂无' : 'unknown')
+ if(content.drivce && content.drivce != '暂无' && content.drivce != 'unknown') content.drivce = decodeURIComponent(content.drivce)
+ else content.drivce = this.settings.is_chinese ? '暂无' : 'unknown'
this.setRowData([content.codebook, this]);
console.log('数据获取成功,密码本覆写成功');
let user_infos = this.user_infos;
- user_infos.update_time = data.modified - 60 * 4;
+ user_infos.update_time = data.modified - 1000 * 60 * 4;
user_infos.user_name = data.username;
user_infos.cloud_drivce = content.drivce
this.setUserInfo([user_infos, this]);
@@ -302,21 +303,19 @@ export default {
this.sync_cloud_loading = true;
let content = {
codebook: this.row_data,
- drivce: this.user_infos.drivce
+ drivce: encodeURIComponent(this.user_infos.drivce)
}
let data = {
cid: this.user_infos.cid,
pwd: decryptMainCode(this.user_infos.row_login_pwd),
content: JSON.stringify(content)
};
+ console.log(data)
syncCloud(data)
.then(res => {
let user_infos = this.user_infos;
user_infos.update_time = new Date().getTime();
- console.log(user_infos)
user_infos.cloud_drivce = user_infos.drivce ? user_infos.drivce : (this.settings.is_chinese ? '暂无' : 'unknown')
- console.log(user_infos)
-
this.setUserInfo([user_infos, this]);
console.log('数据上传成功,用户信息覆写成功');
this.snakebar_msg = this.lang.snakebar_msg[7];
@@ -351,7 +350,7 @@ export default {
user_name: 'A Little Canary',
cid: 'Codebook',
row_login_pwd: '',
- drivce: this.settings.is_chinese ? '暂无' : 'unknown',
+ drivce: this.user_infos.drivce,
cloud_drivce: this.settings.is_chinese ? '暂无' : 'unknown',
update_time: new Date().getTime()
};
diff --git a/src/views/Home/Home.vue b/src/views/Home/Home.vue
index 76b7303..349ce80 100644
--- a/src/views/Home/Home.vue
+++ b/src/views/Home/Home.vue
@@ -37,7 +37,7 @@
{{ lang.drawer[0] }}
-
@@ -20,14 +20,16 @@
{{ err_msg }}
-
-
-
- {{ err_msg }}
+
+
+
+ {{ drivce_err_msg }}
{{ lang.enter }}
+ 此密码本为长理专版,未开启同步密码将加密后存放本地,开启同步密码将加密后存放在您的长理网盘中,请放心使用 点我加入用户群
+