From 4b3c21e0d148dd5e56f4f34c10a0b8919bb1fd68 Mon Sep 17 00:00:00 2001
From: jmal <zhushilun084@gmail.com>
Date: Wed, 8 Mar 2023 14:21:23 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E6=B7=BB=E5=8A=A0username=E5=88=B0?=
 =?UTF-8?q?cookies?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/permission.js         |  2 +-
 src/store/modules/user.js |  7 +++++--
 src/utils/auth.js         | 12 +++++++++++-
 src/utils/request.js      |  5 ++++-
 src/websocket/sockJS.js   |  6 +++---
 5 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/src/permission.js b/src/permission.js
index 930234d..964681b 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -27,7 +27,7 @@ router.beforeEach(async(to, from, next) => {
       NProgress.done()
     } else {
       // 非登录页面
-      const hasGetUserInfo = store.getters.name
+      const hasGetUserInfo = store.getters.userInfo.username
       if (hasGetUserInfo) {
         // 存在用户信息
         setMenuList(next)
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 44559ec..82d5ffd 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -11,7 +11,9 @@ import {
   setRememberName,
   removeRememberName,
   setShareToken,
-  getShareToken, removeShareToken
+  getShareToken,
+  removeShareToken,
+  getUsername, setUsername,
 } from '@/utils/auth'
 import { setLogo } from '@/utils/logo'
 import { resetRouter } from '@/router'
@@ -24,7 +26,7 @@ const getDefaultState = () => {
   return {
     token: getToken(),
     shareToken: getShareToken(),
-    name: '',
+    name: getUsername(),
     showName: '',
     userInfo: {},
     avatar: '',
@@ -97,6 +99,7 @@ const actions = {
         const { data } = response
         commit('SET_TOKEN', data.token)
         setToken(data.token)
+        setUsername(username.trim())
         commit('SET_USERID', data.userId)
         setConsumerId(data.userId)
         if(rememberMe){
diff --git a/src/utils/auth.js b/src/utils/auth.js
index b18357a..70ddf93 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -1,6 +1,7 @@
 import Cookies from 'js-cookie'
 
 const tokenKey = 'jmal_token'
+const usernameKey = 'username'
 const shareTokenKey = 'share-token'
 const consumerId = 'consumerId'
 const rememberName = 'rememberName'
@@ -21,6 +22,14 @@ export function getToken() {
   return Cookies.get(tokenKey)
 }
 
+export function getUsername() {
+  return Cookies.get(usernameKey)
+}
+
+export function setUsername(username) {
+  return Cookies.set(usernameKey, username)
+}
+
 export function getShareToken() {
   return Cookies.get(shareTokenKey)
 }
@@ -34,7 +43,8 @@ export function setToken(token) {
 }
 
 export function removeToken() {
-  return Cookies.remove(tokenKey)
+  Cookies.remove(tokenKey)
+  Cookies.remove(usernameKey)
 }
 
 export function removeShareToken() {
diff --git a/src/utils/request.js b/src/utils/request.js
index 47219b6..92266c7 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -1,6 +1,6 @@
 // import { MessageBox, Message } from 'element-ui'
 import store from '@/store'
-import {getShareToken, getToken} from '@/utils/auth'
+import {getShareToken, getToken, getUsername} from '@/utils/auth'
 
 // create an axios instance
 const service = axios.create({
@@ -16,6 +16,9 @@ service.interceptors.request.use(
     if (store.getters.token) {
       config.headers['jmal-token'] = getToken()
     }
+    if (store.getters.name) {
+      config.headers['name'] = getUsername()
+    }
     if (store.getters.shareToken) {
       config.headers['share-token'] = getShareToken()
     }
diff --git a/src/websocket/sockJS.js b/src/websocket/sockJS.js
index 5520349..6216bf2 100644
--- a/src/websocket/sockJS.js
+++ b/src/websocket/sockJS.js
@@ -4,17 +4,17 @@ import ws from './websocket_config';
 import Bus from '@/assets/js/bus'
 
 export function toConnection(username,token) {
-  connect(username,token);
+  connect(username, token);
   // 断开重连机制,尝试发送消息,捕获异常发生时重连
   ws.timer = setInterval(() => {
     try {
       if(ws.isConnected){
         ws.stompClient.send("test");
       }else{
-        connect(username,token);
+        connect(username, token);
       }
     } catch (err) {
-      connect(username,token);
+      connect(username, token);
     }
   }, 10000);
 }