From ef8acbf3859bd13e759fbb9b8ba726039c1fb2c5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 14 十一月 2023 15:51:59 +0800
Subject: [PATCH] 2023-11-14

---
 src/api/index.js |   42 ++++++++++++++++++++++++++++++++++++------
 1 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/src/api/index.js b/src/api/index.js
index ea5fd03..8884f3f 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -659,7 +659,7 @@
   /**
    * @description 鑾峰彇绯荤粺閰嶇疆锛屼紭鍏堜粠缂撳瓨涓彇鍊硷紝澧炲姞appkey
    * @param {Object}  param   璇锋眰鍙傛暟
-   * @param {Boolean} SSO     鏄惁涓哄崟鐐圭櫥褰曞湴鍧�
+   * @param {Boolean} cache   鏄惁浣跨敤缂撳瓨
    */
   getSystemCacheConfig (param, cache = true) {
     param.userid = param.userid || sessionStorage.getItem('UserID') || ''
@@ -704,7 +704,7 @@
     }
   }
 
-  visitOuterSystem (param, _resolve) {
+  visitOuterSystem (param, _resolve, _reject) {
     let token = param.$token
     delete param.$token
 
@@ -760,6 +760,8 @@
         data: JSON.stringify(param)
       }).then(res => {
         _resolve(res)
+      }, () => {
+        _reject()
       })
     } else {
       let _param = {
@@ -807,9 +809,22 @@
             data: JSON.stringify(param)
           }).then(res => {
             _resolve(res)
+          }, () => {
+            _reject()
           })
         } else {
           _resolve(result)
+        }
+      }, (e) => {
+        if (!e || !e.status) {
+          let msg = '缃戠粶杩炴帴涓嶆甯搞��'
+
+          if (/^http:/.test(token.interface) && /https:/.test(window.location.protocol)) {
+            msg = '缃戠粶杩炴帴涓嶆甯革紝鎺ュ彛鍦板潃鍙兘涓嶆敮鎸乭ttps銆�'
+          }
+          _resolve({status: false, ErrCode: 'E', message: msg})
+        } else {
+          _reject()
         }
       })
     }
@@ -829,7 +844,7 @@
     if (param.$token === '') {
       return Promise.resolve({status: false, ErrCode: 'token_error', message: '鎺ュ彛鍦板潃灏氭湭璁剧疆锛�'})
     } else if (param.$token) {
-      return new Promise(resolve => this.visitOuterSystem(param, resolve))
+      return new Promise((resolve, reject) => this.visitOuterSystem(param, resolve, reject))
     }
 
     if (['sPC_TableData_InUpDe', 'sPC_TableData_InUpDe_debug'].includes(param.func)) {
@@ -888,6 +903,17 @@
             })
           } else {
             resolve(res)
+          }
+        }, (e) => {
+          if (!e || !e.status) {
+            let msg = '缃戠粶杩炴帴涓嶆甯搞��'
+
+            if (/^http:/.test(rduri) && /https:/.test(window.location.protocol)) {
+              msg = '缃戠粶杩炴帴涓嶆甯革紝鎺ュ彛鍦板潃鍙兘涓嶆敮鎸乭ttps銆�'
+            }
+            resolve({status: false, ErrCode: 'E', message: msg})
+          } else {
+            reject()
           }
         })
       })
@@ -1028,13 +1054,15 @@
       appkey: window.GLOB.appkey || ''
     }
 
+    let id = Utils.getuuid()
+    sql = sql.replace(/@time_id@/ig, `'${id}'`)
     if (window.GLOB.externalDatabase !== null) {
       sql = sql.replace(/@db@/ig, window.GLOB.externalDatabase)
     }
 
-    sql = sql.replace(/\n\s{6,20}/ig, ' ')
+    console.info(`/* sql 楠岃瘉 */\n${sql.replace(/\n\s{6,20}/ig, '\n')}`)
 
-    console.info(`/* sql 楠岃瘉 */\n${sql}`)
+    sql = sql.replace(/\n/ig, ' ')
 
     param.LText = Utils.formatOptions(sql)
     param.secretkey = Utils.encrypt('', param.timestamp)
@@ -1062,7 +1090,7 @@
         method: 'post',
         data: JSON.stringify(_param)
       })
-    }, 10000)
+    }, 20000)
 
     return new Promise(resolve => {
       axios({
@@ -1073,6 +1101,8 @@
         clearTimeout(timer)
         if (/Shared Memory Provider|浼氳瘽澶勪簬缁堟鐘舵�亅褰撳墠鍛戒护鍙戠敓浜嗕弗閲嶉敊璇�/.test(res.message)) {
           res.message = '楠岃瘉澶辫触锛岃妫�鏌QL涓槸鍚﹀瓨鍦ㄦ寰幆銆�'
+        } else if (res.message.indexOf('EXECUTE 鍚庣殑浜嬪姟璁℃暟鎸囩ず BEGIN 鍜� COMMIT 璇彞鐨勬暟鐩笉鍖归厤銆備笂涓�璁℃暟 = 1锛屽綋鍓嶈鏁� = 0') > -1) {
+          res.ErrCode = '-2'
         }
         resolve(res)
       }, () => {

--
Gitblit v1.8.0