🐛 #2200 【小程序】修复获取AccessToken时ApiHostUrl未生效的问题

Wechat-Group · Jul 13, 2021 · 737d759 · 737d759
1 parent 2d2cf39
commit 737d759
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/...va-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaServiceHttpClientImpl.java b/...va-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaServiceHttpClientImpl.java
@@ -6,6 +6,7 @@
 import me.chanjar.weixin.common.util.http.HttpType;
 import me.chanjar.weixin.common.util.http.apache.ApacheHttpClientBuilder;
 import me.chanjar.weixin.common.util.http.apache.DefaultApacheHttpClientBuilder;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpHost;
 import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.methods.CloseableHttpResponse;
@@ -60,7 +61,12 @@ public HttpType getRequestType() {
 
   @Override
   protected String doGetAccessTokenRequest() throws IOException {
-    String url = String.format(WxMaService.GET_ACCESS_TOKEN_URL, this.getWxMaConfig().getAppid(), this.getWxMaConfig().getSecret());
+
+    String url = StringUtils.isNotEmpty(this.getWxMaConfig().getApiHostUrl()) ?
+      WxMaService.GET_ACCESS_TOKEN_URL.replace("https://api.weixin.qq.com", this.getWxMaConfig().getApiHostUrl()) :
+      WxMaService.GET_ACCESS_TOKEN_URL;
+
+    url = String.format(url, this.getWxMaConfig().getAppid(), this.getWxMaConfig().getSecret());
 
     HttpGet httpGet = null;
     CloseableHttpResponse response = null;

diff --git a/...java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaServiceJoddHttpImpl.java b/...java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaServiceJoddHttpImpl.java
@@ -7,6 +7,7 @@
 import jodd.http.ProxyInfo;
 import jodd.http.net.SocketHttpConnectionProvider;
 import me.chanjar.weixin.common.util.http.HttpType;
+import org.apache.commons.lang3.StringUtils;
 
 import java.io.IOException;
 
@@ -45,7 +46,11 @@ public HttpType getRequestType() {
 
   @Override
   protected String doGetAccessTokenRequest() throws IOException {
-    String url = String.format(WxMaService.GET_ACCESS_TOKEN_URL, this.getWxMaConfig().getAppid(), this.getWxMaConfig().getSecret());
+    String url = StringUtils.isNotEmpty(this.getWxMaConfig().getApiHostUrl()) ?
+      WxMaService.GET_ACCESS_TOKEN_URL.replace("https://api.weixin.qq.com", this.getWxMaConfig().getApiHostUrl()) :
+      WxMaService.GET_ACCESS_TOKEN_URL;
+
+    url = String.format(url, this.getWxMaConfig().getAppid(), this.getWxMaConfig().getSecret());
     HttpRequest request = HttpRequest.get(url);
     if (this.getRequestHttpProxy() != null) {
       SocketHttpConnectionProvider provider = new SocketHttpConnectionProvider();

diff --git a/...n-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaServiceOkHttpImpl.java b/...n-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaServiceOkHttpImpl.java
@@ -5,6 +5,7 @@
 import me.chanjar.weixin.common.util.http.HttpType;
 import me.chanjar.weixin.common.util.http.okhttp.OkHttpProxyInfo;
 import okhttp3.*;
+import org.apache.commons.lang3.StringUtils;
 
 import java.io.IOException;
 import java.util.Objects;
@@ -63,7 +64,11 @@ public HttpType getRequestType() {
 
   @Override
   protected String doGetAccessTokenRequest() throws IOException {
-    String url = String.format(WxMaService.GET_ACCESS_TOKEN_URL, this.getWxMaConfig().getAppid(), this.getWxMaConfig().getSecret());
+    String url = StringUtils.isNotEmpty(this.getWxMaConfig().getApiHostUrl()) ?
+      WxMaService.GET_ACCESS_TOKEN_URL.replace("https://api.weixin.qq.com", this.getWxMaConfig().getApiHostUrl()) :
+      WxMaService.GET_ACCESS_TOKEN_URL;
+
+    url = String.format(url, this.getWxMaConfig().getAppid(), this.getWxMaConfig().getSecret());
     Request request = new Request.Builder().url(url).get().build();
     try (Response response = getRequestHttpClient().newCall(request).execute()) {
       return Objects.requireNonNull(response.body()).string();