diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpLivingService.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpLivingService.java index 4b417e90f25c961e81c27b7df4e565bff87dc266..380c3bfc50ba8edadb4935f6c2a611dc3fc7df8b 100644 --- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpLivingService.java +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpLivingService.java @@ -84,7 +84,7 @@ public interface WxCpLivingService { * 请求地址： https://qyapi.weixin.qq.com/cgi-bin/living/create?access_token=ACCESS_TOKEN * * @param request 创建预约直播请求参数. - * @return + * @return livingId（直播id） * @throws WxErrorException */ String livingCreate(WxCpLivingCreateRequest request) throws WxErrorException; diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/living/WxCpLivingCreateRequest.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/living/WxCpLivingCreateRequest.java index 6da6b81e55f49784b32dee6758cc6d12a5d08023..4272a0372e09bf9472f35e5124b026407cbfa433 100644 --- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/living/WxCpLivingCreateRequest.java +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/living/WxCpLivingCreateRequest.java @@ -1,14 +1,12 @@ package me.chanjar.weixin.cp.bean.living; import com.google.gson.annotations.SerializedName; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; +import lombok.*; import lombok.experimental.Accessors; import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder; import java.io.Serializable; +import java.util.List; /** * 创建预约直播请求. @@ -57,10 +55,12 @@ public class WxCpLivingCreateRequest implements Serializable { @SerializedName("activity_detail") private ActivityDetail activityDetail; + @Getter + @Setter public static class ActivityDetail implements Serializable { @SerializedName("image_list") - private String[] imageList; + private List imageList; @SerializedName("description") private String description; diff --git a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/WxCpLivingTest.java b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/WxCpLivingTest.java index 295f0497ff6711c8fedb6daabf2bcaa4707f59a8..4305c26c94f510acb530e0f76bbb5c35508426dd 100644 --- a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/WxCpLivingTest.java +++ b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/WxCpLivingTest.java @@ -1,6 +1,7 @@ package me.chanjar.weixin.cp.api; import lombok.extern.slf4j.Slf4j; +import lombok.val; import me.chanjar.weixin.common.error.WxErrorException; import me.chanjar.weixin.cp.api.impl.WxCpServiceImpl; import me.chanjar.weixin.cp.bean.living.*; @@ -10,6 +11,7 @@ import org.eclipse.jetty.util.ajax.JSON; import org.testng.annotations.Test; import java.io.InputStream; +import java.util.ArrayList; import java.util.Date; /** @@ -34,6 +36,46 @@ public class WxCpLivingTest { wxCpService = new WxCpServiceImpl(); wxCpService.setWxCpConfigStorage(config); + /** + * 测试创建直播 + */ + WxCpLivingCreateRequest createRequest = new WxCpLivingCreateRequest(); + createRequest.setAnchorUserid("WangKai"); + createRequest.setTheme("直播1"); + + long currentTimeMillis = System.currentTimeMillis() + 3600000L; + createRequest.setLivingStart(currentTimeMillis); + createRequest.setLivingDuration(3600L); + createRequest.setType(4); + createRequest.setDescription("这是通用直播1"); + + val activityDetail = new WxCpLivingCreateRequest.ActivityDetail(); + activityDetail.setDescription("活动描述，非活动类型的直播不用传"); + +// String[] strings = new String[]{"MEDIA_ID_2", "MEDIA_ID_1"}; + ArrayList imageList = new ArrayList(); + imageList.add("MEDIA_ID_1"); + imageList.add("MEDIA_ID_2"); + + activityDetail.setImageList(imageList); + createRequest.setActivityDetail(activityDetail); + + String livingCreate = wxCpService.getLivingService().livingCreate(createRequest); + log.info("返回的直播id为：{}", livingCreate); + + WxCpLivingCreateRequest thisReq = WxCpLivingCreateRequest.fromJson(createRequest.toJson()); + log.info("返回的数据：{}", thisReq.toJson()); + + // 创建预约直播 + String createJson = "{\"anchor_userid\":\"ChenHu\",\"theme\":\"theme\",\"living_start\":164037820420,\"living_duration\":3600,\"description\":\"test description\",\"type\":4,\"remind_time\":60,\"activity_cover_mediaid\":\"MEDIA_ID\",\"activity_share_mediaid\":\"MEDIA_ID\",\"activity_detail\":{\"description\":\"活动描述，非活动类型的直播不用传\",\"image_list\":[\"xxxx1\",\"xxxx1\"]}}"; + WxCpLivingCreateRequest requestData = WxCpLivingCreateRequest.fromJson(createJson); + String thisLivingId = wxCpService.getLivingService().livingCreate(requestData); + log.info("livingId为：{}", thisLivingId); + + + /** + * other api + */ String livingCode = wxCpService.getLivingService().getLivingCode("o50by5NezHciWnoexJsrI49ILNqI", "lvOQpTDwAAD2MYuOq9y_bmLNMJfbbdGw"); log.info(JSON.toString(livingCode)); diff --git a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/WxCpGroupRobotServiceImplTest.java b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/WxCpGroupRobotServiceImplTest.java index 57bd9b750d304dec17823904fb0f9fd39c4cd359..c1a09f35991fe2ce8a34c9c32e199e5706aadb5e 100644 --- a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/WxCpGroupRobotServiceImplTest.java +++ b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/WxCpGroupRobotServiceImplTest.java @@ -61,7 +61,7 @@ public class WxCpGroupRobotServiceImplTest { @Test public void testSendNews() throws WxErrorException { NewArticle article = new NewArticle("图文消息测试", "hello world", "http://www.baidu.com", - "http://res.mail.qq.com/node/ww/wwopenmng/images/independent/doc/test_pic_msg1.png", null); + "http://res.mail.qq.com/node/ww/wwopenmng/images/independent/doc/test_pic_msg1.png", null, null, null); robotService.sendNews(Stream.of(article).collect(Collectors.toList())); } } diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaCodeService.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaCodeService.java index 7c13818b8122d7cbca2ba6b427925e5e2ed12b82..e560a151211954c99ef4a07ce21e71d4d65bc1ca 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaCodeService.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaCodeService.java @@ -105,6 +105,14 @@ public interface WxMaCodeService { */ WxMaCodeVersionDistribution getSupportVersion() throws WxErrorException; + /** + * 查询小程序版本信息 + * + * @return 小程序的体验版和线上版本信息 + * @throws WxErrorException 失败时抛出，具体错误码请看此接口的注释文档 + */ + WxMaCodeVersionInfo getVersionInfo() throws WxErrorException; + /** * 设置最低基础库版本（仅供第三方代小程序调用）. * diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaCodeServiceImpl.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaCodeServiceImpl.java index 37265cfe5a48dad53ae72b68a99ff54bbffd5f92..68271254a9eecc32d65ce7e401be9475a726db2f 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaCodeServiceImpl.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaCodeServiceImpl.java @@ -138,6 +138,12 @@ public class WxMaCodeServiceImpl implements WxMaCodeService { return WxMaCodeVersionDistribution.fromJson(responseContent); } + @Override + public WxMaCodeVersionInfo getVersionInfo() throws WxErrorException { + String responseContent = this.service.post(GET_VERSION_INFO_URL, "{}"); + return WxMaCodeVersionInfo.fromJson(responseContent); + } + @Override public void setSupportVersion(String version) throws WxErrorException { JsonObject param = new JsonObject(); diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/code/WxMaCodeVersionInfo.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/code/WxMaCodeVersionInfo.java new file mode 100644 index 0000000000000000000000000000000000000000..32999382fbfd1305893a44ecf1e383e0d356b0c2 --- /dev/null +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/code/WxMaCodeVersionInfo.java @@ -0,0 +1,91 @@ +package cn.binarywang.wx.miniapp.bean.code; + +import cn.binarywang.wx.miniapp.json.WxMaGsonBuilder; +import com.google.gson.annotations.SerializedName; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * 查询小程序版本信息 + * + * @author LeonXi + * @since 2022-04-13 16:45 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +public class WxMaCodeVersionInfo implements Serializable { + + private static final long serialVersionUID = 6929700728659511688L; + + /** + * 体验版信息 + */ + @SerializedName("exp_info") + private ExpInfo expInfo; + + /** + * 线上版信息 + */ + @SerializedName("release_info") + private ReleaseInfo releaseInfo; + + public static WxMaCodeVersionInfo fromJson(String json) { + return WxMaGsonBuilder.create().fromJson(json, WxMaCodeVersionInfo.class); + } + + @Data + @NoArgsConstructor + @AllArgsConstructor + public static class ExpInfo implements Serializable { + + private static final long serialVersionUID = 6315578419554592943L; + + /** + * 提交体验版的时间 + */ + @SerializedName("exp_time") + private Long expTime; + + /** + * 体验版版本信息 + */ + @SerializedName("exp_version") + private String expVersion; + + /** + * 体验版版本描述 + */ + @SerializedName("exp_desc") + private String expDesc; + } + + @Data + @NoArgsConstructor + @AllArgsConstructor + public static class ReleaseInfo implements Serializable { + + private static final long serialVersionUID = 2098307354673939939L; + + /** + * 发布线上版的时间 + */ + @SerializedName("release_time") + private Long releaseTime; + + /** + * 线上版版本信息 + */ + @SerializedName("release_version") + private String releaseVersion; + + /** + * 线上版本描述 + */ + @SerializedName("release_desc") + private String releaseDesc; + } +} diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/constant/WxMaApiUrlConstants.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/constant/WxMaApiUrlConstants.java index 4377b148b4312474dafa3b0110faff9a1f391db1..0124943b68e8dd94751c0910436d6d4601ea0ba8 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/constant/WxMaApiUrlConstants.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/constant/WxMaApiUrlConstants.java @@ -70,6 +70,7 @@ public class WxMaApiUrlConstants { String GET_SUPPORT_VERSION_URL = "https://api.weixin.qq.com/cgi-bin/wxopen/getweappsupportversion"; String SET_SUPPORT_VERSION_URL = "https://api.weixin.qq.com/cgi-bin/wxopen/setweappsupportversion"; String UNDO_CODE_AUDIT_URL = "https://api.weixin.qq.com/wxa/undocodeaudit"; + String GET_VERSION_INFO_URL = "https://api.weixin.qq.com/wxa/getversioninfo"; } public interface Express { diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/message/WxMaMessageRouter.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/message/WxMaMessageRouter.java index 031c688c528448f5683a9247bec61a46fe8a9658..e2c497e13925d1ba9f1e58bf55e20248522412da 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/message/WxMaMessageRouter.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/message/WxMaMessageRouter.java @@ -51,6 +51,51 @@ public class WxMaMessageRouter { this.messageDuplicateChecker = new WxMessageInMemoryDuplicateChecker(); } + /** + * 使用自定义的 {@link ExecutorService}. + */ + public WxMaMessageRouter(WxMaService wxMaService, ExecutorService executorService) { + this.wxMaService = wxMaService; + this.executorService = executorService; + this.sessionManager = new StandardSessionManager(); + this.exceptionHandler = new LogExceptionHandler(); + this.messageDuplicateChecker = new WxMessageInMemoryDuplicateChecker(); + } + + /** + * 系统退出前，应该调用该方法 + */ + public void shutDownExecutorService() { + this.executorService.shutdown(); + } + + /** + * 系统退出前，应该调用该方法，增加了超时时间检测 + */ + public void shutDownExecutorService(Integer second) { + this.executorService.shutdown(); + try { + if (!this.executorService.awaitTermination(second, TimeUnit.SECONDS)) { + this.executorService.shutdownNow(); + if (!this.executorService.awaitTermination(second, TimeUnit.SECONDS)) + log.error("线程池未关闭！"); + } + } catch (InterruptedException ie) { + this.executorService.shutdownNow(); + Thread.currentThread().interrupt(); + } + } + + /** + * 
+   * 设置自定义的 {@link ExecutorService}
+   * 如果不调用该方法，默认使用内置的
+   *
+ */ + public void setExecutorService(ExecutorService executorService) { + this.executorService = executorService; + } + /** * 开始一个新的Route规则. */ diff --git a/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaCodeServiceImplTest.java b/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaCodeServiceImplTest.java index 0a4aca45e3ddfe62cda5d6b1e49802972b3a5757..bac7bab5b1374bd75dceb86b2fc1e58594925cec 100644 --- a/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaCodeServiceImplTest.java +++ b/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaCodeServiceImplTest.java @@ -1,25 +1,21 @@ package cn.binarywang.wx.miniapp.api.impl; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.testng.annotations.*; - import cn.binarywang.wx.miniapp.api.WxMaCodeService; import cn.binarywang.wx.miniapp.api.WxMaService; -import cn.binarywang.wx.miniapp.bean.code.WxMaCategory; -import cn.binarywang.wx.miniapp.bean.code.WxMaCodeAuditStatus; -import cn.binarywang.wx.miniapp.bean.code.WxMaCodeCommitRequest; -import cn.binarywang.wx.miniapp.bean.code.WxMaCodeExtConfig; -import cn.binarywang.wx.miniapp.bean.code.WxMaCodeSubmitAuditRequest; -import cn.binarywang.wx.miniapp.bean.code.WxMaCodeVersionDistribution; +import cn.binarywang.wx.miniapp.bean.code.*; import cn.binarywang.wx.miniapp.config.WxMaConfig; import cn.binarywang.wx.miniapp.test.ApiTestModule; import com.google.inject.Inject; +import org.testng.annotations.Guice; +import org.testng.annotations.Test; + +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; -import static org.testng.Assert.*; +import static org.testng.Assert.assertNotNull; +import static org.testng.Assert.assertTrue; /** * @author Charming @@ -143,6 +139,12 @@ public class WxMaCodeServiceImplTest { System.out.println(distribution); } + @Test + public void testGetVersionInfo() throws Exception { + WxMaCodeVersionInfo versionInfo = wxService.getCodeService().getVersionInfo(); + System.out.println(versionInfo); + } + @Test public void testSetSupportVersion() throws Exception { wxService.getCodeService().setSupportVersion("1.2.0");