张涛 1 year ago
parent
commit
f9864fa0ab
3 changed files with 16 additions and 16 deletions
  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 View File

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 View File

5
 import { getAuthedRoutes } from "@/routes/permissions";
5
 import { getAuthedRoutes } from "@/routes/permissions";
6
 
6
 
7
 export default function useUser () {
7
 export default function useUser () {
8
-  const [user, setUser] = useState({ userId: 1, userName: "admin" });
8
+  const [user, setUser] = useState();
9
   const [login, setLogin] = useState(false);
9
   const [login, setLogin] = useState(false);
10
   const menusRef = useRef();
10
   const menusRef = useRef();
11
   const routesRef = useRef();
11
   const routesRef = useRef();
13
 
13
 
14
   const getCurrentUser = (params) =>
14
   const getCurrentUser = (params) =>
15
     new Promise((resolve, reject) => {
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
   // authRoutes 是所有待验证授权的路由
34
   // authRoutes 是所有待验证授权的路由

+ 1
- 1
vite.config.js View File

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