Merge branch 'master' of https://192.168.0.10:8443/r/pcalife/PAM

HelenHuang

2021-12-06 9cb6d5f92ad7aeda45ad1fe6482dcfc63d17be2b

 pamapi/src/main/java/com/pollex/pam/service/OtpUtilService.java

@@ -2,6 +2,7 @@

import com.pollex.pam.domain.OtpTmp;
import com.pollex.pam.enums.OtpTmpStatusEnum;
import com.pollex.pam.web.rest.errors.OtpLoginFailException;
import com.pollex.pam.web.rest.vm.VerifyOtpVM;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -37,25 +38,21 @@

    @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());
                loginRecordService.saveOTPLoginFailRecord(account, otpResponseDTO.getFailReason());
                throw new OtpLoginFailException(otpResponseDTO.getFailCode());
            }
        }
        loginRecordService.saveOTPLoginSuccessRecord(account);
        setVerrifiedOtpTmp(account, indexKey);
    }

    private void setVerrifiedOtpTmp(String account, String indexKey) {