From 1877813c0c9360bc68f4238dc2f80ada9a259e62 Mon Sep 17 00:00:00 2001 From: jinyu Date: Tue, 13 Dec 2016 17:12:19 +0800 Subject: [PATCH] version upgrade to 1.7.3 --- CHANGE.md | 6 +++++- pom.xml | 2 +- weixin4j-base/pom.xml | 2 +- .../weixin4j/payment/WeixinPayProxy.java | 2 +- .../weixin4j/type/mch/RefundAccountType.java | 18 ++++++++++++++++++ weixin4j-example/pom.xml | 6 +++--- weixin4j-mp/CHANGE.md | 6 +++++- weixin4j-mp/pom.xml | 8 +++++++- .../weixin4j/mp/WeixinComponentProxy.java | 2 +- .../com/foxinmy/weixin4j/mp/WeixinProxy.java | 2 +- weixin4j-qy/CHANGE.md | 6 +++++- weixin4j-qy/pom.xml | 2 +- .../com/foxinmy/weixin4j/qy/WeixinProxy.java | 2 +- .../foxinmy/weixin4j/qy/WeixinSuiteProxy.java | 2 +- 14 files changed, 51 insertions(+), 15 deletions(-) create mode 100644 weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/mch/RefundAccountType.java diff --git a/CHANGE.md b/CHANGE.md index bd42b3e2..fa52e2f9 100644 --- a/CHANGE.md +++ b/CHANGE.md @@ -770,4 +770,8 @@ * 2016-11-22 - + weixin4j-mp:新增黑名单接口 \ No newline at end of file + + weixin4j-mp:新增黑名单接口 + +* 2016-12-13 + + + version upgrade to 1.7.3 \ No newline at end of file diff --git a/pom.xml b/pom.xml index 0928bbdf..065acfa9 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.foxinmy weixin4j - 1.7.2 + 1.7.3 pom weixin4j https://github.com/foxinmy/weixin4j diff --git a/weixin4j-base/pom.xml b/weixin4j-base/pom.xml index fb075ff1..ad39d041 100644 --- a/weixin4j-base/pom.xml +++ b/weixin4j-base/pom.xml @@ -5,7 +5,7 @@ com.foxinmy weixin4j - 1.7.2 + 1.7.3 weixin4j-base weixin4j-base diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/WeixinPayProxy.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/WeixinPayProxy.java index 10041ec8..7df325e4 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/WeixinPayProxy.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/WeixinPayProxy.java @@ -859,5 +859,5 @@ public class WeixinPayProxy { return customsApi.queryCustomsOrder(idQuery, customsCity); } - public final static String VERSION = "1.7.2"; + public final static String VERSION = "1.7.3"; } diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/mch/RefundAccountType.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/mch/RefundAccountType.java new file mode 100644 index 00000000..af10c2e1 --- /dev/null +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/mch/RefundAccountType.java @@ -0,0 +1,18 @@ +package com.foxinmy.weixin4j.type.mch; + +/** + * 退款资金来源 + * @className RefundAccountType + * @author jinyu(foxinmy@gmail.com) + * @date 2016年12月12日 + */ +public enum RefundAccountType { + /** + * ---未结算资金退款（默认使用未结算资金退款） + */ + REFUND_SOURCE_UNSETTLED_FUNDS, + /** + * ---可用余额退款 + */ + REFUND_SOURCE_RECHARGE_FUNDS +} diff --git a/weixin4j-example/pom.xml b/weixin4j-example/pom.xml index 9d4e4a38..098860cd 100644 --- a/weixin4j-example/pom.xml +++ b/weixin4j-example/pom.xml @@ -5,7 +5,7 @@ com.foxinmy weixin4j - 1.7.2 + 1.7.3 weixin4j-example 1.0 @@ -47,13 +47,13 @@ com.foxinmy weixin4j-mp - 1.7.2 + 1.7.3 com.foxinmy weixin4j-qy - 1.7.2 + 1.7.3 diff --git a/weixin4j-mp/CHANGE.md b/weixin4j-mp/CHANGE.md index 6178cb46..2ededc69 100644 --- a/weixin4j-mp/CHANGE.md +++ b/weixin4j-mp/CHANGE.md @@ -256,4 +256,8 @@ * 2016-11-22 - + 新增黑名单接口 \ No newline at end of file + + 新增黑名单接口 + +* 2016-12-13 + + + version upgrade to 1.7.3 \ No newline at end of file diff --git a/weixin4j-mp/pom.xml b/weixin4j-mp/pom.xml index 8d9c6e75..07ea2246 100644 --- a/weixin4j-mp/pom.xml +++ b/weixin4j-mp/pom.xml @@ -5,7 +5,7 @@ com.foxinmy weixin4j - 1.7.2 + 1.7.3 weixin4j-mp weixin4j-mp @@ -29,5 +29,11 @@ junit junit + + ch.qos.logback + logback-core + 1.1.8 + test + \ No newline at end of file diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/WeixinComponentProxy.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/WeixinComponentProxy.java index 0472baeb..8f66eec2 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/WeixinComponentProxy.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/WeixinComponentProxy.java @@ -225,5 +225,5 @@ public class WeixinComponentProxy { authAppId), component(componentId).getTokenManager()); } - public final static String VERSION = "1.7.2"; + public final static String VERSION = "1.7.3"; } diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/WeixinProxy.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/WeixinProxy.java index bd2f2de6..57357278 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/WeixinProxy.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/WeixinProxy.java @@ -2062,5 +2062,5 @@ public class WeixinProxy { return cardApi.createCardQR(expireSeconds, cardQRs); } - public final static String VERSION = "1.7.2"; + public final static String VERSION = "1.7.3"; } diff --git a/weixin4j-qy/CHANGE.md b/weixin4j-qy/CHANGE.md index f84d846f..96338603 100644 --- a/weixin4j-qy/CHANGE.md +++ b/weixin4j-qy/CHANGE.md @@ -195,4 +195,8 @@ * 2016-10-10 - + version upgrade to 1.7.2 \ No newline at end of file + + version upgrade to 1.7.2 + +* 2016-12-13 + + + version upgrade to 1.7.3 \ No newline at end of file diff --git a/weixin4j-qy/pom.xml b/weixin4j-qy/pom.xml index 3691fc4d..9c16a356 100644 --- a/weixin4j-qy/pom.xml +++ b/weixin4j-qy/pom.xml @@ -5,7 +5,7 @@ com.foxinmy weixin4j - 1.7.2 + 1.7.3 weixin4j-qy weixin4j-qy diff --git a/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/WeixinProxy.java b/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/WeixinProxy.java index 8c6117b0..2748d886 100644 --- a/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/WeixinProxy.java +++ b/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/WeixinProxy.java @@ -1433,5 +1433,5 @@ public class WeixinProxy { return chatApi.sendChatMessage(message); } - public final static String VERSION = "1.7.2"; + public final static String VERSION = "1.7.3"; } diff --git a/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/WeixinSuiteProxy.java b/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/WeixinSuiteProxy.java index 932f4577..017cd8cd 100644 --- a/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/WeixinSuiteProxy.java +++ b/weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/WeixinSuiteProxy.java @@ -285,5 +285,5 @@ public class WeixinSuiteProxy { suite(suiteId).getTokenManager()); } - public final static String VERSION = "1.7.2"; + public final static String VERSION = "1.7.3"; }