From 654ade05f7d3728066b18e04b5bf789674ceb6e7 Mon Sep 17 00:00:00 2001
From: zhaowei <cp3hnu@gmail.com>
Date: Thu, 17 Jul 2025 09:46:04 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 react-ui/src/app.tsx                    | 1 -
 react-ui/src/pages/Authorize/index.tsx  | 4 +++-
 react-ui/src/pages/User/Login/index.tsx | 6 ++++++
 react-ui/src/utils/ui.tsx               | 3 ---
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/react-ui/src/app.tsx b/react-ui/src/app.tsx
index 16d0e562..9c6650f2 100644
--- a/react-ui/src/app.tsx
+++ b/react-ui/src/app.tsx
@@ -118,7 +118,6 @@ export const layout: RuntimeConfig['layout'] = ({ initialState }) => {
 };
 
 export const onRouteChange: RuntimeConfig['onRouteChange'] = async (e) => {
-  debugger;
   // console.log('onRouteChange');
 
   // 路由切换时，尤其是回退时，关闭打开的弹框
diff --git a/react-ui/src/pages/Authorize/index.tsx b/react-ui/src/pages/Authorize/index.tsx
index 6f101b64..7c5f9fb9 100644
--- a/react-ui/src/pages/Authorize/index.tsx
+++ b/react-ui/src/pages/Authorize/index.tsx
@@ -38,8 +38,10 @@ function Authorize() {
       message.success('登录成功！');
       await fetchUserInfo();
       const redierctUrl = SessionStorage.getItem(SessionStorage.redirectUrl);
+      console.log('redirect', redirect);
+      console.log('redierctUrl', redierctUrl);
       history.replace(redirect || redierctUrl || '/workspace');
-      SessionStorage.removeItem(SessionStorage.redirectUrl);
+      // SessionStorage.removeItem(SessionStorage.redirectUrl);
     }
   }, [fetchUserInfo, redirect, code]);
 
diff --git a/react-ui/src/pages/User/Login/index.tsx b/react-ui/src/pages/User/Login/index.tsx
index e2df0693..4a6f3e7e 100644
--- a/react-ui/src/pages/User/Login/index.tsx
+++ b/react-ui/src/pages/User/Login/index.tsx
@@ -15,6 +15,12 @@ const Login = () => {
     if (res && res.data) {
       const clientInfo = res.data;
       SessionStorage.setItem(SessionStorage.clientInfoKey, clientInfo, true);
+      const urlParams = new URL(window.location.href).searchParams;
+      const redirectUrl = urlParams.get('redirect');
+      console.log('login redirectUrl', redirectUrl);
+      if (redirectUrl) {
+        SessionStorage.setItem(SessionStorage.redirectUrl, redirectUrl);
+      }
       gotoOAuth2();
     }
   };
diff --git a/react-ui/src/utils/ui.tsx b/react-ui/src/utils/ui.tsx
index 3eccaef7..a60c43be 100644
--- a/react-ui/src/utils/ui.tsx
+++ b/react-ui/src/utils/ui.tsx
@@ -77,9 +77,6 @@ export const gotoLoginPage = (toHome: boolean = true) => {
   if (pathname !== PageEnum.LOGIN) {
     closeAllModals();
     removeAllPageCacheState();
-    if (newSearch) {
-      SessionStorage.setItem(newSearch, SessionStorage.redirectUrl);
-    }
     history.replace({
       pathname: PageEnum.LOGIN,
       search: newSearch,