From 4faf659ac4d1287d41d1a9afab3c302356100185 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 29 八月 2024 10:11:04 +0800
Subject: [PATCH] 在pipIrr-web-remote模块中实现RTU上下行数据日志下载功能RtuLogCtrl.java， 为此在pipIrr-global模块中增加了ByteArrayHttpMessageConverter.java和ByteArrayHttpMessageConverterConfig.java pipIrr-global模块的application-global.yml文件中增加了通信中间件相关URL
---
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/config/RestTemplateConfig.java | 40 ++++++----------------------------------
1 files changed, 6 insertions(+), 34 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/config/RestTemplateConfig.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/config/RestTemplateConfig.java
index 3ba853d..58cefe3 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/config/RestTemplateConfig.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/config/RestTemplateConfig.java
@@ -22,40 +22,6 @@
@Autowired
private RestTemplateWechatCertConfig restTemplateWechatCertConfig;
- //@Bean
- //public RestTemplate restTemplate() {
- // return new RestTemplate();
- //}
-
- //@Bean
- //public RestTemplate restTemplate() {
- // String mchid = PayInfo.mchid;
- // RestTemplate restTemplate = null;
- // try {
- // KeyStore keyStore = KeyStore.getInstance("PKCS12");
- // //InputStream cp = this.getClass().getResourceAsStream("apiclient_cert.p12");
- // FileInputStream instream = new FileInputStream(new File("C:\\webchat\\apiclient_cert.p12"));
- // keyStore.load(instream, mchid.toCharArray());
- // // Trust own CA and all self-signed certs
- // SSLContext sslcontext = SSLContextBuilder.create()
- // .loadKeyMaterial(keyStore, mchid.toCharArray())
- // .build();
- // //Allow TLSv1 protocol only
- // SSLConnectionSocketFactory sslsf = new SSLConnectionSocketFactory(sslcontext, new String[]{"TLSv1"}, null, NoopHostnameVerifier.INSTANCE);
- // CloseableHttpClient httpClient = HttpClients.custom().setSSLSocketFactory(sslsf).build();
- // HttpComponentsClientHttpRequestFactory factory = new HttpComponentsClientHttpRequestFactory(httpClient);
- //
- // restTemplate = new RestTemplate(factory);
- // //灏嗚浆鎹㈠櫒鐨勭紪鐮佹崲鎴恥tf-8
- // restTemplate.getMessageConverters().set(1, new StringHttpMessageConverter(Charset.forName("utf-8")));
- // //System.out.println("restTemplate.hashCode():" + restTemplate.hashCode());
- // } catch (Exception e) {
- // e.printStackTrace();
- // }
- // return restTemplate;
- //}
-
- //@Bean(name = "wechatRestTemplate")
@Bean()
public RestTemplate restTemplate() throws Exception {
RestTemplate restTemplate = new RestTemplate(restTemplateWechatCertConfig.wechatHttpRequestFactory());
@@ -76,4 +42,10 @@
return restTemplate;
}
+
+ //绠�鍗昍estTemplate瀹炰緥
+ @Bean
+ public RestTemplate simpleRestTemplate() {
+ return new RestTemplate();
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0