feats

src/layouts/AuthLayout/components/RequireLogin.jsx

@@ -1,13 +1,23 @@
-import React, { useState } from 'react'
-import { useLocation, Navigate } from "react-router-dom"
+import React, { useState, useEffect } from 'react';
+import { useLocation, Navigate } from "react-router-dom";
+import { useModel } from '@/store';
+import { queryCurrentUser } from '@/services/user';
 
 export default (props) => {
-  const { user } = props
-  const location = useLocation()
+  const { user, setUser } = useModel('user');
+  const [userStatus, setUserStatus] = useState(user && user.id ? 1 : 0);
 
-  return props.children
+  useEffect(() => {
+    if (!user || !user.id) {
+      queryCurrentUser().then((res) => {
+        setUser(res);
+        setUserStatus(1);
+      }).catch(() => {
+        setUserStatus(-1);
+      });
+    }
+  }, []);
 
-  // return !user || !user.isLoged ?
-  //   <Navigate to="/login" state={{ from: location }} replace /> :
-  //   props.children
+  return userStatus === 0 ? null :
+    userStatus === -1 ? <Navigate to="/login?back=true" /> : props.children;
 }

src/layouts/AuthLayout/index.jsx

@@ -9,20 +9,16 @@ import SiderBar from './components/SiderBar';
 import Header from './components/Header';
 import Container from './components/Container';
 import HtmlTitle from './components/HtmlTitle';
-import useReady from './useReady';
 
 import './style.less';
 
 export default (props) => {
   const { theme } = useModel('system');
-  const { user, setUser } = useModel('user');
+  const { user } = useModel('user');
 
   const allMenus = useMemo(() => getItems(), []);
   const [siderMenus, setSiderMenus] = useState([]);
 
-  // 如果当前未登录, 跳转到登录页
-  useReady({ user, setUser });
-
   const location = useLocation();
   const currentRoute = useRoute();
 

src/layouts/AuthLayout/useReady.jsx

@@ -1,21 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import { useNavigate, useHref } from "react-router-dom";
-import { queryCurrentUser } from '@/services/user';
-
-export default function useReady({ user, setUser }) {
-  const navigate = useNavigate();
-  const isLogined = user && user.id;
-
-  useEffect(() => {
-    if (!isLogined) {
-      queryCurrentUser().then((res) => {
-        setUser(res);
-      }).catch(err => {
-        const { data } = err;
-        if (data.code === 1001) {
-          navigate('/login?back=true');
-        }
-      });
-    }
-  }, [isLogined]);
-}

vite.config.js

@@ -9,7 +9,7 @@ export default defineConfig({
     proxy: {
       '/api/': {
         // 要代理的地址
-        target: 'http://192.168.89.76:8087',
+        target: 'http://127.0.0.1:8087',
         // 配置了这个可以从 http 代理到 https
         // 依赖 origin 的功能可能需要这个，比如 cookie
         changeOrigin: true,