diff --git a/pom.xml b/pom.xml
index d4cc7929..a586f9e7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
4.0.0
com.foxinmy
weixin4j
- 1.7.8
+ 1.7.9
pom
weixin4j
https://github.com/foxinmy/weixin4j
diff --git a/weixin4j-base/pom.xml b/weixin4j-base/pom.xml
index 2ab03a7d..9bf3d98a 100644
--- a/weixin4j-base/pom.xml
+++ b/weixin4j-base/pom.xml
@@ -5,7 +5,7 @@
com.foxinmy
weixin4j
- 1.7.8
+ 1.7.9
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 76bc4c17..3c4ef17c 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
@@ -864,5 +864,5 @@ public class WeixinPayProxy {
return customsApi.queryCustomsOrder(idQuery, customsCity);
}
- public final static String VERSION = "1.7.8";
+ public final static String VERSION = "1.7.9";
}
diff --git a/weixin4j-example/pom.xml b/weixin4j-example/pom.xml
index 7314962d..dde0fec3 100644
--- a/weixin4j-example/pom.xml
+++ b/weixin4j-example/pom.xml
@@ -5,7 +5,7 @@
com.foxinmy
weixin4j
- 1.7.8
+ 1.7.9
war
weixin4j-example
@@ -48,19 +48,25 @@
com.foxinmy
weixin4j-mp
- 1.7.8
+ 1.7.9
com.foxinmy
weixin4j-qy
- 1.7.8
+ 1.7.9
com.foxinmy
weixin4j-server
1.1.8
+
+
+ netty-all
+ io.netty
+
+
org.springframework
@@ -89,5 +95,10 @@
standard
1.1.2
+
+ com.squareup.okhttp3
+ okhttp
+ 3.3.1
+
\ No newline at end of file
diff --git a/weixin4j-example/src/main/java/PayTest.java b/weixin4j-example/src/main/java/PayTest.java
new file mode 100644
index 00000000..523b3d6a
--- /dev/null
+++ b/weixin4j-example/src/main/java/PayTest.java
@@ -0,0 +1,58 @@
+
+
+import java.io.IOException;
+
+import com.foxinmy.weixin4j.exception.WeixinException;
+import com.foxinmy.weixin4j.model.WeixinPayAccount;
+import com.foxinmy.weixin4j.payment.WeixinPayProxy;
+import com.foxinmy.weixin4j.payment.mch.RefundResult;
+import com.foxinmy.weixin4j.sign.WeixinPaymentSignature;
+import com.foxinmy.weixin4j.sign.WeixinSignature;
+import com.foxinmy.weixin4j.type.CurrencyType;
+import com.foxinmy.weixin4j.type.IdQuery;
+import com.foxinmy.weixin4j.type.IdType;
+import com.foxinmy.weixin4j.type.mch.RefundAccountType;
+
+/**
+ * 支付测试(商户平台)
+ *
+ * @className PayTest
+ * @author jinyu(foxinmy@gmail.com)
+ * @date 2016年1月30日
+ * @since JDK 1.7
+ * @see
+ */
+public class PayTest {
+ protected final static WeixinPayAccount ACCOUNT;
+ protected final static WeixinSignature SIGNATURE;
+ protected final static WeixinPayProxy PAY;
+
+ static {
+ ACCOUNT = new WeixinPayAccount(
+ "wx0d1d598c0c03c999",
+ "GATFzDwbQdbbci3QEQxX2rUBvwTrsMiZ",
+ "10020674",
+ "10020674",
+ "/Users/jy/workspace/feican/canyi-weixin-parent/canyi-weixin-service/src/main/resources/10020674.p12");
+ SIGNATURE = new WeixinPaymentSignature(ACCOUNT.getPaySignKey());
+ PAY = new WeixinPayProxy(ACCOUNT);
+ }
+
+ public static void refund() throws WeixinException, IOException {
+ IdQuery idQuery = new IdQuery("TT_1427183696238", IdType.TRADENO);
+ RefundResult result = PAY.applyRefund(idQuery,
+ "TT_R" + System.currentTimeMillis(), 0.01d, 0.01d,
+ CurrencyType.CNY, "10020674", "退款描述",
+ RefundAccountType.REFUND_SOURCE_RECHARGE_FUNDS);
+ System.err.println(result);
+ String sign = result.getSign();
+ result.setSign(null);
+ String valiSign = SIGNATURE.sign(result);
+ System.err
+ .println(String.format("sign=%s,valiSign=%s", sign, valiSign));
+ }
+
+ public static void main(String[] args) throws WeixinException, IOException{
+ refund();
+ }
+}
\ No newline at end of file
diff --git a/weixin4j-mp/pom.xml b/weixin4j-mp/pom.xml
index fbe4745f..0e0ee994 100644
--- a/weixin4j-mp/pom.xml
+++ b/weixin4j-mp/pom.xml
@@ -5,7 +5,7 @@
com.foxinmy
weixin4j
- 1.7.8
+ 1.7.9
weixin4j-mp
weixin4j-mp
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 7dcdfca4..a5a65f24 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
@@ -212,5 +212,5 @@ public class WeixinComponentProxy {
component(componentId).getTokenManager());
}
- public final static String VERSION = "1.7.8";
+ public final static String VERSION = "1.7.9";
}
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 5f0dec3a..53b585cf 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
@@ -2202,5 +2202,5 @@ public class WeixinProxy {
return commentApi.deleteCommentReply(msgid, index, commentId);
}
- public final static String VERSION = "1.7.8";
+ public final static String VERSION = "1.7.9";
}
diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/component/WeixinTokenComponentCreator.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/component/WeixinTokenComponentCreator.java
index 1f234fb5..b7d30239 100644
--- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/component/WeixinTokenComponentCreator.java
+++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/component/WeixinTokenComponentCreator.java
@@ -42,7 +42,7 @@ public class WeixinTokenComponentCreator extends TokenCreator {
@Override
public String uniqueid() {
- return String.format("%s,%s", perTicketManager.getThirdId(), perTicketManager.getAuthAppId());
+ return String.format("%s_%s", perTicketManager.getThirdId(), perTicketManager.getAuthAppId());
}
@Override
diff --git a/weixin4j-qy/pom.xml b/weixin4j-qy/pom.xml
index 8cb65741..798d274c 100644
--- a/weixin4j-qy/pom.xml
+++ b/weixin4j-qy/pom.xml
@@ -5,7 +5,7 @@
com.foxinmy
weixin4j
- 1.7.8
+ 1.7.9
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 870c8d4a..4e6cfc82 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
@@ -1376,5 +1376,5 @@ public class WeixinProxy {
return chatApi.sendChatMessage(message);
}
- public final static String VERSION = "1.7.8";
+ public final static String VERSION = "1.7.9";
}
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 762151db..911ce797 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
@@ -280,5 +280,5 @@ public class WeixinSuiteProxy {
suite(suiteId).getTokenManager());
}
- public final static String VERSION = "1.7.8";
+ public final static String VERSION = "1.7.9";
}
diff --git a/weixin4j-server/pom.xml b/weixin4j-server/pom.xml
index 60b05f4d..717313fb 100644
--- a/weixin4j-server/pom.xml
+++ b/weixin4j-server/pom.xml
@@ -5,7 +5,7 @@
com.foxinmy
weixin4j
- 1.7.8
+ 1.7.9
weixin4j-server
1.1.8
diff --git a/weixin4j-serverX/pom.xml b/weixin4j-serverX/pom.xml
index 08d0cc73..2b9b7518 100644
--- a/weixin4j-serverX/pom.xml
+++ b/weixin4j-serverX/pom.xml
@@ -6,7 +6,7 @@
com.foxinmy
weixin4j
- 1.7.8
+ 1.7.9
weixin4j-serverX
0.0.1