精简WeixinAccount类及其配置文件

weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/api/MenuApi.java

@@ -60,15 +60,16 @@ public class MenuApi extends QyApi {
 					public String process(Object object, String name,
 							Object value) {
 						if (object instanceof Button && name.equals("content")) {
-							ButtonType buttonType = ((Button) object)
-									.getFormatType();
-							if (buttonType == ButtonType.view) {
-								return "url";
-							} else if (buttonType == ButtonType.media_id
-									|| buttonType == ButtonType.view_limited) {
-								return "media_id";
-							} else {
-								return "key";
+							ButtonType buttonType = ((Button) object).getType();
+							if (buttonType != null) {
+								if (ButtonType.view == buttonType) {
+									return "url";
+								} else if (ButtonType.media_id == buttonType
+										|| ButtonType.view_limited == buttonType) {
+									return "media_id";
+								} else {
+									return "key";
+								}
 							}
 						}
 						return name;
@@ -124,8 +125,8 @@ public class MenuApi extends QyApi {
 	public JsonResult deleteMenu(int agentid) throws WeixinException {
 		String menu_delete_uri = getRequestUri("menu_delete_uri");
 		Token token = tokenHolder.getToken();
-		WeixinResponse response = weixinClient.get(String.format(menu_delete_uri,
-				token.getAccessToken(), agentid));
+		WeixinResponse response = weixinClient.get(String.format(
+				menu_delete_uri, token.getAccessToken(), agentid));
 
 		return response.getAsJsonResult();
 	}

weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/model/WeixinQyAccount.java

@@ -1,5 +1,7 @@
 package com.foxinmy.weixin4j.qy.model;
 
+import com.alibaba.fastjson.annotation.JSONCreator;
+import com.alibaba.fastjson.annotation.JSONField;
 import com.foxinmy.weixin4j.model.WeixinAccount;
 
 /**
@@ -14,22 +16,36 @@ import com.foxinmy.weixin4j.model.WeixinAccount;
  *      >企业号设置</a>
  */
 public class WeixinQyAccount extends WeixinAccount {
-	
+
 	private static final long serialVersionUID = 3689999353867189585L;
 
-	public WeixinQyAccount(){
-		
-	}
-	
 	/**
 	 * 
 	 * @param corpid
 	 *            企业ID
 	 * @param corpsecret
 	 *            管理组的凭证密钥
+	 * @param suiteId
+	 *            应用套件的id
+	 * @param suiteSecret
+	 *            应用套件的secret
+	 * @param providerSecret
+	 *            第三方提供商secret(企业号登陆)
+	 * @param chatSecret
+	 *            消息服务secret(企业号聊天)
 	 */
-	public WeixinQyAccount(String corpid, String corpsecret) {
+	@JSONCreator
+	public WeixinQyAccount(@JSONField(name = "id") String corpid,
+			@JSONField(name = "secret") String corpsecret,
+			@JSONField(name = "suiteId") String suiteId,
+			@JSONField(name = "suiteSecret") String suiteSecret,
+			@JSONField(name = "providerSecret") String providerSecret,
+			@JSONField(name = "chatSecret") String chatSecret) {
 		super(corpid, corpsecret);
+		this.suiteId = suiteId;
+		this.suiteSecret = suiteSecret;
+		this.providerSecret = providerSecret;
+		this.chatSecret = chatSecret;
 	}
 
 	/**
@@ -41,65 +57,34 @@ public class WeixinQyAccount extends WeixinAccount {
 	 */
 	private String suiteSecret;
 	/**
-	 * 应用套件token,用于生成签名,校验回调请求的合法性。后续所有托管的企业产生的回调消息都使用该值来解密。
-	 */
-	private String suiteToken;
-	/**
-	 * 应用套件encodingAesKey,回调消息加解密参数，是AES密钥的Base64编码，用于解密回调消息内容对应的密文。
-	 * 后续所有托管的企业产生的回调消息都使用该值来解密。
-	 */
-	private String suiteEncodingAesKey;
-
-	/**
-	 * 提供商的secret
+	 * 第三方提供商secret(企业号登陆)
 	 */
 	private String providerSecret;
+	/**
+	 * 消息服务secret(企业号聊天)
+	 */
+	private String chatSecret;
 
 	public String getSuiteId() {
 		return suiteId;
 	}
 
-	public void setSuiteId(String suiteId) {
-		this.suiteId = suiteId;
-	}
-
 	public String getSuiteSecret() {
 		return suiteSecret;
 	}
 
-	public void setSuiteSecret(String suiteSecret) {
-		this.suiteSecret = suiteSecret;
-	}
-
-	public String getSuiteToken() {
-		return suiteToken;
-	}
-
-	public void setSuiteToken(String suiteToken) {
-		this.suiteToken = suiteToken;
-	}
-
-	public String getSuiteEncodingAesKey() {
-		return suiteEncodingAesKey;
-	}
-
-	public void setSuiteEncodingAesKey(String suiteEncodingAesKey) {
-		this.suiteEncodingAesKey = suiteEncodingAesKey;
-	}
-
 	public String getProviderSecret() {
 		return providerSecret;
 	}
 
-	public void setProviderSecret(String providerSecret) {
-		this.providerSecret = providerSecret;
+	public String getChatSecret() {
+		return chatSecret;
 	}
 
 	@Override
 	public String toString() {
 		return "WeixinQyAccount [" + super.toString() + ", suiteId=" + suiteId
-				+ ", suiteSecret=" + suiteSecret + ", suiteToken=" + suiteToken
-				+ ", suiteEncodingAesKey=" + suiteEncodingAesKey
-				+ ", providerSecret=" + providerSecret + "]";
+				+ ", suiteSecret=" + suiteSecret + ", providerSecret="
+				+ providerSecret + ",  chatSecret=" + chatSecret + "]";
 	}
 }

weixin4j-qy/src/main/resources/weixin4j.properties

@@ -1,12 +1,9 @@
 # \u6d4b\u8bd5\u4e4b\u7528 \u6b63\u5f0f\u73af\u5883\u4e0bcopy\u4e00\u4efd\u5230classpath
 # \u4f01\u4e1a\u53f7\u4fe1\u606f
 account={"id":"wx6d13cc18002bb2e5","secret":"vcCOTIb-cOzWWhL5r_qKVlfzdpInEEKPRz3K-5ezn-Xt48-tOkxPqEE5XbKLXXFn",\
-"token":"gp2eGT5mIpngr",\
-"encodingAesKey":"BRYfV4zPFUJb3v3MySNBg1ERKE3vyyMRoScu76vFySv",\
 "suiteId":"\u5e94\u7528\u5957\u4ef6\u7684id","suiteSecret":"\u5e94\u7528\u5957\u4ef6\u7684secret",\
-"suiteToken":"\u5e94\u7528\u5957\u4ef6\u7684token",\
-"suiteEncodingAesKey":"\u5e94\u7528\u5957\u4ef6\u7684encodingAesKey",\
-"providerSecret":"\u63d0\u4f9b\u5546\u7684secret"}
+"providerSecret":"\u7b2c\u4e09\u65b9\u63d0\u4f9b\u5546secret(\u4f01\u4e1a\u53f7\u767b\u9646)",\
+"chatSecret":"\u6d88\u606f\u670d\u52a1secret(\u4f01\u4e1a\u53f7\u804a\u5929)"}
 
 # \u4f7f\u7528FileTokenStorager\u65f6token\u7684\u5b58\u653e\u8def\u5f84
 token_path=/tmp/weixin4j/token