From b2d360d9113b6955287108ca9e90d76a1f3c1419 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期日, 29 九月 2024 15:05:11 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia
---
server/service/src/main/java/com/doumee/core/utils/HttpsUtil.java | 41 +++++++++++++++++++++++++++++++----------
1 files changed, 31 insertions(+), 10 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/core/utils/HttpsUtil.java b/server/service/src/main/java/com/doumee/core/utils/HttpsUtil.java
index c74af73..2d2d4f2 100644
--- a/server/service/src/main/java/com/doumee/core/utils/HttpsUtil.java
+++ b/server/service/src/main/java/com/doumee/core/utils/HttpsUtil.java
@@ -11,25 +11,40 @@
import java.security.SecureRandom;
import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;
+import java.util.Map;
public class HttpsUtil {
public static String get(String url,boolean ignoreSSL) {
- return connection(url, "GET", null, null,ignoreSSL);
+ return connection(url, "GET", null, null,ignoreSSL,null);
}
public static String post(String url, String data, String contentType, boolean ignoreSSL) {
- return connection(url, "POST", data, contentType, ignoreSSL);
+ return connection(url, "POST", data, contentType, ignoreSSL,null);
+ }
+ public static String sendGet(String url) {
+ if(url.startsWith("https://")){
+ return connection(url, "GET", "", "text/plain; charset=utf-8", true,null);
+ }else{
+ return connectionHttp(url, "GET", "", "text/plain; charset=utf-8",null);
+ }
}
public static String postJson(String url, String data) {
if(url.startsWith("https://")){
- return connection(url, "POST", data, "application/json", true);
+ return connection(url, "POST", data, "application/json", true,null);
}else{
- return connectionHttp(url, "POST", data, "application/json");
+ return connectionHttp(url, "POST", data, "application/json",null);
+ }
+ }
+ public static String postJsonWithHeaders(String url, String data, Map<String,String> headers) {
+ if(url.startsWith("https://")){
+ return connection(url, "POST", data, "application/json", true,headers);
+ }else{
+ return connectionHttp(url, "POST", data, "application/json",headers);
}
}
- public static String connection(String url,String method,String data,String contentType,boolean ignoreSSL){
+ public static String connection(String url,String method,String data,String contentType,boolean ignoreSSL, Map<String,String> headers){
HttpsURLConnection connection = null;
try {
URL _url = new URL(url);
@@ -41,7 +56,11 @@
if(contentType != null){
connection.setRequestProperty("Content-Type", contentType);
}
-
+ if (headers!=null && headers.size()>0) {
+ for (String s : headers.keySet()) {
+ connection.setRequestProperty(s, headers.get(s));
+ }
+ }
if(ignoreSSL){
//淇′换鎵�鏈塻sl璇佷功鍜屼富鏈�
TrustManager[] trustManagers = {new HttpsTrustManager()};
@@ -56,7 +75,6 @@
});
}
-
connection.connect();
if(data != null){
@@ -64,7 +82,6 @@
outputStream.write(data.getBytes("utf-8"));
outputStream.close();
}
-
int responseCode = connection.getResponseCode();
if (responseCode == HttpsURLConnection.HTTP_OK) {
InputStream is = connection.getInputStream();
@@ -87,7 +104,7 @@
}
return null;
}
- public static String connectionHttp(String url,String method,String data,String contentType ){
+ public static String connectionHttp(String url,String method,String data,String contentType, Map<String,String> headers){
HttpURLConnection connection = null;
try {
URL _url = new URL(url);
@@ -99,7 +116,11 @@
if(contentType != null){
connection.setRequestProperty("Content-Type", contentType);
}
-
+ if (headers!=null && headers.size()>0) {
+ for (String s : headers.keySet()) {
+ connection.setRequestProperty(s, headers.get(s));
+ }
+ }
connection.connect();
if(data != null){
--
Gitblit v1.9.3