From 06d45dc5fefc31ae69b79ded828fc47b17ca79f8 Mon Sep 17 00:00:00 2001
From: uianz <33689429+uianz@users.noreply.github.com>
Date: Sun, 20 Dec 2020 21:57:31 +0800
Subject: [PATCH] =?UTF-8?q?:art:=20#1924=20=E3=80=90=E4=BC=81=E4=B8=9A?=
=?UTF-8?q?=E5=BE=AE=E4=BF=A1=E3=80=91=E7=AC=AC=E4=B8=89=E6=96=B9=E5=BA=94?=
=?UTF-8?q?=E7=94=A8suite=5Fticket=E6=94=B9=E4=B8=BA=E9=BB=98=E8=AE=A430?=
=?UTF-8?q?=E5=88=86=E9=92=9F=E5=A4=B1=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../weixin/cp/tp/service/WxCpTpService.java | 27 ++++++++++++++-----
.../service/impl/BaseWxCpTpServiceImpl.java | 9 +++++--
2 files changed, 28 insertions(+), 8 deletions(-)
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/tp/service/WxCpTpService.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/tp/service/WxCpTpService.java
index 104736883..67ab47b4e 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/tp/service/WxCpTpService.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/tp/service/WxCpTpService.java
@@ -70,12 +70,11 @@ public interface WxCpTpService {
* 详情请见：https://work.weixin.qq.com/api/doc#90001/90143/90628
*
*
- * @Deprecated 由于无法主动刷新，所以这个接口实际已经没有意义，需要在接收企业微信的主动推送后，保存这个ticket
- * @see #setSuiteTicket(String)
- *
* @param forceRefresh 强制刷新
* @return the suite ticket
* @throws WxErrorException the wx error exception
+ * @Deprecated 由于无法主动刷新，所以这个接口实际已经没有意义，需要在接收企业微信的主动推送后，保存这个ticket
+ * @see #setSuiteTicket(String)
*/
@Deprecated
String getSuiteTicket(boolean forceRefresh) throws WxErrorException;
@@ -84,12 +83,28 @@ public interface WxCpTpService {
*
* 保存企业微信定时推送的suite_ticket,（每10分钟）
* 详情请见：https://work.weixin.qq.com/api/doc#90001/90143/90628
+ *
+ * 注意：微信不是固定10分钟推送suite_ticket的, 且suite_ticket的有效期为30分钟
+ * https://work.weixin.qq.com/api/doc/10975#%E8%8E%B7%E5%8F%96%E7%AC%AC%E4%B8%89%E6%96%B9%E5%BA%94%E7%94%A8%E5%87%AD%E8%AF%81
*
*
* @param suiteTicket
- * @throws WxErrorException
*/
- void setSuiteTicket(String suiteTicket) throws WxErrorException;
+ void setSuiteTicket(String suiteTicket);
+
+ /**
+ *
+ * 保存企业微信定时推送的suite_ticket,（每10分钟）
+ * 详情请见：https://work.weixin.qq.com/api/doc#90001/90143/90628
+ *
+ * 注意：微信不是固定10分钟推送suite_ticket的, 且suite_ticket的有效期为30分钟
+ * https://work.weixin.qq.com/api/doc/10975#%E8%8E%B7%E5%8F%96%E7%AC%AC%E4%B8%89%E6%96%B9%E5%BA%94%E7%94%A8%E5%87%AD%E8%AF%81
+ *
+ *
+ * @param suiteTicket
+ * @param expiresInSeconds
+ */
+ void setSuiteTicket(String suiteTicket, int expiresInSeconds);
/**
* 获取应用的 jsapi ticket
@@ -251,8 +266,8 @@ public interface WxCpTpService {
/**
* 获取WxMpConfigStorage 对象.
*
- * @Deprecated storage应该在service内部使用，提供这个接口，容易破坏这个封装
* @return WxMpConfigStorage wx cp tp config storage
+ * @Deprecated storage应该在service内部使用，提供这个接口，容易破坏这个封装
*/
@Deprecated
WxCpTpConfigStorage getWxCpTpConfigStorage();
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/tp/service/impl/BaseWxCpTpServiceImpl.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/tp/service/impl/BaseWxCpTpServiceImpl.java
index 5726204fb..536fd7749 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/tp/service/impl/BaseWxCpTpServiceImpl.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/tp/service/impl/BaseWxCpTpServiceImpl.java
@@ -104,9 +104,14 @@ public abstract class BaseWxCpTpServiceImpl implements WxCpTpService, Requ
}
@Override
- public void setSuiteTicket(String suiteTicket) throws WxErrorException {
+ public void setSuiteTicket(String suiteTicket){
+ setSuiteTicket(suiteTicket, 28 * 60);
+ }
+
+ @Override
+ public void setSuiteTicket(String suiteTicket, int expiresInSeconds){
synchronized (globalSuiteTicketRefreshLock) {
- this.configStorage.updateSuiteTicket(suiteTicket, 10 * 60);
+ this.configStorage.updateSuiteTicket(suiteTicket, expiresInSeconds);
}
}