From a61a91356d94c42d34f98082f41d8a3c969798ae Mon Sep 17 00:00:00 2001 From: jinyu Date: Wed, 6 Jul 2016 13:21:59 +0800 Subject: [PATCH] up --- .../java/com/foxinmy/weixin4j/mp/model/WeixinMpAccount.java | 6 +----- weixin4j-mp/src/main/resources/weixin4j.properties | 2 +- .../java/com/foxinmy/weixin4j/qy/model/WeixinQyAccount.java | 5 ----- weixin4j-qy/src/main/resources/weixin4j.properties | 2 +- 4 files changed, 3 insertions(+), 12 deletions(-) diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/WeixinMpAccount.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/WeixinMpAccount.java index 8c6a94e7..57b87812 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/WeixinMpAccount.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/WeixinMpAccount.java @@ -30,7 +30,7 @@ public class WeixinMpAccount extends WeixinAccount { * @param appSecret * 应用组件密钥 使用普通接口(WeixinProxy对象)必须填写 * @param components - * 应用组件集合 使用套件接口(WeixinSuiteProxy#SuiteApi)必须填写 + * 应用组件集合 使用套件接口(WeixinComponentProxy#ComponentApi)必须填写 */ @JSONCreator public WeixinMpAccount(@JSONField(name = "id") String appId, @JSONField(name = "secret") String appSecret, @@ -43,10 +43,6 @@ public class WeixinMpAccount extends WeixinAccount { return components; } - public WeixinAccount[] componentsToArray() { - return components != null ? components.toArray(new WeixinAccount[components.size()]) : null; - } - @Override public String toString() { return "WeixinMpAccount [" + super.toString() + ", components=" + components + "]"; diff --git a/weixin4j-mp/src/main/resources/weixin4j.properties b/weixin4j-mp/src/main/resources/weixin4j.properties index 6aae84f2..ef4f9102 100644 --- a/weixin4j-mp/src/main/resources/weixin4j.properties +++ b/weixin4j-mp/src/main/resources/weixin4j.properties @@ -1,4 +1,4 @@ -# \u6d4b\u8bd5\u4e4b\u7528 \u6b63\u5f0f\u73af\u5883\u4e0bcopy\u4e00\u4efd\u5230classpath +# weixin4j\u7684\u914d\u7f6e\u6587\u4ef6:\u5982\u679c\u6ca1\u6709\u8bf7\u6784\u9020\u76f8\u5e94\u53c2\u6570\u4f20\u5165 \u5982\u679c\u6709\u8bf7\u4fdd\u8bc1\u5728classpath\u7684\u6839\u76ee\u5f55\u4e0b # \u516c\u4f17\u53f7\u4fe1\u606f \u8bf7\u6309\u9700\u586b\u5199 weixin4j.account={"id":"wx4ab8f8de58159a57","secret":"1d4eb0f4bf556aaed539f30ed05ca795",\ diff --git a/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/model/WeixinQyAccount.java b/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/model/WeixinQyAccount.java index 6f4c23cf..53611d14 100644 --- a/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/model/WeixinQyAccount.java +++ b/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/model/WeixinQyAccount.java @@ -70,11 +70,6 @@ public class WeixinQyAccount extends WeixinAccount { return chatSecret; } - public WeixinAccount[] suitesToArray() { - return suites != null ? suites - .toArray(new WeixinAccount[suites.size()]) : null; - } - @Override public String toString() { return "WeixinQyAccount [" + super.toString() + ", suites=" diff --git a/weixin4j-qy/src/main/resources/weixin4j.properties b/weixin4j-qy/src/main/resources/weixin4j.properties index e4a403fd..ddb46748 100644 --- a/weixin4j-qy/src/main/resources/weixin4j.properties +++ b/weixin4j-qy/src/main/resources/weixin4j.properties @@ -1,4 +1,4 @@ -# \u6d4b\u8bd5\u4e4b\u7528 \u6b63\u5f0f\u73af\u5883\u4e0bcopy\u4e00\u4efd\u5230classpath +# weixin4j\u7684\u914d\u7f6e\u6587\u4ef6:\u5982\u679c\u6ca1\u6709\u8bf7\u6784\u9020\u76f8\u5e94\u53c2\u6570\u4f20\u5165 \u5982\u679c\u6709\u8bf7\u4fdd\u8bc1\u5728classpath\u7684\u6839\u76ee\u5f55\u4e0b # \u4f01\u4e1a\u53f7\u4fe1\u606f \u8bf7\u6309\u9700\u586b\u5199 weixin4j.account={"id":"wx5132afc5da26d661","secret":"GsnKLVDI1pWArdB60Ze4iP2cwFvcW5KCAs2vLJldipilmSYxtbkcAiBcGSHHvu_I",\