From eebe63a6727e6495321d1433ebd2779b5a36d45a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 31 十二月 2020 22:08:14 +0800
Subject: [PATCH] 2020-12-31

---
 src/api/index.js |   61 ++++++++++++++++++++++++------
 1 files changed, 49 insertions(+), 12 deletions(-)

diff --git a/src/api/index.js b/src/api/index.js
index 6821ef2..2bf0ef3 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -7,7 +7,6 @@
 import options from '@/store/options.js'
 
 let mkDataBase = null
-let storUsable = false
 
 if (window.openDatabase) {
   let service = window.GLOB.service ? '-' + window.GLOB.service.replace('/', '') : ''
@@ -15,7 +14,7 @@
     mkDataBase = openDatabase(`mkdb${service}`, '1', 'mk-pc-database', 50 * 1024 * 1024)
     mkDataBase.transaction(tx => {
       tx.executeSql('CREATE TABLE IF NOT EXISTS VERSIONS (version varchar(50), createDate varchar(50), CDefine1 varchar(50), CDefine2 varchar(50), CDefine3 varchar(50))', [], () => {
-
+      
       }, () => {
         // eslint-disable-next-line
         throw 'CREATE TABLE ERROR'
@@ -57,7 +56,7 @@
   return Promise.reject(error)
 })
 
-const setCurrentUrl = () => {
+const setCurrentUrl = (res) => {
   if (!!(window.history && window.history.pushState)) {
     if (window.location.href.indexOf('paramsmain') > -1) {
       let _href = window.location.href.split('#')
@@ -65,6 +64,7 @@
     }
 
     sessionStorage.clear()
+    sessionStorage.setItem('loginError', JSON.stringify({request: res.config ? res.config.data : '', response: JSON.stringify(res.data)}))
     window.history.replaceState(null, null, window.location.href.split('#')[0] + '#/login')
     window.location.reload()
   }
@@ -78,7 +78,7 @@
       response.data.ErrCode = 'E'
       return Promise.resolve(response.data)
     } else {
-      setCurrentUrl()
+      setCurrentUrl(response)
     }
   } else {
     return Promise.resolve(response.data)
@@ -112,6 +112,24 @@
 
     return axios({
       url: '/webapi/dostar',
+      data: param
+    })
+  }
+
+  /**
+   * @description 浣跨敤dostar鎺ュ彛锛岃烦杩囬獙璇�
+   * @param {Object} param 鏌ヨ鍙婃彁浜ゅ弬鏁�
+   */
+  loginAndRedirect (param) {
+    let url = ''
+    if (process.env.NODE_ENV === 'production') {
+      url = document.location.origin + '/Home/LoginAndRedirect'
+    } else {
+      url = '/Home/LoginAndRedirect'
+    }
+
+    return axios({
+      url: url,
       data: param
     })
   }
@@ -290,12 +308,29 @@
             reject()
             return
           }
+          let clear = false
           let version = res.app_version || '1.00'
           appVersion.newVersion = version
           appVersion.oldVersion = appVersion.oldVersion || version
 
+          if (res.menu_data && res.menu_data.length > 0) {
+            let keys = `1581067625930haged11ieaivpavv77k,1581734956310scks442ul2d955g9tu5,1583991994144ndddg0bhh0is6shi0v1,1583979633842550imkchl4qt4qppsiv,1578900109100np8aqd0a77q3na46oas,16044812935562g807p3p12huk8kokmb,
+              1585192949946f3et2ts8tn82krmumdf,15855615451212m12ip23vpcm79kloro,1587005717541lov40vg61q7l1rbveon,1590458676585agbbr63t6ihighg2i1g,1602315375262ikd33ii0nii34pt861o,1582771068837vsv54a089lgp45migbg,
+              1582777675954ifu05upurs465omoth7,158294809668898cklbv6c5bou8e1fpu,1584676379094iktph45fb8imhg96bql,1584695125339vo5g7iqgfn01qmrd6s2,1584699661372vhmpp9dn9foo0eob722,15848421131551gg04ie8sitsd3f7467,
+              1589782279158ngr675kk3oksin35sul,1589788042787ffdt9hle4s45k9r1nvs,15900310928174dro07ihfckghpb5h13,1594095599055qicg2eb642v5qglhnuo,1599613340050c8nu6rbst9d4emnnbsq,1577972969199lei1g0qkvlh4tkc908m,
+              1578479100252lfbp29v1kafk4s4q4ig,1577971621421tg4v0i1ur8873k7e0ob,1577929944419lgc5h3hepum765e2k7u,1588493493409k9guqp067d31lu7blsv`
+
+            res.menu_data.forEach(mid => {
+              if (keys.indexOf(mid.menuid) > -1) {
+                clear = true
+              }
+            })
+          }
+
           mkDataBase.transaction(tx => {
-            if (res.menu_data && res.menu_data.length > 0) {
+            if (clear) {
+              tx.executeSql(`DELETE FROM CONFIGS`, [], () => {}, () => { reject() })
+            } else if (res.menu_data && res.menu_data.length > 0) {
               let keys = res.menu_data.map(mid => `'${mid.menuid}'`)
               tx.executeSql(`DELETE FROM CONFIGS where menuid in (${keys.join(',')})`, [], () => {}, () => {
                 reject()
@@ -318,12 +353,14 @@
         })
       }) 
     }, () => {
-      _reject()
       mkDataBase = null
+      _reject()
       return Promise.reject()
     }).then(() => {
-      storUsable = true
       _resolve(appVersion)
+    }, () => {
+      mkDataBase = null
+      _reject()
     })
   }
 
@@ -476,7 +513,7 @@
    * @description 鑾峰彇鎴栦慨鏀规湰鍦伴厤缃紝澧炲姞appkey
    */
   getLocalConfig (param) {
-    param.userid = sessionStorage.getItem('UserID')
+    param.userid = sessionStorage.getItem('UserID') || ''
     param.lang = localStorage.getItem('lang') || ''
     param.SessionUid = localStorage.getItem('SessionUid') || ''
     param.LoginUID = sessionStorage.getItem('LoginUID') || ''
@@ -518,7 +555,7 @@
     _param = JSON.stringify(_param)
     _param  = md5(_param)
     
-    if (mkDataBase && storUsable) {
+    if (mkDataBase) {
       param = this.encryptParam(param)
 
       return new Promise(resolve => {
@@ -548,6 +585,9 @@
               })
             }
           }, (tx, results) => {
+            mkDataBase = null
+            console.warn(results)
+
             axios({
               url: `/webapi/dostars${param.func ? '/' + param.func : ''}`,
               data: param
@@ -557,9 +597,6 @@
               }
               resolve(res)
             })
-            mkDataBase = null
-            storUsable = false
-            console.warn(results)
           })
         })
       })

--
Gitblit v1.8.0