zhongxiaoyu 3 жил өмнө
parent
commit
5e0a2b0f27
2 өөрчлөгдсөн 16 нэмэгдсэн , 7 устгасан
  1. 2 1
      src/api/login.js
  2. 14 6
      src/utils/request.js

+ 2 - 1
src/api/login.js

@@ -25,7 +25,8 @@ export function login (params) {
         url: '/api/fs4a/Login/v1',
         method: 'post',
         data: params,
-        islogin: true
+        islogin: true,
+        msg: '登录'
     })
 }
 

+ 14 - 6
src/utils/request.js

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2022-01-06 09:45:17
- * @LastEditTime: 2022-04-06 11:17:20
+ * @LastEditTime: 2022-04-14 15:01:34
  * @LastEditors: your name
  * @Description: axios封装
  */
@@ -37,7 +37,7 @@ service.interceptors.request.use(
       // please modify it according to the actual situation
       config.headers['Token'] = getToken()
     }
-    if (config.data) {
+    if (config.data && !config.url.includes('/api/fs4a/sendLog')) {
       config.data['OperatorId'] = getUserId()
     }
     flag = true
@@ -46,6 +46,9 @@ service.interceptors.request.use(
         text: '数据加载中'
       })
     }
+    if (config.url.includes('/api/fs4a/sendLog') && config.data.Data[0]?.OperateResult.Token) {
+      config.headers['token'] = config.data.Data[0].OperateResult.Token
+    }
     config.metaData = {
       BeginTime: parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}')
     }
@@ -73,7 +76,7 @@ service.interceptors.response.use(
   response => {
     const res = response.data
     // 特定请求完成后发送日志
-    const { metaData, url, Ident, data, msg } = response.config
+    const { metaData, url, Ident, data, msg, islogin } = response.config
     if (!url.includes('/api/fs4a/sendLog') && (Ident || msg)) {
       Object.assign(metaData, {
         LogInfo: typeof data === 'string' ? JSON.parse(data) : data,
@@ -82,18 +85,23 @@ service.interceptors.response.use(
         OperateResult: res.returnData,
         Ident: Ident ?? ''
       })
-      service({
+      const config = {
         url: '/api/fs4a/sendLog',
         method: 'post',
         data: {
           Data: [metaData],
           BrowserTag: navigator.userAgent,
           OperateIP: returnCitySN.cip,
-          Operator: getUserId(),
           Msg: msg,
           Type: '2'
         }
-      })
+      }
+      if (islogin) {
+        config.data.OperatorId = config.data.Operator = res.returnData.UserId.toString()
+      } else {
+        config.data.OperatorId = config.data.Operator = getUserId()
+      }
+      service(config)
     }
     if (res.code == 0 || res.code == -1) {
       flag = false