From 3350809003b1e92cbc8852de1c2e16fe716858a8 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 02 二月 2024 17:16:33 +0800
Subject: [PATCH] 2024-02-02

---
 src/api/index.js |   72 ++++++++++++++++++++++++-----------
 1 files changed, 49 insertions(+), 23 deletions(-)

diff --git a/src/api/index.js b/src/api/index.js
index 8884f3f..cc5223d 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -645,7 +645,7 @@
     param.sign = md5(values)
     param.t = new Date().getTime();
 
-    ['arr_field', 'LText_field', 'custom_script', 'LText1', 'LText', 'LText2', 'DateCount'].forEach(key => {
+    ['arr_field', 'custom_script', 'LText', 'DateCount'].forEach(key => {
       if (param[key]) {
         let val = param[key]
         delete param[key]
@@ -755,7 +755,7 @@
       param = this.encryptParam(param)
 
       axios({
-        url: token.interface,
+        url: `${token.interface}${param.func ? '/' + param.func : ''}`,
         method: 'post',
         data: JSON.stringify(param)
       }).then(res => {
@@ -804,7 +804,7 @@
           param = this.encryptParam(param)
 
           axios({
-            url: token.interface,
+            url: `${token.interface}${param.func ? '/' + param.func : ''}`,
             method: 'post',
             data: JSON.stringify(param)
           }).then(res => {
@@ -834,7 +834,7 @@
    * @description 鑾峰彇涓氬姟閫氱敤鎺ュ彛
    * 璁块棶 'https://sso.mk9h.cn/webapi/dostars'鎴栦簯绔椂锛屼紶鍏serid銆丩oginUID
    */
-  genericInterface (param) {
+  genericInterface (param, script = '', position) {
     param.userid = param.userid || sessionStorage.getItem('UserID') || ''
     param.lang = param.lang || sessionStorage.getItem('lang') || ''
     param.SessionUid = localStorage.getItem('SessionUid') || ''
@@ -852,9 +852,6 @@
       param.fullname = sessionStorage.getItem('Full_Name') || ''
     }
 
-    let login = false
-    let rduri = null
-
     if (param.rduri && /\s|\n/.test(param.rduri)) {
       param.rduri = param.rduri.replace(/\s|\n/g, '')
       if (!param.rduri) {
@@ -862,31 +859,50 @@
       }
     }
 
-    if (param.$login && !window.GLOB.transfer) {
-      login = true
-      rduri = param.rduri || ''
-    }
-    delete param.$login
+    if (script) {
+      try {
+        // eslint-disable-next-line
+        let func = new Function('axios', 'Api', 'param', 'position', 'systemType', script)
+        let promise = func(axios, this, param, position, window.GLOB.systemType)
 
-    let url = '/webapi/dostars'
+        if (promise instanceof Promise) {
+          return promise
+        }
+      } catch (e) {
+        console.warn(e)
+      }
 
-    if (param.rduri && !window.GLOB.transfer && /\/dostars/.test(param.rduri) && param.func !== 'webapi_ChangeUser') {
-      url = param.rduri
+      return Promise.resolve({
+        status: false,
+        message: '鑷畾涔夎剼鏈墽琛岄敊璇�',
+        ErrCode: 'E'
+      })
+    } else if (param.$login) {
+      let rduri = param.rduri || ''
+
+      delete param.$login
       delete param.rduri
-    }
 
-    param = this.encryptParam(param)
+      param = this.encryptParam(param)
 
-    if (login) {
       let time = +sessionStorage.getItem(rduri)
       let c_time = Math.round(new Date().getTime() / 1000)
 
       if (time && c_time - time <= 1800) {
         sessionStorage.setItem(rduri, c_time)
-        return axios({
-          url: `${url}${param.func ? '/' + param.func : ''}`,
-          method: 'post',
-          data: JSON.stringify(param)
+        return new Promise((resolve, reject) => {
+          axios({
+            url: `${rduri}${param.func ? '/' + param.func : ''}`,
+            method: 'post',
+            data: JSON.stringify(param)
+          }).then(result => {
+            if (result && result.ErrCode === 'LoginError') {
+              sessionStorage.removeItem(rduri)
+            }
+            resolve(result)
+          }, () => {
+            reject()
+          })
         })
       }
 
@@ -895,11 +911,13 @@
           if (res.status) {
             sessionStorage.setItem(rduri, c_time)
             axios({
-              url: `${url}${param.func ? '/' + param.func : ''}`,
+              url: `${rduri}${param.func ? '/' + param.func : ''}`,
               method: 'post',
               data: JSON.stringify(param)
             }).then(result => {
               resolve(result)
+            }, () => {
+              reject()
             })
           } else {
             resolve(res)
@@ -918,6 +936,14 @@
         })
       })
     } else {
+      let url = '/webapi/dostars'
+      if (param.rduri && !window.GLOB.transfer && /\/dostars/.test(param.rduri) && param.func !== 'webapi_ChangeUser') {
+        url = param.rduri
+        delete param.rduri
+      }
+
+      param = this.encryptParam(param)
+
       return axios({
         url: `${url}${param.func ? '/' + param.func : ''}`,
         method: 'post',

--
Gitblit v1.8.0