From b3277244339c3f0f06d641f21f2ebdec4b1b6915 Mon Sep 17 00:00:00 2001 From: Binary Wang Date: Wed, 29 Aug 2018 00:21:17 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=84=E8=8C=83=E8=8E=B7=E5=8F=96=E5=BA=94?= =?UTF-8?q?=E7=94=A8=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E7=9A=84=E7=9B=B8=E5=85=B3=E5=AD=97=E6=AE=B5=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cp/api/impl/WxCpAgentServiceImpl.java | 8 +++---- .../me/chanjar/weixin/cp/bean/WxCpAgent.java | 22 +++++++++---------- .../cp/api/impl/WxCpAgentServiceImplTest.java | 20 +++++------------ .../chanjar/weixin/cp/bean/WxCpAgentTest.java | 6 ++--- 4 files changed, 22 insertions(+), 34 deletions(-) diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpAgentServiceImpl.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpAgentServiceImpl.java index 3a2733b80..45179fb56 100644 --- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpAgentServiceImpl.java +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpAgentServiceImpl.java @@ -23,13 +23,11 @@ public class WxCpAgentServiceImpl implements WxCpAgentService { @Override public WxCpAgent get(Integer agentId) throws WxErrorException { - - String url = "https://qyapi.weixin.qq.com/cgi-bin/agent/get"; - if (agentId != null) { - url += "?agentid=" + agentId; - } else { + if (agentId == null) { throw new IllegalArgumentException("缺少agentid参数"); } + + String url = "https://qyapi.weixin.qq.com/cgi-bin/agent/get?agentid=" + agentId; String responseContent = this.mainService.get(url, null); return WxCpAgent.fromJson(responseContent); } diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpAgent.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpAgent.java index eb7069bdc..d606e1c6e 100644 --- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpAgent.java +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpAgent.java @@ -17,15 +17,16 @@ import java.util.List; */ @Data public class WxCpAgent implements Serializable { + private static final long serialVersionUID = 5002894979081127234L; @SerializedName("errcode") - private Integer errcode; + private Integer errCode; @SerializedName("errmsg") - private String errmsg; + private String errMsg; @SerializedName("agentid") - private Integer agentid; + private Integer agentId; @SerializedName("name") private String name; @@ -37,10 +38,10 @@ public class WxCpAgent implements Serializable { private String description; @SerializedName("allow_userinfos") - private Users allowUserinfos; + private Users allowUserInfos; @SerializedName("allow_partys") - private Partys allowPartys; + private Partys allowParties; @SerializedName("allow_tags") private Tags allowTags; @@ -55,7 +56,7 @@ public class WxCpAgent implements Serializable { private Integer reportLocationFlag; @SerializedName("isreportenter") - private Integer isreportenter; + private Integer isReportEnter; @SerializedName("home_url") private String homeUrl; @@ -71,26 +72,25 @@ public class WxCpAgent implements Serializable { @Data public static class Users implements Serializable { @SerializedName("user") - private List user; + private List users; } - @Data public class User implements Serializable { @SerializedName("userid") - private String userid; + private String userId; } @Data public class Partys { @SerializedName("partyid") - private List partyids = null; + private List partyIds = null; } @Data public class Tags { @SerializedName("tagid") - private List tagids = null; + private List tagIds = null; } } diff --git a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/WxCpAgentServiceImplTest.java b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/WxCpAgentServiceImplTest.java index f4b2aac05..f69df698e 100644 --- a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/WxCpAgentServiceImplTest.java +++ b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/WxCpAgentServiceImplTest.java @@ -1,23 +1,13 @@ package me.chanjar.weixin.cp.api.impl; -import com.google.inject.Inject; -import me.chanjar.weixin.common.api.WxConsts; -import me.chanjar.weixin.common.bean.menu.WxMenu; -import me.chanjar.weixin.common.bean.menu.WxMenuButton; -import me.chanjar.weixin.cp.api.ApiTestModule; import me.chanjar.weixin.cp.api.WxCpAgentService; import me.chanjar.weixin.cp.api.WxCpService; import me.chanjar.weixin.cp.bean.WxCpAgent; -import me.chanjar.weixin.cp.config.WxCpInMemoryConfigStorage; -import org.mockito.Mock; import org.testng.Assert; -import org.testng.annotations.DataProvider; -import org.testng.annotations.Guice; import org.testng.annotations.Test; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNotNull; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; /** @@ -41,11 +31,11 @@ public class WxCpAgentServiceImplTest { WxCpAgentService wxAgentService = this.wxService.getAgentService(); WxCpAgent wxCpAgent = wxAgentService.get(9); - Assert.assertEquals(9, wxCpAgent.getAgentid().intValue()); + Assert.assertEquals(9, wxCpAgent.getAgentId().intValue()); - Assert.assertEquals(new Integer[]{42762742}, wxCpAgent.getAllowPartys().getPartyids().toArray()); + Assert.assertEquals(new Integer[]{42762742}, wxCpAgent.getAllowParties().getPartyIds().toArray()); - Assert.assertEquals(new Integer[]{23, 22, 35, 19, 32, 125, 133, 46, 150, 38, 183, 9, 7}, wxCpAgent.getAllowTags().getTagids().toArray()); + Assert.assertEquals(new Integer[]{23, 22, 35, 19, 32, 125, 133, 46, 150, 38, 183, 9, 7}, wxCpAgent.getAllowTags().getTagIds().toArray()); } diff --git a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/bean/WxCpAgentTest.java b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/bean/WxCpAgentTest.java index 6a2b87c58..74b8269d3 100644 --- a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/bean/WxCpAgentTest.java +++ b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/bean/WxCpAgentTest.java @@ -14,11 +14,11 @@ public class WxCpAgentTest { WxCpAgent wxCpAgent = WxCpAgent.fromJson(json); - Assert.assertEquals(9, wxCpAgent.getAgentid().intValue()); + Assert.assertEquals(9, wxCpAgent.getAgentId().intValue()); - Assert.assertEquals(new Integer[]{42762742}, wxCpAgent.getAllowPartys().getPartyids().toArray()); + Assert.assertEquals(new Integer[]{42762742}, wxCpAgent.getAllowParties().getPartyIds().toArray()); - Assert.assertEquals(new Integer[]{23, 22, 35, 19, 32, 125, 133, 46, 150, 38, 183, 9, 7}, wxCpAgent.getAllowTags().getTagids().toArray()); + Assert.assertEquals(new Integer[]{23, 22, 35, 19, 32, 125, 133, 46, 150, 38, 183, 9, 7}, wxCpAgent.getAllowTags().getTagIds().toArray()); }