张涛 1 год назад
Родитель
Сommit
f9864fa0ab
3 измененных файлов: 16 добавлений и 16 удалений
  1. 1
    1
      src/services/login.js
  2. 14
    14
      src/store/models/user.js
  3. 1
    1
      vite.config.js

+ 1
- 1
src/services/login.js Просмотреть файл

@@ -33,4 +33,4 @@ export const postQrCode = (id, params) =>
33 33
 /**
34 34
 * 获取当前用户信息
35 35
 */
36
-export const currentUser = (params) => request("/api/admin/current", { params })
36
+export const currentUser = (params) => request("/api/sysUser/current", { params })

+ 14
- 14
src/store/models/user.js Просмотреть файл

@@ -5,7 +5,7 @@ import { currentUser } from "@/services/login";
5 5
 import { getAuthedRoutes } from "@/routes/permissions";
6 6
 
7 7
 export default function useUser () {
8
-  const [user, setUser] = useState({ userId: 1, userName: "admin" });
8
+  const [user, setUser] = useState();
9 9
   const [login, setLogin] = useState(false);
10 10
   const menusRef = useRef();
11 11
   const routesRef = useRef();
@@ -13,22 +13,22 @@ export default function useUser () {
13 13
 
14 14
   const getCurrentUser = (params) =>
15 15
     new Promise((resolve, reject) => {
16
-      // currentUser(params)
17
-      //   .then((res) => {
18
-      // dbMenusRef.current = res?.menuList || [];
19
-      // const permissions = dbMenusRef.current.map((x) => x.menuCode);
16
+      currentUser(params)
17
+        .then((res) => {
18
+      dbMenusRef.current = res?.menuList || [];
19
+      const permissions = dbMenusRef.current.map((x) => x.menuCode);
20 20
 
21
-      // // authRoutes 是所有待验证授权的路由
22
-      // // authedRoutes 是已经被授权的路由
23
-      // const authedRoutes = getAuthedRoutes(authRoutes, permissions || []);
21
+      // authRoutes 是所有待验证授权的路由
22
+      // authedRoutes 是已经被授权的路由
23
+      const authedRoutes = getAuthedRoutes(authRoutes, permissions || []);
24 24
 
25
-      // menusRef.current = getMenuItems(authedRoutes);
26
-      // routesRef.current = mergeAuthRoutes(defaultRoutes, authedRoutes);
25
+      menusRef.current = getMenuItems(authedRoutes);
26
+      routesRef.current = mergeAuthRoutes(defaultRoutes, authedRoutes);
27 27
 
28
-      //   setUser(res);
29
-      //   resolve();
30
-      // })
31
-      // .catch(reject);
28
+        setUser(res);
29
+        resolve();
30
+      })
31
+      .catch(reject);
32 32
     });
33 33
 
34 34
   // authRoutes 是所有待验证授权的路由

+ 1
- 1
vite.config.js Просмотреть файл

@@ -11,7 +11,7 @@ export default defineConfig({
11 11
     host: "0.0.0.0",
12 12
     proxy: {
13 13
       "/api": {
14
-        target: "http://192.168.89.25:7009",
14
+        target: "http://192.168.89.13:8080",
15 15
         changeOrigin: true,
16 16
       },
17 17
     },