From c2d8465faade429e8b8f677864b0bc2da763e71c Mon Sep 17 00:00:00 2001
From: Tomas <tomasysh@gmail.com>
Date: 星期二, 23 十一月 2021 11:57:55 +0800
Subject: [PATCH] Merge branch 'master' of ssh://192.168.0.10:29418/pcalife/PAM

---
 pamapi/src/main/java/com/pollex/pam/service/OtpWebService.java |   17 ++++++++---------
 1 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/pamapi/src/main/java/com/pollex/pam/service/OtpWebService.java b/pamapi/src/main/java/com/pollex/pam/service/OtpWebService.java
index 35c9a63..144e202 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/OtpWebService.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/OtpWebService.java
@@ -22,7 +22,8 @@
 
     public OtpResponseDTO sendByPhone(String phone) throws ServiceException, RemoteException {
         OtpWebServicePortBindingStub stub = getOtpWebServicePortBindingStub();
-        log.info("call OtpService snedOtpBySMS, ");
+        log.info("call OtpService sendOtpBySMS, url = {}, systemType = {}, service password = {}, phone = {}",
+            applicationProperty.getOtpWebServiceUrl(), applicationProperty.getOtpWebServiceSystemType(), applicationProperty.getOtpWebServicePassword(), phone);
 
         String[] result =
             stub.sendOtpBySMS(applicationProperty.getOtpWebServicePassword(), applicationProperty.getOtpWebServiceSystemType(), phone);
@@ -32,21 +33,19 @@
 
     public OtpResponseDTO sendByEmail(String email) throws ServiceException, RemoteException {
         OtpWebServicePortBindingStub stub = getOtpWebServicePortBindingStub();
+        log.info("call OtpService sendByEmail, url = {}, systemType = {}, service password = {}, email = {}",
+            applicationProperty.getOtpWebServiceUrl(), applicationProperty.getOtpWebServiceSystemType(), applicationProperty.getOtpWebServicePassword(), email);
 
         String[] result =
             stub.sendOtpByEmail(applicationProperty.getOtpWebServicePassword(), applicationProperty.getOtpWebServiceSystemType(), email);
 
-        final OtpResponseDTO otpResponseDTO = new OtpResponseDTO(result);
-        if(otpResponseDTO.isSuccess()) {
-            return otpResponseDTO;
-        }
-        else {
-            throw new RuntimeException("error code = " + otpResponseDTO.getFailCode() + ", error reason = " + otpResponseDTO.getFailReason());
-        }
+        return new OtpResponseDTO(result);
     }
 
     public OtpResponseDTO verifyOTP(String indexKey, String otpCode) throws ServiceException, RemoteException {
         OtpWebServicePortBindingStub stub = getOtpWebServicePortBindingStub();
+        log.info("call OtpService verifyOTP, url = {}, systemType = {}, service password = {}, indexKey = {}, otpCode = {}",
+            applicationProperty.getOtpWebServiceUrl(), applicationProperty.getOtpWebServiceSystemType(), applicationProperty.getOtpWebServicePassword(), indexKey, otpCode);
 
         String[] result =
             stub.verifyOtp(applicationProperty.getOtpWebServicePassword(), applicationProperty.getOtpWebServiceSystemType(), indexKey, otpCode);
@@ -54,7 +53,7 @@
         return new OtpResponseDTO(result);
     }
 
-    private OtpWebServicePortBindingStub getOtpWebServicePortBindingStub() throws ServiceException {
+    public OtpWebServicePortBindingStub getOtpWebServicePortBindingStub() throws ServiceException {
         OtpWebServiceLocator locator = new OtpWebServiceLocator();
         locator.setOtpWebServicePortEndpointAddress(applicationProperty.getOtpWebServiceUrl());
 

--
Gitblit v1.8.0