niko/weixin4j
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/foxinmy/weixin4j.git

Browse Source
This commit is contained in:
jinyu 2016-07-07 15:20:30 +08:00
commit 64de38c9bb
4 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/WeixinMpAccount.java
View File

@ -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 + "]";

2
weixin4j-mp/src/main/resources/weixin4j.properties
View File

@ -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",\

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

@ -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="

2
weixin4j-qy/src/main/resources/weixin4j.properties
View File

@ -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",\