Skip to content

Commit 1806389

Browse files
binarywangbinarywang
committed
批量格式化代码
1 parent 8982cf8 commit 1806389

18 files changed

+115
-138
lines changed

‎weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/apache/WxCpServiceImpl.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import me.chanjar.weixin.common.util.http.apache.ApacheHttpClientBuilder;
99
import me.chanjar.weixin.common.util.http.apache.DefaultApacheHttpClientBuilder;
1010
import me.chanjar.weixin.cp.api.WxCpConfigStorage;
11-
1211
import me.chanjar.weixin.cp.api.impl.AbstractWxCpServiceImpl;
1312
import org.apache.http.HttpHost;
1413
import org.apache.http.client.config.RequestConfig;

‎weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/apache/WxMpServiceImpl.java‎

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,15 @@
11
package me.chanjar.weixin.mp.api.impl.apache;
22

3-
import com.google.gson.JsonArray;
4-
import com.google.gson.JsonElement;
5-
import com.google.gson.JsonObject;
6-
import com.google.gson.JsonParser;
73
import me.chanjar.weixin.common.bean.WxAccessToken;
8-
import me.chanjar.weixin.common.bean.WxJsapiSignature;
94
import me.chanjar.weixin.common.bean.result.WxError;
105
import me.chanjar.weixin.common.exception.WxErrorException;
11-
import me.chanjar.weixin.common.session.StandardSessionManager;
12-
import me.chanjar.weixin.common.session.WxSessionManager;
13-
import me.chanjar.weixin.common.util.RandomUtils;
14-
import me.chanjar.weixin.common.util.crypto.SHA1;
15-
import me.chanjar.weixin.common.util.http.*;
6+
import me.chanjar.weixin.common.util.http.HttpType;
7+
import me.chanjar.weixin.common.util.http.RequestHttp;
168
import me.chanjar.weixin.common.util.http.apache.ApacheHttpClientBuilder;
179
import me.chanjar.weixin.common.util.http.apache.DefaultApacheHttpClientBuilder;
18-
import me.chanjar.weixin.mp.api.*;
19-
import me.chanjar.weixin.mp.api.impl.*;
20-
import me.chanjar.weixin.mp.bean.*;
21-
import me.chanjar.weixin.mp.bean.result.*;
10+
import me.chanjar.weixin.mp.api.WxMpConfigStorage;
11+
import me.chanjar.weixin.mp.api.WxMpService;
12+
import me.chanjar.weixin.mp.api.impl.AbstractWxMpServiceImpl;
2213
import org.apache.http.HttpHost;
2314
import org.apache.http.client.config.RequestConfig;
2415
import org.apache.http.client.methods.CloseableHttpResponse;
@@ -32,7 +23,7 @@
3223
/**
3324
* apache-http方式实现
3425
*/
35-
public class WxMpServiceImpl extends AbstractWxMpServiceImpl<CloseableHttpClient,HttpHost> {
26+
public class WxMpServiceImpl extends AbstractWxMpServiceImpl<CloseableHttpClient, HttpHost> {
3627
private CloseableHttpClient httpClient;
3728
private HttpHost httpProxy;
3829

‎weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/jodd/WxMpServiceImpl.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,16 @@
77
import me.chanjar.weixin.common.exception.WxErrorException;
88
import me.chanjar.weixin.common.util.http.HttpType;
99
import me.chanjar.weixin.common.util.http.RequestHttp;
10-
import me.chanjar.weixin.mp.api.*;
11-
import me.chanjar.weixin.mp.api.impl.*;
10+
import me.chanjar.weixin.mp.api.WxMpConfigStorage;
11+
import me.chanjar.weixin.mp.api.WxMpService;
12+
import me.chanjar.weixin.mp.api.impl.AbstractWxMpServiceImpl;
1213

1314
import java.util.concurrent.locks.Lock;
1415

1516
/**
1617
* jodd-http方式实现
1718
*/
18-
public class WxMpServiceImpl extends AbstractWxMpServiceImpl<HttpConnectionProvider,ProxyInfo> {
19+
public class WxMpServiceImpl extends AbstractWxMpServiceImpl<HttpConnectionProvider, ProxyInfo> {
1920
private HttpConnectionProvider httpClient;
2021
private ProxyInfo httpProxy;
2122

‎weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/kefu/request/WxMpKfAccountRequest.java‎

Lines changed: 43 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
package me.chanjar.weixin.mp.bean.kefu.request;
22

3-
import java.io.Serializable;
4-
5-
import org.apache.commons.lang3.builder.ToStringBuilder;
6-
73
import com.google.gson.annotations.SerializedName;
8-
94
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
5+
import org.apache.commons.lang3.builder.ToStringBuilder;
6+
7+
import java.io.Serializable;
108

119
public class WxMpKfAccountRequest implements Serializable {
1210
private static final long serialVersionUID = -5451863610674856927L;
@@ -16,7 +14,7 @@ public class WxMpKfAccountRequest implements Serializable {
1614
*/
1715
@SerializedName("kf_account")
1816
private String kfAccount;
19-
17+
2018
/**
2119
* nickname 客服昵称，最长6个汉字或12个英文字符
2220
*/
@@ -28,12 +26,16 @@ public class WxMpKfAccountRequest implements Serializable {
2826
*/
2927
@SerializedName("invite_wx")
3028
private String inviteWx;
31-
29+
30+
public static Builder builder() {
31+
return new Builder();
32+
}
33+
3234
@Override
3335
public String toString() {
3436
return ToStringBuilder.reflectionToString(this);
3537
}
36-
38+
3739
public String toJson() {
3840
return WxMpGsonBuilder.INSTANCE.create().toJson(this);
3941
}
@@ -54,10 +56,6 @@ public void setNickName(String nickName) {
5456
this.nickName = nickName;
5557
}
5658

57-
public static Builder builder() {
58-
return new Builder();
59-
}
60-
6159
public String getInviteWx() {
6260
return this.inviteWx;
6361
}
@@ -67,39 +65,39 @@ public void setInviteWx(String inviteWx) {
6765
}
6866

6967
public static class Builder {
70-
private String kfAccount;
71-
private String nickName;
72-
private String inviteWx;
73-
74-
public Builder kfAccount(String kfAccount) {
75-
this.kfAccount = kfAccount;
76-
return this;
77-
}
78-
79-
public Builder nickName(String nickName) {
80-
this.nickName = nickName;
81-
return this;
82-
}
83-
84-
public Builder inviteWx(String inviteWx) {
85-
this.inviteWx = inviteWx;
86-
return this;
87-
}
88-
89-
public Builder from(WxMpKfAccountRequest origin) {
90-
this.kfAccount(origin.kfAccount);
91-
this.nickName(origin.nickName);
92-
this.inviteWx(origin.inviteWx);
93-
return this;
94-
}
95-
96-
public WxMpKfAccountRequest build() {
97-
WxMpKfAccountRequest m = new WxMpKfAccountRequest();
98-
m.kfAccount = this.kfAccount;
99-
m.nickName = this.nickName;
100-
m.inviteWx = this.inviteWx;
101-
return m;
102-
}
68+
private String kfAccount;
69+
private String nickName;
70+
private String inviteWx;
71+
72+
public Builder kfAccount(String kfAccount) {
73+
this.kfAccount = kfAccount;
74+
return this;
75+
}
76+
77+
public Builder nickName(String nickName) {
78+
this.nickName = nickName;
79+
return this;
80+
}
81+
82+
public Builder inviteWx(String inviteWx) {
83+
this.inviteWx = inviteWx;
84+
return this;
85+
}
86+
87+
public Builder from(WxMpKfAccountRequest origin) {
88+
this.kfAccount(origin.kfAccount);
89+
this.nickName(origin.nickName);
90+
this.inviteWx(origin.inviteWx);
91+
return this;
92+
}
93+
94+
public WxMpKfAccountRequest build() {
95+
WxMpKfAccountRequest m = new WxMpKfAccountRequest();
96+
m.kfAccount = this.kfAccount;
97+
m.nickName = this.nickName;
98+
m.inviteWx = this.inviteWx;
99+
return m;
100+
}
103101
}
104102

105103
}

‎weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/jodd/JoddMaterialDeleteRequestExecutor.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package me.chanjar.weixin.mp.util.http.jodd;
22

3-
import java.io.IOException;
4-
53
import jodd.http.HttpConnectionProvider;
64
import jodd.http.HttpRequest;
75
import jodd.http.HttpResponse;
@@ -11,10 +9,12 @@
119
import me.chanjar.weixin.common.util.http.RequestHttp;
1210
import me.chanjar.weixin.mp.util.http.MaterialDeleteRequestExecutor;
1311

12+
import java.io.IOException;
13+
1414
/**
1515
* Created by ecoolper on 2017/5/5.
1616
*/
17-
public class JoddMaterialDeleteRequestExecutor extends MaterialDeleteRequestExecutor<HttpConnectionProvider,ProxyInfo> {
17+
public class JoddMaterialDeleteRequestExecutor extends MaterialDeleteRequestExecutor<HttpConnectionProvider, ProxyInfo> {
1818
public JoddMaterialDeleteRequestExecutor(RequestHttp requestHttp) {
1919
super(requestHttp);
2020
}

‎weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/jodd/JoddMaterialNewsInfoRequestExecutor.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package me.chanjar.weixin.mp.util.http.jodd;
22

3-
import java.io.IOException;
4-
53
import jodd.http.HttpConnectionProvider;
64
import jodd.http.HttpRequest;
75
import jodd.http.HttpResponse;
@@ -13,10 +11,12 @@
1311
import me.chanjar.weixin.mp.util.http.MaterialNewsInfoRequestExecutor;
1412
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
1513

14+
import java.io.IOException;
15+
1616
/**
1717
* Created by ecoolper on 2017/5/5.
1818
*/
19-
public class JoddMaterialNewsInfoRequestExecutor extends MaterialNewsInfoRequestExecutor<HttpConnectionProvider,ProxyInfo> {
19+
public class JoddMaterialNewsInfoRequestExecutor extends MaterialNewsInfoRequestExecutor<HttpConnectionProvider, ProxyInfo> {
2020
public JoddMaterialNewsInfoRequestExecutor(RequestHttp requestHttp) {
2121
super(requestHttp);
2222
}

‎weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/jodd/JoddMaterialUploadRequestExecutor.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
package me.chanjar.weixin.mp.util.http.jodd;
22

3-
import java.io.File;
4-
import java.io.FileNotFoundException;
5-
import java.io.IOException;
6-
import java.util.Map;
7-
83
import jodd.http.HttpConnectionProvider;
94
import jodd.http.HttpRequest;
105
import jodd.http.HttpResponse;
@@ -17,10 +12,15 @@
1712
import me.chanjar.weixin.mp.bean.material.WxMpMaterialUploadResult;
1813
import me.chanjar.weixin.mp.util.http.MaterialUploadRequestExecutor;
1914

15+
import java.io.File;
16+
import java.io.FileNotFoundException;
17+
import java.io.IOException;
18+
import java.util.Map;
19+
2020
/**
2121
* Created by ecoolper on 2017/5/5.
2222
*/
23-
public class JoddMaterialUploadRequestExecutor extends MaterialUploadRequestExecutor<HttpConnectionProvider,ProxyInfo> {
23+
public class JoddMaterialUploadRequestExecutor extends MaterialUploadRequestExecutor<HttpConnectionProvider, ProxyInfo> {
2424
public JoddMaterialUploadRequestExecutor(RequestHttp requestHttp) {
2525
super(requestHttp);
2626
}

‎weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/jodd/JoddMaterialVideoInfoRequestExecutor.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package me.chanjar.weixin.mp.util.http.jodd;
22

3-
import java.io.IOException;
4-
53
import jodd.http.HttpConnectionProvider;
64
import jodd.http.HttpRequest;
75
import jodd.http.HttpResponse;
@@ -12,10 +10,12 @@
1210
import me.chanjar.weixin.mp.bean.material.WxMpMaterialVideoInfoResult;
1311
import me.chanjar.weixin.mp.util.http.MaterialVideoInfoRequestExecutor;
1412

13+
import java.io.IOException;
14+
1515
/**
1616
* Created by ecoolper on 2017/5/5.
1717
*/
18-
public class JoddMaterialVideoInfoRequestExecutor extends MaterialVideoInfoRequestExecutor<HttpConnectionProvider,ProxyInfo> {
18+
public class JoddMaterialVideoInfoRequestExecutor extends MaterialVideoInfoRequestExecutor<HttpConnectionProvider, ProxyInfo> {
1919
public JoddMaterialVideoInfoRequestExecutor(RequestHttp requestHttp) {
2020
super(requestHttp);
2121
}

‎weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/jodd/JoddMaterialVoiceAndImageDownloadRequestExecutor.java‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,5 @@
11
package me.chanjar.weixin.mp.util.http.jodd;
22

3-
import java.io.ByteArrayInputStream;
4-
import java.io.File;
5-
import java.io.IOException;
6-
import java.io.InputStream;
7-
8-
import org.apache.commons.io.IOUtils;
9-
103
import jodd.http.HttpConnectionProvider;
114
import jodd.http.HttpRequest;
125
import jodd.http.HttpResponse;
@@ -16,12 +9,17 @@
169
import me.chanjar.weixin.common.util.http.RequestHttp;
1710
import me.chanjar.weixin.common.util.json.WxGsonBuilder;
1811
import me.chanjar.weixin.mp.util.http.MaterialVoiceAndImageDownloadRequestExecutor;
19-
import me.chanjar.weixin.mp.util.http.okhttp.OkhttpMaterialVoiceAndImageDownloadRequestExecutor;
12+
import org.apache.commons.io.IOUtils;
13+
14+
import java.io.ByteArrayInputStream;
15+
import java.io.File;
16+
import java.io.IOException;
17+
import java.io.InputStream;
2018

2119
/**
2220
* Created by ecoolper on 2017/5/5.
2321
*/
24-
public class JoddMaterialVoiceAndImageDownloadRequestExecutor extends MaterialVoiceAndImageDownloadRequestExecutor<HttpConnectionProvider,ProxyInfo> {
22+
public class JoddMaterialVoiceAndImageDownloadRequestExecutor extends MaterialVoiceAndImageDownloadRequestExecutor<HttpConnectionProvider, ProxyInfo> {
2523
public JoddMaterialVoiceAndImageDownloadRequestExecutor(RequestHttp requestHttp, File tmpDirFile) {
2624
super(requestHttp, tmpDirFile);
2725
}

‎weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/jodd/JoddMediaImgUploadRequestExecutor.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
package me.chanjar.weixin.mp.util.http.jodd;
22

3-
import java.io.File;
4-
import java.io.IOException;
5-
63
import jodd.http.HttpConnectionProvider;
74
import jodd.http.HttpRequest;
85
import jodd.http.HttpResponse;
@@ -13,10 +10,13 @@
1310
import me.chanjar.weixin.mp.bean.material.WxMediaImgUploadResult;
1411
import me.chanjar.weixin.mp.util.http.MediaImgUploadRequestExecutor;
1512

13+
import java.io.File;
14+
import java.io.IOException;
15+
1616
/**
1717
* Created by ecoolper on 2017/5/5.
1818
*/
19-
public class JoddMediaImgUploadRequestExecutor extends MediaImgUploadRequestExecutor<HttpConnectionProvider,ProxyInfo> {
19+
public class JoddMediaImgUploadRequestExecutor extends MediaImgUploadRequestExecutor<HttpConnectionProvider, ProxyInfo> {
2020
public JoddMediaImgUploadRequestExecutor(RequestHttp requestHttp) {
2121
super(requestHttp);
2222
}

0 commit comments

Comments
 (0)