Skip to content

Commit f1905b3

Browse files
hb0730hb0730
committed
feat: 完善
1 parent 85ed891 commit f1905b3

File tree

4 files changed

+40
-38
lines changed

4 files changed

+40
-38
lines changed

‎src/main/java/com/hb0730/https/inter/SyncHttp.java‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,4 +75,14 @@ public interface SyncHttp extends Http {
7575
*/
7676
String post(String url, Map<String, String> formdata);
7777

78+
/**
79+
* post 请求
80+
*
81+
* @param url 请求地址
82+
* @param formData 表单参数
83+
* @param header 请求头
84+
* @return 响应结果
85+
*/
86+
String post(String url, Map<String, String> formData, HttpHeader header);
87+
7888
}

‎src/main/java/com/hb0730/https/support/httpclient/HttpClientSyncImpl.java‎

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -106,19 +106,7 @@ public String post(String url) {
106106

107107
@Override
108108
public String post(String url, String dataJson) {
109-
if (StringUtils.isEmpty(url)) {
110-
return Constants.EMPTY;
111-
}
112-
RequestBuilder builder = RequestBuilder.post(url);
113-
if (!StringUtils.isBlank(dataJson)) {
114-
StringEntity entity = new StringEntity(dataJson, getContentType());
115-
builder.setEntity(entity);
116-
}
117-
builder.setConfig(buildConfig());
118-
builder.setCharset(getCharSet());
119-
HttpUriRequest uriRequest = builder.build();
120-
addHeader(uriRequest);
121-
return this.execStr(uriRequest);
109+
return post(url, dataJson, null);
122110
}
123111

124112
@Override
@@ -158,20 +146,26 @@ public InputStream postStream(String url, String dataJson) {
158146

159147
@Override
160148
public String post(String url, Map<String, String> formdata) {
149+
return post(url, formdata, null);
150+
}
151+
152+
@Override
153+
public String post(String url, Map<String, String> formData, HttpHeader header) {
161154
if (StringUtils.isEmpty(url)) {
162155
return Constants.EMPTY;
163156
}
164157
RequestBuilder builder = RequestBuilder.post(url);
165-
if (!CollectionUtils.isEmpty(formdata)) {
166-
List<NameValuePair> form = new ArrayList<>(formdata.size());
167-
MapUtils.forEach(formdata, (k, v) -> form.add(new BasicNameValuePair(v, k)));
158+
if (!CollectionUtils.isEmpty(formData)) {
159+
List<NameValuePair> form = new ArrayList<>(formData.size());
160+
MapUtils.forEach(formData, (k, v) -> form.add(new BasicNameValuePair(v, k)));
168161
builder.setEntity(new UrlEncodedFormEntity(form, getCharSet()));
169162
}
170163
builder.setCharset(getCharSet());
171164
builder.setConfig(buildConfig());
172165
builder.setCharset(getCharSet());
173166
HttpUriRequest uriRequest = builder.build();
174167
addHeader(uriRequest);
168+
addHeader(uriRequest, header);
175169
return this.execStr(uriRequest);
176170
}
177171

‎src/main/java/com/hb0730/https/support/hutool/HutoolSyncImpl.java‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -54,17 +54,7 @@ public String post(String url) {
5454

5555
@Override
5656
public String post(String url, String dataJson) {
57-
if (StringUtils.isEmpty(url)) {
58-
return Constants.EMPTY;
59-
}
60-
UrlBuilder builder = urlBuilder(url, null, httpConfig.getCharset(), httpConfig.isEncode());
61-
HttpRequest request = getRequest(builder, Method.POST);
62-
request.body(dataJson, getContentType(Constants.CONTENT_TYPE_JSON_UTF_8));
63-
HttpResponse execute = request.execute();
64-
if (execute.isOk()) {
65-
return execute.body();
66-
}
67-
return Constants.EMPTY;
57+
return post(url, dataJson, null);
6858
}
6959

7060
@Override
@@ -100,13 +90,19 @@ public InputStream postStream(String url, String dataJson) {
10090

10191
@Override
10292
public String post(String url, Map<String, String> formdata) {
93+
return post(url, formdata, null);
94+
}
95+
96+
@Override
97+
public String post(String url, Map<String, String> formData, HttpHeader header) {
10398
if (StringUtils.isEmpty(url)) {
10499
return Constants.EMPTY;
105100
}
106101
UrlBuilder builder = urlBuilder(url, null, httpConfig.getCharset(), httpConfig.isEncode());
107102
HttpRequest request = getRequest(builder, Method.POST);
108-
request.formStr(formdata);
103+
request.formStr(formData);
109104
request.contentType(getContentType(Constants.CONTENT_TYPE_FORM_DATA_UTF_8));
105+
request.addHeaders(header.getHeaders());
110106
HttpResponse execute = request.execute();
111107
if (execute.isOk()) {
112108
return execute.body();

‎src/main/java/com/hb0730/https/support/okhttp3/OkHttp3SyncImpl.java‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -63,14 +63,7 @@ public String post(String url) {
6363

6464
@Override
6565
public String post(String url, String data) {
66-
if (StringUtils.isEmpty(url)) {
67-
return Constants.EMPTY;
68-
}
69-
Request.Builder requestBuilder = postJsonRequestBuild(url, data,
70-
StringUtils.isBlank(this.httpConfig.getContentType()) ?
71-
JSON_UTF_8 : MediaType.parse(this.httpConfig.getContentType()),
72-
this.header == null ? null : this.header.getHeaders());
73-
return execStr(requestBuilder);
66+
return post(url, data, null);
7467
}
7568

7669
@Override
@@ -82,7 +75,7 @@ public String post(String url, String dataJson, HttpHeader header) {
8275
StringUtils.isBlank(this.httpConfig.getContentType()) ?
8376
JSON_UTF_8 : MediaType.parse(this.httpConfig.getContentType()),
8477
this.header == null ? null : this.header.getHeaders());
85-
if (null!=header){
78+
if (null != header) {
8679
header.getHeaders().forEach(requestBuilder::addHeader);
8780
}
8881
return execStr(requestBuilder);
@@ -102,16 +95,25 @@ public InputStream postStream(String url, String dataJson) {
10295

10396
@Override
10497
public String post(String url, Map<String, String> formdata) {
98+
return post(url, formdata, null);
99+
}
100+
101+
@Override
102+
public String post(String url, Map<String, String> formData, HttpHeader header) {
105103
if (StringUtils.isBlank(url)) {
106104
return Constants.EMPTY;
107105
}
108-
Request.Builder requestBuilder = postFormDataRequestBuild(url, formdata, this.httpConfig.isEncode(),
106+
Request.Builder requestBuilder = postFormDataRequestBuild(url, formData, this.httpConfig.isEncode(),
109107
StringUtils.isBlank(this.httpConfig.getContentType()) ? FORM_DATA_UTF_8 :
110108
MediaType.parse(this.httpConfig.getContentType()),
111109
null == this.header ? null : this.header.getHeaders());
110+
if (null != header) {
111+
header.getHeaders().forEach(requestBuilder::addHeader);
112+
}
112113
return execStr(requestBuilder);
113114
}
114115

116+
115117
public String execStr(Request.Builder requestBuilder) {
116118
String result = Constants.EMPTY;
117119
if (null == requestBuilder) {

0 commit comments

Comments
 (0)