.

src/app.jsx

@@ -4,6 +4,7 @@ import RightContent from '@/components/RightContent';
 import Footer from '@/components/Footer';
 import { currentUser as queryCurrentUser } from './services/user';
 import { requestConfig } from '@/utils/request';
+import myPath from './utils/myPath';
 
 const isDev = process.env.NODE_ENV === 'development';
 let loginPath = '/user/orgLogin';
@@ -16,16 +17,11 @@ export const initialStateConfig = {
  * @see  https://umijs.org/zh-CN/plugins/plugin-initial-state
  * */
 export async function getInitialState() {
-  let role=localStorage.getItem('roleAlias');
   const fetchUserInfo = async () => {
     try {
       return await queryCurrentUser();
-    } catch (error) {      
-      if(role=='admin'){
-        history.push('/user/login');
-      }else {
-        history.push(loginPath);
-      }      
+    } catch (error) {
+      history.push(myPath());
     }
 
     return undefined;
@@ -58,20 +54,15 @@ export const layout = ({ initialState }) => {
     footerRender: () => <Footer />,
     onPageChange: () => {
       const { location } = history; // 如果没有登录，重定向到 login
-      let role=localStorage.getItem('roleAlias');
       if (!initialState?.currentUser &&
         location.pathname !== loginPath &&
         location.pathname !== '/user/login') {
-          if(role=='admin'){
-            history.push('/user/login');
-          }else {
-            history.push(loginPath);
-          }
+        history.push(myPath());
       }
     },
     menuHeaderRender: undefined,
     // 自定义 403 页面
-    unAccessible: history.push('/'),
+    // unAccessible: history.push('/'),
     ...initialState?.settings,
   };
 };

src/components/RightContent/AvatarDropdown.jsx

@@ -6,31 +6,24 @@ import { stringify } from 'querystring';
 import HeaderDropdown from '../HeaderDropdown';
 import ChangePassword from './ChangePassword';
 import styles from './index.less';
+import myPath from '@/utils/myPath';
 
 /**
  * 退出登录，并且将当前的 url 保存
  */
 const loginOut = async () => {
   localStorage.removeItem('token');
-  let role=localStorage.getItem('roleAlias');
   const { query = {}, pathname } = history.location;
   const { redirect } = query;
   if (window.location.pathname !== '/user/login' && !redirect) {
-    if (role == 'org') {
-      goPage('/user/orgLogin',pathname);      
-    } else {
-      goPage('/user/login',pathname);
-    }
+    history.replace({
+      pathname: myPath(),
+      search: stringify({
+        redirect: pathname,
+      }),
+    });
   }
 };
-const goPage = (val,pathname) => {
-  history.replace({
-    pathname: val,
-    search: stringify({
-      redirect: pathname,
-    }),
-  });
-}
 const AvatarDropdown = ({ menu }) => {
   const [showPasswordModal, setShowPasswordModal] = useState(false);
   const { initialState, setInitialState } = useModel('@@initialState');

src/utils/myPath.js

@@ -0,0 +1,9 @@
+
+export default function myPath(){
+  let role = localStorage.getItem('roleAlias');
+  if (role == 'admin') {
+    return '/user/login'
+  } else {
+    return '/user/orgLogin'
+  }
+}