From 4e54ae39c612c2995e3592121327fa79ded539a9 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期五, 19 十一月 2021 14:18:14 +0800
Subject: [PATCH] Merge branch 'build'
---
pamapi/src/main/java/com/pollex/pam/web/rest/LoginResource.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/pamapi/src/main/java/com/pollex/pam/web/rest/LoginResource.java b/pamapi/src/main/java/com/pollex/pam/web/rest/LoginResource.java
index 561e3de..3734775 100644
--- a/pamapi/src/main/java/com/pollex/pam/web/rest/LoginResource.java
+++ b/pamapi/src/main/java/com/pollex/pam/web/rest/LoginResource.java
@@ -33,26 +33,26 @@
this.applicationProperty = applicationProperty;
}
- @PostMapping("/bySMS")
- public ResponseEntity<OtpResponseDTO> sendOtpBySMS(@RequestBody OtpSMSLoginVM login) throws ServiceException, RemoteException {
+ @GetMapping("/bySMS")
+ public ResponseEntity<OtpResponseDTO> sendOtpBySMS(@RequestParam("phone") String phone) throws ServiceException, RemoteException {
OtpWebServiceLocator locator = new OtpWebServiceLocator();
locator.setOtpWebServicePortEndpointAddress(applicationProperty.getOtpWebServiceUrl());
OtpWebServicePortBindingStub otpWebServicePort = (OtpWebServicePortBindingStub) locator.getOtpWebServicePort();
String[] result =
- otpWebServicePort.sendOtpBySMS(applicationProperty.getOtpWebServicePassword(), applicationProperty.getOtpWebServiceSystemType(), login.getPhone());
+ otpWebServicePort.sendOtpBySMS(applicationProperty.getOtpWebServicePassword(), applicationProperty.getOtpWebServiceSystemType(), phone);
return new ResponseEntity<>(new OtpResponseDTO(result), HttpStatus.OK);
}
- @PostMapping("/byEmail")
- public ResponseEntity<OtpResponseDTO> sendOtpByEmail(@RequestBody OtpEmailLoginVM login) throws RemoteException, ServiceException {
+ @GetMapping("/byEmail")
+ public ResponseEntity<OtpResponseDTO> sendOtpByEmail(@RequestParam("email") String email) throws RemoteException, ServiceException {
OtpWebServiceLocator locator = new OtpWebServiceLocator();
locator.setOtpWebServicePortEndpointAddress(applicationProperty.getOtpWebServiceUrl());
OtpWebServicePortBindingStub otpWebServicePort = (OtpWebServicePortBindingStub) locator.getOtpWebServicePort();
String[] result =
- otpWebServicePort.sendOtpByEmail(applicationProperty.getOtpWebServicePassword(), applicationProperty.getOtpWebServiceSystemType(), login.getEmail());
+ otpWebServicePort.sendOtpByEmail(applicationProperty.getOtpWebServicePassword(), applicationProperty.getOtpWebServiceSystemType(), email);
return new ResponseEntity<>(new OtpResponseDTO(result), HttpStatus.OK);
}
@@ -64,8 +64,8 @@
}
// todo: �ㄐ蝘餃�隤����rovider
- @PostMapping("/byEService")
- public ResponseEntity<EServiceResponse> loginByEService(@RequestBody EServiceRequestVM param) throws Exception {
- return loginService.loginByEService(param);
+ @GetMapping("/byEService")
+ public ResponseEntity<EServiceResponse> loginByEService(@RequestParam("account") String account, @RequestParam("password") String password) throws Exception {
+ return loginService.loginByEService(account, password);
}
}
--
Gitblit v1.8.0