From 893f8276436137c61128d60031ecd8d8d5df62eb Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Mon, 26 May 2025 18:03:05 +0800
Subject: [PATCH] sc

---
 .env.base                                |  4 ++--
 src/store/modules/user.ts                | 17 ++++++++++++-----
 src/views/Error/403.vue                  |  2 +-
 src/views/Error/404.vue                  |  2 +-
 src/views/Error/500.vue                  |  2 +-
 src/views/Login/components/LoginForm.vue |  2 ++
 6 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/.env.base b/.env.base
index 6debe25..176d569 100644
--- a/.env.base
+++ b/.env.base
@@ -6,9 +6,9 @@ VITE_DEV=true
 # 请求路径
 # VITE_BASE_URL='http://localhost:48080'
 
-VITE_BASE_URL='http://47.98.161.246:48080'
+# VITE_BASE_URL='http://47.98.161.246:48080'
 # VITE_BASE_URL='http://114.55.169.15:48080'
-# VITE_BASE_URL='http://114.215.207.150:48080'
+VITE_BASE_URL='http://114.215.207.150:48080'
 
 # 上传路径
 VITE_UPLOAD_URL='http://47.98.161.246:48080/admin-api/system/file/upload'
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 23cd47d..30ceee9 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -2,7 +2,8 @@ import { store } from '../index'
 import { defineStore } from 'pinia'
 import { getAccessToken, removeToken } from '@/utils/auth'
 import { CACHE_KEY } from '@/hooks/web/useCache'
-import { getInfo, loginOut } from '@/api/login'
+import { loginOut } from '@/api/login'
+import { getUser as getUserInfo } from '@/api/system/user'
 
 import cache from '@/plugins/cache'
 
@@ -50,11 +51,17 @@ export const useUserStore = defineStore('admin-user', {
         return null
       }
       let userInfo = cache.local.get(CACHE_KEY.USER)
-      if (!userInfo || !userInfo?.menus || userInfo.menus.length == 0) {
-        userInfo = await getInfo({})
+      // if (!userInfo || !userInfo?.menus || userInfo.menus.length == 0) {
+      //   userInfo = await getInfo({})
+      // }
+      if (!userInfo?.user) {
+        const userId = localStorage.getItem('userId')
+        userInfo = {
+          user: await getUserInfo(Number(userId))
+        }
       }
-      this.permissions = userInfo.permissions
-      this.roles = userInfo.roles
+      // this.permissions = userInfo.permissions
+      // this.roles = userInfo.roles
       this.user = userInfo.user
       this.isSetUser = true
       cache.local.set(CACHE_KEY.USER, userInfo)
diff --git a/src/views/Error/403.vue b/src/views/Error/403.vue
index 242b05a..c362556 100644
--- a/src/views/Error/403.vue
+++ b/src/views/Error/403.vue
@@ -1,5 +1,5 @@
 <template>
-  <Error type="403" @error-click="push('/Home/index')" />
+  <Error type="403" @error-click="push('/index')" />
 </template>
 <script lang="ts" name="Error403" setup>
 const { push } = useRouter()
diff --git a/src/views/Error/404.vue b/src/views/Error/404.vue
index 580d3e0..17545ac 100644
--- a/src/views/Error/404.vue
+++ b/src/views/Error/404.vue
@@ -1,5 +1,5 @@
 <template>
-  <Error @error-click="push('/Home/index')" />
+  <Error @error-click="push('/index')" />
 </template>
 <script lang="ts" name="Error404" setup>
 const { push } = useRouter()
diff --git a/src/views/Error/500.vue b/src/views/Error/500.vue
index 6a7bce9..7c4e26b 100644
--- a/src/views/Error/500.vue
+++ b/src/views/Error/500.vue
@@ -1,5 +1,5 @@
 <template>
-  <Error type="500" @error-click="push('/Home/index')" />
+  <Error type="500" @error-click="push('/index')" />
 </template>
 <script lang="ts" name="Error500" setup>
 const { push } = useRouter()
diff --git a/src/views/Login/components/LoginForm.vue b/src/views/Login/components/LoginForm.vue
index d616811..32dca8d 100644
--- a/src/views/Login/components/LoginForm.vue
+++ b/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,