Skip to content

Commit 88a53ff

Browse files
xkcodingxkcoding
committed
👌 review 代码
1 parent d8aabc5 commit 88a53ff

File tree

6 files changed

+53
-42
lines changed

6 files changed

+53
-42
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<dependency>
1616
<groupId>com.xkcoding.http</groupId>
1717
<artifactId>simple-http</artifactId>
18-
<version>1.0.2</version>
18+
<version>1.0.1</version>
1919
</dependency>
2020
```
2121

‎pom.xml

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>com.xkcoding.http</groupId>
88
<artifactId>simple-http</artifactId>
9-
<version>1.0.2</version>
9+
<version>1.0.1</version>
1010

1111
<name>${project.artifactId}</name>
1212
<url>https://github.com/xkcoding/simple-http</url>
@@ -208,20 +208,17 @@
208208
<name>aliyun</name>
209209
<url>http://maven.aliyun.com/nexus/content/groups/public</url>
210210
</repository>
211-
<!--xkcoding 私服-->
212-
<repository>
213-
<id>xkcoding-nexus</id>
214-
<name>xkcoding nexus</name>
215-
<url>https://nexus.xkcoding.com/repository/maven-public/</url>
216-
<releases>
217-
<enabled>true</enabled>
218-
</releases>
219-
<snapshots>
220-
<enabled>true</enabled>
221-
</snapshots>
222-
</repository>
223211
</repositories>
224212

213+
<pluginRepositories>
214+
<!--阿里云私服-->
215+
<pluginRepository>
216+
<id>aliyun</id>
217+
<name>aliyun</name>
218+
<url>http://maven.aliyun.com/nexus/content/groups/public</url>
219+
</pluginRepository>
220+
</pluginRepositories>
221+
225222
<profiles>
226223
<profile>
227224
<id>release</id>

‎src/main/java/com/xkcoding/http/constants/Constants.java

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,18 @@ public interface Constants {
5454
String CONTENT_ENCODING = "Content-Encoding";
5555

5656
/**
57-
* 空字符串
57+
* User-Agent
5858
*/
59-
String EMPTY = "";
59+
String USER_AGENT = "User-Agent";
6060

6161
/**
62-
* User-Agent
62+
* 模拟 User-Agent
63+
*/
64+
String USER_AGENT_DATA = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/75.0.3770.142 Safari/537.36 simple-http";
65+
66+
/**
67+
* 空字符串
6368
*/
64-
String USER_AGENT = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/75.0.3770.142 Safari/537.36 simple-http";
69+
String EMPTY = "";
70+
6571
}

‎src/main/java/com/xkcoding/http/support/httpclient/HttpClientImpl.java

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import com.xkcoding.http.util.MapUtil;
2424
import com.xkcoding.http.util.StringUtil;
2525
import org.apache.http.Header;
26-
import org.apache.http.HttpHeaders;
2726
import org.apache.http.NameValuePair;
2827
import org.apache.http.client.config.RequestConfig;
2928
import org.apache.http.client.entity.UrlEncodedFormEntity;
@@ -64,11 +63,7 @@ public HttpClientImpl(CloseableHttpClient httpClient) {
6463
private String exec(HttpRequestBase request) {
6564
this.addHeader(request);
6665
// 设置超时时长
67-
request.setConfig(RequestConfig.custom()
68-
.setConnectTimeout(Constants.TIMEOUT)
69-
.setSocketTimeout(Constants.TIMEOUT)
70-
.setConnectionRequestTimeout(Constants.TIMEOUT)
71-
.build());
66+
request.setConfig(RequestConfig.custom().setConnectTimeout(Constants.TIMEOUT).setSocketTimeout(Constants.TIMEOUT).setConnectionRequestTimeout(Constants.TIMEOUT).build());
7267

7368
try (CloseableHttpResponse response = this.httpClient.execute(request)) {
7469
if (!isSuccess(response)) {
@@ -92,10 +87,10 @@ private String exec(HttpRequestBase request) {
9287
* @param request HttpRequestBase
9388
*/
9489
private void addHeader(HttpRequestBase request) {
95-
String ua = HttpHeaders.USER_AGENT;
90+
String ua = Constants.USER_AGENT;
9691
Header[] headers = request.getHeaders(ua);
9792
if (null == headers || headers.length == 0) {
98-
request.addHeader(ua, Constants.USER_AGENT);
93+
request.addHeader(ua, Constants.USER_AGENT_DATA);
9994
}
10095
}
10196

@@ -113,6 +108,7 @@ private boolean isSuccess(CloseableHttpResponse response) {
113108
* GET 请求
114109
*
115110
* @param url URL
111+
*
116112
* @return 结果
117113
*/
118114
@Override
@@ -126,6 +122,7 @@ public String get(String url) {
126122
* @param url URL
127123
* @param params 参数
128124
* @param encode 是否需要 url encode
125+
*
129126
* @return 结果
130127
*/
131128
@Override
@@ -140,6 +137,7 @@ public String get(String url, Map<String, String> params, boolean encode) {
140137
* @param params 参数
141138
* @param header 请求头
142139
* @param encode 是否需要 url encode
140+
*
143141
* @return 结果
144142
*/
145143
@Override
@@ -160,6 +158,7 @@ public String get(String url, Map<String, String> params, HttpHeader header, boo
160158
* POST 请求
161159
*
162160
* @param url URL
161+
*
163162
* @return 结果
164163
*/
165164
@Override
@@ -173,6 +172,7 @@ public String post(String url) {
173172
*
174173
* @param url URL
175174
* @param data JSON 参数
175+
*
176176
* @return 结果
177177
*/
178178
@Override
@@ -186,6 +186,7 @@ public String post(String url, String data) {
186186
* @param url URL
187187
* @param data JSON 参数
188188
* @param header 请求头
189+
*
189190
* @return 结果
190191
*/
191192
@Override
@@ -212,6 +213,7 @@ public String post(String url, String data, HttpHeader header) {
212213
* @param url URL
213214
* @param params form 参数
214215
* @param encode 是否需要 url encode
216+
*
215217
* @return 结果
216218
*/
217219
@Override
@@ -226,6 +228,7 @@ public String post(String url, Map<String, String> params, boolean encode) {
226228
* @param params form 参数
227229
* @param header 请求头
228230
* @param encode 是否需要 url encode
231+
*
229232
* @return 结果
230233
*/
231234
@Override

‎src/main/java/com/xkcoding/http/support/java11/HttpClientImpl.java

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import com.xkcoding.http.support.HttpHeader;
2323
import com.xkcoding.http.util.MapUtil;
2424
import com.xkcoding.http.util.StringUtil;
25-
import org.apache.http.HttpHeaders;
2625

2726
import java.io.IOException;
2827
import java.net.URI;
@@ -64,13 +63,14 @@ private String exec(HttpRequest.Builder builder) {
6463
* @param builder HttpRequest.Builder
6564
*/
6665
private void addHeader(HttpRequest.Builder builder) {
67-
builder.header(HttpHeaders.USER_AGENT, Constants.USER_AGENT);
66+
builder.header(Constants.USER_AGENT, Constants.USER_AGENT_DATA);
6867
}
6968

7069
/**
7170
* GET 请求
7271
*
7372
* @param url URL
73+
*
7474
* @return 结果
7575
*/
7676
@Override
@@ -84,6 +84,7 @@ public String get(String url) {
8484
* @param url URL
8585
* @param params 参数
8686
* @param encode 是否需要 url encode
87+
*
8788
* @return 结果
8889
*/
8990
@Override
@@ -98,17 +99,15 @@ public String get(String url, Map<String, String> params, boolean encode) {
9899
* @param params 参数
99100
* @param header 请求头
100101
* @param encode 是否需要 url encode
102+
*
101103
* @return 结果
102104
*/
103105
@Override
104106
public String get(String url, Map<String, String> params, HttpHeader header, boolean encode) {
105107
String baseUrl = StringUtil.appendIfNotContain(url, "?", "&");
106108
String reqUrl = baseUrl + MapUtil.parseMapToString(params, encode);
107109

108-
HttpRequest.Builder builder = HttpRequest.newBuilder()
109-
.uri(URI.create(reqUrl))
110-
.GET()
111-
.timeout(Duration.ofMillis(Constants.TIMEOUT));
110+
HttpRequest.Builder builder = HttpRequest.newBuilder().uri(URI.create(reqUrl)).GET().timeout(Duration.ofMillis(Constants.TIMEOUT));
112111

113112
if (header != null) {
114113
MapUtil.forEach(header.getHeaders(), builder::header);
@@ -121,6 +120,7 @@ public String get(String url, Map<String, String> params, HttpHeader header, boo
121120
* POST 请求
122121
*
123122
* @param url URL
123+
*
124124
* @return 结果
125125
*/
126126
@Override
@@ -133,6 +133,7 @@ public String post(String url) {
133133
*
134134
* @param url URL
135135
* @param data JSON 参数
136+
*
136137
* @return 结果
137138
*/
138139
@Override
@@ -146,13 +147,12 @@ public String post(String url, String data) {
146147
* @param url URL
147148
* @param data JSON 参数
148149
* @param header 请求头
150+
*
149151
* @return 结果
150152
*/
151153
@Override
152154
public String post(String url, String data, HttpHeader header) {
153-
HttpRequest.Builder builder = HttpRequest.newBuilder()
154-
.uri(URI.create(url))
155-
.timeout(Duration.ofMillis(Constants.TIMEOUT));
155+
HttpRequest.Builder builder = HttpRequest.newBuilder().uri(URI.create(url)).timeout(Duration.ofMillis(Constants.TIMEOUT));
156156

157157
if (StringUtil.isNotEmpty(data)) {
158158
builder.POST(HttpRequest.BodyPublishers.ofString(data, Constants.DEFAULT_ENCODING));
@@ -175,6 +175,7 @@ public String post(String url, String data, HttpHeader header) {
175175
* @param url URL
176176
* @param params form 参数
177177
* @param encode 是否需要 url encode
178+
*
178179
* @return 结果
179180
*/
180181
@Override
@@ -189,6 +190,7 @@ public String post(String url, Map<String, String> params, boolean encode) {
189190
* @param params form 参数
190191
* @param header 请求头
191192
* @param encode 是否需要 url encode
193+
*
192194
* @return 结果
193195
*/
194196
@Override

‎src/main/java/com/xkcoding/http/support/okhttp3/OkHttp3Impl.java

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import com.xkcoding.http.util.MapUtil;
2424
import com.xkcoding.http.util.StringUtil;
2525
import okhttp3.*;
26-
import org.apache.http.HttpHeaders;
2726

2827
import java.io.IOException;
2928
import java.time.Duration;
@@ -43,11 +42,7 @@ public class OkHttp3Impl implements Http {
4342

4443

4544
public OkHttp3Impl() {
46-
this(new OkHttpClient().newBuilder()
47-
.connectTimeout(Duration.ofMillis(Constants.TIMEOUT))
48-
.writeTimeout(Duration.ofMillis(Constants.TIMEOUT))
49-
.readTimeout(Duration.ofMillis(Constants.TIMEOUT))
50-
.build());
45+
this(new OkHttpClient().newBuilder().connectTimeout(Duration.ofMillis(Constants.TIMEOUT)).writeTimeout(Duration.ofMillis(Constants.TIMEOUT)).readTimeout(Duration.ofMillis(Constants.TIMEOUT)).build());
5146
}
5247

5348
public OkHttp3Impl(OkHttpClient httpClient) {
@@ -74,13 +69,14 @@ private String exec(Request.Builder requestBuilder) {
7469
* @param builder Request.Builder
7570
*/
7671
private void addHeader(Request.Builder builder) {
77-
builder.header(HttpHeaders.USER_AGENT, Constants.USER_AGENT);
72+
builder.header(Constants.USER_AGENT, Constants.USER_AGENT_DATA);
7873
}
7974

8075
/**
8176
* GET 请求
8277
*
8378
* @param url URL
79+
*
8480
* @return 结果
8581
*/
8682
@Override
@@ -94,6 +90,7 @@ public String get(String url) {
9490
* @param url URL
9591
* @param params 参数
9692
* @param encode 是否需要 url encode
93+
*
9794
* @return 结果
9895
*/
9996
@Override
@@ -108,6 +105,7 @@ public String get(String url, Map<String, String> params, boolean encode) {
108105
* @param params 参数
109106
* @param header 请求头
110107
* @param encode 是否需要 url encode
108+
*
111109
* @return 结果
112110
*/
113111
@Override
@@ -133,6 +131,7 @@ public String get(String url, Map<String, String> params, HttpHeader header, boo
133131
* POST 请求
134132
*
135133
* @param url URL
134+
*
136135
* @return 结果
137136
*/
138137
@Override
@@ -145,6 +144,7 @@ public String post(String url) {
145144
*
146145
* @param url URL
147146
* @param data JSON 参数
147+
*
148148
* @return 结果
149149
*/
150150
@Override
@@ -158,6 +158,7 @@ public String post(String url, String data) {
158158
* @param url URL
159159
* @param data JSON 参数
160160
* @param header 请求头
161+
*
161162
* @return 结果
162163
*/
163164
@Override
@@ -182,6 +183,7 @@ public String post(String url, String data, HttpHeader header) {
182183
* @param url URL
183184
* @param params form 参数
184185
* @param encode 是否需要 url encode
186+
*
185187
* @return 结果
186188
*/
187189
@Override
@@ -196,6 +198,7 @@ public String post(String url, Map<String, String> params, boolean encode) {
196198
* @param params form 参数
197199
* @param header 请求头
198200
* @param encode 是否需要 url encode
201+
*
199202
* @return 结果
200203
*/
201204
@Override

0 commit comments

Comments
 (0)