diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/jssdk/JSSDKAPI.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/jssdk/JSSDKAPI.java index 72b0bbad..b162a935 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/jssdk/JSSDKAPI.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/jssdk/JSSDKAPI.java @@ -260,6 +260,7 @@ public enum JSSDKAPI { * 企业号-选取联系人 */ openEnterpriseContact, + selectEnterpriseContact, /** * 企业号-向当前企业会话发送消息 diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/MenuMatchRule.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/MenuMatchRule.java index cbb61684..af34284f 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/MenuMatchRule.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/MenuMatchRule.java @@ -28,14 +28,14 @@ public class MenuMatchRule implements Serializable { } /** - * 用户分组id，可通过用户分组管理接口获取 + * 用户标签id，可通过用户表情管理接口获取 */ - private Integer groupId; + private Integer tagId; - @JSONField(name = "group_id") - public MenuMatchRule group(int groupId) { - matchRule.put("group_id", groupId); - this.groupId = groupId; + @JSONField(name = "tag_id") + public MenuMatchRule group(int tagId) { + matchRule.put("tag_id", tagId); + this.tagId = tagId; return this; } @@ -165,8 +165,8 @@ public class MenuMatchRule implements Serializable { return platformType; } - public Integer getGroupId() { - return groupId; + public Integer getTagId() { + return tagId; } public Gender getGender() { @@ -199,7 +199,7 @@ public class MenuMatchRule implements Serializable { @Override public String toString() { - return "MenuMatchRule [groupId=" + groupId + ", gender=" + gender + return "MenuMatchRule [tagId=" + tagId + ", gender=" + gender + ", platformType=" + platformType + ", country=" + country + ", province=" + province + ", city=" + city + ", language=" + language + "]"; diff --git a/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/model/AgentInfo.java b/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/model/AgentInfo.java index ac8b2c7a..dcae383d 100644 --- a/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/model/AgentInfo.java +++ b/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/model/AgentInfo.java @@ -22,11 +22,6 @@ public class AgentInfo extends AgentSetter { */ @JSONField(name = "square_logo_url") private String squareLogoUrl; - /** - * 企业应用圆形头像 - */ - @JSONField(name = "round_logo_url") - private String roundLogoUrl; /** * 企业应用可见范围（人员），其中包括userid和关注状态state */ @@ -46,23 +41,11 @@ public class AgentInfo extends AgentSetter { * 企业应用是否被禁用 */ private boolean close; - /** - * 应用类型。1：消息型；2：主页型 - */ - private int type; public AgentInfo() { super(0); } - public String getSquareLogoUrl() { - return squareLogoUrl; - } - - public String getRoundLogoUrl() { - return roundLogoUrl; - } - public List getAllowUsers() { return allowUsers; } @@ -97,26 +80,15 @@ public class AgentInfo extends AgentSetter { this.squareLogoUrl = squareLogoUrl; } - public void setRoundLogoUrl(String roundLogoUrl) { - this.roundLogoUrl = roundLogoUrl; - } - public void setClose(boolean close) { this.close = close; } - public int getType() { - return type; - } - - public void setType(int type) { - this.type = type; - } - @Override public String toString() { - return "AgentInfo [type=" + type + ", squareLogoUrl=" + squareLogoUrl + ", roundLogoUrl=" + roundLogoUrl - + ", allowUsers=" + allowUsers + ", allowPartys=" + allowPartys + ", allowTags=" + allowTags - + ", close=" + close + ", " + super.toString() + "]"; + return "AgentInfo [squareLogoUrl=" + squareLogoUrl + ", allowUsers=" + + allowUsers + ", allowPartys=" + allowPartys + ", allowTags=" + + allowTags + ", close=" + close + ", " + super.toString() + + "]"; } } diff --git a/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/model/AgentOverview.java b/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/model/AgentOverview.java index c80f0caa..f2e3648e 100644 --- a/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/model/AgentOverview.java +++ b/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/model/AgentOverview.java @@ -30,11 +30,6 @@ public class AgentOverview implements Serializable { */ @JSONField(name = "square_logo_url") private String squareLogoUrl; - /** - * 企业应用圆形头像 - */ - @JSONField(name = "round_logo_url") - private String roundLogoUrl; public int getAgentId() { return agentId; @@ -48,10 +43,6 @@ public class AgentOverview implements Serializable { return squareLogoUrl; } - public String getRoundLogoUrl() { - return roundLogoUrl; - } - // ---------- setter 应该全部去掉 public void setAgentId(int agentId) { this.agentId = agentId; @@ -65,14 +56,9 @@ public class AgentOverview implements Serializable { this.squareLogoUrl = squareLogoUrl; } - public void setRoundLogoUrl(String roundLogoUrl) { - this.roundLogoUrl = roundLogoUrl; - } - @Override public String toString() { return "AgentOverview [agentId=" + agentId + ", name=" + name - + ", squareLogoUrl=" + squareLogoUrl + ", roundLogoUrl=" - + roundLogoUrl + "]"; + + ", squareLogoUrl=" + squareLogoUrl + "]"; } } diff --git a/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/model/AgentSetter.java b/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/model/AgentSetter.java index b0dfec78..6d4f6317 100644 --- a/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/model/AgentSetter.java +++ b/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/model/AgentSetter.java @@ -46,26 +46,16 @@ public class AgentSetter implements Serializable { */ @JSONField(name = "redirect_domain") private String redirectDomain; - /** - * 是否接收用户变更通知。0：不接收；1：接收。主页型应用无需该参数 - */ - @JSONField(name = "isreportuser") - private boolean isReportUser; /** * 是否上报用户进入应用事件。0：不接收；1：接收。主页型应用无需该参数 */ @JSONField(name = "isreportenter") private boolean isReportEnter; /** - * 主页型应用url。url必须以http或者https开头。消息型应用无需该参数 + * 应用主页url。url必须以http或者https开头。消息型应用无需该参数 */ @JSONField(name = "home_url") private String homeUrl; - /** - * 关联会话url - */ - @JSONField(name = "chat_extension_url") - private String chatExtensionUrl; public AgentSetter(int agentId) { this.agentId = agentId; @@ -95,10 +85,6 @@ public class AgentSetter implements Serializable { return redirectDomain; } - public boolean isReportUser() { - return isReportUser; - } - public boolean isReportEnter() { return isReportEnter; } @@ -137,10 +123,6 @@ public class AgentSetter implements Serializable { this.logoMediaId = logoMediaId; } - public void setReportUser(boolean isReportUser) { - this.isReportUser = isReportUser; - } - public void setReportEnter(boolean isReportEnter) { this.isReportEnter = isReportEnter; } @@ -149,22 +131,12 @@ public class AgentSetter implements Serializable { this.homeUrl = homeUrl; } - public String getChatExtensionUrl() { - return chatExtensionUrl; - } - - public void setChatExtensionUrl(String chatExtensionUrl) { - this.chatExtensionUrl = chatExtensionUrl; - } - @Override public String toString() { return "agentId=" + agentId + ", reportLocationType=" + reportLocationType + ", logoMediaId=" + logoMediaId + ", name=" + name + ", description=" + description - + ", redirectDomain=" + redirectDomain + ", isReportUser=" - + isReportUser + ", isReportEnter=" + isReportEnter - + ", homeUrl=" + homeUrl + ", chatExtensionUrl=" - + chatExtensionUrl; + + ", redirectDomain=" + redirectDomain + ", isReportEnter=" + + isReportEnter + ", homeUrl=" + homeUrl; } } diff --git a/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/model/Party.java b/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/model/Party.java index 6c69f6a3..3959edef 100644 --- a/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/model/Party.java +++ b/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/model/Party.java @@ -31,7 +31,7 @@ public class Party implements Serializable { @JSONField(name = "parentid") private int parentId; /** - * 在父部门中的次序。从1开始，数字越大排序越靠后 + * 在父部门中的次序值。order值大的排序靠前。有效的值范围是[0, 2^32) */ private int order; diff --git a/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/model/User.java b/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/model/User.java index 05b85841..4bb37971 100644 --- a/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/model/User.java +++ b/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/model/User.java @@ -56,11 +56,6 @@ public class User implements Serializable { * 非必须 邮箱。长度为0~64个字符。企业内必须唯一 */ private String email; - /** - * 非必须 微信号。企业内必须唯一 - */ - @JSONField(name = "weixinid") - private String weixinId; /** * 头像url。注：如果要获取小图将url最后的"/0"改成"/64"即可 */ @@ -74,6 +69,25 @@ public class User implements Serializable { */ private List extattr; + /** + * 英文名。长度为1-64个字节。 + */ + @JSONField(name = "english_name") + private String englishName; + /** + * 座机。长度0-64个字节。 + */ + private String telephone; + /** + * 上级字段，标识是否为上级。 + */ + @JSONField(name = "isleader") + private Boolean isLeader; + /** + * 启用/禁用成员。1表示启用成员，0表示禁用成员 + */ + private Boolean enable; + protected User() { } @@ -132,10 +146,6 @@ public class User implements Serializable { return email; } - public String getWeixinId() { - return weixinId; - } - public String getAvatar() { return avatar; } @@ -218,10 +228,6 @@ public class User implements Serializable { this.email = email; } - public void setWeixinId(String weixinId) { - this.weixinId = weixinId; - } - public void setAvatar(String avatar) { this.avatar = avatar; } @@ -230,6 +236,38 @@ public class User implements Serializable { this.status = status; } + public String getEnglishName() { + return englishName; + } + + public void setEnglishName(String englishName) { + this.englishName = englishName; + } + + public String getTelephone() { + return telephone; + } + + public void setTelephone(String telephone) { + this.telephone = telephone; + } + + public Boolean getIsLeader() { + return isLeader; + } + + public void setIsLeader(Boolean isLeader) { + this.isLeader = isLeader; + } + + public Boolean getEnable() { + return enable; + } + + public void setEnable(Boolean enable) { + this.enable = enable; + } + @Override public int hashCode() { final int prime = 31; @@ -260,7 +298,9 @@ public class User implements Serializable { return "User [userId=" + userId + ", name=" + name + ", partyIds=" + partyIds + ", position=" + position + ", mobile=" + mobile + ", gender=" + gender + ", tel=" + tel + ", email=" + email - + ", weixinId=" + weixinId + ", avatar=" + avatar + ", status=" - + status + ", extattr=" + extattr + "]"; + + ", avatar=" + avatar + ", status=" + status + ", extattr=" + + extattr + ", englishName=" + englishName + ", telephone=" + + telephone + ", isLeader=" + isLeader + ", enable=" + enable + + "]"; } }