diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/weixin/error.xml b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/weixin/error.xml
index b4bddbc6..5ef5a4a5 100644
--- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/weixin/error.xml
+++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/weixin/error.xml
@@ -859,15 +859,15 @@
60027
- 主页型应用不支持调用该接口
+ 不支持第三方修改主页型应用字段
60028
- 应用已授权予第三方,不允许通过分级管理员主页url
+ 应用已授权予第三方,不允许通过接口修改主页url
60029
- 应用已授权予第三方,不允许通过分级管理员修改可信域名
+ 应用已授权予第三方,不允许通过接口修改可信域名
60102
diff --git a/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/model/CorpInfo.java b/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/model/CorpInfo.java
index 937f1a5f..2211a836 100644
--- a/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/model/CorpInfo.java
+++ b/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/model/CorpInfo.java
@@ -1,9 +1,11 @@
package com.foxinmy.weixin4j.qy.model;
import java.io.Serializable;
+import java.util.Date;
import com.alibaba.fastjson.annotation.JSONField;
import com.foxinmy.weixin4j.qy.type.CorpType;
+import com.foxinmy.weixin4j.qy.type.CorporateType;
/**
* 授权方企业号信息
@@ -57,6 +59,21 @@ public class CorpInfo implements Serializable {
*/
@JSONField(name = "corp_wxqrcode")
private String wxQrCode;
+ /**
+ * 所绑定的企业号主体名称
+ */
+ @JSONField(name = "corp_full_name")
+ private String fullName;
+ /**
+ * 认证到期时间
+ */
+ @JSONField(name = "verified_end_time")
+ private long verifiedEndTime;
+ /**
+ * 企业类型
+ */
+ @JSONField(name = "subject_type")
+ private int corporateType;
public String getCorpId() {
return corpId;
@@ -95,6 +112,30 @@ public class CorpInfo implements Serializable {
return wxQrCode;
}
+ public String getFullName() {
+ return fullName;
+ }
+
+ public long getVerifiedEndTime() {
+ return verifiedEndTime;
+ }
+
+ @JSONField(serialize = false)
+ public Date getFormatVerifiedEndTime() {
+ return verifiedEndTime > 0l ? new Date(verifiedEndTime * 1000l) : null;
+ }
+
+ public int getCorporateType() {
+ return corporateType;
+ }
+
+ @JSONField(serialize = false)
+ public CorporateType getFormatCorporateType() {
+ return corporateType > 0
+ && corporateType <= CorporateType.values().length ? CorporateType
+ .values()[corporateType - 1] : null;
+ }
+
// ---------- setter 应该全部去掉
public void setCorpId(String corpId) {
@@ -129,12 +170,25 @@ public class CorpInfo implements Serializable {
this.wxQrCode = wxQrCode;
}
+ public void setFullName(String fullName) {
+ this.fullName = fullName;
+ }
+
+ public void setVerifiedEndTime(long verifiedEndTime) {
+ this.verifiedEndTime = verifiedEndTime;
+ }
+
+ public void setCorporateType(int corporateType) {
+ this.corporateType = corporateType;
+ }
+
@Override
public String toString() {
- return "CorpInfo [corpType=" + corpId + ", corpName=" + corpName
+ return "CorpInfo [corpId=" + corpId + ", corpName=" + corpName
+ ", squareLogoUrl=" + squareLogoUrl + ", roundLogoUrl="
+ roundLogoUrl + ", corpType=" + corpType + ", userMax="
+ userMax + ", agentMax=" + agentMax + ", wxQrCode=" + wxQrCode
- + "]";
+ + ", fullName=" + fullName + ", verifiedEndTime="
+ + verifiedEndTime + ", corporateType=" + corporateType + "]";
}
}
\ No newline at end of file
diff --git a/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/type/CorporateType.java b/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/type/CorporateType.java
new file mode 100644
index 00000000..5da5070e
--- /dev/null
+++ b/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/type/CorporateType.java
@@ -0,0 +1,29 @@
+package com.foxinmy.weixin4j.qy.type;
+
+/**
+ * 企业类型
+ *
+ * @className CorporateType
+ * @author jy
+ * @date 2016年3月12日
+ * @since JDK 1.6
+ * @see
+ */
+public enum CorporateType {
+ /**
+ * 企业
+ */
+ CORP,
+ /**
+ * 政府以及事业单位
+ */
+ GOVINS,
+ /**
+ * 其他组织
+ */
+ OTHER,
+ /**
+ * 团队号
+ */
+ TEAM;
+}
diff --git a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/handler/MultipleMessageHandlerAdapter.java b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/handler/MultipleMessageHandlerAdapter.java
index 3b6e1384..598c2781 100644
--- a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/handler/MultipleMessageHandlerAdapter.java
+++ b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/handler/MultipleMessageHandlerAdapter.java
@@ -59,4 +59,4 @@ public abstract class MultipleMessageHandlerAdapter implements
public int weight() {
return 1;
}
-}
+}
\ No newline at end of file
diff --git a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/handler/WeixinMessageHandler.java b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/handler/WeixinMessageHandler.java
index 019965e2..78b95b76 100644
--- a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/handler/WeixinMessageHandler.java
+++ b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/handler/WeixinMessageHandler.java
@@ -15,6 +15,7 @@ import com.foxinmy.weixin4j.response.WeixinResponse;
* @date 2015年5月7日
* @since JDK 1.6
* @see MessageHandlerAdapter
+ * @see MultipleMessageHandlerAdapter
*/
public interface WeixinMessageHandler {