From d09828cdec78a160f4530a8ab245216ed8671c27 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 20 九月 2023 18:43:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-course/src/main/java/com/dsh/course/util/httpClinet/HttpClientUtil.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/util/httpClinet/HttpClientUtil.java b/cloud-server-course/src/main/java/com/dsh/course/util/httpClinet/HttpClientUtil.java
index 4458ff5..9c588b5 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/util/httpClinet/HttpClientUtil.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/util/httpClinet/HttpClientUtil.java
@@ -196,14 +196,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){
@@ -211,7 +211,7 @@
}else{
content = "返回状态码：" + httpResponse.getStatusLine() + "。" + EntityUtils.toString(httpResponse.getEntity());
}
- this.close(httpResponse);
+ close(httpResponse);
httpCline.close();
return content;
}
@@ -224,7 +224,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