f

src/layouts/AuthLayout/components/Header/User.jsx

@@ -113,8 +113,8 @@ export default (props) => {
   return (
     <Dropdown menu={{ items, onClick }}>
       <div className="user-info">
-        <Avatar size={24} src={user.avatar || <DefaultAvatar />} />
-        <span className="font">{user.name}</span>
+        <Avatar size={24} src={user.account || <DefaultAvatar />} />
+        <span className="font">{user.userName}</span>
         <ChangePassword user={user} ref={passRef} />
       </div>
     </Dropdown>

src/layouts/AuthLayout/index.jsx

@@ -1,10 +1,8 @@
-import React, { useEffect } from "react";
+import React from "react";
 import { Spin } from "antd";
 import HtmlTitle from "./components/HtmlTitle";
 // import Main from './Main';
 import withLogin from "./withLogin";
-import { getToken } from "@/utils/token";
-import { useNavigate } from "react-router-dom";
 
 const Spinner = () => (
   <div
@@ -20,14 +18,6 @@ const Spinner = () => (
 );
 
 export default (props) => {
-  const navigator = useNavigate();
-
-  const token = getToken();
-  useEffect(() => {
-    if (!token) {
-      navigator("login");
-    }
-  }, [token]);
   const RequireLogin = React.lazy(() => {
     return withLogin(import("./Main"));
   });

src/services/login.js

@@ -23,3 +23,9 @@ export const logout = (data) =>
  *查询当前登录状态
  */
 export const isLogin = (params) => request("/api/isLogin", { params })
+
+
+/**
+ * 获取当前用户信息
+ */
+export const currentUser = (params) => request("/api/current", { params })

src/store/models/user.js

@@ -2,39 +2,29 @@ import { useState, useRef } from "react";
 import { defaultRoutes, authRoutes, mergeAuthRoutes } from "@/routes/routes";
 import { getMenuItems } from "@/routes/menus";
 // import { getAuthedRoutes } from "@/routes/permissions";
-import { isLogin } from "@/services/login";
+import { currentUser } from "@/services/login";
 
-export default function useUser () {
-  // const [user, setUser] = useState();
+export default function useUser() {
+  const [user, setUser] = useState({});
   const menusRef = useRef();
   const routesRef = useRef();
 
-  const getCurrentUser = () =>
-    new Promise((resolve, reject) => {
-      // isLogin()
-      //   .then((res) => {
-      // const { user } = res;
-      // const permissions = res;
-
-      // authRoutes 是所有待验证授权的路由
-      // authedRoutes 是已经被授权的路由
-      // const authedRoutes = authRoutes;
-
-      menusRef.current = getMenuItems(authRoutes);
-      routesRef.current = mergeAuthRoutes(defaultRoutes);
-      // console.log('menusRef.current', menusRef.current)
-
-      // setUser(user);
-      resolve();
-      // })
-
-    }).catch((e) => {
-      console.log(e)
-    });
+  const getCurrentUser = async () => 
+  new Promise((resolve, reject) => {
+    currentUser()
+      .then((res) => {
+        setUser(res);
+        menusRef.current = getMenuItems(authRoutes);
+        routesRef.current = mergeAuthRoutes(defaultRoutes);
+        // console.log('menusRef.current', menusRef.current)
+        resolve(res);
+      })
+      .catch(reject);
+  });
 
   return {
-    // user,
-    // setUser,
+    user,
+    setUser,
     getCurrentUser,
     menus: menusRef.current || [],
     routes: routesRef.current || [],