From 23f937de7378d94c74e81e6f0ef1d6a1e0f1fa0e Mon Sep 17 00:00:00 2001
From: Tomas <tomasysh@gmail.com>
Date: 星期五, 01 九月 2023 13:37:45 +0800
Subject: [PATCH] Merge branch '滲透' of https://dev.pollex.com.tw:8443/r/pcalife/PAM into 滲透
---
pamapi/src/main/java/com/pollex/pam/web/rest/TestLoginResource.java | 86 +++++++++++++++++++++---------------------
1 files changed, 43 insertions(+), 43 deletions(-)
diff --git a/pamapi/src/main/java/com/pollex/pam/web/rest/TestLoginResource.java b/pamapi/src/main/java/com/pollex/pam/web/rest/TestLoginResource.java
index 8c12c37..29f0bc6 100644
--- a/pamapi/src/main/java/com/pollex/pam/web/rest/TestLoginResource.java
+++ b/pamapi/src/main/java/com/pollex/pam/web/rest/TestLoginResource.java
@@ -71,49 +71,49 @@
return new ResponseEntity<>(otpResponseDTO, HttpStatus.OK);
}
- @GetMapping("/byEService")
- public ResponseEntity<EServiceResponse> loginByEService(@RequestParam("account") String account, @RequestParam("password") String password) throws Exception {
- RestTemplate restTemplate = getTrustAllRestTemplate();
- settingMessageConvertesToSpecifyType(restTemplate, MediaType.ALL);
+// @GetMapping("/byEService")
+// public ResponseEntity<EServiceResponse> loginByEService(@RequestParam("account") String account, @RequestParam("password") String password) throws Exception {
+// RestTemplate restTemplate = getTrustAllRestTemplate();
+// settingMessageConvertesToSpecifyType(restTemplate, MediaType.ALL);
+//
+// String urlTemplate = UriComponentsBuilder.fromHttpUrl(applicationProperty.geteServiceLoginUrl())
+// .queryParam("func", applicationProperty.geteServiceLoginFunc())
+// .queryParam("id", account)
+// .queryParam("pin", password)
+// .queryParam("pwd", password)
+// .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<>(headers);
+// return restTemplate.exchange(urlTemplate, HttpMethod.GET, entity, EServiceResponse.class);
+// }
- String urlTemplate = UriComponentsBuilder.fromHttpUrl(applicationProperty.geteServiceLoginUrl())
- .queryParam("func", applicationProperty.geteServiceLoginFunc())
- .queryParam("id", account)
- .queryParam("pin", password)
- .queryParam("pwd", password)
- .queryParam("sys", applicationProperty.geteServiceLoginSys())
- .queryParam("transactionId", UUID.randomUUID().toString())
- .encode().toUriString();
+// private void settingMessageConvertesToSpecifyType(RestTemplate restTemplate, MediaType mediaType) {
+// List<HttpMessageConverter<?>> messageConverters = new ArrayList<>();
+// MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter();
+// converter.setSupportedMediaTypes(Collections.singletonList(mediaType));
+// messageConverters.add(converter);
+// restTemplate.setMessageConverters(messageConverters);
+// }
- log.debug("http get loginByEService, url = {}", urlTemplate);
-
- HttpHeaders headers = new HttpHeaders();
- headers.setContentType(MediaType.APPLICATION_JSON);
-
- HttpEntity<String> entity = new HttpEntity<>(headers);
- return restTemplate.exchange(urlTemplate, HttpMethod.GET, entity, EServiceResponse.class);
- }
-
- private void settingMessageConvertesToSpecifyType(RestTemplate restTemplate, MediaType mediaType) {
- List<HttpMessageConverter<?>> messageConverters = new ArrayList<>();
- MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter();
- converter.setSupportedMediaTypes(Collections.singletonList(mediaType));
- messageConverters.add(converter);
- restTemplate.setMessageConverters(messageConverters);
- }
-
- private RestTemplate getTrustAllRestTemplate() throws KeyStoreException, NoSuchAlgorithmException, KeyManagementException {
- SSLContext sslContext = SSLContexts.custom()
- .loadTrustMaterial(null, (X509Certificate[] x509Certs, String s) -> true)
- .build();
- SSLConnectionSocketFactory csf = new SSLConnectionSocketFactory(sslContext, new NoopHostnameVerifier());
- CloseableHttpClient httpClient = HttpClients.custom()
- .setSSLSocketFactory(csf)
- .build();
- HttpComponentsClientHttpRequestFactory requestFactory = new HttpComponentsClientHttpRequestFactory();
- requestFactory.setHttpClient(httpClient);
- requestFactory.setConnectTimeout(300000);
- requestFactory.setReadTimeout(300000);
- return new RestTemplate(requestFactory);
- }
+// private RestTemplate getTrustAllRestTemplate() throws KeyStoreException, NoSuchAlgorithmException, KeyManagementException {
+// SSLContext sslContext = SSLContexts.custom()
+// .loadTrustMaterial(null, (X509Certificate[] x509Certs, String s) -> true)
+// .build();
+// SSLConnectionSocketFactory csf = new SSLConnectionSocketFactory(sslContext, new NoopHostnameVerifier());
+// CloseableHttpClient httpClient = HttpClients.custom()
+// .setSSLSocketFactory(csf)
+// .build();
+// HttpComponentsClientHttpRequestFactory requestFactory = new HttpComponentsClientHttpRequestFactory();
+// requestFactory.setHttpClient(httpClient);
+// requestFactory.setConnectTimeout(300000);
+// requestFactory.setReadTimeout(300000);
+// return new RestTemplate(requestFactory);
+// }
}
--
Gitblit v1.8.0