From 42d07cdabd43213c5d328fc0dc285624b33e46b0 Mon Sep 17 00:00:00 2001
From: lk <kelis@Gmail.com>
Date: Thu, 12 Sep 2024 12:41:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E6=B3=A8=E5=86=8C=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=20=20=E6=9C=AA=E6=88=90=E5=8A=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/login/index.tsx |  4 ++--
 src/request.ts            |  8 ++++++--
 src/routes.tsx            |  5 +++++
 src/store/system/user.ts  | 16 ++++++++--------
 vite.config.ts            |  2 +-
 5 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/src/pages/login/index.tsx b/src/pages/login/index.tsx
index 9e327a5..0e1580a 100644
--- a/src/pages/login/index.tsx
+++ b/src/pages/login/index.tsx
@@ -13,13 +13,13 @@ const { TabPane } = Tabs;
 const Login = memo(() => {
   const [upform] = Form.useForm();
   const [emailform] = Form.useForm();
-  const { mutate: upMutate } = useAtomValue(upLoginAtom);
+  const { mutate: upLoginFun } = useAtomValue(upLoginAtom);
   const { mutate: emailCodeMutate } = useAtomValue(emailCodeAtom);
   const { mutate: emailLoginMutate } = useAtomValue(emailLoginAtom);
 
   const uphandleSubmit = (values: any) => {
     console.log(values);
-    upMutate(values);
+    upLoginFun(values);
   };
   const emailhandleSubmit = (values: any) => {
     console.log(values);
diff --git a/src/request.ts b/src/request.ts
index 0f39b4e..c129df6 100644
--- a/src/request.ts
+++ b/src/request.ts
@@ -71,7 +71,9 @@ axiosInstance.interceptors.response.use(
         if (window.location.pathname === "/login") {
           return Promise.reject(new Error("to login"));
         }
-
+        if (window.location.pathname === "/register") {
+          return Promise.reject(new Error("register"));
+        }
         // 401: 未登录
         message.error("登录失败，跳转重新登录");
         // eslint-disable-next-line no-case-declarations
@@ -98,7 +100,9 @@ axiosInstance.interceptors.response.use(
           if (window.location.pathname === "/login") {
             return;
           }
-
+          if (window.location.pathname === "/register") {
+            return;
+          }
           setToken("");
           // 401: 未登录
           message.error("登录失败，跳转重新登录");
diff --git a/src/routes.tsx b/src/routes.tsx
index ca6d7d2..5cfcfc6 100644
--- a/src/routes.tsx
+++ b/src/routes.tsx
@@ -163,6 +163,11 @@ declare module '@tanstack/react-router' {
       preLoaderRoute: typeof LoginRouteImport
       parentRoute: typeof rootRoute
     },
+
+    '/register': {
+      preLoaderRoute: typeof layoutNormalRoute
+      parentRoute: typeof rootRoute
+    },
     // '/system/menus': {
     //     preLoaderRoute: typeof menusRoute
     //     parentRoute: typeof layoutAuthRoute
diff --git a/src/store/system/user.ts b/src/store/system/user.ts
index 578b86e..3e679b3 100644
--- a/src/store/system/user.ts
+++ b/src/store/system/user.ts
@@ -17,6 +17,7 @@ export interface UPLoginRequest {
   password: string;
   code: string;
 }
+export interface LoginResponse {}
 
 export const authAtom = atom<IAuth>({
   isLogin: false,
@@ -31,30 +32,30 @@ const devLogin = {
 export const upLoginFormAtom = atom<UPLoginRequest>({
   ...(isDev ? devLogin : {}),
 } as UPLoginRequest);
-
-export const upLoginAtom = atomWithMutation<any, System.LoginRequest>((get) => ({
+//============================================================================================================登录  登出
+export const  upLoginAtom = atomWithMutation<any, UPLoginRequest>((get) => ({
   mutationKey: ["uplogin"],
-  mutationFn: async (params) => {
+  mutationFn: async (params: UPLoginRequest) => {
     return await systemServ.uplogin(params);
   },
   onSuccess: (res) => {
     message.success(t("login.success"));
-    // console.log('login success', res)
     get(userMenuDataAtom).refetch().then();
     return res.data;
   },
   retry: false,
 }));
 
+
 export const emailCodeAtom = atomWithMutation<any, any>((get) => ({
   mutationKey: ["emailCode"],
   mutationFn: async (params) => {
     return await systemServ.emailCode(params);
   },
   onSuccess: (res) => {
-    message.success(t("login.success"));
+    //message.success(t("login.success"));
     // console.log('login success', res)
-    get(userMenuDataAtom).refetch().then();
+    //get(userMenuDataAtom).refetch().then();
     return res.data;
   },
   retry: false,
@@ -67,7 +68,6 @@ export const emailLoginAtom = atomWithMutation<any, any>((get) => ({
   onSuccess: (res) => {
     message.success(t("login.success"));
     // console.log('login success', res)
-    get(userMenuDataAtom).refetch().then();
     return res.data;
   },
   retry: false,
@@ -80,7 +80,7 @@ export const logoutAtom = atomWithMutation(() => ({
     return true;
   },
 }));
-
+//============================================================================================================
 export const currentStaticUserAtom = atomWithStorage<IUserInfo | null>("user", null);
 
 export const currentUserAtom = atomWithQuery<IApiResult<System.IUserInfo>, any, System.IUserInfo>((get) => {
diff --git a/vite.config.ts b/vite.config.ts
index 8efc084..c9d35d4 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -14,7 +14,7 @@ const proxyMap = {
   //'/api/v1/certold': 'http://192.168.31.41:8000',
   "/api/v1/cert": "http://127.0.0.1:8000",
   //'/api/v1/cert': 'http://192.168.31.41:8000',
-  "/api/v1/sys": "http://192.168.31.41:8686/",
+  //"/api/v1/sys": "http://192.168.31.41:8686/",
 } as Record<any, string>;
 
 const proxyConfig = Object.keys(proxyMap).reduce(