Skip to content

Commit 2f25436

Browse files
committed
Merge pull request #193 from ajffdnt/develop
企业号用户增加enable属性,可以同步本地系统的用户有效性
2 parents acedf39 + cf8f279 commit 2f25436

File tree

3 files changed

+13
-1
lines changed

3 files changed

+13
-1
lines changed

weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/result/WxError.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public static WxError fromJson(String json) {
4949

5050
@Override
5151
public String toString() {
52-
return "微信错误 errcode=" + errorCode + ", errmsg=" + errorMsg + "\njson:" + json;
52+
return "微信错误: errcode=" + errorCode + ", errmsg=" + errorMsg + "\njson:" + json;
5353
}
5454

5555
}

weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpUser.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ public class WxCpUser implements Serializable {
2424
private String weiXinId;
2525
private String avatar;
2626
private Integer status;
27+
private Integer enable;
2728
private final List<Attr> extAttrs = new ArrayList<Attr>();
2829

2930
public String getUserId() {
@@ -114,6 +115,14 @@ public void setStatus(Integer status) {
114115
this.status = status;
115116
}
116117

118+
public Integer getEnable() {
119+
return enable;
120+
}
121+
122+
public void setEnable(Integer enable) {
123+
this.enable = enable;
124+
}
125+
117126
public void addExtAttr(String name, String value) {
118127
this.extAttrs.add(new Attr(name, value));
119128
}

weixin-java-cp/src/main/java/me/chanjar/weixin/cp/util/json/WxCpUserGsonAdapter.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,9 @@ public JsonElement serialize(WxCpUser user, Type typeOfSrc, JsonSerializationCon
9898
if (user.getStatus() != null) {
9999
o.addProperty("status", user.getStatus());
100100
}
101+
if (user.getEnable() != null) {
102+
o.addProperty("enable", user.getEnable());
103+
}
101104
if (user.getExtAttrs().size() > 0) {
102105
JsonArray attrsJsonArray = new JsonArray();
103106
for (WxCpUser.Attr attr : user.getExtAttrs()) {

0 commit comments

Comments
 (0)