Merge pull request chaitin#156 from guanweiwang/main

yokowu · web-flow · commit b6a227f1e67c · 2025-07-25T19:21:49.000+08:00
feat: 用户登录和管理员登录合一起
diff --git a/ui/api-templates/http-client.ejs b/ui/api-templates/http-client.ejs
@@ -45,9 +45,9 @@ const redirectToLogin = () => {
   const redirectAfterLogin = encodeURIComponent(location.href);
   const search = `redirect=${redirectAfterLogin}`;
   const pathname = location.pathname.startsWith('/user')
-    ? '/user/login'
-    : '/login';
-  window.location.href = `${pathname}?${search}`;
+    ? '/login'
+    : '/login/admin';
+  window.location.href = `${pathname}`;
 };
 
 type ExtractDataProp<T> = T extends { data?: infer U } ? U : never
diff --git a/ui/src/api/httpClient.ts b/ui/src/api/httpClient.ts
@@ -65,9 +65,9 @@ const redirectToLogin = () => {
   const redirectAfterLogin = encodeURIComponent(location.href);
   const search = `redirect=${redirectAfterLogin}`;
   const pathname = location.pathname.startsWith("/user")
-    ? "/user/login"
-    : "/login";
-  window.location.href = `${pathname}?${search}`;
+    ? "/login"
+    : "/login/admin";
+  window.location.href = `${pathname}`;
 };
 
 type ExtractDataProp<T> = T extends { data?: infer U } ? U : never;
diff --git a/ui/src/components/header/index.tsx b/ui/src/components/header/index.tsx
@@ -17,7 +17,7 @@ const Header = () => {
       await postAdminLogout();
     }
     message.success('退出登录成功');
-    navigate(pathname.startsWith('/user') ? '/user/login' : '/login');
+    navigate(pathname.startsWith('/user') ? '/login/user' : '/login/admin');
   };
   return (
     <Stack
diff --git a/ui/src/main.tsx b/ui/src/main.tsx
@@ -107,18 +107,26 @@ const App = () => {
 
   const getUser = () => {
     setLoading(true);
-    if (location.pathname.startsWith('/user')) {
+    if (
+      location.pathname.startsWith('/user') ||
+      location.pathname === '/login' ||
+      location.pathname === '/login/user'
+    ) {
       return getUserProfile()
         .then((res) => {
           setUser(res);
-          if (location.pathname.startsWith('/user/login')) {
+          if (location.pathname.startsWith('/login')) {
             onGotoRedirect('user');
           }
         })
         .finally(() => {
           setLoading(false);
         });
-    } else if (!location.pathname.startsWith('/auth')) {
+    } else if (
+      !location.pathname.startsWith('/auth') ||
+      !location.pathname.startsWith('/user') ||
+      location.pathname === '/login/admin'
+    ) {
       return getAdminProfile()
         .then((res) => {
           setUser(res);
diff --git a/ui/src/pages/login/index.tsx b/ui/src/pages/login/index.tsx
diff --git a/ui/src/router.tsx b/ui/src/router.tsx

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ const Header = () => {`
`17`	`17`	`await postAdminLogout();`
`18`	`18`	`}`
`19`	`19`	`message.success('退出登录成功');`
`20`		`- navigate(pathname.startsWith('/user') ? '/user/login' : '/login');`
	`20`	`+ navigate(pathname.startsWith('/user') ? '/login/user' : '/login/admin');`
`21`	`21`	`};`
`22`	`22`	`return (`
`23`	`23`	`<Stack`