From 6c5165f73c90fbd4e22e4f9a39497b5a25ee37f9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 26 十二月 2024 09:53:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/system_gateway/src/main/java/com/doumee/api/gateway/JwtAuthController.java |   22 +++++++++++++++++++++-
 1 files changed, 21 insertions(+), 1 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 045f486..3ccf2be 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
@@ -102,7 +102,27 @@
         try {
             ServerHttpRequest request = serverWebExchange.getRequest();
             dto.setCheckCode(false);
-            LoginUserInfo user = systemLoginService.loginByPasswordNew(dto,request);
+            LoginUserInfo user =  systemLoginService.loginByPasswordNew(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("PDA涓氬姟鐧诲綍")
+    @PostMapping("/loginPDA")
+    @LoginNoRequired
+    public ApiResponse<String> loginPDA (@Validated @RequestBody LoginDTO dto, ServerWebExchange serverWebExchange) {
+        try {
+            ServerHttpRequest request = serverWebExchange.getRequest();
+            dto.setCheckCode(false);
+            LoginUserInfo user = systemLoginService.loginByPasswordForPda(dto,request);
             String token = jwtTokenUtil.generateToken(user);
             return ApiResponse.success(token);
         }catch (BusinessException e){

--
Gitblit v1.9.3