Merge branch 'master' of http://120.26.64.82:3000/BFFE/Foshan4A4.0

src/store/modules/user.js

@@ -1,5 +1,5 @@
 import { login, loginUp, getInfo } from '@/api/login'
-import { getToken, setToken, removeToken, setUserId, TokenKey, setLogId, removeLogId } from '@/utils/auth'
+import { getToken, setToken, removeToken, setUserId, TokenKey, setLogId, removeLogId, setUserName } from '@/utils/auth'
 import { resetRouter } from '@/router'
 import { wsSocketClose } from '@/utils/socket'
 const getDefaultState = () => {
@@ -65,6 +65,7 @@ const actions = {
           setToken('FirstLogin', returnData.FirstLogin);
           setLogId(returnData.LogId)
           setUserId(returnData.UserId)
+          setUserName(returnData.UserName)
           let nowDate = new Date();
           let oldDate = new Date(returnData.ValidTime);
           let diffTime = oldDate - nowDate;

src/utils/auth.js

@@ -31,13 +31,25 @@ export function getCodeToken () {
 }
 
 export function setLogId(id) {
-  sessionStorage.setItem('LogId', id)
+  id && sessionStorage.setItem('LogId', id)
 }
 
 export function getLogId() {
-  return sessionStorage.getItem('LogId')
+  return sessionStorage.getItem('LogId') ?? ''
 }
 
 export function removeLogId() {
   sessionStorage.removeItem('LogId')
 }
+
+export function setUserName(name) {
+  name && sessionStorage.setItem('UserName', name)
+}
+
+export function getUserName() {
+  return sessionStorage.getItem('UserName') ?? ''
+}
+
+export function removeUserName() {
+  sessionStorage.removeItem('UserName')
+}

src/utils/request.js

@@ -1,14 +1,14 @@
 /*
  * @Author: your name
  * @Date: 2022-01-06 09:45:17
- * @LastEditTime: 2022-04-16 21:51:46
+ * @LastEditTime: 2022-04-19 14:35:29
  * @LastEditors: your name
  * @Description: axios封装
  */
 import axios from 'axios'
 import { MessageBox, Message } from 'element-ui'
 import store from '@/store'
-import { getToken, getUserId, getCodeToken, getLogId } from '@/utils/auth'
+import { getToken, getUserId, getCodeToken, getLogId, getUserName } from '@/utils/auth'
 import { parseTime } from '@/utils'
 import { Loading } from 'element-ui'
 // create an axios instance
@@ -105,10 +105,12 @@ service.interceptors.response.use(
         if (res.code === 0) {
           config.data.OperatorId = (res.returnData.UserId ?? '').toString()
           config.data.LogId = (res.returnData.LogId ?? '').toString()
+          config.data.UserName = (res.returnData.UserName ?? '').toString()
         }
       } else {
         config.data.OperatorId = getUserId()
-        config.data.LogId = getLogId() ?? ''
+        config.data.LogId = getLogId()
+        config.data.UserName = getUserName()
       }
       service(config)
     }