From 56b8aa40e7e73b92f983a2c6ee0f87adbe2b4731 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期四, 25 十一月 2021 10:26:49 +0800
Subject: [PATCH] [fix] 修正OtpResource 在 git merge時導致的錯誤
---
pamapi/src/main/java/com/pollex/pam/web/rest/OtpResource.java | 40 ++++++++++++++++++----------------------
1 files changed, 18 insertions(+), 22 deletions(-)
diff --git a/pamapi/src/main/java/com/pollex/pam/web/rest/OtpResource.java b/pamapi/src/main/java/com/pollex/pam/web/rest/OtpResource.java
index d2ba706..e8f5533 100644
--- a/pamapi/src/main/java/com/pollex/pam/web/rest/OtpResource.java
+++ b/pamapi/src/main/java/com/pollex/pam/web/rest/OtpResource.java
@@ -25,6 +25,7 @@
import javax.xml.rpc.ServiceException;
import java.rmi.RemoteException;
+import java.util.Arrays;
import java.util.UUID;
@RestController
@@ -44,36 +45,31 @@
@Autowired
TokenProvider tokenProvider;
-
+
@Autowired
CustomerAuthService customerAuthService;
-
+
@Autowired
OtpTmpService otpTmpService;
-
+
@Autowired
CustomerService customerService;
@PostMapping("/sendOtp")
public ResponseEntity<Object> sendOtp(@RequestBody OtpLoginVM login) {
OtpResponseDTO otpResponse;
- try {
- if(applicationProperty.isMockLogin()) {
- otpResponse = getMockSendOtpResponse();
- }else if(login.getLoginType() == OtpLoginTypeEnum.SMS) {
- otpResponse = otpWebService.sendByPhone(login.getAccount());
- }
- else if(login.getLoginType() == OtpLoginTypeEnum.EMAIL) {
- otpResponse = otpWebService.sendByEmail(login.getAccount());
- }else {
- return ResponseEntity.status(HttpStatus.BAD_REQUEST).body("can not support this login type, loginType = " + login.getLoginType().name());
- }
- otpTmpService.createOtpTmp(login.getAccount(), otpResponse.getIndexKey());
- return new ResponseEntity<>(otpResponse, HttpStatus.OK);
-
- } catch (ServiceException | RemoteException e) {
- return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("connecting otp web service error");
+ if(applicationProperty.isMockLogin()) {
+ otpResponse = getMockSendOtpResponse();
+ }else if(login.getLoginType() == OtpLoginTypeEnum.SMS) {
+ otpResponse = otpWebService.sendByPhone(login.getAccount());
}
+ else if(login.getLoginType() == OtpLoginTypeEnum.EMAIL) {
+ otpResponse = otpWebService.sendByEmail(login.getAccount());
+ }else {
+ return ResponseEntity.status(HttpStatus.BAD_REQUEST).body("can not support this login type, loginType = " + login.getLoginType().name());
+ }
+ otpTmpService.createOtpTmp(login.getAccount(), otpResponse.getIndexKey());
+ return new ResponseEntity<>(otpResponse, HttpStatus.OK);
}
@PostMapping("/verify")
@@ -83,12 +79,12 @@
httpHeaders.add(JWTFilter.AUTHORIZATION_HEADER, "Bearer" + jwt);
return new ResponseEntity<>(new UserJWTController.JWTToken(jwt), httpHeaders, HttpStatus.OK);
}
-
+
private OtpResponseDTO getMockSendOtpResponse() {
String indexKey = UUID.randomUUID().toString().substring(0, 8);
- return new OtpResponseDTO(new String[]{indexKey, "0", "", ""});
+ return new OtpResponseDTO(Arrays.asList(indexKey, "0", "", ""));
}
-
+
@PostMapping("/register")
public ResponseEntity<UserJWTController.JWTToken> registerAccount(@RequestBody CustomerRegisterDTO registDTO) {
String jwt = customerService.registerCustomer(registDTO);
--
Gitblit v1.8.0