From 742a32ec7169db793adb1efde6e2897e514a76fc Mon Sep 17 00:00:00 2001
From: jack <jack.su@pollex.com.tw>
Date: 星期一, 06 一月 2025 17:59:49 +0800
Subject: [PATCH] [UPDATE] 更新YML
---
pamapi/src/main/java/com/pollex/pam/security/provider/EServiceAuthenticationProvider.java | 42 ++++++++++++++++++++++++++++++++++++------
1 files changed, 36 insertions(+), 6 deletions(-)
diff --git a/pamapi/src/main/java/com/pollex/pam/security/provider/EServiceAuthenticationProvider.java b/pamapi/src/main/java/com/pollex/pam/security/provider/EServiceAuthenticationProvider.java
index f157b02..1860b1b 100644
--- a/pamapi/src/main/java/com/pollex/pam/security/provider/EServiceAuthenticationProvider.java
+++ b/pamapi/src/main/java/com/pollex/pam/security/provider/EServiceAuthenticationProvider.java
@@ -3,6 +3,7 @@
import com.pollex.pam.business.domain.Consultant;
import com.pollex.pam.business.enums.ConsultantDetailEnum;
import com.pollex.pam.business.repository.ConsultantRepository;
+import com.pollex.pam.business.repository.EServiceErrorCodeRepository;
import com.pollex.pam.business.service.EServiceConnectService;
import com.pollex.pam.business.service.dto.EServiceResponse;
import com.pollex.pam.business.web.errors.ConsultantDisableException;
@@ -25,6 +26,8 @@
import java.security.GeneralSecurityException;
import java.util.*;
+import static java.util.Arrays.asList;
+
@Component
public class EServiceAuthenticationProvider {
@@ -40,13 +43,19 @@
@Autowired
EServiceConnectService eServiceConnectService;
+ @Autowired
+ EServiceErrorCodeRepository eServiceErrorCodeRepository;
+
public Authentication authenticate(EServiceAuthenticationToken authenticationToken) throws AuthenticationException {
String account = authenticationToken.getPrincipal();
String credentials = authenticationToken.getCredentials();
+
if(applicationProperties.isMockLogin()){
return getConsultantTokenAndRecordLoginTime(account, credentials);
}
+
+
try {
ResponseEntity<EServiceResponse> responseEntity = eServiceConnectService.loginByEService(account, credentials);
@@ -54,24 +63,45 @@
EServiceResponse eServiceResponse = responseEntity.getBody();
log.debug("eService response = {}", eServiceResponse);
- if(E_SERVICE_LOGIN_SUCCESS_CODE.equals(eServiceResponse.getIssuccess())){
+ if(eServiceResponse == null) {
+ throw new RuntimeException("eService error!, response body is null");
+ }
+
+ List<String> successCode = new ArrayList<>(asList("0","3","4","6"));
+
+ if(successCode.contains(eServiceResponse.getCode())) {
return getConsultantTokenAndRecordLoginTime(account, credentials);
+ } else {
+ log.debug("account:{},error:{}",account,eServiceResponse.getMsg());
+ eServiceErrorCodeRepository.findByErrorCode(eServiceResponse.getCode()).
+ ifPresent(eServiceErrorCode -> {
+ throw new EServiceErrorException(eServiceErrorCode.getErrorMessage());
+ });
+
+ throw new EServiceErrorException("�頛詨�����炊嚗��頛詨");
}
- else {
- throw new EServiceErrorException(eServiceResponse.getMsg());
- }
+
+// if(E_SERVICE_LOGIN_SUCCESS_CODE.equals(eServiceResponse.getIssuccess())){
+//
+// return getConsultantTokenAndRecordLoginTime(account, credentials);
+// }
+// else {
+// log.debug("account:{},error:{}",account,eServiceResponse.getMsg());
+// throw new EServiceErrorException("�頛詨�����炊嚗��頛詨");
+// }
}
throw new RuntimeException("eService http error!, response http status code = " + responseEntity.getStatusCode());
} catch (GeneralSecurityException e) {
+ log.error("General Security SSL error!",e);
throw new RuntimeException("General Security SSL error!");
}
}
private UsernamePasswordAuthenticationToken getConsultantTokenAndRecordLoginTime(String account, String credential) throws ConsultantDisableException {
- Consultant consultant = consultantRepository.findOneByAgentNo(account).orElseThrow(() -> new UsernameNotFoundException("閰脤“����蒂銝��慦�像�蝟餌絞銝�"));
+ Consultant consultant = consultantRepository.findOneByAgentNo(account).orElseThrow(() -> new UsernameNotFoundException("撣唾��Ⅳ�隤�"));
- List<GrantedAuthority> grantedAuths = Arrays.asList(new SimpleGrantedAuthority("ROLE_USER"));
+ List<GrantedAuthority> grantedAuths = Collections.singletonList(new SimpleGrantedAuthority("ROLE_USER"));
UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(account, credential, grantedAuths);
Map<String, String> details = new HashMap<>();
--
Gitblit v1.8.0