From e22ec5757588b4816da5c9a0ea7d1b7a9ad333af Mon Sep 17 00:00:00 2001
From: egan <egzosn@gmail.com>
Date: Sat, 29 Sep 2018 17:56:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E5=BA=94=E6=94=AF=E4=BB=98=E6=A1=88?=
 =?UTF-8?q?=E4=BE=8B=E5=A2=9E=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pay-java-demo/pom.xml                              |  2 +-
 .../pay/demo/controller/UnionPayController.java    | 14 ++++++++++++--
 .../pay/demo/controller/WxPayController.java       |  7 ++++++-
 pom.xml                                            |  4 ++--
 4 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/pay-java-demo/pom.xml b/pay-java-demo/pom.xml
index db9fec0..c9087ce 100644
--- a/pay-java-demo/pom.xml
+++ b/pay-java-demo/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>pay-java-parent</artifactId>
         <groupId>com.egzosn</groupId>
-        <version>2.10.3-SNAPSHOT</version>
+        <version>2.11.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>war</packaging>
diff --git a/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/UnionPayController.java b/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/UnionPayController.java
index 3a79ac3..bfbeebf 100644
--- a/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/UnionPayController.java
+++ b/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/UnionPayController.java
@@ -45,9 +45,19 @@ public class UnionPayController {
         //设置CertSign必须在设置证书前
         unionPayConfigStorage.setCertSign(true);
         //公钥，验签证书链格式： 中级证书路径;根证书路径
-        unionPayConfigStorage.setKeyPublic("D:/certs/acp_test_middle.cer;D:/certs/acp_test_root.cer");
+//        unionPayConfigStorage.setKeyPublic("D:/certs/acp_test_middle.cer;D:/certs/acp_test_root.cer");
+        //中级证书路径
+        unionPayConfigStorage.setAcpMiddleCert("D:/certs/acp_test_middle.cer");
+        //根证书路径
+        unionPayConfigStorage.setAcpRootCert("D:/certs/acp_test_root.cer");
+
         //私钥, 私钥证书格式： 私钥证书路径;私钥证书对应的密码
-        unionPayConfigStorage.setKeyPrivate("D:/certs/acp_test_sign.pfx;000000");
+//        unionPayConfigStorage.setKeyPrivate("D:/certs/acp_test_sign.pfx;000000");
+        // 私钥证书路径
+        unionPayConfigStorage.setKeyPrivateCert("D:/certs/acp_test_sign.pfx");
+        //私钥证书对应的密码
+        unionPayConfigStorage.setKeyPrivateCertPwd("000000");
+
         unionPayConfigStorage.setNotifyUrl("http://www.pay.egzosn.com/payBack.json");
         // 无需同步回调可不填  app填这个就可以
         unionPayConfigStorage.setReturnUrl("http://www.pay.egzosn.com/payBack.json");
diff --git a/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/WxPayController.java b/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/WxPayController.java
index 591e030..a991a83 100644
--- a/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/WxPayController.java
+++ b/pay-java-demo/src/main/java/com/egzosn/pay/demo/controller/WxPayController.java
@@ -48,8 +48,13 @@ public class WxPayController {
     @PostConstruct
     public void init() {
         WxPayConfigStorage wxPayConfigStorage = new WxPayConfigStorage();
+        wxPayConfigStorage.setAppid("公众账号ID");
+
         wxPayConfigStorage.setMchId("合作者id（商户号）");
-        wxPayConfigStorage.setAppid("应用id");
+        //以下两个参数在 服务商版模式中必填--------
+//        wxPayConfigStorage.setSubAppid("子商户公众账号ID ");
+//        wxPayConfigStorage.setSubMchId("微信支付分配的子商户号 ");
+        //-----------------------------------------------
         wxPayConfigStorage.setKeyPublic("转账公钥，转账时必填");
         wxPayConfigStorage.setSecretKey("密钥");
         wxPayConfigStorage.setNotifyUrl("异步回调地址");
diff --git a/pom.xml b/pom.xml
index 18492cb..84475ef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>com.egzosn</groupId>
     <artifactId>pay-java-parent</artifactId>
     <packaging>pom</packaging>
-    <version>2.10.3-SNAPSHOT</version>
+    <version>2.11.1-SNAPSHOT</version>
 
     <name>Pay Java - Parent</name>
     <description>Pay Java Parent</description>
@@ -56,7 +56,7 @@
 
 
     <properties>
-        <pay.version>2.10.3-SNAPSHOT</pay.version>
+        <pay.version>2.11.1-SNAPSHOT</pay.version>
         <httpmime.version>4.5.4</httpmime.version>
         <log4j.version>1.2.17</log4j.version>
         <fastjson.version>1.2.41</fastjson.version>