From 42567b98b186f219b7a923dc3e6daeb5ffa31cfe Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期五, 17 十二月 2021 15:29:59 +0800
Subject: [PATCH] [add][todo 132507] 新增發送手機簡訊service
---
pamapi/src/main/java/com/pollex/pam/security/provider/EServiceAuthenticationProvider.java | 30 ++++++++++++++++++------------
1 files changed, 18 insertions(+), 12 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 0f7db32..06c3fe0 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,15 +1,15 @@
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 com.pollex.pam.service.util.HttpRequestUtil;
+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;
@@ -22,8 +22,6 @@
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;
import org.springframework.security.core.AuthenticationException;
@@ -54,11 +52,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);
}
@@ -66,24 +68,28 @@
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);
return getConsultantToken(account, credentials);
}
-
- throw new RuntimeException("eService login failed, eService response code = " + eServiceResponse.getCode() + ", eService response msg = " + eServiceResponse.getMsg());
+ else {
+ loginRecordService.saveEServiceLoginFailRecord(account, 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);
@@ -99,7 +105,7 @@
private ResponseEntity<EServiceResponse> loginByEService(String account, String paxxword) throws JsonProcessingException, GeneralSecurityException {
RestTemplate restTemplate = getTrustAllRestTemplate();
- settingMessageConvertesToSpecifyType(restTemplate, MediaType.ALL);
+ settingMessageConvertersToSpecifyType(restTemplate, MediaType.ALL);
String urlTemplate = UriComponentsBuilder.fromHttpUrl(applicationProperty.geteServiceLoginUrl())
.queryParam("func", applicationProperty.geteServiceLoginFunc())
@@ -134,7 +140,7 @@
return new RestTemplate(requestFactory);
}
- private void settingMessageConvertesToSpecifyType(RestTemplate restTemplate, MediaType mediaType) {
+ private void settingMessageConvertersToSpecifyType(RestTemplate restTemplate, MediaType mediaType) {
List<HttpMessageConverter<?>> messageConverters = new ArrayList<>();
MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter();
converter.setSupportedMediaTypes(Collections.singletonList(mediaType));
--
Gitblit v1.8.0