fix: Resolve wireless redirection issues

JerryFan626 · JerryFan626 · commit 59eb2c4efd73 · 2023-10-16T17:13:09.000+08:00
diff --git a/chat2db-client/package.json b/chat2db-client/package.json
@@ -22,7 +22,7 @@
     "start": "concurrently \"npm run start:web\" \"npm run start:main\"",
     "start:main": "cross-env NODE_ENV=development electron .",
     "start:main:prod": "cross-env NODE_ENV=production electron .",
-    "start:web": "cross-env UMI_ENV=local cross-env APP_VERSION=${npm_config_app_version} umi dev"
+    "start:web": "cross-env UMI_ENV=local HMR=none cross-env APP_VERSION=${npm_config_app_version} umi dev"
   },
   "dependencies": {
     "ahooks": "^3.7.7",
diff --git a/chat2db-client/src/utils/eventSource.ts b/chat2db-client/src/utils/eventSource.ts
@@ -15,6 +15,7 @@ const connectToEventSource = (params: { url: string; uid: string; onMessage: Fun
     },
   };
   const eventSource = new EventSourcePolyfill(`${window._BaseURL}${url}`, p);
+  // const eventSource = new EventSource(`${window._BaseURL}${url}`, p)
 
   eventSource.onmessage = (event) => {
     // console.log('onmessage', event);
diff --git a/chat2db-server/chat2db-server-start/src/main/java/ai/chat2db/server/start/config/config/Chat2dbWebMvcConfigurer.java b/chat2db-server/chat2db-server-start/src/main/java/ai/chat2db/server/start/config/config/Chat2dbWebMvcConfigurer.java
@@ -56,7 +56,7 @@ public class Chat2dbWebMvcConfigurer implements WebMvcConfigurer {
      * 全局放行的url
      */
     private static final String[] FRONT_PERMIT_ALL = new String[] {"/favicon.ico", "/error", "/static/**",
-        "/api/system"};
+        "/api/system", "/login"};
 
     @Resource
     private UserService userService;
@@ -138,14 +138,17 @@ public boolean preHandle(@NotNull HttpServletRequest request, @NotNull HttpServl
                         log.info("访问{},{}需要登录", buildHeaderString(request), SaHolder.getRequest().getUrl());
 
                         String path = SaHolder.getRequest().getRequestPath();
+//                        if(path.startsWith("/login")){
+//                            return true;
+//                        }
                         if (path.startsWith(API_PREFIX)) {
                             response.getWriter().println(JSON.toJSONString(
                                 ActionResult.fail("common.needLoggedIn", I18nUtils.getMessage("common.needLoggedIn"),
                                     "")));
                             return false;
                         } else {
                             throw new RedirectBusinessException(
-                                "/login-a#/login?callback=" + SaFoxUtil.joinParam(request.getRequestURI(),
+                                "/login?callback=" + SaFoxUtil.joinParam(request.getRequestURI(),
                                     request.getQueryString()));
                         }
                     }
diff --git a/chat2db-server/chat2db-server-start/src/main/java/ai/chat2db/server/start/controller/thymeleaf/ThymeleafController.java b/chat2db-server/chat2db-server-start/src/main/java/ai/chat2db/server/start/controller/thymeleaf/ThymeleafController.java
@@ -22,7 +22,7 @@ public class ThymeleafController {
      *
      * @return
      */
-    @GetMapping(value = {"/", "/web/", "/web/**","login-a"})
+    @GetMapping(value = {"/", "/web/", "/web/**","/login"})
     public String index() {
         return "index";
     }

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public class ThymeleafController {`
`22`	`22`	`*`
`23`	`23`	`* @return`
`24`	`24`	`*/`
`25`		`- @GetMapping(value = {"/", "/web/", "/web/**","login-a"})`
	`25`	`+ @GetMapping(value = {"/", "/web/", "/web/**","/login"})`
`26`	`26`	`public String index() {`
`27`	`27`	`return "index";`
`28`	`28`	`}`