From f1a4a2e83a5a3a3f8636c0d85a3a02471c5b07e7 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 05 三月 2025 15:39:52 +0800
Subject: [PATCH] Merge branch 'positec' into dms

---
 src/api/index.js |   94 +++++++++++++++++++++++------------------------
 1 files changed, 46 insertions(+), 48 deletions(-)

diff --git a/src/api/index.js b/src/api/index.js
index 06e7393..2b7208c 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -15,7 +15,8 @@
 window.GLOB.$error = false
 
 let service = window.GLOB.service ? '-' + window.GLOB.service.replace('/', '') : ''
-let lang = sessionStorage.getItem('lang') !== 'zh-CN' ? sessionStorage.getItem('lang') : ''
+let lang = sessionStorage.getItem('lang') || 'zh-CN'
+lang = lang !== 'zh-CN' ? lang : ''
 let db = `mkdb${service + lang}`
 
 if (window.indexedDB) {
@@ -86,6 +87,32 @@
       placement: 'bottomRight',
       duration: 15
     })
+    if ([500, 504].includes(response.status) && error.config && error.config.url && error.config.data) {
+      window.mkInfo(error.config.url)
+      window.mkInfo(error.config.data)
+      if (window.GLOB.errorLog && !sessionStorage.getItem('local_error')) {
+        let urlReg = new RegExp('^(' + window.GLOB.baseurl + '|/)webapi/(exstars|dostars)', 'ig')
+        if (urlReg.test(error.config.url) && !/s_special_error_note_log/.test(error.config.url)) {
+          let res = null
+          try {
+            let data = JSON.parse(error.config.data)
+            if (!data.rduri) {
+              res = {
+                api_url: error.config.url,
+                error_code: response.status,
+                error_time: moment().format('YYYY-MM-DD HH:mm:ss'),
+                api_param: error.config.data
+              }
+            }
+          } catch (e) {
+            res = null
+          }
+          if (res) {
+            sessionStorage.setItem('local_error', JSON.stringify(res))
+          }
+        }
+      }
+    }
   }
 
   return Promise.reject(response)
@@ -142,36 +169,12 @@
   // }
 
   /**
-   * @description 寰俊涓氬姟璇锋眰
-   * 39涓� qingqiumarket.cn|cloud.mk9h.cn|sso.mk9h.cn
+   * @description 蹇�掓煡璇�
    */
-  wxNginxRequest (url, method, param) {
-    let _url = url
-
-    if (!/^http/.test(url)) {
-      _url = window.GLOB.location + '/' + url
-      if (process.env.NODE_ENV === 'production') {
-        _url = document.location.origin + '/' + url
-      }
-    }
-    if (/qingqiumarket.cn|cloud.mk9h.cn/.test(_url)) {
-      _url = _url.replace('http://qingqiumarket.cn/', 'http://qingqiumarket.cn:8080/')
-      _url = _url.replace('http://cloud.mk9h.cn/', 'http://cloud.mk9h.cn:8080/')
-      _url = _url.replace('https://qingqiumarket.cn/', 'https://qingqiumarket.cn:8443/')
-      _url = _url.replace('https://cloud.mk9h.cn/', 'https://cloud.mk9h.cn:8443/')
-    }
-    
-    if (param) {
-      return axios({
-        url: _url,
-        method,
-        data: param
-      })
-    }
-
+  expressRequest (url) {
     return axios({
-      url: _url,
-      method
+      url: window.GLOB.location + '/' + url,
+      method: 'get'
     })
   }
 
@@ -206,12 +209,7 @@
    * @description 娓稿鐧诲綍
    */
   getTouristMsg (binding_type, appid, openid, memberid, scanId) {
-    let _SessionUid = localStorage.getItem('SessionUid')
-
-    if (!_SessionUid) { // 鎵嬪姩娓呴櫎SessionUid鏃讹紝瀹炴椂鐢熸垚
-      _SessionUid = Utils.getuuid()
-      localStorage.setItem('SessionUid', _SessionUid)
-    }
+    let _SessionUid = localStorage.getItem('SessionUid') || ''
 
     let param = {
       func: 's_visitor_login',
@@ -247,6 +245,9 @@
       } else {
         param.linkurl = window.GLOB.linkurl
       }
+    } else if (binding_type === 'cloud') { // 鐧诲綍浜戠
+      delete param.rduri
+      url = window.atob('aHR0cHM6Ly9jbG91$mkZC5tazloLmNu'.replace('$mk', '')) + '/webapi/dologon/s_visitor_login'
     }
     
     param.LText = md5(window.btoa(_SessionUid + param.timestamp + (param.linkurl || '')))
@@ -781,6 +782,9 @@
           if (res.mksqls) {
             res.mksqls.forEach(n => {
               n = n.replace(/(UNION ALL\s+)?SELECT obj_name='[\S\s]+sub_field=''\s+/ig, '')
+              if (!res.status && param.data[0] && param.data[0].menuname) {
+                window.mkInfo('%c' + param.data[0].menuname, 'color: #f5222d')
+              }
               window.mkInfo(n)
             })
           }
@@ -1100,6 +1104,9 @@
           if (res.mksqls) {
             res.mksqls.forEach(n => {
               n = n.replace(/(UNION ALL\s+)?SELECT obj_name='[\S\s]+sub_field=''\s+/ig, '')
+              if (!res.status && param.data[0] && param.data[0].menuname) {
+                window.mkInfo('%c' + param.data[0].menuname, 'color: #f5222d')
+              }
               window.mkInfo(n)
             })
           }
@@ -1244,19 +1251,8 @@
    * @description oss鏂囦欢涓婁紶
    */
   fileOssUpload (param) {
-    let _url = window.GLOB.location + '/file/oss/upload'
-    if (process.env.NODE_ENV === 'production') {
-      _url = document.location.origin + '/file/oss/upload'
-    }
-    if (/qingqiumarket.cn|cloud.mk9h.cn/.test(_url)) {
-      _url = _url.replace('http://qingqiumarket.cn/', 'http://qingqiumarket.cn:8080/')
-      _url = _url.replace('http://cloud.mk9h.cn/', 'http://cloud.mk9h.cn:8080/')
-      _url = _url.replace('https://qingqiumarket.cn/', 'https://qingqiumarket.cn:8443/')
-      _url = _url.replace('https://cloud.mk9h.cn/', 'https://cloud.mk9h.cn:8443/')
-    }
-    
     return axios({
-      url: _url,
+      url: window.GLOB.location + '/file/oss/upload',
       method: 'post',
       headers: { 'Content-Type': 'multipart/form-data' },
       data: param
@@ -1296,7 +1292,7 @@
   /**
    * @description sql妫�楠�
    */
-  sDebug (sql) {
+  sDebug (sql, skip = false) {
     let param = {
       func: 's_debug_sql',
       exec_type: window.GLOB.execType || 'y',
@@ -1324,6 +1320,8 @@
 
     window.mkInfo(`/* sql 楠岃瘉 */\n${sql.replace(/\n\s{6,20}/ig, '\n')}`)
 
+    if (skip) return
+
     sql = sql.replace(/\n/ig, ' ')
 
     param.LText = Utils.formatOptions(sql, param.exec_type)

--
Gitblit v1.8.0