src/config/axios/service.ts

@@ -218,7 +218,7 @@ service.interceptors.response.use(
             resetRouter() // 重置静态路由表
             cache.local.clear()
             removeToken()
-            window.location.href = `/ss/login`
+            window.location.href = `/login`
           })
         }
       }
@@ -266,7 +266,7 @@ const handleAuthorized = () => {
       isRelogin.show = false
       // 干掉token后再走一次路由让它过router.beforeEach的校验
       // window.location.href = window.location.href
-      window.location.href = `/ss/login`
+      window.location.href = `/login`
     })
   }
   return Promise.reject(t('sys.api.timeoutMessage'))

src/permission.js

@@ -1,12 +1,14 @@
 import router from './router'
 import { isRelogin } from '@/config/axios/service'
-import { getAccessToken } from '@/utils/auth'
+import { getAccessToken, removeToken } from '@/utils/auth'
 import { useTitle } from '@/hooks/web/useTitle'
 import { useNProgress } from '@/hooks/web/useNProgress'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
 import { useDictStoreWithOut } from '@/store/modules/dict'
 import { useUserStoreWithOut } from '@/store/modules/user'
 import { usePermissionStoreWithOut } from '@/store/modules/permission'
+import { getAppId } from '@/utils/auth'
+import cache from '@/plugins/cache'
 
 const { start, done } = useNProgress()
 
@@ -18,17 +20,21 @@ const whiteList = ['/login', '/social-login', '/auth-redirect', '/bind', '/regis
 router.beforeEach(async (to, from, next) => {
   start()
   loadStart()
-  const userStore = useUserStoreWithOut()
+  if (getAppId() && to.query?.appId && getAppId() != to.query?.appId) {
-  if (to.path == '/login') {
+    removeToken()
-    userStore.resetState() // 重置用户信息状态
+    cache?.local?.delete('appInfo')
-  }
+    cache?.local?.delete('roleRouters')
-
+    cache?.local?.delete('user')
+    cache?.local?.delete('App_ID')
+    next(`/login`)
+  } else {
     if (getAccessToken()) {
       if (to.path === '/login') {
         next({ path: '/' })
       } else {
         // 获取所有字典
         const dictStore = useDictStoreWithOut()
+        const userStore = useUserStoreWithOut()
         const permissionStore = usePermissionStoreWithOut()
         if (!dictStore.getIsSetDict) {
           await dictStore.setDictMap()
@@ -63,6 +69,7 @@ router.beforeEach(async (to, from, next) => {
         // }
       }
     }
+  }
 })
 
 router.afterEach((to) => {

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 { getUserProfile as getUserInfo } from '@/api/system/user/profile'
+import { getUser as getUserInfo } from '@/api/system/user'
 
 import cache from '@/plugins/cache'
 
@@ -55,8 +55,9 @@ export const useUserStore = defineStore('admin-user', {
       //   userInfo = await getInfo({})
       // }
       if (!userInfo?.user) {
+        const userId = localStorage.getItem('userId')
         userInfo = {
-          user: await getUserInfo()
+          user: await getUserInfo(Number(userId))
         }
       }
       // this.permissions = userInfo.permissions
@@ -81,7 +82,6 @@ export const useUserStore = defineStore('admin-user', {
         avatar: '',
         nickname: ''
       }
-      cache.local.delete(CACHE_KEY.USER)
     },
     refresh() {
       cache.local.delete(CACHE_KEY.USER)

src/views/Home/index.vue

@@ -10,17 +10,12 @@
         @click="handleAppClick(item)"
       >
         <!-- card body -->
-        <div
-          class="inline-flex align-center justify-center"
-          style="width: 180px; height: 180px; border-radius: 10px; background-color: #fff"
-        >
         <el-image
           :src="item.clientLogo"
-            fit="contain"
+          fit="fill"
           :lazy="true"
-            style="width: 100%; height: auto"
+          style="width: 180px; height: 180px; border-radius: 10px; background-color: #fff"
         />
-        </div>
         <div class="cutout-text">{{ item.clientName }}</div>
 
         <template #footer v-if="item.clientDescription">

src/views/Login/components/LoginForm.vue

@@ -200,6 +200,8 @@ const handleLogin = async (params) => {
     if (res?.tenantId) {
       authUtil.setTenantId(res.tenantId)
     }
+    // 设置userId
+    localStorage.setItem('userId', res.userId)
 
     ElLoading.service({
       lock: true,