From c986f2f56bb153a9b6cebc74b4d9334c85ddfdda Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 04 一月 2021 18:54:02 +0800
Subject: [PATCH] 2020-01-04

---
 src/api/index.js |  517 +++++++++++++++++++++++++++++++--------------------------
 1 files changed, 283 insertions(+), 234 deletions(-)

diff --git a/src/api/index.js b/src/api/index.js
index bae643c..8dd84df 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -6,29 +6,33 @@
 import Utils from '@/utils/utils.js'
 import options from '@/store/options.js'
 
-let mkDB = null
+let mkDataBase = null
 
-if (window.GLOB.webSqlUsable) {
+if (window.openDatabase) {
   let service = window.GLOB.service ? '-' + window.GLOB.service.replace('/', '') : ''
   try {
-    mkDB = openDatabase(`mkdb${service}`, '1', 'mk-pc-database', 50 * 1024 * 1024)
-    mkDB.transaction(tx => {
-      tx.executeSql('CREATE TABLE IF NOT EXISTS VERSIONS (id unique, version varchar(50), CDefine1 varchar(50), CDefine2 varchar(50), CDefine3 varchar(50))', [], () => {
-
+    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'
       })
-      tx.executeSql('CREATE TABLE IF NOT EXISTS CONFIGS (id unique, menuid varchar(50), userid varchar(50), openEdition varchar(50), webEdition varchar(50), LongParam text, LongParamUser text, CDefine1 varchar(50), CDefine2 varchar(50), CDefine3 varchar(50), CDefine4 varchar(50), CDefine5 varchar(50))', [], () => {
+      tx.executeSql('CREATE TABLE IF NOT EXISTS CONFIGS (menuid varchar(50), userid varchar(50), openEdition varchar(50), webEdition varchar(50), LongParam text, LongParamUser text, CDefine1 varchar(50), CDefine2 varchar(50), CDefine3 varchar(50), CDefine4 varchar(50), CDefine5 varchar(50))', [], () => {
 
       }, () => {
         // eslint-disable-next-line
         throw 'CREATE TABLE ERROR'
       })
     })
+    // mkDataBase.transaction(tx => {
+    //   tx.executeSql('DROP TABLE VERSIONS')
+    //   tx.executeSql('DROP TABLE CONFIGS')
+    // })
   } catch (e) {
     console.warn(e)
-    mkDB = null
+    mkDataBase = null
   }
 }
 
@@ -52,9 +56,15 @@
   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('#')
+      localStorage.setItem(_href[0] + 'paramsmain', _href[1])
+    }
+
     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()
   }
@@ -64,18 +74,25 @@
 
 axios.interceptors.response.use((response) => {
   if (response.data.ErrCode === 'LoginError') {
-    setCurrentUrl()
+    if (window.debugger === true) {
+      response.data.ErrCode = 'E'
+      return Promise.resolve(response.data)
+    } else {
+      setCurrentUrl(response)
+    }
   } else {
     return Promise.resolve(response.data)
   }
 }, (error) => {
-  notification.error({
-    className: 'notification-custom-error',
-    bottom: 0,
-    message: '鐘舵�佺爜-' + error.response.status + '锛岃鑱旂郴绠$悊鍛�',
-    placement: 'bottomRight',
-    duration: 15
-  })
+  if (error && error.response) {
+    notification.error({
+      className: 'notification-custom-error',
+      bottom: 0,
+      message: '鐘舵�佺爜-' + error.response.status + '锛岃鑱旂郴绠$悊鍛�',
+      placement: 'bottomRight',
+      duration: 15
+    })
+  }
   return Promise.reject(error)
 })
 
@@ -109,20 +126,7 @@
     param.userid = param.userid || sessionStorage.getItem('UserID') || ''
     param.LoginUID = param.LoginUID || sessionStorage.getItem('LoginUID') || ''
 
-    param.nonc = Utils.getuuid()
-    
-    let keys = Object.keys(param).sort()
-    let values = ''
-    keys.forEach(key => {
-      if (key === 'rduri' || key === 't') return
-      if (typeof(param[key]) === 'object') {
-        values += key + JSON.stringify(param[key])
-      } else {
-        values += key + param[key]
-      }
-    })
-    param.sign  = md5(values)
-    param.t = new Date().getTime()
+    param = this.encryptParam(param)
 
     return axios({
       url: '/webapi/dostar',
@@ -143,7 +147,7 @@
 
     let param = {
       func: 's_visitor_login',
-      timestamp: moment().format('YYYY-MM-DD HH:mm:ss') + '.000', 
+      timestamp: moment().format('YYYY-MM-DD HH:mm:ss'), 
       SessionUid: _SessionUid,
       TypeCharOne: 'pc'
     }
@@ -225,79 +229,166 @@
   }
 
   /**
-   * @description 鑾峰彇绯荤粺鍩烘湰璁剧疆锛屽惎鐢ㄦ垨鏇存柊websql
+   * @description 鑾峰彇绯荤粺鐗堟湰淇℃伅锛屽惎鐢ㄦ垨鏇存柊websql
    */
-  getSystemStyle () {
-    // 鑾峰彇绯荤粺淇℃伅
-    let param = {
-      func: 's_Get_style',
-      TypeCharOne: 'PC',
-      LText: `select '${window.GLOB.appkey}'`,
-    }
-
-    param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
-    param.secretkey = Utils.encrypt(param.LText, param.timestamp)
-
-    param.userid = sessionStorage.getItem('UserID') || ''
-    param.lang = localStorage.getItem('lang') || ''
-    param.SessionUid = localStorage.getItem('SessionUid') || ''
-    param.LoginUID = sessionStorage.getItem('LoginUID') || ''
-    param.appkey = window.GLOB.appkey || ''
-
-    if (window.GLOB.mainSystemApi) {
-      param.rduri = window.GLOB.mainSystemApi
-    }
-
-    param.nonc = Utils.getuuid()
+  getAppVersion (_resolve, _reject) {
+    let appVersion = {}
     
-    let keys = Object.keys(param).sort()
-    let values = ''
-    keys.forEach(key => {
-      if (key === 'rduri' || key === 't') return
-      if (typeof(param[key]) === 'object') {
-        values += key + JSON.stringify(param[key])
+    new Promise((resolve, reject) => {
+      if (!mkDataBase) {
+        reject()
       } else {
-        values += key + param[key]
-      }
-    })
-    param.sign  = md5(values)
-    param.t = new Date().getTime()
-
-    return new Promise(resolve => {
-      axios({
-        url: `/webapi/dostars${param.func ? '/' + param.func : ''}`,
-        data: param
-      }).then(res => {
-        if (mkDB) {
-          let version = res.app_version ? `${res.app_version}` : '1'
-          // mkDB.transaction(tx => {
-          //   tx.executeSql('DROP TABLE CONFIGS')
-          // })
-
-          mkDB.transaction(tx => {
-            tx.executeSql('SELECT * FROM VERSIONS', [], (tx, results) => {
-              if (results.rows.length === 0) {
-                tx.executeSql('INSERT INTO VERSIONS (id, version) VALUES (?, ?)', ['pc', version])
-                tx.executeSql('DELETE FROM CONFIGS')
-              } else if (results.rows.length === 1) {
-                let _ver = results.rows[0]
-                if (version !== _ver.version) {
-                  tx.executeSql(`UPDATE VERSIONS SET version=${version}`)
-                  tx.executeSql('DELETE FROM CONFIGS')
-                }
-              } else if (results.rows.length > 1) {
-                tx.executeSql('DELETE FROM VERSIONS')
-                tx.executeSql('INSERT INTO VERSIONS (id, version) VALUES (?, ?)', ['pc', version])
-                tx.executeSql('DELETE FROM CONFIGS')
-              }
-            }, (tx, results) => {
-              console.warn(results)
-            })
+        mkDataBase.transaction(tx => {
+          if (!mkDataBase) {
+            reject()
+            return
+          }
+          tx.executeSql('SELECT * FROM VERSIONS', [], (tx, results) => {
+            if (results.rows.length === 0) {
+              tx.executeSql('DELETE FROM CONFIGS')
+              resolve({version: '', createDate: ''})
+            } else if (results.rows.length === 1) {
+              resolve(results.rows[0])
+            } else if (results.rows.length > 1) {
+              tx.executeSql('DELETE FROM VERSIONS')
+              tx.executeSql('DELETE FROM CONFIGS')
+              resolve({version: '', createDate: ''})
+            }
+          }, (tx, results) => {
+            reject()
+            console.warn(results)
           })
-        }
-        resolve(res)
+        })
+      }
+    }).then(msg => {
+      if (msg.version) {
+        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,
+      }
+  
+      param.userid = sessionStorage.getItem('UserID') || ''
+      param.lang = localStorage.getItem('lang') || ''
+      param.SessionUid = localStorage.getItem('SessionUid') || ''
+      param.LoginUID = sessionStorage.getItem('LoginUID') || ''
+      param.appkey = window.GLOB.appkey || ''
+  
+      if (window.GLOB.mainSystemApi) {
+        param.rduri = window.GLOB.mainSystemApi
+      }
+  
+      param = this.encryptParam(param)
+  
+      return new Promise((resolve, reject) => {
+        axios({
+          url: `/webapi/dostars${param.func ? '/' + param.func : ''}`,
+          data: param
+        }).then(res => {
+          if (!res.status) {
+            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 (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()
+              })
+            }
+            if (msg.version) {
+              tx.executeSql(`UPDATE VERSIONS SET createDate='${curTime}'`, [], () => {
+                resolve()
+              }, () => {
+                reject()
+              })
+            } else {
+              tx.executeSql('INSERT INTO VERSIONS (version, createDate) VALUES (?, ?)', [version, curTime], () => {
+                resolve()
+              }, () => {
+                reject()
+              })
+            }
+          })
+        })
+      }) 
+    }, () => {
+      mkDataBase = null
+      _reject()
+      return Promise.reject()
+    }).then(() => {
+      _resolve(appVersion)
+    }, () => {
+      mkDataBase = null
+      _reject()
+    })
+  }
+
+  /**
+   * @description 鏇存柊绯荤粺鐗堟湰淇℃伅锛屾竻绌洪厤缃俊鎭�
+   */
+  updateAppVersion (newVersion) {
+    return new Promise(resolve => {
+      if (!mkDataBase) {
+        resolve({status: false})
+        return
+      }
+      let curTime = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
+      
+      mkDataBase.transaction(tx => {
+        tx.executeSql(`DELETE FROM CONFIGS`, [], () => {}, () => {
+          resolve({status: false})
+        })
+        tx.executeSql(`UPDATE VERSIONS SET version='${newVersion}', createDate='${curTime}'`, [], () => {
+          resolve({status: true})
+        }, () => {
+          resolve({status: false})
+        })
       })
-    }) 
+    })
+  }
+
+  /**
+   * @description 鍒犻櫎鏌愪釜鑿滃崟閰嶇疆淇℃伅
+   */
+  deleteMenuStorage (menuId) {
+    return new Promise(resolve => {
+      if (!mkDataBase) {
+        resolve()
+        return
+      }
+      mkDataBase.transaction(tx => {
+        tx.executeSql(`DELETE FROM CONFIGS where menuid='${menuId}'`, [], () => {
+          resolve()
+        }, () => {
+          mkDataBase = null
+        })
+      })
+    })
   }
 
   /**
@@ -321,25 +412,59 @@
       param.LoginUID = sessionStorage.getItem('LoginUID') || ''
     }
 
-    param.nonc = Utils.getuuid()
-    
-    let keys = Object.keys(param).sort()
-    let values = ''
-    keys.forEach(key => {
-      if (key === 'rduri' || key === 't') return
-      if (typeof(param[key]) === 'object') {
-        values += key + JSON.stringify(param[key])
-      } else {
-        values += key + param[key]
-      }
-    })
-    param.sign  = md5(values)
-    param.t = new Date().getTime()
+    param = this.encryptParam(param)
 
     return axios({
       url: `/webapi/dostars${param.func ? '/' + param.func : ''}`,
       data: param
     })
+  }
+
+  /**
+   * @description 鑾峰彇浜戠閰嶇疆锛屽苟缂撳瓨淇℃伅
+   */
+  getCloudCacheConfig (param) {
+    param.lang = localStorage.getItem('lang') || ''
+    param.appkey = window.GLOB.appkey || ''
+    param.SessionUid = localStorage.getItem('SessionUid') || ''
+
+    if (sessionStorage.getItem('CloudUserID') && options.cloudServiceApi) { // 瀛樺湪浜戠鐧诲綍淇℃伅锛屼笖瀛樺湪浜戠鍦板潃
+      param.rduri = options.cloudServiceApi
+      param.userid = sessionStorage.getItem('CloudUserID')
+      param.LoginUID = sessionStorage.getItem('CloudLoginUID') || ''
+    } else if (window.GLOB.mainSystemApi) {
+      param.rduri = window.GLOB.mainSystemApi
+      param.userid = sessionStorage.getItem('UserID')
+      param.LoginUID = sessionStorage.getItem('LoginUID') || ''
+    } else {
+      param.userid = sessionStorage.getItem('UserID')
+      param.LoginUID = sessionStorage.getItem('LoginUID') || ''
+    }
+
+    let _param = JSON.parse(JSON.stringify(param)) // 缂撳瓨鏍¢獙锛屽幓闄ゆ椂闂村拰鍔犲瘑瀛楃
+    delete _param.timestamp
+    delete _param.secretkey
+    delete _param.open_key
+    _param = JSON.stringify(_param)
+    _param  = md5(_param)
+    
+    if (window.GLOB.CacheMap.has(_param)) {
+      return Promise.resolve(window.GLOB.CacheMap.get(_param))
+    } else {
+      param = this.encryptParam(param)
+
+      return new Promise(resolve => {
+        axios({
+          url: `/webapi/dostars${param.func ? '/' + param.func : ''}`,
+          data: param
+        }).then(res => {
+          if (res.status) {
+            window.GLOB.CacheMap.set(_param, res)
+          }
+          resolve(res)
+        })
+      })
+    }
   }
 
   /**
@@ -360,20 +485,7 @@
       param.rduri = window.GLOB.mainSystemApi
     }
 
-    param.nonc = Utils.getuuid()
-    
-    let keys = Object.keys(param).sort()
-    let values = ''
-    keys.forEach(key => {
-      if (key === 'rduri' || key === 't') return
-      if (typeof(param[key]) === 'object') {
-        values += key + JSON.stringify(param[key])
-      } else {
-        values += key + param[key]
-      }
-    })
-    param.sign  = md5(values)
-    param.t = new Date().getTime()
+    param = this.encryptParam(param)
 
     return axios({
       url: `/webapi/dostars${param.func ? '/' + param.func : ''}`,
@@ -385,26 +497,13 @@
    * @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') || ''
     param.appkey = window.GLOB.appkey || ''
 
-    param.nonc = Utils.getuuid()
-    
-    let keys = Object.keys(param).sort()
-    let values = ''
-    keys.forEach(key => {
-      if (key === 'rduri' || key === 't') return
-      if (typeof(param[key]) === 'object') {
-        values += key + JSON.stringify(param[key])
-      } else {
-        values += key + param[key]
-      }
-    })
-    param.sign  = md5(values)
-    param.t = new Date().getTime()
+    param = this.encryptParam(param)
 
     return axios({
       url: `/webapi/dostars${param.func ? '/' + param.func : ''}`,
@@ -440,24 +539,11 @@
     _param = JSON.stringify(_param)
     _param  = md5(_param)
     
-    if (mkDB) {
-      param.nonc = Utils.getuuid()
-      
-      let keys = Object.keys(param).sort()
-      let values = ''
-      keys.forEach(key => {
-        if (key === 'rduri' || key === 't') return
-        if (typeof(param[key]) === 'object') {
-          values += key + JSON.stringify(param[key])
-        } else {
-          values += key + param[key]
-        }
-      })
-      param.sign  = md5(values)
-      param.t = new Date().getTime()
+    if (mkDataBase) {
+      param = this.encryptParam(param)
 
       return new Promise(resolve => {
-        mkDB.transaction(tx => {
+        mkDataBase.transaction(tx => {
           tx.executeSql(`SELECT * FROM CONFIGS WHERE menuid='${param.MenuID}' and userid='${param.userid}'`, [], (tx, results) => {
             let paramItem = results.rows[0]
             if (paramItem) {
@@ -477,12 +563,15 @@
                 data: param
               }).then(res => {
                 if (res.status) {
-                  this.writeInWebSql([param.MenuID, param.MenuID, param.userid, res.open_edition, res.web_edition, res.LongParam, res.LongParamUser])
+                  this.writeInWebSql([param.MenuID, param.userid, res.open_edition, res.web_edition, res.LongParam, res.LongParamUser])
                 }
                 resolve(res)
               })
             }
           }, (tx, results) => {
+            mkDataBase = null
+            console.warn(results)
+
             axios({
               url: `/webapi/dostars${param.func ? '/' + param.func : ''}`,
               data: param
@@ -492,28 +581,13 @@
               }
               resolve(res)
             })
-            mkDB = null
-            console.warn(results)
           })
         })
       })
     } else if (window.GLOB.CacheMap.has(_param)) {
       return Promise.resolve(window.GLOB.CacheMap.get(_param))
     } else {
-      param.nonc = Utils.getuuid()
-      
-      let keys = Object.keys(param).sort()
-      let values = ''
-      keys.forEach(key => {
-        if (key === 'rduri' || key === 't') return
-        if (typeof(param[key]) === 'object') {
-          values += key + JSON.stringify(param[key])
-        } else {
-          values += key + param[key]
-        }
-      })
-      param.sign  = md5(values)
-      param.t = new Date().getTime()
+      param = this.encryptParam(param)
 
       return new Promise(resolve => {
         axios({
@@ -533,10 +607,34 @@
    * @description 灏嗘暟鎹啓鍏ebsql
    */
   writeInWebSql (data) {
-    if (!mkDB) return
-    mkDB.transaction(tx => {
-      tx.executeSql('INSERT INTO CONFIGS (id, menuid, userid, openEdition, webEdition, LongParam, LongParamUser) VALUES (?, ?, ?, ?, ?, ?, ?)', data)
+    if (!mkDataBase) return
+    mkDataBase.transaction(tx => {
+      tx.executeSql('INSERT INTO CONFIGS (menuid, userid, openEdition, webEdition, LongParam, LongParamUser) VALUES (?, ?, ?, ?, ?, ?)', data)
     })
+  }
+
+  /**
+   * @description dostars 鍙傛暟鍔犲瘑
+   */
+  encryptParam (param) {
+    param.nonc = Utils.getuuid()
+      
+    let keys = Object.keys(param).sort()
+    let values = ''
+    keys.forEach(key => {
+      if (key === 'rduri' || key === 't') return
+      if (param[key] === undefined) {
+        delete param[key]
+      } else if (typeof(param[key]) === 'object') {
+        values += key + JSON.stringify(param[key])
+      } else {
+        values += key + param[key]
+      }
+    })
+    param.sign = md5(values)
+    param.t = new Date().getTime()
+
+    return param
   }
 
   /**
@@ -544,22 +642,12 @@
    * @param {Object}  param   璇锋眰鍙傛暟
    * @param {Boolean} SSO     鏄惁涓哄崟鐐圭櫥褰曞湴鍧�
    */
-  getSystemCacheConfig (param, SSO = true) {
-    param.userid = sessionStorage.getItem('UserID') || ''
+  getSystemCacheConfig (param) {
+    param.userid = param.userid || sessionStorage.getItem('UserID') || ''
     param.lang = localStorage.getItem('lang') || ''
     param.SessionUid = localStorage.getItem('SessionUid') || ''
-    param.LoginUID = sessionStorage.getItem('LoginUID') || ''
+    param.LoginUID = param.LoginUID || sessionStorage.getItem('LoginUID') || ''
     param.appkey = window.GLOB.appkey || ''
-
-    if (sessionStorage.getItem('isEditState') === 'true' && SSO) { // 缂栬緫鐘舵�侊紝鍗曠偣鐧诲綍鏈嶅姟鍣ㄤ负浜戠
-      if (options.cloudServiceApi) { // 瀛樺湪浜戠鍦板潃鏃讹紝浣跨敤浜戠绯荤粺鍙傛暟
-        param.rduri = options.cloudServiceApi
-        param.userid = sessionStorage.getItem('CloudUserID') || ''
-        param.LoginUID = sessionStorage.getItem('CloudLoginUID') || ''
-      }
-    } else if (window.GLOB.mainSystemApi && SSO) {
-      param.rduri = window.GLOB.mainSystemApi
-    }
 
     let _param = JSON.parse(JSON.stringify(param)) // 缂撳瓨鏍¢獙锛屽幓闄ゆ椂闂村拰鍔犲瘑瀛楃
     delete _param.timestamp
@@ -571,20 +659,7 @@
     if (window.GLOB.CacheMap.has(_param)) {
       return Promise.resolve(window.GLOB.CacheMap.get(_param))
     } else {
-      param.nonc = Utils.getuuid()
-      
-      let keys = Object.keys(param).sort()
-      let values = ''
-      keys.forEach(key => {
-        if (key === 'rduri' || key === 't') return
-        if (typeof(param[key]) === 'object') {
-          values += key + JSON.stringify(param[key])
-        } else {
-          values += key + param[key]
-        }
-      })
-      param.sign  = md5(values)
-      param.t = new Date().getTime()
+      param = this.encryptParam(param)
 
       return new Promise(resolve => {
         axios({
@@ -615,20 +690,7 @@
       param.LoginUID = sessionStorage.getItem('CloudLoginUID') || ''
     }
 
-    param.nonc = Utils.getuuid()
-    
-    let keys = Object.keys(param).sort()
-    let values = ''
-    keys.forEach(key => {
-      if (key === 'rduri' || key === 't') return
-      if (typeof(param[key]) === 'object') {
-        values += key + JSON.stringify(param[key])
-      } else {
-        values += key + param[key]
-      }
-    })
-    param.sign  = md5(values)
-    param.t = new Date().getTime()
+    param = this.encryptParam(param)
 
     return axios({
       url: `/webapi/dostars${param.func ? '/' + param.func : ''}`,
@@ -714,20 +776,7 @@
       param.LoginUID = sessionStorage.getItem('LoginUID') || ''
     }
 
-    param.nonc = Utils.getuuid()
-    
-    let keys = Object.keys(param).sort()
-    let values = ''
-    keys.forEach(key => {
-      if (key === 'rduri' || key === 't') return
-      if (typeof(param[key]) === 'object') {
-        values += key + JSON.stringify(param[key])
-      } else {
-        values += key + param[key]
-      }
-    })
-    param.sign  = md5(values)
-    param.t = new Date().getTime()
+    param = this.encryptParam(param)
 
     if (param.rduri) {
       param.rduri = param.rduri.replace(/webapi(.*)$/, 'webapi/SaveBase64Image')

--
Gitblit v1.8.0