From 33ef6ebbe9ebf9e2a631245b0b1ae66101d811bd Mon Sep 17 00:00:00 2001 From: Binary Wang Date: Tue, 22 Nov 2016 14:16:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D#82=E5=BC=95=E5=85=A5?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=AF=BC=E8=87=B4=E7=9A=84=E5=8D=95=E5=85=83?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../me/chanjar/weixin/mp/api/impl/WxMpServiceImpl.java | 4 +--- .../java/me/chanjar/weixin/mp/api/ApiTestModule.java | 9 +++++---- .../weixin/mp/api/WxXmlMpInMemoryConfigStorage.java | 8 ++++++-- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceImpl.java index 3b8bf113..fa7dc795 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceImpl.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceImpl.java @@ -368,9 +368,7 @@ public class WxMpServiceImpl implements WxMpService { return result; } catch (WxErrorException e) { WxError error = e.getError(); - /** - * -1 系统繁忙, 1000ms后重试 - */ + // -1 系统繁忙, 1000ms后重试 if (error.getErrorCode() == -1) { int sleepMillis = this.retrySleepMillis * (1 << retryTimes); try { diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/ApiTestModule.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/ApiTestModule.java index 310593c7..2b749b9f 100644 --- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/ApiTestModule.java +++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/ApiTestModule.java @@ -1,15 +1,15 @@ package me.chanjar.weixin.mp.api; -import java.io.IOException; -import java.io.InputStream; - import com.google.inject.Binder; import com.google.inject.Module; import com.thoughtworks.xstream.XStream; - import me.chanjar.weixin.common.util.xml.XStreamInitializer; import me.chanjar.weixin.mp.api.impl.WxMpServiceImpl; +import java.io.IOException; +import java.io.InputStream; +import java.util.concurrent.locks.ReentrantLock; + public class ApiTestModule implements Module { @Override @@ -18,6 +18,7 @@ public class ApiTestModule implements Module { .getSystemResourceAsStream("test-config.xml")) { WxXmlMpInMemoryConfigStorage config = this .fromXml(WxXmlMpInMemoryConfigStorage.class, is1); + config.setAccessTokenLock(new ReentrantLock()); WxMpService wxService = new WxMpServiceImpl(); wxService.setWxMpConfigStorage(config); diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxXmlMpInMemoryConfigStorage.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxXmlMpInMemoryConfigStorage.java index c9835a0a..75494efe 100644 --- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxXmlMpInMemoryConfigStorage.java +++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxXmlMpInMemoryConfigStorage.java @@ -1,8 +1,9 @@ package me.chanjar.weixin.mp.api; +import com.thoughtworks.xstream.annotations.XStreamAlias; import org.apache.commons.lang3.builder.ToStringBuilder; -import com.thoughtworks.xstream.annotations.XStreamAlias; +import java.util.concurrent.locks.Lock; @XStreamAlias("xml") public class WxXmlMpInMemoryConfigStorage @@ -50,4 +51,7 @@ public class WxXmlMpInMemoryConfigStorage this.templateId = templateId; } -} \ No newline at end of file + public void setAccessTokenLock(Lock lock){ + super.accessTokenLock = lock; + } +}