🎨 调整加锁与获取缓存的顺序

ylwind · web-flow · commit 8cf85933f065 · 2024-03-13T23:26:39.000+08:00
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/BaseWxMpServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/BaseWxMpServiceImpl.java
@@ -267,10 +267,10 @@ public String getAccessToken(boolean forceRefresh) throws WxErrorException {
     boolean locked = false;
     try {
       do {
-        locked = lock.tryLock(100, TimeUnit.MILLISECONDS);
         if (!forceRefresh && !this.getWxMpConfigStorage().isAccessTokenExpired()) {
           return this.getWxMpConfigStorage().getAccessToken();
         }
+        locked = lock.tryLock(100, TimeUnit.MILLISECONDS);
         if (!locked && System.currentTimeMillis() > timeOutMillis) {
           throw new InterruptedException("获取accessToken超时：获取时间超时");
         }

Original file line number	Diff line number	Diff line change
`@@ -267,10 +267,10 @@ public String getAccessToken(boolean forceRefresh) throws WxErrorException {`
`267`	`267`	`boolean locked = false;`
`268`	`268`	`try {`
`269`	`269`	`do {`
`270`		`- locked = lock.tryLock(100, TimeUnit.MILLISECONDS);`
`271`	`270`	`if (!forceRefresh && !this.getWxMpConfigStorage().isAccessTokenExpired()) {`
`272`	`271`	`return this.getWxMpConfigStorage().getAccessToken();`
`273`	`272`	`}`
	`273`	`+ locked = lock.tryLock(100, TimeUnit.MILLISECONDS);`
`274`	`274`	`if (!locked && System.currentTimeMillis() > timeOutMillis) {`
`275`	`275`	`throw new InterruptedException("获取accessToken超时：获取时间超时");`
`276`	`276`	`}`