From ce70be666bcd78a7e16e739040488cf7e7256cc2 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期一, 31 五月 2021 15:49:43 +0800 Subject: [PATCH] 2021-05-31 --- src/api/index.js | 39 ++++++++++++++++++++++++--------------- 1 files changed, 24 insertions(+), 15 deletions(-) diff --git a/src/api/index.js b/src/api/index.js index 0beff01..87db4d9 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -230,6 +230,14 @@ // Type: 'S' 鏃� let shaObj = new jsSHA('SHA-1', 'TEXT') param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') + + let sys_datetime = sessionStorage.getItem('sys_datetime') + let app_datetime = sessionStorage.getItem('app_datetime') + if (sys_datetime && app_datetime) { + let seconds = Math.floor((new Date().getTime() - app_datetime) / 1000) + param.timestamp = moment(sys_datetime, 'YYYY-MM-DD HH:mm:ss').add(seconds, 'seconds').format('YYYY-MM-DD HH:mm:ss') + } + shaObj.update(password) param.Password = shaObj.getHash('HEX').toUpperCase() param.Password = md5(username + param.Password + param.timestamp) @@ -269,11 +277,18 @@ return Promise.reject() } + let curTime = moment().format('YYYY-MM-DD HH:mm:ss') + '.000' + let sys_datetime = sessionStorage.getItem('sys_datetime') + let app_datetime = sessionStorage.getItem('app_datetime') + if (sys_datetime && app_datetime) { + let seconds = Math.floor((new Date().getTime() - app_datetime) / 1000) + curTime = moment(sys_datetime, 'YYYY-MM-DD HH:mm:ss').add(seconds, 'seconds').format('YYYY-MM-DD HH:mm:ss') + '.000' + } + if (window.GLOB.WebSql) { return new Promise((resolve, reject) => { CacheUtils.getWebSqlVersion().then(msg => { appVersion.oldVersion = msg.version || '' - let curTime = moment().format('YYYY-MM-DD HH:mm:ss') + '.000' let param = { func: 's_get_app_version', modifydate: msg.createDate || curTime, @@ -320,7 +335,6 @@ return new Promise((resolve, reject) => { CacheUtils.getIndexDBVersion().then(msg => { appVersion.oldVersion = msg.version || '' - let curTime = moment().format('YYYY-MM-DD HH:mm:ss') + '.000' let param = { func: 's_get_app_version', modifydate: msg.createDate || curTime, @@ -757,22 +771,17 @@ param = this.encryptParam(param) + let url = '/webapi/SaveBase64Image' if (param.rduri) { - let url = param.rduri.replace(/webapi(.*)$/, 'webapi/SaveBase64Image') + url = param.rduri.replace(/webapi(.*)$/, 'webapi/SaveBase64Image') delete param.rduri - - return axios({ - url, - method: 'post', - data: param - }) - } else { - return axios({ - url: '/webapi/SaveBase64Image', - method: 'post', - data: param - }) } + + return axios({ + url, + method: 'post', + data: param + }) } /** -- Gitblit v1.8.0