From d707140d066f6648e7a2872ca3c0c8f866d4fac6 Mon Sep 17 00:00:00 2001 From: Daniel Qian Date: Fri, 26 Jun 2015 16:40:07 +0800 Subject: [PATCH 1/3] upgrade to 1.1.7-SNAPSHOT --- pom.xml | 2 +- weixin-java-common/pom.xml | 2 +- weixin-java-cp/pom.xml | 2 +- weixin-java-mp/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 276d4a694..1eb486426 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 me.chanjar weixin-java-parent - 1.1.6 + 1.1.7-SNAPSHOT pom WeiXin Java Tools - Parent 微信公众号、企业号上级POM diff --git a/weixin-java-common/pom.xml b/weixin-java-common/pom.xml index 194cfa6f0..17b8bc900 100644 --- a/weixin-java-common/pom.xml +++ b/weixin-java-common/pom.xml @@ -6,7 +6,7 @@ me.chanjar weixin-java-parent - 1.1.6 + 1.1.7-SNAPSHOT weixin-java-common diff --git a/weixin-java-cp/pom.xml b/weixin-java-cp/pom.xml index 607d4cd24..a67ddaf73 100644 --- a/weixin-java-cp/pom.xml +++ b/weixin-java-cp/pom.xml @@ -6,7 +6,7 @@ me.chanjar weixin-java-parent - 1.1.6 + 1.1.7-SNAPSHOT weixin-java-cp diff --git a/weixin-java-mp/pom.xml b/weixin-java-mp/pom.xml index 04d162327..7ff9f237d 100644 --- a/weixin-java-mp/pom.xml +++ b/weixin-java-mp/pom.xml @@ -6,7 +6,7 @@ me.chanjar weixin-java-parent - 1.1.6 + 1.1.7-SNAPSHOT weixin-java-mp WeiXin Java Tools - MP From ee2cf21efc8cf43fa2334a23e7437f1ccd646fbe Mon Sep 17 00:00:00 2001 From: Daniel Qian Date: Thu, 2 Jul 2015 09:40:12 +0800 Subject: [PATCH 2/3] fix: issue #163 --- .../mp/api/WxMpInMemoryConfigStorage.java | 41 +++++++++++-------- 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpInMemoryConfigStorage.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpInMemoryConfigStorage.java index 45adc4fe7..98247599e 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpInMemoryConfigStorage.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpInMemoryConfigStorage.java @@ -192,26 +192,31 @@ public class WxMpInMemoryConfigStorage implements WxMpConfigStorage { '}'; } - @Override - public String getPartnerId() { - return partnerId; - } + @Override + public String getPartnerId() { + return partnerId; + } - public void setPartnerId(String partnerId) { - this.partnerId = partnerId; - } + public void setPartnerId(String partnerId) { + this.partnerId = partnerId; + } - @Override - public String getPartnerKey() { - return partnerKey; - } + @Override + public String getPartnerKey() { + return partnerKey; + } - public void setPartnerKey(String partnerKey) { - this.partnerKey = partnerKey; - } + public void setPartnerKey(String partnerKey) { + this.partnerKey = partnerKey; + } + + @Override + public File getTmpDirFile() { + return this.tmpDirFile; + } + + public void setTmpDirFile(File tmpDirFile) { + this.tmpDirFile = tmpDirFile; + } - @Override - public File getTmpDirFile() { - return this.getTmpDirFile(); - } } From 1ade0072501a4c602260bc0ab53efe8ec54a60fa Mon Sep 17 00:00:00 2001 From: Daniel Qian Date: Fri, 10 Jul 2015 13:57:40 +0800 Subject: [PATCH 3/3] upgrade to 1.1.7 --- pom.xml | 2 +- weixin-java-common/pom.xml | 2 +- weixin-java-cp/pom.xml | 2 +- weixin-java-mp/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 1eb486426..cc16cf7d5 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 me.chanjar weixin-java-parent - 1.1.7-SNAPSHOT + 1.1.7 pom WeiXin Java Tools - Parent 微信公众号、企业号上级POM diff --git a/weixin-java-common/pom.xml b/weixin-java-common/pom.xml index 17b8bc900..2ca6bba13 100644 --- a/weixin-java-common/pom.xml +++ b/weixin-java-common/pom.xml @@ -6,7 +6,7 @@ me.chanjar weixin-java-parent - 1.1.7-SNAPSHOT + 1.1.7 weixin-java-common diff --git a/weixin-java-cp/pom.xml b/weixin-java-cp/pom.xml index a67ddaf73..74a784b66 100644 --- a/weixin-java-cp/pom.xml +++ b/weixin-java-cp/pom.xml @@ -6,7 +6,7 @@ me.chanjar weixin-java-parent - 1.1.7-SNAPSHOT + 1.1.7 weixin-java-cp diff --git a/weixin-java-mp/pom.xml b/weixin-java-mp/pom.xml index 7ff9f237d..7f733dbba 100644 --- a/weixin-java-mp/pom.xml +++ b/weixin-java-mp/pom.xml @@ -6,7 +6,7 @@ me.chanjar weixin-java-parent - 1.1.7-SNAPSHOT + 1.1.7 weixin-java-mp WeiXin Java Tools - MP