From f75496139d661ee4c0550e4e10a86b899371637a Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 29 八月 2025 09:18:52 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0
---
cloud-server-activity/src/main/java/com/dsh/activity/util/httpClinet/HttpClientUtil.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/util/httpClinet/HttpClientUtil.java b/cloud-server-activity/src/main/java/com/dsh/activity/util/httpClinet/HttpClientUtil.java
index dba10c1..6ad2bdf 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/util/httpClinet/HttpClientUtil.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/util/httpClinet/HttpClientUtil.java
@@ -199,14 +199,14 @@
* @return
* @throws Exception
*/
- public String pushHttpsRequsetXml(String url, String xml, Map<String, String> header, String certPassword, String certPath, String certType) throws Exception {
+ public static String pushHttpsRequsetXml(String url, String xml, Map<String, String> header, String certPassword, String certPath, String certType) throws Exception {
HttpPost httpPost = new HttpPost(url);
for (String key : header.keySet()) {
httpPost.setHeader(key, header.get(key));
}
httpPost.setHeader("Content-Type", "application/xml");
httpPost.setEntity(new StringEntity(xml, "UTF-8"));
- CloseableHttpClient httpCline = this.initCert(certPassword, certPath, certType);
+ CloseableHttpClient httpCline = initCert(certPassword, certPath, certType);
CloseableHttpResponse httpResponse = httpCline.execute(httpPost);
String content = null;
if (httpResponse.getStatusLine().getStatusCode() == 200) {
@@ -214,7 +214,7 @@
} else {
content = "返回状态码：" + httpResponse.getStatusLine() + "。" + EntityUtils.toString(httpResponse.getEntity());
}
- this.close(httpResponse);
+ close(httpResponse);
httpCline.close();
return content;
}
@@ -228,7 +228,7 @@
* @param certType 证书类型
* @throws Exception
*/
- private CloseableHttpClient initCert(String key, String certPath, String certType) throws Exception {
+ private static CloseableHttpClient initCert(String key, String certPath, String certType) throws Exception {
KeyStore keyStore = KeyStore.getInstance(certType);
InputStream inputStream = new FileInputStream(new File(certPath));
try {
--
Gitblit v1.7.1