From 0c6d3c66de8c75f82547d51848d4445853d7c4fd Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 05 十二月 2024 19:36:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/system_gateway/src/main/java/com/doumee/api/gateway/JwtAuthController.java | 47 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 45 insertions(+), 2 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 73b0de7..274dc49 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
@@ -10,11 +10,11 @@
import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.utils.Constants;
import com.doumee.dao.system.dto.LoginDTO;
+import com.doumee.dao.system.dto.LoginPhoneDTO;
import com.doumee.service.common.CaptchaService;
import com.doumee.service.system.SystemLoginService;
import com.doumee.service.system.SystemUserService;
import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.server.reactive.ServerHttpRequest;
@@ -60,6 +60,7 @@
public ApiResponse<String> login (@Validated @RequestBody LoginDTO dto, ServerWebExchange serverWebExchange) {
try {
ServerHttpRequest request = serverWebExchange.getRequest();
+ dto.setCheckCode(true);
LoginUserInfo user = systemLoginService.loginByPasswordNew(dto,request);
String token = jwtTokenUtil.generateToken(user);
return ApiResponse.success(token);
@@ -70,6 +71,26 @@
return ApiResponse.failed(ResponseStatus.SERVER_ERROR);
}
}
+
+
+ @PreventRepeat(limit = 10, lockTime = 10000)
+ @ApiOperation("鐭俊楠岃瘉鐮佺櫥褰�")
+ @PostMapping("/loginByPhone")
+ @LoginNoRequired
+ public ApiResponse<String> loginByPhone (@Validated @RequestBody LoginPhoneDTO dto, ServerWebExchange serverWebExchange) {
+ try {
+ ServerHttpRequest request = serverWebExchange.getRequest();
+ LoginUserInfo user = systemLoginService.loginByPhone(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)
@@ -91,6 +112,24 @@
}
}
+ @PreventRepeat(limit = 10, lockTime = 10000)
+ @ApiOperation("鍙告満鐧诲綍")
+ @PostMapping("/loginDriver")
+ @LoginNoRequired
+ public ApiResponse<String> loginDriver (@Validated @RequestBody LoginDTO dto, ServerWebExchange serverWebExchange) {
+ try {
+ ServerHttpRequest request = serverWebExchange.getRequest();
+ dto.setCheckCode(false);
+ LoginUserInfo user = systemLoginService.driverLogin(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);
+ }
+ }
/**
* 鍒锋柊JWT浠ょ墝,鐢ㄦ棫鐨勪护鐗屾崲鏂扮殑浠ょ墝
@@ -108,7 +147,6 @@
}catch (Exception e){
return ApiResponse.failed(ResponseStatus.SERVER_ERROR);
}
-
}
/**
* 鍒锋柊JWT浠ょ墝,鐢ㄦ棫鐨勪护鐗屾崲鏂扮殑浠ょ墝
@@ -118,6 +156,9 @@
public ApiResponse<String> logout(@RequestHeader(Constants.HEADER_USER_TOKEN) String oldToken){
try {
jwtTokenUtil.logout(oldToken);
+
+
+
}catch (BusinessException e){
return ApiResponse.failed(e.getCode(),e.getMessage());
}catch (Exception e){
@@ -127,6 +168,8 @@
}
+
+
/**
* 鍒锋柊JWT浠ょ墝,鐢ㄦ棫鐨勪护鐗屾崲鏂扮殑浠ょ墝
*/
--
Gitblit v1.9.3