From df4d7d8013955f2ac832c4275a28fdfcb9e92628 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期二, 30 十一月 2021 10:47:05 +0800
Subject: [PATCH] [ref] 補上EService的response log以及微調程式碼

---
 pamapi/src/main/java/com/pollex/pam/security/provider/EServiceAuthenticationProvider.java |   10 ++++++----
 1 files changed, 6 insertions(+), 4 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 a23c399..9a90c5e 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
@@ -8,6 +8,7 @@
 import com.pollex.pam.security.token.EServiceAuthenticationToken;
 import com.pollex.pam.service.LoginRecordService;
 import com.pollex.pam.service.dto.EServiceResponse;
+import com.pollex.pam.web.rest.errors.EServiceErrorException;
 import org.apache.http.conn.ssl.NoopHostnameVerifier;
 import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
 import org.apache.http.impl.client.CloseableHttpClient;
@@ -67,6 +68,7 @@
             ResponseEntity<EServiceResponse> responseEntity = loginByEService(account, credentials);
             if(HttpStatus.OK.equals(responseEntity.getStatusCode())) {
                 EServiceResponse eServiceResponse = responseEntity.getBody();
+                log.debug("eService response = {}", eServiceResponse);
 
                 if(E_SERVICE_LOGIN_SUCCESS_CODE.equals(eServiceResponse.getCode())){
                     loginRecordService.saveEServiceLoginSuccessRecord(account);
@@ -74,20 +76,20 @@
                 }
                 else {
                     loginRecordService.saveEServiceLoginFailRecord(account, eServiceResponse.getMsg());
-                    throw new RuntimeException("eService login failed, eService response code = " + eServiceResponse.getCode() + ", eService response msg = " + eServiceResponse.getMsg());
+                    throw new EServiceErrorException(eServiceResponse.getMsg());
                 }
             }
 
             throw new RuntimeException("eService http error!, response http status code = " + responseEntity.getStatusCode());
         } catch (JsonProcessingException e) {
-            throw new AuthenticationServiceException("convert to json processing error!");
+            throw new RuntimeException("convert to json processing error!");
         } catch (GeneralSecurityException e) {
-            throw new AuthenticationServiceException("General Security SSL error!");
+            throw new RuntimeException("General Security SSL error!");
         }
     }
 
     private UsernamePasswordAuthenticationToken getConsultantToken(String account, String credential) {
-        Consultant consultant = consultantRepository.findOneByAgentNo(account).orElseThrow(() -> new UsernameNotFoundException("consultant is not in db, consultant agentNo = " + account));
+        Consultant consultant = consultantRepository.findOneByAgentNo(account).orElseThrow(() -> new UsernameNotFoundException("閰脤“����蒂銝��慦�像�蝟餌絞銝�"));
 
         List<GrantedAuthority> grantedAuths = Arrays.asList(new SimpleGrantedAuthority("ROLE_USER"));
         UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(account, credential, grantedAuths);

--
Gitblit v1.8.0