🐛 #3515 修复OkHttp请求方式时代理认证头设置错误的问题
This commit is contained in:
@@ -41,11 +41,11 @@ public class WxChannelServiceOkHttpImpl extends BaseWxChannelServiceImpl<OkHttpC
|
|||||||
this.httpProxy = OkHttpProxyInfo.httpProxy(this.config.getHttpProxyHost(), this.config.getHttpProxyPort(), this.config.getHttpProxyUsername(), this.config.getHttpProxyPassword());
|
this.httpProxy = OkHttpProxyInfo.httpProxy(this.config.getHttpProxyHost(), this.config.getHttpProxyPort(), this.config.getHttpProxyUsername(), this.config.getHttpProxyPassword());
|
||||||
okhttp3.OkHttpClient.Builder clientBuilder = new okhttp3.OkHttpClient.Builder();
|
okhttp3.OkHttpClient.Builder clientBuilder = new okhttp3.OkHttpClient.Builder();
|
||||||
clientBuilder.proxy(this.getRequestHttpProxy().getProxy());
|
clientBuilder.proxy(this.getRequestHttpProxy().getProxy());
|
||||||
clientBuilder.authenticator(new Authenticator() {
|
clientBuilder.proxyAuthenticator(new Authenticator() {
|
||||||
@Override
|
@Override
|
||||||
public Request authenticate(Route route, Response response) throws IOException {
|
public Request authenticate(Route route, Response response) throws IOException {
|
||||||
String credential = Credentials.basic(WxChannelServiceOkHttpImpl.this.httpProxy.getProxyUsername(), WxChannelServiceOkHttpImpl.this.httpProxy.getProxyPassword());
|
String credential = Credentials.basic(WxChannelServiceOkHttpImpl.this.httpProxy.getProxyUsername(), WxChannelServiceOkHttpImpl.this.httpProxy.getProxyPassword());
|
||||||
return response.request().newBuilder().header("Authorization", credential).build();
|
return response.request().newBuilder().header("Proxy-Authorization", credential).build();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
this.httpClient = clientBuilder.build();
|
this.httpClient = clientBuilder.build();
|
||||||
|
|||||||
@@ -86,12 +86,12 @@ public class WxCpServiceOkHttpImpl extends BaseWxCpServiceImpl<OkHttpClient, OkH
|
|||||||
OkHttpClient.Builder clientBuilder = new OkHttpClient.Builder();
|
OkHttpClient.Builder clientBuilder = new OkHttpClient.Builder();
|
||||||
clientBuilder.proxy(getRequestHttpProxy().getProxy());
|
clientBuilder.proxy(getRequestHttpProxy().getProxy());
|
||||||
//设置授权
|
//设置授权
|
||||||
clientBuilder.authenticator(new Authenticator() {
|
clientBuilder.proxyAuthenticator(new Authenticator() {
|
||||||
@Override
|
@Override
|
||||||
public Request authenticate(Route route, Response response) throws IOException {
|
public Request authenticate(Route route, Response response) throws IOException {
|
||||||
String credential = Credentials.basic(httpProxy.getProxyUsername(), httpProxy.getProxyPassword());
|
String credential = Credentials.basic(httpProxy.getProxyUsername(), httpProxy.getProxyPassword());
|
||||||
return response.request().newBuilder()
|
return response.request().newBuilder()
|
||||||
.header("Authorization", credential)
|
.header("Proxy-Authorization", credential)
|
||||||
.build();
|
.build();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -108,12 +108,12 @@ public class WxCpTpServiceOkHttpImpl extends BaseWxCpTpServiceImpl<OkHttpClient,
|
|||||||
OkHttpClient.Builder clientBuilder = new OkHttpClient.Builder();
|
OkHttpClient.Builder clientBuilder = new OkHttpClient.Builder();
|
||||||
clientBuilder.proxy(getRequestHttpProxy().getProxy());
|
clientBuilder.proxy(getRequestHttpProxy().getProxy());
|
||||||
//设置授权
|
//设置授权
|
||||||
clientBuilder.authenticator(new Authenticator() {
|
clientBuilder.proxyAuthenticator(new Authenticator() {
|
||||||
@Override
|
@Override
|
||||||
public Request authenticate(Route route, Response response) throws IOException {
|
public Request authenticate(Route route, Response response) throws IOException {
|
||||||
String credential = Credentials.basic(httpProxy.getProxyUsername(), httpProxy.getProxyPassword());
|
String credential = Credentials.basic(httpProxy.getProxyUsername(), httpProxy.getProxyPassword());
|
||||||
return response.request().newBuilder()
|
return response.request().newBuilder()
|
||||||
.header("Authorization", credential)
|
.header("Proxy-Authorization", credential)
|
||||||
.build();
|
.build();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -32,12 +32,12 @@ public class WxMaServiceOkHttpImpl extends BaseWxMaServiceImpl<OkHttpClient, OkH
|
|||||||
OkHttpClient.Builder clientBuilder = new OkHttpClient.Builder();
|
OkHttpClient.Builder clientBuilder = new OkHttpClient.Builder();
|
||||||
clientBuilder.proxy(getRequestHttpProxy().getProxy());
|
clientBuilder.proxy(getRequestHttpProxy().getProxy());
|
||||||
//设置授权
|
//设置授权
|
||||||
clientBuilder.authenticator(new Authenticator() {
|
clientBuilder.proxyAuthenticator(new Authenticator() {
|
||||||
@Override
|
@Override
|
||||||
public Request authenticate(Route route, Response response) throws IOException {
|
public Request authenticate(Route route, Response response) throws IOException {
|
||||||
String credential = Credentials.basic(httpProxy.getProxyUsername(), httpProxy.getProxyPassword());
|
String credential = Credentials.basic(httpProxy.getProxyUsername(), httpProxy.getProxyPassword());
|
||||||
return response.request().newBuilder()
|
return response.request().newBuilder()
|
||||||
.header("Authorization", credential)
|
.header("Proxy-Authorization", credential)
|
||||||
.build();
|
.build();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -80,11 +80,11 @@ public class WxQidianServiceOkHttpImpl extends BaseWxQidianServiceImpl<OkHttpCli
|
|||||||
clientBuilder.proxy(getRequestHttpProxy().getProxy());
|
clientBuilder.proxy(getRequestHttpProxy().getProxy());
|
||||||
|
|
||||||
// 设置授权
|
// 设置授权
|
||||||
clientBuilder.authenticator(new Authenticator() {
|
clientBuilder.proxyAuthenticator(new Authenticator() {
|
||||||
@Override
|
@Override
|
||||||
public Request authenticate(Route route, Response response) throws IOException {
|
public Request authenticate(Route route, Response response) throws IOException {
|
||||||
String credential = Credentials.basic(httpProxy.getProxyUsername(), httpProxy.getProxyPassword());
|
String credential = Credentials.basic(httpProxy.getProxyUsername(), httpProxy.getProxyPassword());
|
||||||
return response.request().newBuilder().header("Authorization", credential).build();
|
return response.request().newBuilder().header("Proxy-Authorization", credential).build();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
httpClient = clientBuilder.build();
|
httpClient = clientBuilder.build();
|
||||||
|
|||||||
Reference in New Issue
Block a user