From 6552d77334bdd5dce05b6a293ac70827f27ec603 Mon Sep 17 00:00:00 2001 From: wayne <wayne8692wayne8692@gmail.com> Date: 星期三, 16 三月 2022 12:27:58 +0800 Subject: [PATCH] [update] [todo 136817] 移除填寫滿意度通知API --- pamapi/src/main/java/com/pollex/pam/service/OtpUtilService.java | 42 +++++++++++++++++------------------------- 1 files changed, 17 insertions(+), 25 deletions(-) diff --git a/pamapi/src/main/java/com/pollex/pam/service/OtpUtilService.java b/pamapi/src/main/java/com/pollex/pam/service/OtpUtilService.java index be48bd2..ff21125 100644 --- a/pamapi/src/main/java/com/pollex/pam/service/OtpUtilService.java +++ b/pamapi/src/main/java/com/pollex/pam/service/OtpUtilService.java @@ -1,16 +1,17 @@ package com.pollex.pam.service; -import com.pollex.pam.domain.OtpTmp; -import com.pollex.pam.enums.OtpTmpStatusEnum; -import com.pollex.pam.web.rest.vm.VerifyOtpVM; +import com.pollex.pam.business.domain.OtpTmp; +import com.pollex.pam.business.enums.OtpTmpStatusEnum; +import com.pollex.pam.business.service.OtpTmpService; +import com.pollex.pam.business.web.errors.OtpLoginFailException; +import com.pollex.pam.business.web.vm.VerifyOtpVM; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.authentication.AuthenticationCredentialsNotFoundException; import org.springframework.stereotype.Service; import com.pollex.pam.config.ApplicationProperties; -import com.pollex.pam.service.dto.OtpResponseDTO; +import com.pollex.pam.business.service.dto.OtpResponseDTO; import org.springframework.transaction.annotation.Transactional; @Service @@ -27,9 +28,6 @@ @Autowired OtpTmpService otpTmpService; - @Autowired - LoginRecordService loginRecordService; - @Transactional public void verifyOtp(VerifyOtpVM verifyOtpParam) { verifyOtp(verifyOtpParam.getAccount(), verifyOtpParam.getIndexKey(), verifyOtpParam.getOtpCode()); @@ -37,25 +35,19 @@ @Transactional public void verifyOtp(String account, String indexKey, String otpCode) { - try { - if(applicationProperty.isMockLogin()){ - loginRecordService.saveOTPLoginSuccessRecord(account); - log.debug("Do MockLogin"); - } else { // otp logon - OtpResponseDTO otpResponseDTO = otpWebService.verifyOTP(indexKey, otpCode); - if (otpResponseDTO.isSuccess()) { - loginRecordService.saveOTPLoginSuccessRecord(account); - } - else { - loginRecordService.saveOTPLoginFailRecord(account, otpResponseDTO.getFailReason()); - throw new AuthenticationCredentialsNotFoundException(""); - } + if (applicationProperty.isMockLogin()) { + log.debug("Do MockLogin"); + } else { // otp logon + OtpResponseDTO otpResponseDTO = otpWebService.verifyOTP(indexKey, otpCode); + if (otpResponseDTO.isSuccess()) { + log.info("otp login success!, account = {}", account); } - setVerrifiedOtpTmp(account, indexKey); - } catch (Exception e) { - log.error("Exception: ", e); - throw new AuthenticationCredentialsNotFoundException(""); + else { + log.info("otp login fail... , account = {}, error code = {}, failReason = {}", account, otpResponseDTO.getFailCode(), otpResponseDTO.getFailReason()); + throw new OtpLoginFailException(otpResponseDTO.getFailCode()); + } } + setVerrifiedOtpTmp(account, indexKey); } private void setVerrifiedOtpTmp(String account, String indexKey) { -- Gitblit v1.8.0