规范统一openid的问题 binarywang#177

binarywang · binarywang · commit bc0fbf76a5dc · 2017-04-10T10:24:32.000+08:00
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpUserList.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpUserList.java
@@ -14,8 +14,8 @@ public class WxMpUserList {
 
   protected int total = -1;
   protected int count = -1;
-  protected List<String> openIds = new ArrayList<>();
-  protected String nextOpenId;
+  protected List<String> openids = new ArrayList<>();
+  protected String nextOpenid;
   public int getTotal() {
     return this.total;
   }
@@ -28,19 +28,19 @@ public int getCount() {
   public void setCount(int count) {
     this.count = count;
   }
-  public List<String> getOpenIds() {
-    return this.openIds;
+  public List<String> getOpenids() {
+    return this.openids;
   }
-  public void setOpenIds(List<String> openIds) {
-    this.openIds = openIds;
+  public void setOpenids(List<String> openids) {
+    this.openids = openids;
   }
-  public String getNextOpenId() {
-    return this.nextOpenId;
+  public String getNextOpenid() {
+    return this.nextOpenid;
   }
-  public void setNextOpenId(String nextOpenId) {
-    this.nextOpenId = nextOpenId;
+  public void setNextOpenid(String nextOpenid) {
+    this.nextOpenid = nextOpenid;
   }
-  
+
   public static WxMpUserList fromJson(String json) {
     return WxMpGsonBuilder.INSTANCE.create().fromJson(json, WxMpUserList.class);
   }
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxUserListGsonAdapter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxUserListGsonAdapter.java
@@ -22,11 +22,11 @@ public WxMpUserList deserialize(JsonElement json, Type typeOfT, JsonDeserializat
     WxMpUserList wxMpUserList = new WxMpUserList();
     wxMpUserList.setTotal(GsonHelper.getInteger(o, "total"));
     wxMpUserList.setCount(GsonHelper.getInteger(o, "count"));
-    wxMpUserList.setNextOpenId(GsonHelper.getString(o, "next_openid"));
+    wxMpUserList.setNextOpenid(GsonHelper.getString(o, "next_openid"));
     if (o.get("data") != null && !o.get("data").isJsonNull() && !o.get("data").getAsJsonObject().get("openid").isJsonNull()) {
       JsonArray data = o.get("data").getAsJsonObject().get("openid").getAsJsonArray();
       for (int i = 0; i < data.size(); i++) {
-        wxMpUserList.getOpenIds().add(GsonHelper.getAsString(data.get(i)));
+        wxMpUserList.getOpenids().add(GsonHelper.getAsString(data.get(i)));
       }
     }
     return wxMpUserList;
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpUserServiceImplTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpUserServiceImplTest.java
@@ -70,7 +70,7 @@ public void testUserList() throws WxErrorException {
     Assert.assertNotNull(wxMpUserList);
     Assert.assertFalse(wxMpUserList.getCount() == -1);
     Assert.assertFalse(wxMpUserList.getTotal() == -1);
-    Assert.assertFalse(wxMpUserList.getOpenIds().size() == -1);
+    Assert.assertFalse(wxMpUserList.getOpenids().size() == -1);
     System.out.println(wxMpUserList);
   }
 

Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,8 @@ public class WxMpUserList {`
`14`	`14`
`15`	`15`	`protected int total = -1;`
`16`	`16`	`protected int count = -1;`
`17`		`- protected List<String> openIds = new ArrayList<>();`
`18`		`- protected String nextOpenId;`
	`17`	`+ protected List<String> openids = new ArrayList<>();`
	`18`	`+ protected String nextOpenid;`
`19`	`19`	`public int getTotal() {`
`20`	`20`	`return this.total;`
`21`	`21`	`}`
`@@ -28,19 +28,19 @@ public int getCount() {`
`28`	`28`	`public void setCount(int count) {`
`29`	`29`	`this.count = count;`
`30`	`30`	`}`
`31`		`- public List<String> getOpenIds() {`
`32`		`- return this.openIds;`
	`31`	`+ public List<String> getOpenids() {`
	`32`	`+ return this.openids;`
`33`	`33`	`}`
`34`		`- public void setOpenIds(List<String> openIds) {`
`35`		`- this.openIds = openIds;`
	`34`	`+ public void setOpenids(List<String> openids) {`
	`35`	`+ this.openids = openids;`
`36`	`36`	`}`
`37`		`- public String getNextOpenId() {`
`38`		`- return this.nextOpenId;`
	`37`	`+ public String getNextOpenid() {`
	`38`	`+ return this.nextOpenid;`
`39`	`39`	`}`
`40`		`- public void setNextOpenId(String nextOpenId) {`
`41`		`- this.nextOpenId = nextOpenId;`
	`40`	`+ public void setNextOpenid(String nextOpenid) {`
	`41`	`+ this.nextOpenid = nextOpenid;`
`42`	`42`	`}`
`43`		`-`
	`43`	`+`
`44`	`44`	`public static WxMpUserList fromJson(String json) {`
`45`	`45`	`return WxMpGsonBuilder.INSTANCE.create().fromJson(json, WxMpUserList.class);`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,11 +22,11 @@ public WxMpUserList deserialize(JsonElement json, Type typeOfT, JsonDeserializat`
`22`	`22`	`WxMpUserList wxMpUserList = new WxMpUserList();`
`23`	`23`	`wxMpUserList.setTotal(GsonHelper.getInteger(o, "total"));`
`24`	`24`	`wxMpUserList.setCount(GsonHelper.getInteger(o, "count"));`
`25`		`- wxMpUserList.setNextOpenId(GsonHelper.getString(o, "next_openid"));`
	`25`	`+ wxMpUserList.setNextOpenid(GsonHelper.getString(o, "next_openid"));`
`26`	`26`	`if (o.get("data") != null && !o.get("data").isJsonNull() && !o.get("data").getAsJsonObject().get("openid").isJsonNull()) {`
`27`	`27`	`JsonArray data = o.get("data").getAsJsonObject().get("openid").getAsJsonArray();`
`28`	`28`	`for (int i = 0; i < data.size(); i++) {`
`29`		`- wxMpUserList.getOpenIds().add(GsonHelper.getAsString(data.get(i)));`
	`29`	`+ wxMpUserList.getOpenids().add(GsonHelper.getAsString(data.get(i)));`
`30`	`30`	`}`
`31`	`31`	`}`
`32`	`32`	`return wxMpUserList;`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ public void testUserList() throws WxErrorException {`
`70`	`70`	`Assert.assertNotNull(wxMpUserList);`
`71`	`71`	`Assert.assertFalse(wxMpUserList.getCount() == -1);`
`72`	`72`	`Assert.assertFalse(wxMpUserList.getTotal() == -1);`
`73`		`- Assert.assertFalse(wxMpUserList.getOpenIds().size() == -1);`
	`73`	`+ Assert.assertFalse(wxMpUserList.getOpenids().size() == -1);`
`74`	`74`	`System.out.println(wxMpUserList);`
`75`	`75`	`}`
`76`	`76`