From cc752b0680d6f4975b14a3cdc2b8922e8d3bf0ee Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期一, 29 十一月 2021 19:56:39 +0800
Subject: [PATCH] [update] Otp認證錯誤代碼規格調整
---
pamapi/src/main/java/com/pollex/pam/security/provider/EServiceAuthenticationProvider.java | 44 +++++++++++++++++++++++++++-----------------
1 files changed, 27 insertions(+), 17 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 6d3e961..a23c399 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
@@ -1,26 +1,25 @@
package com.pollex.pam.security.provider;
import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
import com.pollex.pam.config.ApplicationProperties;
import com.pollex.pam.domain.Consultant;
import com.pollex.pam.enums.ConsultantDetailEnum;
-import com.pollex.pam.enums.CustomerDetailEnum;
import com.pollex.pam.repository.ConsultantRepository;
import com.pollex.pam.security.token.EServiceAuthenticationToken;
-import com.pollex.pam.service.dto.EServiceRequest;
+import com.pollex.pam.service.LoginRecordService;
import com.pollex.pam.service.dto.EServiceResponse;
import org.apache.http.conn.ssl.NoopHostnameVerifier;
import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
import org.apache.http.ssl.SSLContexts;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.*;
import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
import org.springframework.http.converter.HttpMessageConverter;
import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
-import org.springframework.security.authentication.AuthenticationCredentialsNotFoundException;
import org.springframework.security.authentication.AuthenticationServiceException;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.Authentication;
@@ -30,6 +29,7 @@
import org.springframework.security.core.userdetails.UsernameNotFoundException;
import org.springframework.stereotype.Component;
import org.springframework.web.client.RestTemplate;
+import org.springframework.web.util.UriComponentsBuilder;
import javax.net.ssl.SSLContext;
import java.security.GeneralSecurityException;
@@ -43,6 +43,7 @@
public class EServiceAuthenticationProvider {
private static final String E_SERVICE_LOGIN_SUCCESS_CODE = "0";
+ private static final Logger log = LoggerFactory.getLogger(EServiceAuthenticationProvider.class);
@Autowired
ApplicationProperties applicationProperty;
@@ -50,11 +51,15 @@
@Autowired
ConsultantRepository consultantRepository;
+ @Autowired
+ LoginRecordService loginRecordService;
+
public Authentication authenticate(EServiceAuthenticationToken authenticationToken) throws AuthenticationException {
String account = authenticationToken.getPrincipal();
String credentials = authenticationToken.getCredentials();
if(applicationProperty.isMockLogin()){
+ loginRecordService.saveEServiceLoginSuccessRecord(account);
return getConsultantToken(account, credentials);
}
@@ -64,10 +69,13 @@
EServiceResponse eServiceResponse = responseEntity.getBody();
if(E_SERVICE_LOGIN_SUCCESS_CODE.equals(eServiceResponse.getCode())){
+ loginRecordService.saveEServiceLoginSuccessRecord(account);
return getConsultantToken(account, credentials);
}
-
- throw new RuntimeException("eService login failed, eService response code = " + eServiceResponse.getCode());
+ else {
+ loginRecordService.saveEServiceLoginFailRecord(account, eServiceResponse.getMsg());
+ throw new RuntimeException("eService login failed, eService response code = " + eServiceResponse.getCode() + ", eService response msg = " + eServiceResponse.getMsg());
+ }
}
throw new RuntimeException("eService http error!, response http status code = " + responseEntity.getStatusCode());
@@ -94,23 +102,25 @@
}
private ResponseEntity<EServiceResponse> loginByEService(String account, String paxxword) throws JsonProcessingException, GeneralSecurityException {
- EServiceRequest dto = new EServiceRequest();
- dto.setFunc("ValidateUserLogin");
- dto.setId(account);
- dto.setPin(paxxword);
- dto.setPwd(paxxword);
- dto.setSys("epos");
-
- String dtoJson = new ObjectMapper().writeValueAsString(dto);
-
RestTemplate restTemplate = getTrustAllRestTemplate();
settingMessageConvertesToSpecifyType(restTemplate, MediaType.ALL);
+
+ String urlTemplate = UriComponentsBuilder.fromHttpUrl(applicationProperty.geteServiceLoginUrl())
+ .queryParam("func", applicationProperty.geteServiceLoginFunc())
+ .queryParam("id", account)
+ .queryParam("pin", paxxword)
+ .queryParam("pwd", paxxword)
+ .queryParam("sys", applicationProperty.geteServiceLoginSys())
+ .queryParam("transactionId", UUID.randomUUID().toString())
+ .encode().toUriString();
+
+ log.debug("http get loginByEService, url = {}", urlTemplate);
HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.APPLICATION_JSON);
- HttpEntity<String> entity = new HttpEntity<>(dtoJson, headers);
- return restTemplate.exchange(applicationProperty.geteServiceLoginUrl(), HttpMethod.POST, entity, EServiceResponse.class);
+ HttpEntity<String> entity = new HttpEntity<>(headers);
+ return restTemplate.exchange(urlTemplate, HttpMethod.GET, entity, EServiceResponse.class);
}
private RestTemplate getTrustAllRestTemplate() throws KeyStoreException, NoSuchAlgorithmException, KeyManagementException {
--
Gitblit v1.8.0