From d59f518f466274b2caeb2e01c10c92deafe7c93b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 09 二月 2022 11:48:29 +0800
Subject: [PATCH] 2022-02-09
---
src/api/index.js | 30 ++++++++++++------------------
1 files changed, 12 insertions(+), 18 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index 88876da..01fda72 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -288,7 +288,6 @@
* @description 鑾峰彇绯荤粺鐗堟湰淇℃伅锛屽惎鐢ㄦ垨鏇存柊websql
*/
getAppVersion (_resolve, _reject) {
- let appVersion = {}
if (!window.GLOB.WebSql && !window.GLOB.IndexDB) {
return Promise.reject()
}
@@ -304,7 +303,6 @@
if (window.GLOB.WebSql) {
return new Promise((resolve, reject) => {
CacheUtils.getWebSqlVersion().then(msg => {
- appVersion.oldVersion = msg.version || ''
let modifydate = msg.createDate || curTime
if (modifydate.indexOf('Invalid date') > -1) {
modifydate = curTime
@@ -321,9 +319,7 @@
return
}
let clear = false
- let version = res.app_version || '1.00'
- appVersion.newVersion = version
- appVersion.oldVersion = appVersion.oldVersion || version
+ let version = '1.00'
if (res.menu_data && res.menu_data.length > 0) {
res.menu_data.forEach(mid => {
@@ -346,7 +342,7 @@
CacheUtils.createWebSqlversion(version, curTime)
}
- resolve(appVersion)
+ resolve()
})
}, () => {
reject()
@@ -355,7 +351,6 @@
} else {
return new Promise((resolve, reject) => {
CacheUtils.getIndexDBVersion().then(msg => {
- appVersion.oldVersion = msg.version || ''
let modifydate = msg.createDate || curTime
if (modifydate.indexOf('Invalid date') > -1) {
modifydate = curTime
@@ -371,9 +366,7 @@
return
}
let clear = false
- let version = res.app_version || '1.00'
- appVersion.newVersion = version
- appVersion.oldVersion = appVersion.oldVersion || version
+ let version = '1.00'
if (res.menu_data && res.menu_data.length > 0) {
res.menu_data.forEach(mid => {
@@ -390,9 +383,9 @@
}
}
- CacheUtils.updateIndexDBversion({version: appVersion.oldVersion, createDate: curTime})
+ CacheUtils.updateIndexDBversion({version: version, createDate: curTime})
- resolve(appVersion)
+ resolve()
})
}, () => {
reject()
@@ -404,12 +397,13 @@
/**
* @description 鏇存柊绯荤粺鐗堟湰淇℃伅锛屾竻绌洪厤缃俊鎭�
*/
- updateAppVersion (newVersion) {
+ updateAppVersion () {
let curTime = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
CacheUtils.clearWebSqlConfig()
- CacheUtils.updateWebSqlversion(newVersion, curTime)
+ CacheUtils.updateWebSqlversion('1.00', curTime)
CacheUtils.clearIndexDBConfig()
- CacheUtils.updateIndexDBversion({version: newVersion, createDate: curTime})
+ CacheUtils.updateIndexDBversion({version: '1.00', createDate: curTime})
+ CacheUtils.clearFuncs(options.sysType)
}
/**
@@ -485,7 +479,7 @@
param.lang = param.lang || sessionStorage.getItem('lang') || ''
param.SessionUid = localStorage.getItem('SessionUid') || ''
param.LoginUID = param.LoginUID || sessionStorage.getItem('LoginUID') || ''
- param.appkey = window.GLOB.appkey || ''
+ param.appkey = param.appkey || window.GLOB.appkey
let url = '/webapi/dostars'
if (sessionStorage.getItem('isEditState') === 'true' && options.cloudServiceApi) { // 缂栬緫鐘舵�侊紝涓斿瓨鍦ㄤ簯绔湴鍧�
@@ -682,7 +676,7 @@
* @param {Object} param 璇锋眰鍙傛暟
* @param {Boolean} SSO 鏄惁涓哄崟鐐圭櫥褰曞湴鍧�
*/
- getSystemCacheConfig (param) {
+ getSystemCacheConfig (param, cache = true) {
param.userid = param.userid || sessionStorage.getItem('UserID') || ''
param.lang = param.lang || sessionStorage.getItem('lang') || ''
param.SessionUid = localStorage.getItem('SessionUid') || ''
@@ -702,7 +696,7 @@
_param = JSON.stringify(_param)
_param = md5(_param)
- if (window.GLOB.CacheMap.has(_param)) {
+ if (cache && window.GLOB.CacheMap.has(_param)) {
return Promise.resolve(window.GLOB.CacheMap.get(_param))
} else {
param = this.encryptParam(param)
--
Gitblit v1.8.0