From 4394e4248455637ab7836756058ac872fdf4af10 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期四, 17 二月 2022 11:39:43 +0800
Subject: [PATCH] Merge branch 'pollex-dev' into sit
---
pamapi/src/main/java/com/pollex/pam/security/provider/EServiceAuthenticationProvider.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 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..54391f0 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;
@@ -20,7 +21,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.AuthenticationServiceException;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.AuthenticationException;
@@ -42,7 +42,7 @@
@Component
public class EServiceAuthenticationProvider {
- private static final String E_SERVICE_LOGIN_SUCCESS_CODE = "0";
+ private static final String E_SERVICE_LOGIN_SUCCESS_CODE = "true";
private static final Logger log = LoggerFactory.getLogger(EServiceAuthenticationProvider.class);
@Autowired
@@ -67,27 +67,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())){
+ if(E_SERVICE_LOGIN_SUCCESS_CODE.equals(eServiceResponse.getIssuccess())){
loginRecordService.saveEServiceLoginSuccessRecord(account);
return getConsultantToken(account, credentials);
}
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);
@@ -103,7 +104,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())
@@ -138,7 +139,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