From 3875da845b8fae679bd784d1246101a5fb1b61b5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 15 三月 2023 16:33:20 +0800
Subject: [PATCH] 2023-03-15

---
 src/api/index.js |  242 +++++++++++++++++++++++++-----------------------
 1 files changed, 126 insertions(+), 116 deletions(-)

diff --git a/src/api/index.js b/src/api/index.js
index bb681d0..fc1f44b 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -9,7 +9,7 @@
 import CacheUtils from './cacheutils'
 import options from '@/store/options.js'
 
-window.GLOB.WebSql = null
+// window.GLOB.WebSql = null
 window.GLOB.IndexDB = null
 window.GLOB.OuterToken = {}
 const systemMenuKeys = `1581067625930haged11ieaivpavv77k,1581734956310scks442ul2d955g9tu5,1583991994144ndddg0bhh0is6shi0v1,1583979633842550imkchl4qt4qppsiv,
@@ -21,9 +21,10 @@
 let service = window.GLOB.service ? '-' + window.GLOB.service.replace('/', '') : ''
 let db = `mkdb${service}`
 
-if (window.openDatabase) {
-  CacheUtils.openWebSql(db)
-} else if (window.indexedDB) {
+// if (window.openDatabase) {
+//   CacheUtils.openWebSql(db)
+// } else if (window.indexedDB) {
+if (window.indexedDB) {
   CacheUtils.openIndexDB(db)
 }
 
@@ -363,7 +364,7 @@
 
   delCacheConfig (type = '') {
     let date = moment().subtract(7, 'days').format('YYYY-MM-DD')
-    CacheUtils.delWebSqlCacheConfig(date, type)
+    // CacheUtils.delWebSqlCacheConfig(date, type)
     CacheUtils.delIndexDBCacheConfig(date, type)
   }
 
@@ -372,26 +373,27 @@
     let date = moment().format('YYYY-MM-DD')
     let _data = data ? JSON.stringify(data) : ''
 
-    CacheUtils.writeCacheInWebSql([menuid, date, _data])
+    // CacheUtils.writeCacheInWebSql([menuid, date, _data])
     CacheUtils.writeCacheInIndexDB({menuid, CreateDate: date, LongParam: _data})
   }
 
   getLCacheConfig (menuid) {
     return new Promise((resolve, reject) => {
-      if (window.GLOB.WebSql) {
-        CacheUtils.getWebSqlCacheConfig(menuid).then(res => {
-          if (res && res.LongParam) {
-            let _data = JSON.parse(res.LongParam)
-            if (_data.length === 0) {
-              resolve()
-            } else {
-              resolve(_data)
-            }
-          } else {
-            resolve()
-          }
-        })
-      } else if (window.GLOB.IndexDB) {
+      // if (window.GLOB.WebSql) {
+      //   CacheUtils.getWebSqlCacheConfig(menuid).then(res => {
+      //     if (res && res.LongParam) {
+      //       let _data = JSON.parse(res.LongParam)
+      //       if (_data.length === 0) {
+      //         resolve()
+      //       } else {
+      //         resolve(_data)
+      //       }
+      //     } else {
+      //       resolve()
+      //     }
+      //   })
+      // }
+      if (window.GLOB.IndexDB) {
         CacheUtils.getIndexDBCacheConfig(menuid).then(res => {
           if (res && res.LongParam) {
             let _data = JSON.parse(res.LongParam)
@@ -414,7 +416,7 @@
    * @description 鑾峰彇绯荤粺鐗堟湰淇℃伅锛屽惎鐢ㄦ垨鏇存柊websql
    */
   getAppVersion (reload) {
-    if (!window.GLOB.WebSql && !window.GLOB.IndexDB) {
+    if (!window.GLOB.IndexDB) {
       return Promise.reject()
     }
 
@@ -429,76 +431,79 @@
       }
     }
 
-    if (window.GLOB.WebSql) {
-      return new Promise((resolve, reject) => {
-        CacheUtils.getWebSqlVersion().then(msg => {
-          let param = {
-            func: 's_get_app_version',
-            modifydate: msg.createDate
-          }
+    // if (window.GLOB.WebSql) {
+    //   return new Promise((resolve, reject) => {
+    //     CacheUtils.getWebSqlVersion().then(msg => {
+    //       let param = {
+    //         func: 's_get_app_version',
+    //         modifydate: msg.createDate
+    //       }
 
-          param.TypeCharOne = ''
-          param.typename = ''
+    //       param.TypeCharOne = ''
+    //       param.typename = ''
 
-          if (!msg.createDate && !msg.menuids) {
-            CacheUtils.updateWebSqlversion('1.00', curTime)
-            resolve()
-            return
-          } else if (!msg.createDate || reload === true) {
-            param.modifydate = curTime
-            param.menuids = window.btoa(msg.menuids)
-          } else if (msg.menuids) {
-            let d = localStorage.getItem(db)
+    //       if (!msg.createDate && !msg.menuids) {
+    //         CacheUtils.updateWebSqlversion('1.00', curTime)
+    //         resolve()
+    //         return
+    //       } else if (!msg.createDate || reload === true) {
+    //         param.modifydate = curTime
+    //         param.menuids = window.btoa(msg.menuids)
+    //       } else if (msg.menuids) {
+    //         let d = localStorage.getItem(db)
 
-            if (!d || curTime.indexOf(d) === -1) {
-              param.menuids = window.btoa(msg.menuids)
-            }
+    //         if (!d || curTime.indexOf(d) === -1) {
+    //           param.menuids = window.btoa(msg.menuids)
+    //         }
 
-            localStorage.setItem(db, curTime.substr(0, 10))
-          }
+    //         localStorage.setItem(db, curTime.substr(0, 10))
+    //       }
   
-          this.getSystemConfig(param).then(res => {
-            if (!res.status) {
-              reject()
-              return
-            }
+    //       this.getSystemConfig(param).then(res => {
+    //         if (!res.status) {
+    //           reject()
+    //           return
+    //         }
             
-            let list = res.menu_data || []
+    //         let list = res.menu_data || []
 
-            if (res.menu_del) {
-              list.push(...res.menu_del)
-            }
+    //         if (res.menu_del) {
+    //           list.push(...res.menu_del)
+    //         }
 
-            list = list.map(mid => mid.menuid)
+    //         list = list.map(mid => mid.menuid)
 
-            if (typeof(reload) === 'string' && !list.includes(reload)) {
-              list.push(reload)
-            }
+    //         if (typeof(reload) === 'string' && !list.includes(reload)) {
+    //           list.push(reload)
+    //         }
 
-            if (list.length > 0) {
-              let clear = false
-              list.forEach(mid => {
-                if (systemMenuKeys.indexOf(mid) > -1) {
-                  clear = true
-                }
-              })
-              if (clear) {
-                list = ''
-              } else {
-                list = list.map(mid => `'${mid}'`).join(',')
-              }
-              CacheUtils.delWebSqlConfig(list)
-            }
+    //         if (list.length > 0) {
+    //           let clear = false
+    //           let _appkey = window.GLOB.appkey.substr(-10)
+    //           let reg = new RegExp(_appkey + '$', 'ig')
 
-            CacheUtils.updateWebSqlversion(res.app_version || '1.00', curTime)
+    //           list.forEach(mid => {
+    //             if (systemMenuKeys.indexOf(mid) > -1 || reg.test(mid)) {
+    //               clear = true
+    //             }
+    //           })
+    //           if (clear) {
+    //             list = ''
+    //           } else {
+    //             list = list.map(mid => `'${mid}'`).join(',')
+    //           }
+    //           CacheUtils.delWebSqlConfig(list)
+    //         }
+
+    //         CacheUtils.updateWebSqlversion(res.app_version || '1.00', curTime)
   
-            resolve()
-          })
-        }, () => {
-          reject()
-        })
-      })
-    } else {
+    //         resolve()
+    //       })
+    //     }, () => {
+    //       reject()
+    //     })
+    //   })
+    // } else {
       return new Promise((resolve, reject) => {
         CacheUtils.getIndexDBVersion().then(msg => {
           let param = {
@@ -546,8 +551,11 @@
 
             if (list.length > 0) {
               let clear = false
+              let _appkey = window.GLOB.appkey.substr(-10)
+              let reg = new RegExp(_appkey + '$', 'ig')
+
               list.forEach(mid => {
-                if (systemMenuKeys.indexOf(mid) > -1) {
+                if (systemMenuKeys.indexOf(mid) > -1 || reg.test(mid)) {
                   clear = true
                 }
               })
@@ -565,18 +573,18 @@
           reject()
         })
       })
-    }
+    // }
   }
 
   /**
    * @description 鏇存柊绯荤粺鐗堟湰淇℃伅锛屾竻绌洪厤缃俊鎭�
    */
   updateAppVersion () {
-    CacheUtils.delWebSqlConfig()
-    CacheUtils.updateWebSqlversion()
+    // CacheUtils.delWebSqlConfig()
+    // CacheUtils.updateWebSqlversion()
     CacheUtils.delIndexDBConfig()
     CacheUtils.updateIndexDBversion()
-    CacheUtils.clearFuncs()
+    // CacheUtils.clearFuncs()
   }
 
   /**
@@ -586,8 +594,8 @@
     if (window.GLOB.IndexDB) {
       let key = menuId + (sessionStorage.getItem('UserID') || '')
       return CacheUtils.delMenuIndexDBConfig(key)
-    } else {
-      return CacheUtils.delMenuWebSqlConfig(menuId)
+    // } else {
+    //   return CacheUtils.delMenuWebSqlConfig(menuId)
     }
   }
 
@@ -703,27 +711,28 @@
     _param = JSON.stringify(_param)
     _param  = md5(_param)
     
-    if (window.GLOB.WebSql) {
-      return new Promise(resolve => {
-        CacheUtils.getWebSqlMenuConfig(param.MenuID, param.userid).then(res => {
-          resolve(res)
-        }, () => {
-          param = this.encryptParam(param)
-          axios({
-            url: `${url}${param.func ? '/' + param.func : ''}`,
-            method: 'post',
-            data: param
-          }).then(res => {
-            if (res.status && window.GLOB.WebSql) {
-              CacheUtils.writeInWebSql([param.MenuID, param.userid, res.open_edition, res.web_edition, res.LongParam, res.LongParamUser])
-            } else if (res.status) {
-              window.GLOB.CacheMap.set(_param, res)
-            }
-            resolve(res)
-          })
-        })
-      })
-    } else if (window.GLOB.IndexDB) {
+    // if (window.GLOB.WebSql) {
+    //   return new Promise(resolve => {
+    //     CacheUtils.getWebSqlMenuConfig(param.MenuID, param.userid).then(res => {
+    //       resolve(res)
+    //     }, () => {
+    //       param = this.encryptParam(param)
+    //       axios({
+    //         url: `${url}${param.func ? '/' + param.func : ''}`,
+    //         method: 'post',
+    //         data: param
+    //       }).then(res => {
+    //         if (res.status && window.GLOB.WebSql) {
+    //           CacheUtils.writeInWebSql([param.MenuID, param.userid, res.open_edition, res.web_edition, res.LongParam, res.LongParamUser])
+    //         } else if (res.status) {
+    //           window.GLOB.CacheMap.set(_param, res)
+    //         }
+    //         resolve(res)
+    //       })
+    //     })
+    //   })
+    // }
+    if (window.GLOB.IndexDB) {
       return new Promise(resolve => {
         CacheUtils.getIndexDBMenuConfig(param.MenuID, param.userid).then(res => {
           resolve(res)
@@ -781,15 +790,16 @@
 
     let _param  = md5(JSON.stringify(param))
     
-    if (window.GLOB.WebSql) {
-      return new Promise(resolve => {
-        CacheUtils.getWebSqlMenuConfig(param.MenuID, param.userid).then(res => {
-          resolve(res)
-        }, () => {
-          resolve({ ErrCode: 'S', ErrMesg: '', LongParam: '', message: '', status: false })
-        })
-      })
-    } else if (window.GLOB.CacheMap.has(_param)) {
+    // if (window.GLOB.WebSql) {
+    //   return new Promise(resolve => {
+    //     CacheUtils.getWebSqlMenuConfig(param.MenuID, param.userid).then(res => {
+    //       resolve(res)
+    //     }, () => {
+    //       resolve({ ErrCode: 'S', ErrMesg: '', LongParam: '', message: '', status: false })
+    //     })
+    //   })
+    // }
+    if (window.GLOB.CacheMap.has(_param)) {
       return Promise.resolve(window.GLOB.CacheMap.get(_param))
     } else {
       return Promise.resolve({ErrCode: 'S', ErrMesg: '', LongParam: '', message: '', status: false})

--
Gitblit v1.8.0