From 6db7edfc2f0a0c4e52f13bb207919f732bcd3860 Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Tue, 27 May 2025 11:38:18 +0800
Subject: [PATCH] sc

---
 src/config/axios/service.ts              | 4 ++--
 src/permission.js                        | 6 +++++-
 src/store/modules/user.ts                | 6 +++---
 src/views/Login/components/LoginForm.vue | 2 --
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/config/axios/service.ts b/src/config/axios/service.ts
index 99a1087..68ff30f 100644
--- a/src/config/axios/service.ts
+++ b/src/config/axios/service.ts
@@ -218,7 +218,7 @@ service.interceptors.response.use(
             resetRouter() // 重置静态路由表
             cache.local.clear()
             removeToken()
-            window.location.href = `/login`
+            window.location.href = `/ss/login`
           })
         }
       }
@@ -266,7 +266,7 @@ const handleAuthorized = () => {
       isRelogin.show = false
       // 干掉token后再走一次路由让它过router.beforeEach的校验
       // window.location.href = window.location.href
-      window.location.href = `/login`
+      window.location.href = `/ss/login`
     })
   }
   return Promise.reject(t('sys.api.timeoutMessage'))
diff --git a/src/permission.js b/src/permission.js
index 22c5153..9343943 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -18,13 +18,17 @@ const whiteList = ['/login', '/social-login', '/auth-redirect', '/bind', '/regis
 router.beforeEach(async (to, from, next) => {
   start()
   loadStart()
+  const userStore = useUserStoreWithOut()
+  if (to.path == '/login') {
+    userStore.resetState() // 重置用户信息状态
+  }
+
   if (getAccessToken()) {
     if (to.path === '/login') {
       next({ path: '/' })
     } else {
       // 获取所有字典
       const dictStore = useDictStoreWithOut()
-      const userStore = useUserStoreWithOut()
       const permissionStore = usePermissionStoreWithOut()
       if (!dictStore.getIsSetDict) {
         await dictStore.setDictMap()
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 30ceee9..0110c0f 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -3,7 +3,7 @@ import { defineStore } from 'pinia'
 import { getAccessToken, removeToken } from '@/utils/auth'
 import { CACHE_KEY } from '@/hooks/web/useCache'
 import { loginOut } from '@/api/login'
-import { getUser as getUserInfo } from '@/api/system/user'
+import { getUserProfile as getUserInfo } from '@/api/system/user/profile'
 
 import cache from '@/plugins/cache'
 
@@ -55,9 +55,8 @@ export const useUserStore = defineStore('admin-user', {
       //   userInfo = await getInfo({})
       // }
       if (!userInfo?.user) {
-        const userId = localStorage.getItem('userId')
         userInfo = {
-          user: await getUserInfo(Number(userId))
+          user: await getUserInfo()
         }
       }
       // this.permissions = userInfo.permissions
@@ -82,6 +81,7 @@ export const useUserStore = defineStore('admin-user', {
         avatar: '',
         nickname: ''
       }
+      cache.local.delete(CACHE_KEY.USER)
     },
     refresh() {
       cache.local.delete(CACHE_KEY.USER)
diff --git a/src/views/Login/components/LoginForm.vue b/src/views/Login/components/LoginForm.vue
index 32dca8d..d616811 100644
--- a/src/views/Login/components/LoginForm.vue
+++ b/src/views/Login/components/LoginForm.vue
@@ -200,8 +200,6 @@ const handleLogin = async (params) => {
     if (res?.tenantId) {
       authUtil.setTenantId(res.tenantId)
     }
-    // 设置userId
-    localStorage.setItem('userId', res.userId)
 
     ElLoading.service({
       lock: true,