Skip to content

Commit 4d0617f

Browse files
authored
🐛 #3515 修复OkHttp请求方式时代理认证头设置错误的问题
1 parent fd3bbde commit 4d0617f

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelServiceOkHttpImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@ public void initHttp() {
4141
this.httpProxy = OkHttpProxyInfo.httpProxy(this.config.getHttpProxyHost(), this.config.getHttpProxyPort(), this.config.getHttpProxyUsername(), this.config.getHttpProxyPassword());
4242
okhttp3.OkHttpClient.Builder clientBuilder = new okhttp3.OkHttpClient.Builder();
4343
clientBuilder.proxy(this.getRequestHttpProxy().getProxy());
44-
clientBuilder.authenticator(new Authenticator() {
44+
clientBuilder.proxyAuthenticator(new Authenticator() {
4545
@Override
4646
public Request authenticate(Route route, Response response) throws IOException {
4747
String credential = Credentials.basic(WxChannelServiceOkHttpImpl.this.httpProxy.getProxyUsername(), WxChannelServiceOkHttpImpl.this.httpProxy.getProxyPassword());
48-
return response.request().newBuilder().header("Authorization", credential).build();
48+
return response.request().newBuilder().header("Proxy-Authorization", credential).build();
4949
}
5050
});
5151
this.httpClient = clientBuilder.build();

weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpServiceOkHttpImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,12 +86,12 @@ public void initHttp() {
8686
OkHttpClient.Builder clientBuilder = new OkHttpClient.Builder();
8787
clientBuilder.proxy(getRequestHttpProxy().getProxy());
8888
//设置授权
89-
clientBuilder.authenticator(new Authenticator() {
89+
clientBuilder.proxyAuthenticator(new Authenticator() {
9090
@Override
9191
public Request authenticate(Route route, Response response) throws IOException {
9292
String credential = Credentials.basic(httpProxy.getProxyUsername(), httpProxy.getProxyPassword());
9393
return response.request().newBuilder()
94-
.header("Authorization", credential)
94+
.header("Proxy-Authorization", credential)
9595
.build();
9696
}
9797
});

weixin-java-cp/src/main/java/me/chanjar/weixin/cp/tp/service/impl/WxCpTpServiceOkHttpImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,12 +108,12 @@ public void initHttp() {
108108
OkHttpClient.Builder clientBuilder = new OkHttpClient.Builder();
109109
clientBuilder.proxy(getRequestHttpProxy().getProxy());
110110
//设置授权
111-
clientBuilder.authenticator(new Authenticator() {
111+
clientBuilder.proxyAuthenticator(new Authenticator() {
112112
@Override
113113
public Request authenticate(Route route, Response response) throws IOException {
114114
String credential = Credentials.basic(httpProxy.getProxyUsername(), httpProxy.getProxyPassword());
115115
return response.request().newBuilder()
116-
.header("Authorization", credential)
116+
.header("Proxy-Authorization", credential)
117117
.build();
118118
}
119119
});

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaServiceOkHttpImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@ public void initHttp() {
3232
OkHttpClient.Builder clientBuilder = new OkHttpClient.Builder();
3333
clientBuilder.proxy(getRequestHttpProxy().getProxy());
3434
//设置授权
35-
clientBuilder.authenticator(new Authenticator() {
35+
clientBuilder.proxyAuthenticator(new Authenticator() {
3636
@Override
3737
public Request authenticate(Route route, Response response) throws IOException {
3838
String credential = Credentials.basic(httpProxy.getProxyUsername(), httpProxy.getProxyPassword());
3939
return response.request().newBuilder()
40-
.header("Authorization", credential)
40+
.header("Proxy-Authorization", credential)
4141
.build();
4242
}
4343
});

weixin-java-qidian/src/main/java/me/chanjar/weixin/qidian/api/impl/WxQidianServiceOkHttpImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,11 @@ public void initHttp() {
8080
clientBuilder.proxy(getRequestHttpProxy().getProxy());
8181

8282
// 设置授权
83-
clientBuilder.authenticator(new Authenticator() {
83+
clientBuilder.proxyAuthenticator(new Authenticator() {
8484
@Override
8585
public Request authenticate(Route route, Response response) throws IOException {
8686
String credential = Credentials.basic(httpProxy.getProxyUsername(), httpProxy.getProxyPassword());
87-
return response.request().newBuilder().header("Authorization", credential).build();
87+
return response.request().newBuilder().header("Proxy-Authorization", credential).build();
8888
}
8989
});
9090
httpClient = clientBuilder.build();

0 commit comments

Comments
 (0)