From 9b8baee48d0bdd95ea157be10e7c24711c511dc1 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 19 九月 2025 09:26:03 +0800
Subject: [PATCH] 最新版本541200007

---
 server/system_gateway/src/main/java/com/doumee/api/gateway/JwtAuthController.java |   65 ++++++++++++++++++++++++++++----
 1 files changed, 56 insertions(+), 9 deletions(-)

diff --git a/server/system_gateway/src/main/java/com/doumee/api/gateway/JwtAuthController.java b/server/system_gateway/src/main/java/com/doumee/api/gateway/JwtAuthController.java
index be5add3..4751b64 100644
--- a/server/system_gateway/src/main/java/com/doumee/api/gateway/JwtAuthController.java
+++ b/server/system_gateway/src/main/java/com/doumee/api/gateway/JwtAuthController.java
@@ -6,8 +6,9 @@
 import com.doumee.core.annotation.pr.PreventRepeat;
 import com.doumee.core.constants.ResponseStatus;
 import com.doumee.core.exception.BusinessException;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.LoginUserInfo;
+import com.doumee.dao.system.dto.LoginH5DTO;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.LoginUserInfo;
 import com.doumee.core.utils.Constants;
 import com.doumee.dao.system.dto.LoginDTO;
 import com.doumee.dao.system.dto.LoginPhoneDTO;
@@ -23,7 +24,6 @@
 import org.springframework.web.server.ServerWebExchange;
 
 import javax.annotation.Resource;
-import java.util.Objects;
 
 /**
  * JWT鑾峰彇浠ょ墝鍜屽埛鏂颁护鐗屾帴鍙�
@@ -98,11 +98,28 @@
     @ApiOperation("H5涓氬姟鐧诲綍")
     @PostMapping("/loginH5")
     @LoginNoRequired
-    public ApiResponse<String> loginH5 (@Validated @RequestBody LoginDTO dto, ServerWebExchange serverWebExchange) {
+    public ApiResponse<String> loginH5 (@Validated @RequestBody LoginH5DTO dto, ServerWebExchange serverWebExchange) {
         try {
             ServerHttpRequest request = serverWebExchange.getRequest();
             dto.setCheckCode(false);
-            LoginUserInfo user =  systemLoginService.loginByPasswordNew(dto,request);
+            LoginUserInfo user =  systemLoginService.loginH5(dto,request);
+            String token = jwtTokenUtil.generateToken(user);
+            return ApiResponse.success(token);
+        }catch (BusinessException e){
+            return ApiResponse.failed(e.getCode(),e.getMessage());
+        }catch (Exception e){
+            e.printStackTrace();
+            return ApiResponse.failed(ResponseStatus.SERVER_ERROR);
+        }
+    }
+    @PreventRepeat(limit = 10, lockTime = 10000)
+    @ApiOperation("H5涓氬姟鐧诲綍(鎵嬫満鍙烽獙璇佺爜鐧诲綍锛�")
+    @PostMapping("/loginH5ByPhone")
+    @LoginNoRequired
+    public ApiResponse<String> loginH5ByPhone (@Validated @RequestBody LoginPhoneDTO dto, ServerWebExchange serverWebExchange) {
+        try {
+            ServerHttpRequest request = serverWebExchange.getRequest();
+            LoginUserInfo user =  systemLoginService.loginH5ByPhone(dto,request);
             String token = jwtTokenUtil.generateToken(user);
             return ApiResponse.success(token);
         }catch (BusinessException e){
@@ -134,10 +151,27 @@
     }
 
     @PreventRepeat(limit = 10, lockTime = 10000)
+    @ApiOperation("鍙告満鐧诲綍(鎵嬫満鍙烽獙璇佺爜鐧诲綍锛�")
+    @PostMapping("/loginDriverByPhone")
+    @LoginNoRequired
+    public ApiResponse<String> loginDriverByPhone (@Validated @RequestBody LoginPhoneDTO dto, ServerWebExchange serverWebExchange) {
+        try {
+            ServerHttpRequest request = serverWebExchange.getRequest();
+            LoginUserInfo user = systemLoginService.loginDriverByPhone(dto,request);
+            String token = jwtTokenUtil.generateToken(user);
+            return ApiResponse.success(token);
+        }catch (BusinessException e){
+            return ApiResponse.failed(e.getCode(),e.getMessage());
+        }catch (Exception e){
+            e.printStackTrace();
+            return ApiResponse.failed(ResponseStatus.SERVER_ERROR);
+        }
+    }
+    @PreventRepeat(limit = 10, lockTime = 10000)
     @ApiOperation("鍙告満鐧诲綍")
     @PostMapping("/loginDriver")
     @LoginNoRequired
-    public ApiResponse<String> loginDriver (@Validated @RequestBody LoginDTO dto, ServerWebExchange serverWebExchange) {
+    public ApiResponse<String> loginDriver (@Validated @RequestBody LoginH5DTO dto, ServerWebExchange serverWebExchange) {
         try {
             ServerHttpRequest request = serverWebExchange.getRequest();
             dto.setCheckCode(false);
@@ -158,6 +192,22 @@
         try {
             ServerHttpRequest request = serverWebExchange.getRequest();
             LoginUserInfo user = systemLoginService.loginDriverWithCode(dto,request);
+            String token = jwtTokenUtil.generateToken(user);
+            return ApiResponse.success(token);
+        }catch (BusinessException e){
+            return ApiResponse.failed(e.getCode(),e.getMessage());
+        }catch (Exception e){
+            e.printStackTrace();
+            return ApiResponse.failed(ResponseStatus.SERVER_ERROR);
+        }
+    }
+    @ApiOperation("绠℃帶浜哄憳楠岃瘉鐮佺櫥褰�")
+    @PostMapping("/loginGkUserWithCode")
+    @LoginNoRequired
+    public ApiResponse<String> loginGkUserWithCode (@Validated @RequestBody LoginPhoneDTO dto, ServerWebExchange serverWebExchange) {
+        try {
+            ServerHttpRequest request = serverWebExchange.getRequest();
+            LoginUserInfo user = systemLoginService.loginGkUserWithCode(dto,request);
             String token = jwtTokenUtil.generateToken(user);
             return ApiResponse.success(token);
         }catch (BusinessException e){
@@ -202,8 +252,6 @@
         return ApiResponse.success(null);
 
     }
-
-
     @PostMapping("/logoutForH5")
     @ApiOperation("閫�鍑虹櫥闄�")
     public ApiResponse<String> logoutForH5(@RequestHeader(Constants.HEADER_USER_TOKEN) String oldToken){
@@ -215,7 +263,6 @@
             return ApiResponse.failed(ResponseStatus.SERVER_ERROR);
         }
         return ApiResponse.success(null);
-
     }
 
 

--
Gitblit v1.9.3