diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/Group.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/Group.java index da213b63..b1e784f2 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/Group.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/Group.java @@ -2,6 +2,9 @@ package com.foxinmy.weixin4j.mp.model; import java.io.Serializable; +import com.alibaba.fastjson.annotation.JSONCreator; +import com.alibaba.fastjson.annotation.JSONField; + /** * 分组 * @@ -26,26 +29,6 @@ public class Group implements Serializable { */ private int count; - public int getId() { - return id; - } - - public void setId(int id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public int getCount() { - return count; - } - public Group(int id, String name) { this.id = id; this.name = name; @@ -55,8 +38,25 @@ public class Group implements Serializable { this.name = name; } - public Group() { + @JSONCreator + public Group(@JSONField(name = "id") int id, + @JSONField(name = "name") String name, + @JSONField(name = "count") int count) { + this.id = id; + this.name = name; + this.count = count; + } + public int getId() { + return id; + } + + public String getName() { + return name; + } + + public int getCount() { + return count; } /** diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/token/WeixinTokenCreator.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/token/WeixinTokenCreator.java index 387027e2..e850f14c 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/token/WeixinTokenCreator.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/token/WeixinTokenCreator.java @@ -50,6 +50,7 @@ public class WeixinTokenCreator extends AbstractTokenCreator { WeixinResponse response = weixinExecutor.get(tokenUrl); Token token = response.getAsObject(new TypeReference() { }); + token.setCreateTime(System.currentTimeMillis()); token.setOriginalResult(response.getAsString()); return token; } diff --git a/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/GroupTest.java b/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/GroupTest.java index 85820901..db65da71 100644 --- a/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/GroupTest.java +++ b/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/GroupTest.java @@ -36,10 +36,8 @@ public class GroupTest extends TokenTest { @Test public void get() throws WeixinException { List groups = groupApi.getGroups(); - for (Group group : groups) { - System.out.println(group.toModifyJson()); - } - Assert.assertEquals(1, groups.size()); + System.err.println(groups); + Assert.assertTrue(groups.size() > 0); } @Test diff --git a/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/token/WeixinTokenCreator.java b/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/token/WeixinTokenCreator.java index 233d956a..3eaa35b0 100644 --- a/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/token/WeixinTokenCreator.java +++ b/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/token/WeixinTokenCreator.java @@ -50,6 +50,7 @@ public class WeixinTokenCreator extends AbstractTokenCreator { WeixinResponse response = weixinExecutor.get(tokenUrl); Token token = response.getAsObject(new TypeReference() { }); + token.setCreateTime(System.currentTimeMillis()); token.setOriginalResult(response.getAsString()); return token; }