binarywang#674 修复微信返回0/1值转换为布尔值错误的问题

qsjia · binarywang · commit bd941025b6ce · 2018-07-12T10:34:48.000+08:00
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMassNewsArticleGsonAdapter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMassNewsArticleGsonAdapter.java
@@ -3,6 +3,7 @@
 import com.google.gson.*;
 import me.chanjar.weixin.common.util.json.GsonHelper;
 import me.chanjar.weixin.mp.bean.WxMpMassNews;
+import org.apache.commons.lang3.BooleanUtils;
 
 import java.lang.reflect.Type;
 
@@ -59,7 +60,7 @@ public WxMpMassNews.WxMpMassNewsArticle deserialize(JsonElement jsonElement, Typ
     }
     JsonElement showCoverPic = articleInfo.get("show_cover_pic");
     if (showCoverPic != null && !showCoverPic.isJsonNull()) {
-      article.setShowCoverPic(GsonHelper.getAsBoolean(showCoverPic));
+      article.setShowCoverPic(BooleanUtils.toBoolean(showCoverPic.getAsInt()));
     }
     return article;
   }
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMaterialNewsArticleGsonAdapter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMaterialNewsArticleGsonAdapter.java
@@ -78,7 +78,7 @@ public WxMpMaterialNews.WxMpMaterialNewsArticle deserialize(JsonElement jsonElem
     }
     JsonElement showCoverPic = articleInfo.get("show_cover_pic");
     if (showCoverPic != null && !showCoverPic.isJsonNull()) {
-      article.setShowCoverPic(GsonHelper.getAsBoolean(showCoverPic));
+      article.setShowCoverPic(BooleanUtils.toBoolean(showCoverPic.getAsInt()));
     }
     JsonElement url = articleInfo.get("url");
     if (url != null && !url.isJsonNull()) {
@@ -87,12 +87,12 @@ public WxMpMaterialNews.WxMpMaterialNewsArticle deserialize(JsonElement jsonElem
 
     JsonElement needOpenComment = articleInfo.get("need_open_comment");
     if (needOpenComment != null && !needOpenComment.isJsonNull()) {
-      article.setNeedOpenComment(GsonHelper.getAsBoolean(needOpenComment));
+      article.setNeedOpenComment(BooleanUtils.toBoolean(needOpenComment.getAsInt()));
     }
 
     JsonElement onlyFansCanComment = articleInfo.get("only_fans_can_comment");
     if (onlyFansCanComment != null && !onlyFansCanComment.isJsonNull()) {
-      article.setOnlyFansCanComment(GsonHelper.getAsBoolean(onlyFansCanComment));
+      article.setOnlyFansCanComment(BooleanUtils.toBoolean(onlyFansCanComment.getAsInt()));
     }
     return article;
   }

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`import com.google.gson.*;`
`4`	`4`	`import me.chanjar.weixin.common.util.json.GsonHelper;`
`5`	`5`	`import me.chanjar.weixin.mp.bean.WxMpMassNews;`
	`6`	`+import org.apache.commons.lang3.BooleanUtils;`
`6`	`7`
`7`	`8`	`import java.lang.reflect.Type;`
`8`	`9`
`@@ -59,7 +60,7 @@ public WxMpMassNews.WxMpMassNewsArticle deserialize(JsonElement jsonElement, Typ`
`59`	`60`	`}`
`60`	`61`	`JsonElement showCoverPic = articleInfo.get("show_cover_pic");`
`61`	`62`	`if (showCoverPic != null && !showCoverPic.isJsonNull()) {`
`62`		`- article.setShowCoverPic(GsonHelper.getAsBoolean(showCoverPic));`
	`63`	`+ article.setShowCoverPic(BooleanUtils.toBoolean(showCoverPic.getAsInt()));`
`63`	`64`	`}`
`64`	`65`	`return article;`
`65`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ public WxMpMaterialNews.WxMpMaterialNewsArticle deserialize(JsonElement jsonElem`
`78`	`78`	`}`
`79`	`79`	`JsonElement showCoverPic = articleInfo.get("show_cover_pic");`
`80`	`80`	`if (showCoverPic != null && !showCoverPic.isJsonNull()) {`
`81`		`- article.setShowCoverPic(GsonHelper.getAsBoolean(showCoverPic));`
	`81`	`+ article.setShowCoverPic(BooleanUtils.toBoolean(showCoverPic.getAsInt()));`
`82`	`82`	`}`
`83`	`83`	`JsonElement url = articleInfo.get("url");`
`84`	`84`	`if (url != null && !url.isJsonNull()) {`
`@@ -87,12 +87,12 @@ public WxMpMaterialNews.WxMpMaterialNewsArticle deserialize(JsonElement jsonElem`
`87`	`87`
`88`	`88`	`JsonElement needOpenComment = articleInfo.get("need_open_comment");`
`89`	`89`	`if (needOpenComment != null && !needOpenComment.isJsonNull()) {`
`90`		`- article.setNeedOpenComment(GsonHelper.getAsBoolean(needOpenComment));`
	`90`	`+ article.setNeedOpenComment(BooleanUtils.toBoolean(needOpenComment.getAsInt()));`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`JsonElement onlyFansCanComment = articleInfo.get("only_fans_can_comment");`
`94`	`94`	`if (onlyFansCanComment != null && !onlyFansCanComment.isJsonNull()) {`
`95`		`- article.setOnlyFansCanComment(GsonHelper.getAsBoolean(onlyFansCanComment));`
	`95`	`+ article.setOnlyFansCanComment(BooleanUtils.toBoolean(onlyFansCanComment.getAsInt()));`
`96`	`96`	`}`
`97`	`97`	`return article;`
`98`	`98`	`}`