From 5e82b0ad1b94b8d2d9603fb9384346e6be60d5ab Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 08 八月 2023 14:03:34 +0800
Subject: [PATCH] 2023-08-08

---
 src/api/index.js |   70 +++++++++++++++--------------------
 1 files changed, 30 insertions(+), 40 deletions(-)

diff --git a/src/api/index.js b/src/api/index.js
index 607c1ae..cd5b4fb 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -341,20 +341,15 @@
     return new Promise((resolve, reject) => {
       if (window.GLOB.IndexDB) {
         let limit = minutes ? moment().subtract(minutes, 'minutes').format('YYYY-MM-DD HH:mm:ss') : ''
-        CacheUtils.getIndexDBCacheConfig(menuid, limit).then(res => {
+        CacheUtils.getIndexDBCacheConfig(menuid).then(res => {
           if (res && res.LongParam) {
-            let _data = JSON.parse(res.LongParam)
-            if (_data.length === 0) {
-              resolve()
-            } else {
-              resolve(_data)
-            }
+            resolve({data: JSON.parse(res.LongParam), valid: !limit || res.CreateDate > limit})
           } else {
-            resolve()
+            resolve({data: null, valid: false})
           }
         })
       } else {
-        resolve()
+        resolve({data: null, valid: false})
       }
     })
   }
@@ -463,10 +458,10 @@
    */
   getCloudConfig (param) {
     param.lang = param.lang || sessionStorage.getItem('lang') || ''
-    param.appkey = window.GLOB.appkey || ''
+    param.appkey = param.appkey || window.GLOB.appkey || ''
     param.SessionUid = localStorage.getItem('SessionUid') || ''
-    param.userid = sessionStorage.getItem('CloudUserID') || ''
-    param.LoginUID = sessionStorage.getItem('CloudLoginUID') || ''
+    param.userid = param.userid || sessionStorage.getItem('CloudUserID') || ''
+    param.LoginUID = param.LoginUID || sessionStorage.getItem('CloudLoginUID') || ''
 
     param = this.encryptParam(param)
 
@@ -485,26 +480,26 @@
   /**
    * @description 鑾峰彇鎴栦慨鏀圭郴缁熼厤缃紝澧炲姞appkey
    */
-  // getSystemFuncs (time) {
-  //   let param = {
-  //     func: 's_get_func_base_sso',
-  //     update_date: time,
-  //     userid: sessionStorage.getItem('UserID') || '',
-  //     lang: sessionStorage.getItem('lang') || '',
-  //     SessionUid: localStorage.getItem('SessionUid') || '',
-  //     LoginUID: sessionStorage.getItem('LoginUID') || '',
-  //     appkey: window.GLOB.appkey
-  //   }
+  getSystemFuncs (time) {
+    let param = {
+      func: 's_get_func_base_sso',
+      update_date: time,
+      userid: sessionStorage.getItem('UserID') || '',
+      lang: sessionStorage.getItem('lang') || '',
+      SessionUid: localStorage.getItem('SessionUid') || '',
+      LoginUID: sessionStorage.getItem('LoginUID') || '',
+      appkey: window.GLOB.appkey
+    }
 
-  //   let url = window.GLOB.mainSystemApi || '/webapi/dostars'
-  //   param = this.encryptParam(param)
+    let url = window.GLOB.mainSystemApi || '/webapi/dostars'
+    param = this.encryptParam(param)
 
-  //   return axios({
-  //     url: `${url}/${param.func}`,
-  //     method: 'post',
-  //     data: JSON.stringify(param)
-  //   })
-  // }
+    return axios({
+      url: `${url}/${param.func}`,
+      method: 'post',
+      data: JSON.stringify(param)
+    })
+  }
 
   /**
    * @description 鑾峰彇鎴栦慨鏀圭郴缁熼厤缃紝澧炲姞appkey
@@ -517,7 +512,7 @@
     param.appkey = param.appkey || window.GLOB.appkey
 
     let url = '/webapi/dostars'
-    if (sessionStorage.getItem('isEditState') === 'true' && options.cloudServiceApi) { // 缂栬緫鐘舵�侊紝涓斿瓨鍦ㄤ簯绔湴鍧�
+    if (window.GLOB.mkHS && options.cloudServiceApi) { // HS涓嬶紝涓斿瓨鍦ㄤ簯绔湴鍧�
       url = options.cloudServiceApi
       param.userid = sessionStorage.getItem('CloudUserID') || ''
       param.LoginUID = sessionStorage.getItem('CloudLoginUID') || ''
@@ -549,7 +544,7 @@
     param.appkey = param.appkey || window.GLOB.appkey || ''
 
     let url = '/webapi/dostars'
-    if (sessionStorage.getItem('isEditState') === 'true') { // 缂栬緫鐘舵�侊紝鍗曠偣鐧诲綍鏈嶅姟鍣ㄤ负浜戠
+    if (window.GLOB.mkHS) {          // HS涓嬶紝鍗曠偣鐧诲綍鏈嶅姟鍣ㄤ负浜戠
       if (options.cloudServiceApi) { // 瀛樺湪浜戠鍦板潃鏃讹紝浣跨敤浜戠绯荤粺鍙傛暟
         url = options.cloudServiceApi
         param.userid = sessionStorage.getItem('CloudUserID') || ''
@@ -838,14 +833,9 @@
       return new Promise(resolve => this.visitOuterSystem(param, resolve))
     }
 
-    if (['sPC_Get_TableData', 'sPC_Get_TableData_debug', 'sPC_TableData_InUpDe', 'sPC_TableData_InUpDe_debug', 'sPC_Get_structured_data'].includes(param.func)) {
-      if (sessionStorage.getItem('isEditState') === 'true') {
-        param.username = sessionStorage.getItem('CloudUserName') || ''
-        param.fullname = sessionStorage.getItem('CloudFullName') || ''
-      } else {
-        param.username = sessionStorage.getItem('User_Name') || ''
-        param.fullname = sessionStorage.getItem('Full_Name') || ''
-      }
+    if (['sPC_TableData_InUpDe', 'sPC_TableData_InUpDe_debug'].includes(param.func)) {
+      param.username = sessionStorage.getItem('User_Name') || ''
+      param.fullname = sessionStorage.getItem('Full_Name') || ''
     }
 
     let login = false

--
Gitblit v1.8.0