From 6f776bdda0d6891a4aaf0f900c10fc28beac1118 Mon Sep 17 00:00:00 2001 From: Wong <1960779692@qq.com> Date: Thu, 14 Apr 2022 06:36:40 +0000 Subject: [PATCH] =?UTF-8?q?:bug:=E3=80=90=E4=BC=81=E4=B8=9A=E5=BE=AE?= =?UTF-8?q?=E4=BF=A1=E3=80=91=E4=BF=AE=E5=A4=8D=E5=88=9B=E5=BB=BA=E9=A2=84?= =?UTF-8?q?=E7=BA=A6=E7=9B=B4=E6=92=AD=E6=B4=BB=E5=8A=A8=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=8F=96=E5=80=BC=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../weixin/cp/api/WxCpLivingService.java | 2 +- .../bean/living/WxCpLivingCreateRequest.java | 10 ++--- .../chanjar/weixin/cp/api/WxCpLivingTest.java | 42 +++++++++++++++++++ .../impl/WxCpGroupRobotServiceImplTest.java | 2 +- 4 files changed, 49 insertions(+), 7 deletions(-) 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 4b417e90f..380c3bfc5 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 6da6b81e5..4272a0372 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 295f0497f..4305c26c9 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 57bd9b750..c1a09f359 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())); } }