From dc89396ead9056b6f6f32de3bf32f9202c3518f8 Mon Sep 17 00:00:00 2001
From: kennywgx <543444431@qq.com>
Date: Fri, 22 Nov 2019 14:58:40 +0800
Subject: [PATCH] =?UTF-8?q?:art:=20#1294=20=E4=BC=98=E5=8C=96getAccessToke?=
 =?UTF-8?q?n=E6=96=B9=E6=B3=95,=E8=A7=A3=E5=86=B3=E5=B9=B6=E5=8F=91?=
 =?UTF-8?q?=E6=97=B6=E9=87=8D=E5=A4=8D=E5=88=B7=E6=96=B0=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/impl/WxMpServiceHttpClientImpl.java   |  3 ++
 .../mp/api/impl/WxMpServiceJoddHttpImpl.java  |  3 ++
 .../mp/api/impl/WxMpServiceOkHttpImpl.java    |  3 ++
 .../mp/api/impl/BaseWxMpServiceImplTest.java  | 37 +++++++++++++++++++
 4 files changed, 46 insertions(+)

diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceHttpClientImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceHttpClientImpl.java
index d13a95b16..a25a910ef 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceHttpClientImpl.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceHttpClientImpl.java
@@ -74,6 +74,9 @@ public class WxMpServiceHttpClientImpl extends BaseWxMpServiceImpl<CloseableHttp
     Lock lock = config.getAccessTokenLock();
     lock.lock();
     try {
+      if (!config.isAccessTokenExpired() && !forceRefresh) {
+        return config.getAccessToken();
+      }
       String url = String.format(GET_ACCESS_TOKEN_URL.getUrl(config), config.getAppId(), config.getSecret());
       try {
         HttpGet httpGet = new HttpGet(url);
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceJoddHttpImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceJoddHttpImpl.java
index a4aeac5ad..6cb0e7731 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceJoddHttpImpl.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceJoddHttpImpl.java
@@ -59,6 +59,9 @@ public class WxMpServiceJoddHttpImpl extends BaseWxMpServiceImpl<HttpConnectionP
     Lock lock = config.getAccessTokenLock();
     lock.lock();
     try {
+      if (!config.isAccessTokenExpired() && !forceRefresh) {
+        return config.getAccessToken();
+      }
       String url = String.format(GET_ACCESS_TOKEN_URL.getUrl(config), config.getAppId(), config.getSecret());
 
       HttpRequest request = HttpRequest.get(url);
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceOkHttpImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceOkHttpImpl.java
index f7f2a8e7a..d9497b479 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceOkHttpImpl.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceOkHttpImpl.java
@@ -48,6 +48,9 @@ public class WxMpServiceOkHttpImpl extends BaseWxMpServiceImpl<OkHttpClient, OkH
     Lock lock = config.getAccessTokenLock();
     lock.lock();
     try {
+      if (!config.isAccessTokenExpired() && !forceRefresh) {
+        return config.getAccessToken();
+      }
       String url = String.format(GET_ACCESS_TOKEN_URL.getUrl(config), config.getAppId(), config.getSecret());
 
       Request request = new Request.Builder().url(url).get().build();
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/BaseWxMpServiceImplTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/BaseWxMpServiceImplTest.java
index 18b719d93..e0b2471bd 100644
--- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/BaseWxMpServiceImplTest.java
+++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/BaseWxMpServiceImplTest.java
@@ -1,6 +1,11 @@
 package me.chanjar.weixin.mp.api.impl;
 
+import com.google.common.collect.Sets;
 import com.google.inject.Inject;
+import java.util.Set;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
 import me.chanjar.weixin.common.api.WxConsts;
 import me.chanjar.weixin.common.bean.WxNetCheckResult;
 import me.chanjar.weixin.common.error.WxErrorException;
@@ -14,6 +19,7 @@ import org.testng.annotations.Test;
 import java.util.Arrays;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
 
@@ -114,4 +120,35 @@ public class BaseWxMpServiceImplTest {
   public void testShortUrl_with_exceptional_url() throws WxErrorException {
     this.wxService.shortUrl("http://www.baidu.com/test?redirect_count=1&access_token=123");
   }
+
+  @Test
+  public void refreshAccessTokenDuplicatelyTest() throws InterruptedException {
+    // 测试多线程刷新accessToken时是否重复刷新
+    wxService.getWxMpConfigStorage().expireAccessToken();
+    final Set<String> set = Sets.newConcurrentHashSet();
+    Runnable r = new Runnable() {
+      @Override
+      public void run() {
+        try {
+          String accessToken = wxService.getAccessToken();
+          set.add(accessToken);
+        } catch (WxErrorException e) {
+          e.printStackTrace();
+        }
+      }
+    };
+
+    final int threadNumber = 10;
+    ExecutorService executorService = Executors.newFixedThreadPool(threadNumber);
+    for ( int i = 0; i < threadNumber; i++ ) {
+      executorService.submit(r);
+    }
+    executorService.shutdown();
+    boolean isTerminated = executorService.awaitTermination(15, TimeUnit.SECONDS);
+    System.out.println("isTerminated: " + isTerminated);
+    System.out.println("times of refreshing accessToken: " + set.size());
+
+    assertEquals(set.size(), 1);
+
+  }
 }