收银端相关代码

kmall-api/src/main/java/com/kmall/api/entity/OrderVo.java

@@ -155,6 +155,8 @@ public class OrderVo implements Serializable {
     private String payMobile;
 
 
+    private String aliTradeNo;
+
     private String merchSn;
 
     private String sku;
@@ -994,4 +996,12 @@ public class OrderVo implements Serializable {
     public void setComment_count(Integer comment_count) {
         this.comment_count = comment_count;
     }
+
+    public String getAliTradeNo() {
+        return aliTradeNo;
+    }
+
+    public void setAliTradeNo(String aliTradeNo) {
+        this.aliTradeNo = aliTradeNo;
+    }
 }

kmall-manager/pom.xml

@@ -19,8 +19,54 @@
             <artifactId>kmall-common</artifactId>
             <version>${kmall-version}</version>
         </dependency>
+
+        <dependency>
+            <groupId>com.alipay</groupId>
+            <artifactId>com-alipay</artifactId>
+            <version>1.0</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/src/main/resources/lib/alipay-sdk-java-3.3.0.jar</systemPath>
+        </dependency>
+        <dependency>
+            <groupId>com.alipay.demo</groupId>
+            <artifactId>com-alipay-demo</artifactId>
+            <version>1.0</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/src/main/resources/lib/alipay-trade-sdk-20161215.jar</systemPath>
+        </dependency>
+
+
+        <dependency>
+            <groupId>com.alipay</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>1.0</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/src/main/resources/lib/commons-codec-1.10.jar</systemPath>
+        </dependency>
+        <dependency>
+            <groupId>com.alipay.demo</groupId>
+            <artifactId>commons-configuration</artifactId>
+            <version>1.0</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/src/main/resources/lib/commons-configuration-1.10.jar</systemPath>
+        </dependency>
+
+
     </dependencies>
 
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <includeSystemScope>true</includeSystemScope>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+
 
 </project>

kmall-manager/src/main/java/com/kmall/manager/manager/alipay/AliPayUtil.java

@@ -81,7 +81,16 @@ public class AliPayUtil {
         /**
          * 支付失败（付款码支付）
          */
-        PAYERROR("PAYERROR", "支付失败");
+        PAYERROR("PAYERROR", "支付失败"),
+
+        SUCC("10000","接口调用成功"),
+        SERVER_FAIL("20000","服务不可用"),
+        PERMISSION_DENIED("20001","授权权限不足"),
+        MISSING_PARAM("40001","缺少必选参数"),
+        ILLEGAL_PARAM("40002","非法的参数"),
+        BUSINESS_FAIL("40004","业务处理失败"),
+        ISV_PERMISSION("40006","权限不足");
+
 
         private String code;
         private String codeZn;
@@ -100,6 +109,53 @@ public class AliPayUtil {
         }
     }
 
+    public enum BusinessFailState {
+
+        SYSTEM_ERROR("ACQ.SYSTEM_ERROR","接口返回错误"),
+        EXIST_FORBIDDEN_WORD("ACQ.EXIST_FORBIDDEN_WORD","订单信息中包含违禁词"),
+        TOTAL_FEE_EXCEED("ACQ.TOTAL_FEE_EXCEED","订单总金额超过限额"),
+        PAYMENT_AUTH_CODE_INVALID("ACQ.PAYMENT_AUTH_CODE_INVALID","支付授权码无效"),
+        CONTEXT_INCONSISTENT("ACQ.CONTEXT_INCONSISTENT","交易信息被篡改"),
+        TRADE_HAS_SUCCESS("ACQ.TRADE_HAS_SUCCESS","交易已被支付"),
+        TRADE_HAS_CLOSE("ACQ.TRADE_HAS_CLOSE","交易已经关闭"),
+        BUYER_BALANCE_NOT_ENOUGH("ACQ.BUYER_BALANCE_NOT_ENOUGH","买家余额不足"),
+        BUYER_BANKCARD_BALANCE_NOT_ENOUGH("ACQ.BUYER_BANKCARD_BALANCE_NOT_ENOUGH","用户银行卡余额不足"),
+        ERROR_BALANCE_PAYMENT_DISABLE("ACQ.ERROR_BALANCE_PAYMENT_DISABLE","余额支付功能关闭"),
+        BUYER_SELLER_EQUAL("ACQ.BUYER_SELLER_EQUAL","买卖家不能相同"),
+        TRADE_BUYER_NOT_MATCH("ACQ.TRADE_BUYER_NOT_MATCH","交易买家不匹配"),
+        BUYER_ENABLE_STATUS_FORBID("ACQ.BUYER_ENABLE_STATUS_FORBID","买家状态非法"),
+        PULL_MOBILE_CASHIER_FAIL("ACQ.PULL_MOBILE_CASHIER_FAIL","唤起移动收银台失败"),
+        MOBILE_PAYMENT_SWITCH_OFF("ACQ.MOBILE_PAYMENT_SWITCH_OFF","用户的无线支付开关关闭"),
+        PAYMENT_FAIL("ACQ.PAYMENT_FAIL","支付失败"),
+        BUYER_PAYMENT_AMOUNT_DAY_LIMIT_ERROR("ACQ.BUYER_PAYMENT_AMOUNT_DAY_LIMIT_ERROR","买家付款日限额超限"),
+        BEYOND_PAY_RESTRICTION("ACQ.BEYOND_PAY_RESTRICTION","商户收款额度超限"),
+        BEYOND_PER_RECEIPT_RESTRICTION("ACQ.BEYOND_PER_RECEIPT_RESTRICTION","商户收款金额超过月限额"),
+        BUYER_PAYMENT_AMOUNT_MONTH_LIMIT_ERROR("ACQ.BUYER_PAYMENT_AMOUNT_MONTH_LIMIT_ERROR","买家付款月额度超限"),
+        SELLER_BEEN_BLOCKED("ACQ.SELLER_BEEN_BLOCKED","商家账号被冻结"),
+        ERROR_BUYER_CERTIFY_LEVEL_LIMIT("ACQ.ERROR_BUYER_CERTIFY_LEVEL_LIMIT","买家未通过人行认证"),
+        PAYMENT_REQUEST_HAS_RISK("ACQ.PAYMENT_REQUEST_HAS_RISK","支付有风险"),
+        NO_PAYMENT_INSTRUMENTS_AVAILABLE("ACQ.NO_PAYMENT_INSTRUMENTS_AVAILABLE","没用可用的支付工具"),
+        USER_FACE_PAYMENT_SWITCH_OFF("ACQ.USER_FACE_PAYMENT_SWITCH_OFF","用户当面付付款开关关闭"),
+
+        ;
+        private String code;
+        private String codeZn;
+
+        private BusinessFailState(String code, String codeZn) {
+            this.code = code;
+            this.codeZn = codeZn;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getCodeZn() {
+            return codeZn;
+        }
+    }
+
+
     /**
      * 支付宝退款
      * @param outTradeNo    外部订单号，需要退款交易的商户外部订单号
@@ -222,6 +278,7 @@ public class AliPayUtil {
 
         // 调用tradePay方法获取当面付应答
         AlipayF2FPayResult result = tradeService.tradePay(builder);
+
         AliPayMicropayApiResult apiResult = new AliPayMicropayApiResult();
 
         apiResult.setCode(result.getResponse().getCode());
@@ -290,21 +347,24 @@ public class AliPayUtil {
 
     public static void main(String[] args) throws Exception{
         //支付
-//        AliPayRequestParams params = new AliPayRequestParams();
-//        params.setAuthCode("283476976115347941");
-//        params.setBody("");
-//        params.setOutTradeNo("521521521521521");
-//        params.setSubject("main测试");
-//        params.setStoreId("200");
-//        params.setTotalAmount("10");
-//        AliPayMicropayApiResult aliPayMicropayApiResult = aliTradePay(params);
+        AliPayRequestParams params = new AliPayRequestParams();
+        params.setAuthCode("283476976115347941");
+        params.setBody("");
+        params.setOutTradeNo("521521521521521");
+        params.setSubject("main测试");
+        params.setStoreId("200");
+        params.setTotalAmount("10");
+        AliPayMicropayApiResult aliPayMicropayApiResult = aliTradePay(params);
 //        System.out.println(aliPayMicropayApiResult.getSubMsg());
         //查询
 //        AliPayMicropayApiResult aliPayMicropayApiResult = aliTradeQuery("521521521521521", "");
         //退款
-        AliPayMicropayApiResult aliPayMicropayApiResult = aliTradeRefund("521521521521521", "10","正常退款","10");
+//        AliPayMicropayApiResult aliPayMicropayApiResult = aliTradeRefund("521521521521521", "10","正常退款","10");
         //撤销
 //        AliPayMicropayApiResult aliPayMicropayApiResult = aliTradeCancel("521521521521324", "");
         System.out.println(aliPayMicropayApiResult.getSubMsg());
     }
+
+
+
 }

kmall-manager/src/main/resources/conf/alipay.properties

@@ -1,57 +1,58 @@
-# [dev, prod]
-pay.ali.env=dev
-# 沙箱 支付宝网关名、partnerId和appId
-open_api_domain=https://openapi.alipaydev.com/gateway.do
-mcloud_api_domain=http://mcloudmonitor.com/gateway.do
-pid=2088102176590386
-appid=2016092100561081
-# RSA私钥、公钥和支付宝公钥
-private_key=MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCAw4hQJytraRr7yJUYkVh38rHuciupGZZwVUbwWFMw5AT/Ms0+UgwleeOc6KHDbwanGD4ZYwBjEGQGisj6Bxgu+2M2voS50J+YM+MAL/X7AF+kIbmuHBZjIzuvWEDOZnt+ZXks+gsXZKh0wc9wZpwb/jG8uHmBAhWcCvPz+dx5TSh6KcWuFLR2rf76mwRkCMx+xtHw9Dh+02Fuhx7tb1Wp4lQZzQ3X+pyRVYvjdoPOSuAUY0NwZ7YK1kBzfYaTcK31kp+quqr6zdJTeNDIswt7VJb2gKHkahJmTAcFZza4AbPEDXmDQ0gDoy6I3wOs3OUFHDEjN1+ZMj/D99MEuKThAgMBAAECggEAGjy9h+eTV12hW/CxQMJNDpPrYbTt5JUMLHOT8uFsgifURNPrMmmxg+lkUdKtM49qAZ5U+QNNTuJGH3ckIJ5VdS1QOBV2Ig66ll7sQFuFedHHq0Ab/7hFb4n8XWxUODp1q3mtyVZh8DBYiwH67OJbqPCQ3e2RBJKSKKuqreoZ3LVsCsks4l7hpxgw0KbFqGhVaTOhYlUdGwJ10PPtWwnIDAMIM87uvf2Q9wxPGtGVO3CmvwGS8vZNkyXcO37DLPM/RTsq+KU3melfAh9asm15aW5CGlXgiVzzGv9syoNl+ENS7ezO0oIzpKROPLRhmD9gxVj1JGqo7ggIErYr/slCqQKBgQDBCFfVZgkbohPbcMtcTwgCU1XLBMIYgfPeDkOUGLalXO6mkManGQk8ywhKEP2M035XmX5PmApSqusVZbFc/gZlXFTHZqLDu0LR2nhJPL0TsgAJhBuywOAbI8/7UbwqL3sG99vm1NSVVAs8MJwQVMa7kALKpnS4SWRA1a5gXWaTtwKBgQCqxERuDBXLjjY5mznHABG9X3Mf4hB5AyGFEwMzbyx+p0zG+i9DCHljXeoRL0gn/2btUoP9dVhulKXSbD/mVv0V3WcYadEfNCzvTkih5BBtDYtjc9oCcE59myf4CMfVXiKLfnt6sXrjK6okPq0vwbwKxWO7uv2sF0+CHjU6lND8JwKBgCDAuaaL2Z/GsHfbe6X+Au3iFfyMoiJmamqTIQRP7S3BxvycNBjGNrsJ+C4ZE+yBNj7G3JfExHuiZKEM0DtnHs60C+6Ji7SKYZwZ5a8Hj014Nmlm8QwzjdMNEI0kITlHNSjJhZZ1JlzwFbfwx4o92DqbBN49wDBEw638k8nmDzGhAoGAXz09SP72fOOgvHolPCZ+vlZot8R2GXe0jypuY5ZCg5S9DlBkYYdtZAzxyYnMPXqFJiEaOhbjLjE7VmNHNCkZ18L2h7gkiLmpwgGwIpI20wt1zQ7E7Q1DyWvqW7xR718j9xaguWoYtnAY4UQPhQ4Q2RUDraT5a6xIjLJaT4TGFYsCgYBNH5GsYBzoo+U6N0bnia1r5mBQZtVHPE1pkChhvlGJPu1U5iMDttGb2Xsmyk7n9QyRdcCmvyd0TnFaUCokPs4OjBqpi3X5yWuldbVKDQ/swsyIpUIEVm7idlv8dbladu3QFxw17LBvSglsB/jJZEMc1JlgizNIiQRngA96mfmLIw==
-public_key=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgMOIUCcra2ka+8iVGJFYd/Kx7nIrqRmWcFVG8FhTMOQE/zLNPlIMJXnjnOihw28Gpxg+GWMAYxBkBorI+gcYLvtjNr6EudCfmDPjAC/1+wBfpCG5rhwWYyM7r1hAzmZ7fmV5LPoLF2SodMHPcGacG/4xvLh5gQIVnArz8/nceU0oeinFrhS0dq3++psEZAjMfsbR8PQ4ftNhboce7W9VqeJUGc0N1/qckVWL43aDzkrgFGNDcGe2CtZAc32Gk3Ct9ZKfqrqq+s3SU3jQyLMLe1SW9oCh5GoSZkwHBWc2uAGzxA15g0NIA6MuiN8DrNzlBRwxIzdfmTI/w/fTBLik4QIDAQAB
-#SHA1withRsa对应支付宝公钥
-#alipay_public_key = MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDDI6d306Q8fIfCOaTXyiUeJHkrIvYISRcc73s3vF1ZT7XN8RNPwJxo8pWaJMmvyTn9N4HQ632qJBVHf8sxHi/fEsraprwCtzvzQETrNRwVxLO5jVmRGi60j8Ue1efIlzPXV9je9mkjzOmdssymZkh2QhUrCmZYI/FCEa3/cNMW0QIDAQAB
-#SHA256withRsa对应支付宝公钥
-alipay_public_key=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtr0hvHSwFmRHx/NAaKgqVZ2zDLrCoJiMKOYeL1BtKXhT6IbgnXERgxXgW1T+XC1ZdkagQa7nhw8ckEGTwfvhbJXryA+9hpePjeouFf+IOU7Qlk/ndjT7mmSAi/rP8FsJJ8p1/NcxcRRtFC0zUolC8ZgcfTcJgJb1dnAlZWOCB7+JQrxQbk1Gn7m2oAOl8gBQSFfmtEBBosZwq2PWM4psHoQ5yrfMJHmCrWGSEu3UVAZwNNMJ4hclgMGiVxRvzUPX80IuOOlHTZOaF01EjTPsKxF9SvXqSlnMGot3rTmlAP/RYplhwHSKi5JBxPYu4AiTMLgfzPbg61pmNeELO11QpwIDAQAB
-# 签名类型: RSA->SHA1withRsa,RSA2->SHA256withRsa
-sign_type=RSA2
-# 当面付最大查询次数和查询间隔（毫秒）
-max_query_retry=5
-query_duration=5000
-# 当面付最大撤销次数和撤销间隔（毫秒）
-max_cancel_retry=3
-cancel_duration=2000
-# 交易保障线程第一次调度延迟和调度间隔（秒）
-heartbeat_delay=5
-heartbeat_duration=900
-
-
-
-## 支付宝网关名、partnerId和appId
-#open_api_domain = https://openapi.alipay.com/gateway.do
-#mcloud_api_domain = http://mcloudmonitor.com/gateway.do
-#pid = 此处请填写你的PID
-#appid = 此处请填写你当面付的APPID
-#
-## RSA私钥、公钥和支付宝公钥
-#private_key = 此处请填写你的商户私钥且转PKCS8格式
-#public_key = 此处请填写你的商户公钥
 #
-##SHA1withRsa对应支付宝公钥
+## \u6C99\u7BB1 \u652F\u4ED8\u5B9D\u7F51\u5173\u540D\u3001partnerId\u548CappId
+#open_api_domain=https://openapi.alipaydev.com/gateway.do
+#mcloud_api_domain=http://mcloudmonitor.com/gateway.do
+#pid=2088102176590386
+#appid=2017103009619232
+## RSA\u79C1\u94A5\u3001\u516C\u94A5\u548C\u652F\u4ED8\u5B9D\u516C\u94A5
+## \u4E2D\u7F51RSA2 \u79C1\u94A5 -- hhq
+#private_key=MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCAw4hQJytraRr7yJUYkVh38rHuciupGZZwVUbwWFMw5AT/Ms0+UgwleeOc6KHDbwanGD4ZYwBjEGQGisj6Bxgu+2M2voS50J+YM+MAL/X7AF+kIbmuHBZjIzuvWEDOZnt+ZXks+gsXZKh0wc9wZpwb/jG8uHmBAhWcCvPz+dx5TSh6KcWuFLR2rf76mwRkCMx+xtHw9Dh+02Fuhx7tb1Wp4lQZzQ3X+pyRVYvjdoPOSuAUY0NwZ7YK1kBzfYaTcK31kp+quqr6zdJTeNDIswt7VJb2gKHkahJmTAcFZza4AbPEDXmDQ0gDoy6I3wOs3OUFHDEjN1+ZMj/D99MEuKThAgMBAAECggEAGjy9h+eTV12hW/CxQMJNDpPrYbTt5JUMLHOT8uFsgifURNPrMmmxg+lkUdKtM49qAZ5U+QNNTuJGH3ckIJ5VdS1QOBV2Ig66ll7sQFuFedHHq0Ab/7hFb4n8XWxUODp1q3mtyVZh8DBYiwH67OJbqPCQ3e2RBJKSKKuqreoZ3LVsCsks4l7hpxgw0KbFqGhVaTOhYlUdGwJ10PPtWwnIDAMIM87uvf2Q9wxPGtGVO3CmvwGS8vZNkyXcO37DLPM/RTsq+KU3melfAh9asm15aW5CGlXgiVzzGv9syoNl+ENS7ezO0oIzpKROPLRhmD9gxVj1JGqo7ggIErYr/slCqQKBgQDBCFfVZgkbohPbcMtcTwgCU1XLBMIYgfPeDkOUGLalXO6mkManGQk8ywhKEP2M035XmX5PmApSqusVZbFc/gZlXFTHZqLDu0LR2nhJPL0TsgAJhBuywOAbI8/7UbwqL3sG99vm1NSVVAs8MJwQVMa7kALKpnS4SWRA1a5gXWaTtwKBgQCqxERuDBXLjjY5mznHABG9X3Mf4hB5AyGFEwMzbyx+p0zG+i9DCHljXeoRL0gn/2btUoP9dVhulKXSbD/mVv0V3WcYadEfNCzvTkih5BBtDYtjc9oCcE59myf4CMfVXiKLfnt6sXrjK6okPq0vwbwKxWO7uv2sF0+CHjU6lND8JwKBgCDAuaaL2Z/GsHfbe6X+Au3iFfyMoiJmamqTIQRP7S3BxvycNBjGNrsJ+C4ZE+yBNj7G3JfExHuiZKEM0DtnHs60C+6Ji7SKYZwZ5a8Hj014Nmlm8QwzjdMNEI0kITlHNSjJhZZ1JlzwFbfwx4o92DqbBN49wDBEw638k8nmDzGhAoGAXz09SP72fOOgvHolPCZ+vlZot8R2GXe0jypuY5ZCg5S9DlBkYYdtZAzxyYnMPXqFJiEaOhbjLjE7VmNHNCkZ18L2h7gkiLmpwgGwIpI20wt1zQ7E7Q1DyWvqW7xR718j9xaguWoYtnAY4UQPhQ4Q2RUDraT5a6xIjLJaT4TGFYsCgYBNH5GsYBzoo+U6N0bnia1r5mBQZtVHPE1pkChhvlGJPu1U5iMDttGb2Xsmyk7n9QyRdcCmvyd0TnFaUCokPs4OjBqpi3X5yWuldbVKDQ/swsyIpUIEVm7idlv8dbladu3QFxw17LBvSglsB/jJZEMc1JlgizNIiQRngA96mfmLIw==
+## \u4E2D\u7F51RSA2 \u516C\u94A5 -- hhq
+#public_key=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgMOIUCcra2ka+8iVGJFYd/Kx7nIrqRmWcFVG8FhTMOQE/zLNPlIMJXnjnOihw28Gpxg+GWMAYxBkBorI+gcYLvtjNr6EudCfmDPjAC/1+wBfpCG5rhwWYyM7r1hAzmZ7fmV5LPoLF2SodMHPcGacG/4xvLh5gQIVnArz8/nceU0oeinFrhS0dq3++psEZAjMfsbR8PQ4ftNhboce7W9VqeJUGc0N1/qckVWL43aDzkrgFGNDcGe2CtZAc32Gk3Ct9ZKfqrqq+s3SU3jQyLMLe1SW9oCh5GoSZkwHBWc2uAGzxA15g0NIA6MuiN8DrNzlBRwxIzdfmTI/w/fTBLik4QIDAQAB
+##SHA1withRsa\u5BF9\u5E94\u652F\u4ED8\u5B9D\u516C\u94A5
 ##alipay_public_key = MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDDI6d306Q8fIfCOaTXyiUeJHkrIvYISRcc73s3vF1ZT7XN8RNPwJxo8pWaJMmvyTn9N4HQ632qJBVHf8sxHi/fEsraprwCtzvzQETrNRwVxLO5jVmRGi60j8Ue1efIlzPXV9je9mkjzOmdssymZkh2QhUrCmZYI/FCEa3/cNMW0QIDAQAB
-#
-##SHA256withRsa对应支付宝公钥
-#alipay_public_key = MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjrEVFMOSiNJXaRNKicQuQdsREraftDA9Tua3WNZwcpeXeh8Wrt+V9JilLqSa7N7sVqwpvv8zWChgXhX/A96hEg97Oxe6GKUmzaZRNh0cZZ88vpkn5tlgL4mH/dhSr3Ip00kvM4rHq9PwuT4k7z1DpZAf1eghK8Q5BgxL88d0X07m9X96Ijd0yMkXArzD7jg+noqfbztEKoH3kPMRJC2w4ByVdweWUT2PwrlATpZZtYLmtDvUKG/sOkNAIKEMg3Rut1oKWpjyYanzDgS7Cg3awr1KPTl9rHCazk15aNYowmYtVabKwbGVToCAGK+qQ1gT3ELhkGnf3+h53fukNqRH+wIDAQAB
-#
-## 签名类型: RSA->SHA1withRsa,RSA2->SHA256withRsa
-#sign_type = RSA2
-## 当面付最大查询次数和查询间隔（毫秒）
-#max_query_retry = 5
-#query_duration = 5000
-#
-## 当面付最大撤销次数和撤销间隔（毫秒）
-#max_cancel_retry = 3
-#cancel_duration = 2000
-#
-## 交易保障线程第一次调度延迟和调度间隔（秒）
-#heartbeat_delay = 5
-#heartbeat_duration = 900
+##SHA256withRsa\u5BF9\u5E94\u652F\u4ED8\u5B9D\u516C\u94A5
+#alipay_public_key=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtr0hvHSwFmRHx/NAaKgqVZ2zDLrCoJiMKOYeL1BtKXhT6IbgnXERgxXgW1T+XC1ZdkagQa7nhw8ckEGTwfvhbJXryA+9hpePjeouFf+IOU7Qlk/ndjT7mmSAi/rP8FsJJ8p1/NcxcRRtFC0zUolC8ZgcfTcJgJb1dnAlZWOCB7+JQrxQbk1Gn7m2oAOl8gBQSFfmtEBBosZwq2PWM4psHoQ5yrfMJHmCrWGSEu3UVAZwNNMJ4hclgMGiVxRvzUPX80IuOOlHTZOaF01EjTPsKxF9SvXqSlnMGot3rTmlAP/RYplhwHSKi5JBxPYu4AiTMLgfzPbg61pmNeELO11QpwIDAQAB
+## \u7B7E\u540D\u7C7B\u578B: RSA->SHA1withRsa,RSA2->SHA256withRsa
+#sign_type=RSA2
+## \u5F53\u9762\u4ED8\u6700\u5927\u67E5\u8BE2\u6B21\u6570\u548C\u67E5\u8BE2\u95F4\u9694\uFF08\u6BEB\u79D2\uFF09
+#max_query_retry=5
+#query_duration=5000
+## \u5F53\u9762\u4ED8\u6700\u5927\u64A4\u9500\u6B21\u6570\u548C\u64A4\u9500\u95F4\u9694\uFF08\u6BEB\u79D2\uFF09
+#max_cancel_retry=3
+#cancel_duration=2000
+## \u4EA4\u6613\u4FDD\u969C\u7EBF\u7A0B\u7B2C\u4E00\u6B21\u8C03\u5EA6\u5EF6\u8FDF\u548C\u8C03\u5EA6\u95F4\u9694\uFF08\u79D2\uFF09
+#heartbeat_delay=5
+#heartbeat_duration=900
+
+
+
+# \u652F\u4ED8\u5B9D\u7F51\u5173\u540D\u3001partnerId\u548CappId
+open_api_domain = https://openapi.alipay.com/gateway.do
+mcloud_api_domain = http://mcloudmonitor.com/gateway.do
+pid = 2088821582509154
+appid = 2017103009619232
+
+# RSA\u79C1\u94A5\u3001\u516C\u94A5\u548C\u652F\u4ED8\u5B9D\u516C\u94A5
+private_key = MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQC1DOjdI/nVtDq3NRU8mZ08uTzDWcGYFCV1c+pH8q0MjdA518xsQv5ecuyf1jNwMJ7YcartUeanLHF/mys4hbTCyeOXwC9rX9Dd6xGSC6K/jCMiKu4ZDIRWpA93a35Lu9qRZKkD7h+cWuCMfu6s+qM8ikDN1MU2y7846AKL39XtDEpOzHKuctvxysXfz2MkI4rsKLyy8TmkG+q5hAU1C+Rs+nDp3D2C5dC9Aku7hRCW68rQo3yzuvn0EZ37BxIQO4pTCSbyI0N0C7gv5yjr+jFRnguXcNO/Qf0Vyfu9EUDPabQHwckoqD3ZAysS38oqvC3N1NlLI/+FEks4uR1cZAubAgMBAAECggEBAJjbwW+UBEdt13T/GGMFvz+ZlbfJfC4ONGIp78+3EGvc/8UWcb2mAmVz2lxI2T0Lj9Fmhs2/rGHQoDMAq0kZejhLhCCHXoHlb88tvLP1pv7aLn+Wh1gWvVT5RyWoWAVRIYRH3Hs4/O9hutxj/teE9XUTtQsTbT6KX3SITj4SSefMYREqMGro2qwL8yBj3d/wspi4iFQM8IbQdXWUlCbq9Y+hS3pDKxZn7MRqL2gcASbPvI9JRl2m5eqWRVG/2SdYvyFIuzas7l0ytuR/86bxw/rsmTNPZfcW7Y/MN9/+PGLJY0lDKD4QLnp/vG7hjXEgVqFuys7rCCWX0fgJiBNO22ECgYEA2dXkwG9U3COC3Bh/snJ9yRNeUkeZo8W3EfdRgKJqmid8dBR1hvV8dDgOTVsk5I7J4uktBruUN1i1FJwxU9mDuoWE1wbEnirdqyGVi4v9bLgmckTF5pr6y/q5PzVMcNgf64iu28PHv8cWdiltnBG622mFcJG/9KaaMlRaVFY/19UCgYEA1MUsdYDT6RgcDoMoGCoc2mX7Bv/2M6M0p5PURl/2o8Z4EdcqZO57ieCL5UVlXdHUkfuui9lVELv8zZXP7+OKiI/fV9yG37gtPH3c1pVj9wuAWhY0S0ENMIT4PELSiturGWA7GRBM5p6CDxA1N+ANcdg6ZzLgk6p8D0T1NI+q/a8CgYAK6YcbCLi0imbcxbFn7ApXD0xTTNjqdlYUZVJE4l36uO2oFvpIN3XzkHdO8rjnZivA3TNvOehT2XLAxI5ICAZsSpH7/4/L6JPQJc+K/QlF7/elE8LiKXNU0ouDGhVpNbprnx47ThRsi/mZE7w07EJzCVcw62w1Qj9JNCaOQP/TvQKBgQCtLnwcfCp/3JbhnRGicYygm0cykF51805lY+bxDST0cxPB+a9RDefR9soHaG+0aJkr5X5R6CjcARcowtrIOB3HP8ubeSzypbd0OEHrCxedumfTa6VO53jz2Bcw/XbffSML+Y7AvMrLH5Ne7WNTwnNPCZ+n5fpzVt25k/g9uv6DkwKBgQCbJFdWeLM3Ve7ci38bh53Elp+BLSQjViRvj59xb8Ymm3H1UbwyLPQQ48lJXAVDo1AZe1MXEr40mbqGrKnjaTv3T2r4Vj7UT4y3O0attE6t3gWv8AXR6nidj60RQhynnv4oFEBDUWuIIjez4xSMH9og8ZYHBWOis1isQ8vu4fVRtQ==
+public_key = MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtQzo3SP51bQ6tzUVPJmdPLk8w1nBmBQldXPqR/KtDI3QOdfMbEL+XnLsn9YzcDCe2HGq7VHmpyxxf5srOIW0wsnjl8Ava1/Q3esRkguiv4wjIiruGQyEVqQPd2t+S7vakWSpA+4fnFrgjH7urPqjPIpAzdTFNsu/OOgCi9/V7QxKTsxyrnLb8crF389jJCOK7Ci8svE5pBvquYQFNQvkbPpw6dw9guXQvQJLu4UQluvK0KN8s7r59BGd+wcSEDuKUwkm8iNDdAu4L+co6/oxUZ4Ll3DTv0H9Fcn7vRFAz2m0B8HJKKg92QMrEt/KKrwtzdTZSyP/hRJLOLkdXGQLmwIDAQAB
+
+#SHA1withRsa\u5BF9\u5E94\u652F\u4ED8\u5B9D\u516C\u94A5
+#alipay_public_key = MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDDI6d306Q8fIfCOaTXyiUeJHkrIvYISRcc73s3vF1ZT7XN8RNPwJxo8pWaJMmvyTn9N4HQ632qJBVHf8sxHi/fEsraprwCtzvzQETrNRwVxLO5jVmRGi60j8Ue1efIlzPXV9je9mkjzOmdssymZkh2QhUrCmZYI/FCEa3/cNMW0QIDAQAB
+
+#SHA256withRsa\u5BF9\u5E94\u652F\u4ED8\u5B9D\u516C\u94A5
+alipay_public_key = MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqxh6qHdB39ZB77asmE+kxMJbw7qWN0QlL5g8X++Idg/WmXR0RcEnKjTr3T43jB2Vb1jkMFOWhvf/LtiWxIfjVnlMvNdDiCHDPUPu/HGbAM4EvMKDMjdiSPAkP8Phm7hbGh/Oqy9tovoqM367ELocw/xi+1qvu76uflAIlrtXLvJLfbA7OJ/f5fHZAuKoraeuIPEsfjIocHH+OXpcyjdw02IpauOnOvUnfd6gXMqcbU1KfjI3Nd36W8VQhgvdGIJy818VhwgpwD3ZMm40Fq1Uf9gGox6yvDdFJ2n9FjxypiIUaNgSnclnbWKUW9aIVPCTtPxWeTKx+9wciRrQeeVOLwIDAQAB
+
+# \u7B7E\u540D\u7C7B\u578B: RSA->SHA1withRsa,RSA2->SHA256withRsa
+sign_type = RSA2
+# \u5F53\u9762\u4ED8\u6700\u5927\u67E5\u8BE2\u6B21\u6570\u548C\u67E5\u8BE2\u95F4\u9694\uFF08\u6BEB\u79D2\uFF09
+max_query_retry = 5
+query_duration = 5000
+
+# \u5F53\u9762\u4ED8\u6700\u5927\u64A4\u9500\u6B21\u6570\u548C\u64A4\u9500\u95F4\u9694\uFF08\u6BEB\u79D2\uFF09
+max_cancel_retry = 3
+cancel_duration = 2000
+
+# \u4EA4\u6613\u4FDD\u969C\u7EBF\u7A0B\u7B2C\u4E00\u6B21\u8C03\u5EA6\u5EF6\u8FDF\u548C\u8C03\u5EA6\u95F4\u9694\uFF08\u79D2\uFF09
+heartbeat_delay = 5
+heartbeat_duration = 900

kmall-manager/src/main/resources/conf/cus.properties

@@ -1,40 +1,40 @@
-########## 海关 配置 ##########
+########## \u6D77\u5173 \u914D\u7F6E ##########
 
 # [dev, prod]
 cus.env = dev
 
-# 开发环境
-# 企业返回海关实时数据接口地址
+# \u5F00\u53D1\u73AF\u5883
+# \u4F01\u4E1A\u8FD4\u56DE\u6D77\u5173\u5B9E\u65F6\u6570\u636E\u63A5\u53E3\u5730\u5740
 cus.dev.payDateUrl=https://swapptest.singlewindow.cn/ceb2grab/grab/realTimeDataUpload
-# 电商平台代码, 中网科技（深圳）有限公司
+# \u7535\u5546\u5E73\u53F0\u4EE3\u7801, \u4E2D\u7F51\u79D1\u6280\uFF08\u6DF1\u5733\uFF09\u6709\u9650\u516C\u53F8
 cus.dev.ebpCode=4403160Z3Y
-# 支付企业代码, 财付通支付科技有限公司
+# \u652F\u4ED8\u4F01\u4E1A\u4EE3\u7801, \u8D22\u4ED8\u901A\u652F\u4ED8\u79D1\u6280\u6709\u9650\u516C\u53F8
 cus.dev.payCode=440316T004
-# 收款账号
+# \u6536\u6B3E\u8D26\u53F7
 cus.dev.recpAccount=20000032506200012146872
-# 收款企业代码（境内企业为统一社会信用代码；境外企业可不填写）
+# \u6536\u6B3E\u4F01\u4E1A\u4EE3\u7801\uFF08\u5883\u5185\u4F01\u4E1A\u4E3A\u7EDF\u4E00\u793E\u4F1A\u4FE1\u7528\u4EE3\u7801\uFF1B\u5883\u5916\u4F01\u4E1A\u53EF\u4E0D\u586B\u5199\uFF09
 cus.dev.recpCode=91440300MA5DGG1J0R
-# 收款企业名称
-cus.dev.recpName=中网科技（深圳）有限公司
-# 商品展示链接地址
+# \u6536\u6B3E\u4F01\u4E1A\u540D\u79F0
+cus.dev.recpName=\u4E2D\u7F51\u79D1\u6280\uFF08\u6DF1\u5733\uFF09\u6709\u9650\u516C\u53F8
+# \u5546\u54C1\u5C55\u793A\u94FE\u63A5\u5730\u5740
 cus.dev.itemLink=http://qhdswl.f3322.net:9002/api/goods/detail
-# 定时器请求地址
+# \u5B9A\u65F6\u5668\u8BF7\u6C42\u5730\u5740
 cus.dev.sendUrl=http://qhdswl.f3322.net:9002/cus/send
 
-# 生产环境
-# 企业返回海关实时数据接口地址
+# \u751F\u4EA7\u73AF\u5883
+# \u4F01\u4E1A\u8FD4\u56DE\u6D77\u5173\u5B9E\u65F6\u6570\u636E\u63A5\u53E3\u5730\u5740
 cus.prod.payDateUrl=https://customs.chinaport.gov.cn/ceb2grab/grab/realTimeDataUpload
-#电商平台代码, 中网科技（深圳）有限公司
+#\u7535\u5546\u5E73\u53F0\u4EE3\u7801, \u4E2D\u7F51\u79D1\u6280\uFF08\u6DF1\u5733\uFF09\u6709\u9650\u516C\u53F8
 cus.prod.ebpCode=4403160Z3Y
-#支付企业代码, 财付通支付科技有限公司
+#\u652F\u4ED8\u4F01\u4E1A\u4EE3\u7801, \u8D22\u4ED8\u901A\u652F\u4ED8\u79D1\u6280\u6709\u9650\u516C\u53F8
 cus.prod.payCode=440316T004
-# 收款账号
+# \u6536\u6B3E\u8D26\u53F7
 cus.prod.recpAccount=20000032506200012146872
-# 收款企业代码（境内企业为统一社会信用代码；境外企业可不填写）
+# \u6536\u6B3E\u4F01\u4E1A\u4EE3\u7801\uFF08\u5883\u5185\u4F01\u4E1A\u4E3A\u7EDF\u4E00\u793E\u4F1A\u4FE1\u7528\u4EE3\u7801\uFF1B\u5883\u5916\u4F01\u4E1A\u53EF\u4E0D\u586B\u5199\uFF09
 cus.prod.recpCode=91440300MA5DGG1J0R
-# 收款企业名称
-cus.prod.recpName=中网科技（深圳）有限公司
-# 商品展示链接地址
+# \u6536\u6B3E\u4F01\u4E1A\u540D\u79F0
+cus.prod.recpName=\u4E2D\u7F51\u79D1\u6280\uFF08\u6DF1\u5733\uFF09\u6709\u9650\u516C\u53F8
+# \u5546\u54C1\u5C55\u793A\u94FE\u63A5\u5730\u5740
 cus.prod.itemLink=https://mp.k1net.cn/api/goods/detail
-# 定时器请求地址
-cus.prod.sendUrl=https://mp.k1net.cn/cus/send
+# \u5B9A\u65F6\u5668\u8BF7\u6C42\u5730\u5740
+cus.prod.sendUrl=https://mp.k1net.cn/cus/send

kmall-manager/src/main/resources/conf/db.properties

@@ -1,7 +1,7 @@
 ########## \u6570\u636E\u5E93\u914D\u7F6E ##########
 
 #========== \u5F00\u53D1\u73AF\u5883 ==========
-jdbc.url=jdbc:mysql://120.76.84.45:3306/kmall_pt?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
+jdbc.url=jdbc:mysql://120.76.84.45:3306/kmall_pt_general?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
 jdbc.username=tuser
 jdbc.password=Qq!123
 #jdbc.url=jdbc:mysql://127.0.0.1:3306/kmall_pt?serverTimezone=GMT%2B8&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
@@ -27,12 +27,12 @@ jdbc.validationTimeout=4000
 
 
 ####========== \u751F\u4EA7\u73AF\u5883 ==========
-##\u963F\u91CC\u4E91\u5185\u7F51\u5730\u5740
-####jdbc.url=jdbc:mysql://rm-wz9rps8173a1nx63g819.mysql.rds.aliyuncs.com:3306/kmall_pt?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
-##\u963F\u91CC\u4E91\u5916\u7F51\u5730\u5740
-#jdbc.url=jdbc:mysql://out-rm-wz9rps8173a1nx63gio.mysql.rds.aliyuncs.com:3306/kmall_pt?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
-#jdbc.username=kmall_pt
-#jdbc.password=AFnwRBu!3q
+#\u963F\u91CC\u4E91\u5185\u7F51\u5730\u5740
+###jdbc.url=jdbc:mysql://rm-wz9rps8173a1nx63g819.mysql.rds.aliyuncs.com:3306/kmall_pt?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
+#\u963F\u91CC\u4E91\u5916\u7F51\u5730\u5740
+#jdbc.url=jdbc:mysql://out-rm-wz9rps8173a1nx63gio.mysql.rds.aliyuncs.com:3306/kmall_cw?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
+#jdbc.username=kmall_cw
+#jdbc.password=eb6zHJg%x3
 #
 #jdbc.initialSize=5
 #jdbc.maxActive=30

kmall-manager/src/main/resources/conf/pingan-pay.properties

@@ -1,62 +1,62 @@
-########## 平安支付配置 ##########
+########## \u5E73\u5B89\u652F\u4ED8\u914D\u7F6E ##########
 
 # [dev, prod]
 pay.pingan.env = dev
 
 
-#========== 开发环境 ==========
-#平安支付open_id
+#========== \u5F00\u53D1\u73AF\u5883 ==========
+#\u5E73\u5B89\u652F\u4ED8open_id
 pingan.dev.payOpenId=6ad8a69d33b5bf188f7c0ab7bae95931
-#平安支付open_key
+#\u5E73\u5B89\u652F\u4ED8open_key
 pingan.dev.payOpenKey=ac1705d3ace4b6b69044494d0e28310e
-#平安退款公钥
+#\u5E73\u5B89\u9000\u6B3E\u516C\u94A5
 pingan.dev.payPublicKey=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC7q4B8d6EIMUo8AK2sdgxbmdrFyklVW+4+y2KI+jeHgAwA9SwBn3KVIUa1aVrBcZzQh0RhSCy8r+vfh67/KVTU+Oaav0ZH3B/Wem5DkLMrkz8IMm17NsUFhXZCCyC5KXIbzciueHdYTObbV4r4oDazf52708jSIVKDSYkjcTEoiQIDAQAB
-#平安取消交易私钥
+#\u5E73\u5B89\u53D6\u6D88\u4EA4\u6613\u79C1\u94A5
 pingan.dev.payPrivateKey=MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBALurgHx3oQgxSjwArax2DFuZ2sXKSVVb7j7LYoj6N4eADAD1LAGfcpUhRrVpWsFxnNCHRGFILLyv69+Hrv8pVNT45pq/RkfcH9Z6bkOQsyuTPwgybXs2xQWFdkILILkpchvNyK54d1hM5ttXivigNrN/nbvTyNIhUoNJiSNxMSiJAgMBAAECgYAB3H+XvHACbsq3saIHVdxlhC8hSxJTIGhKgyXlCeZHF8QGtmfLVFOEmyHiZrsZtBDEGLNa66ZV8MC8JNJdgYFv3vZeYpLDgmAPmiKadEiCu4pg/QwpfeHGEDZfaxWfjWfNwyLv6RmXv310hP8WEMC9xv2Cx9DXIAcXg0SlNy4CoQJBAOLsicAop3i7LT+oGw6GoPTaHyTk20yJVXn/VMKXMLIT4371bcANrj1zj2EWjLUPOqYAApWxYDahg4hLIcD1e40CQQDTt16bagAJw/sShVXYcKuuf3vKIG/ZMXgfxddxFkd4aMmpImW6LwqFIV96J5jhYlcVwtXdWtDiuqHgsAgPD6PtAkBRxIfybPPDpjaszGdLeal/8STtx2VaE9ZwClhBcfdDA7Wi5s7wOD3DuOM+ScDT8TPh4vkLdYnExbg+oUv9Wrd1AkEAvC6k/Ob/Ga8FH7U8VKHxN61Azqx+PkNmTnd/w5jV9gTOGnPkj9T4ONUtFFrV3J+YYFNJ3PK38I+LCzfsMdbpEQJAWoJ7g9IMMu6yx4JyCzE15OdOcJDytqZ6gIiXvtkqEGywyxNdEyUOu/+BkAQElTdUCCWuVBllm09K/y95I6zG8A==
-#平安进件open_id
+#\u5E73\u5B89\u8FDB\u4EF6open_id
 pingan.dev.pluginOpenId=txafCXQt058248b3230c9081ff90ce80
-#平安进件open_key
+#\u5E73\u5B89\u8FDB\u4EF6open_key
 pingan.dev.pluginOpenKey=aG0ck19g2HdthGRdSCfmiloOoGXoOzWZ
-#平安进件公钥
+#\u5E73\u5B89\u8FDB\u4EF6\u516C\u94A5
 pingan.dev.pluginPublicKey=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuyohp+CrDTaz6tW2uMrWxs2lFwEbRCsPg69gObtjirgMuGtcB+vhzCFn6rN8IvohvpGkO8vjZw6qrmlbNrauaUuW5j82eyZ749ZfTggFjIqteL9MeF88sAY3rw0AItcUUP3XaYamedKGrdeellfbgvyaJJ+m2evY/yP9FRTVEKgmbi0UvNMvCqqiWty3H3WURFjjj2J+/4b5zI8od4rSTsHetD8psOViMbHuYoqhl583UW/6veu1+ZvKPkJ8ZneP/jGCWe3BNWUMH3Y9+rPSOn+pnWmV3R926qKReeZBdMfK9ExYMFZi7ZfypEASz5pG+Jh5lTAwvgEATznQ7iESNQIDAQAB
-#平安进件私钥
+#\u5E73\u5B89\u8FDB\u4EF6\u79C1\u94A5
 pingan.dev.pluginPrivateKey=MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC7KiGn4KsNNrPq1ba4ytbGzaUXARtEKw+Dr2A5u2OKuAy4a1wH6+HMIWfqs3wi+iG+kaQ7y+NnDqquaVs2tq5pS5bmPzZ7Jnvj1l9OCAWMiq14v0x4XzywBjevDQAi1xRQ/ddphqZ50oat156WV9uC/Jokn6bZ69j/I/0VFNUQqCZuLRS80y8KqqJa3LcfdZREWOOPYn7/hvnMjyh3itJOwd60Pymw5WIxse5iiqGXnzdRb/q967X5m8o+Qnxmd4/+MYJZ7cE1ZQwfdj36s9I6f6mdaZXdH3bqopF55kF0x8r0TFgwVmLtl/KkQBLPmkb4mHmVMDC+AQBPOdDuIRI1AgMBAAECggEAYH/ihmoCB3gS35t88F40yp+w5OF/K3CAOUcs99c0BYvLkzJXawYlj1gR+iK8eFQ7HcR9xw7imnonanGLw/QAjO2aSfCBqJE5A0m+Lb9ZDRNbSYxoYw/HfIJYJ3sufMgkA3Y9oHz6TIlNQ0iOzblSxoBzATsHjghaA4KMtFffWwxVgeY1ozHGwt4pOv5opdr7JfJHz4Xv/G2wbmDpYEwlHWn4Iu1QZgOcmnufzIjEK7OXSvfEc0Ohjta4TikpfJK9W4gZ28B3yPSUmNlszsRUbOT8R5sI2QIYHemlYuyY9h9d1ZxgMv6QVu2dYdZSGHOzqd04mueYzPIWRD4WRETvaQKBgQDk6xwaq0JnZBVy9UXbS9Kn75SaYferqgKClYbeu7GfzYyjj5N/XZEuj5DwfxQa2jijy7QqX7Tqskridh7+sTcNDZZ4J6dT5Tivgfb3YQCVXIWL16uqSdasG1thGOAI9/0tzkHjknpjIpMNcT3s15I7tx7b4kyUlhR1FTKHygh5IwKBgQDRTn1V0iwbi3P0hV3bqHRxcCLmO9Bhdf3UekDiVvegtihLVZoUGCx/aOlhWQa5+1SVMziB7ms+16vEB9QI0wZXhrHCBszknMvYJFp9AuErvFAVCkgL0cAnhvj6QBFji5AFElNyNlExZ+hUpj6nBB/kmvF/kyiOQdAQM6WInJv4xwKBgC+aJFH3YuuVCFDLaCdd8QQy8bfYv2PXCoaVCWKvrRQJ7kDkzksh7dq8x+r6wfeDgVuuNFzLYheb066b2X4k48m3FZ8Ov+DWPZ9hazWt2i00/CBETNIwYI+RcMMUJSI4T1GDHnhwMTsEKYgWEEZ73VDFl4kp2brcKozeR4+tF235AoGBAJsk9N5iVXNtYNwE51dkfDuBhTznZUR4s1eF7wZWtGKZ4zBEGVt/t6wRVbxkwwmkdEPLnb0hvrjsIFPEAbUwxmimXKiXZdSnLKnf+HrlYYaLpUiTQGgSZ75k27STPNBuqKg5t0TXYkOe46WrPJGMCx/mgc+wgsU/nzwDLFYgz7QNAoGAXNjnCWMvwDeIS4tMYDfrVUfmvjXRFZuiOm0+a92huKlu72azi3mIme0YyIVSFGLl+Lk/BeBJYWnLNo6CsGyPqLyi4Pkoftq+BZS3ls25pFl+8QGjrLXky+nIXbceqf1YwdNHEEIOU14jHZyPAJR2M2Trj1iKrqJIRhkTT6WtjgE=
-#平安交接口交易地址
+#\u5E73\u5B89\u4EA4\u63A5\u53E3\u4EA4\u6613\u5730\u5740
 pingan.dev.payUrl=https://api.orangebank.com.cn/mct1/
-#平安交接口进件地址
+#\u5E73\u5B89\u4EA4\u63A5\u53E3\u8FDB\u4EF6\u5730\u5740
 pingan.dev.pluginUrl=https://mixpayuat4.orangebank.com.cn/org1/
-#平安交文件上传地址
+#\u5E73\u5B89\u4EA4\u6587\u4EF6\u4E0A\u4F20\u5730\u5740
 pingan.dev.fileUrl=https://mixpayst6.orangebank.com.cn/fileup1/
-#平安下单异步通知地址
+#\u5E73\u5B89\u4E0B\u5355\u5F02\u6B65\u901A\u77E5\u5730\u5740
 pingan.dev.notifyUrl=http://qhdswl.f3322.net:9002/api/pay/pingan/notify
-#平安支付成功跳转地址
+#\u5E73\u5B89\u652F\u4ED8\u6210\u529F\u8DF3\u8F6C\u5730\u5740
 pingan.dev.jumpUrl=
 
 
-#========== 生产环境 ==========
-#平安支付open_id
+#========== \u751F\u4EA7\u73AF\u5883 ==========
+#\u5E73\u5B89\u652F\u4ED8open_id
 pingan.prod.payOpenId=6ad8a69d33b5bf188f7c0ab7bae95931
-#平安支付open_key
+#\u5E73\u5B89\u652F\u4ED8open_key
 pingan.prod.payOpenKey=ac1705d3ace4b6b69044494d0e28310e
-#平安退款公钥
+#\u5E73\u5B89\u9000\u6B3E\u516C\u94A5
 pingan.prod.payPublicKey=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC7q4B8d6EIMUo8AK2sdgxbmdrFyklVW+4+y2KI+jeHgAwA9SwBn3KVIUa1aVrBcZzQh0RhSCy8r+vfh67/KVTU+Oaav0ZH3B/Wem5DkLMrkz8IMm17NsUFhXZCCyC5KXIbzciueHdYTObbV4r4oDazf52708jSIVKDSYkjcTEoiQIDAQAB
-#平安取消交易私钥
+#\u5E73\u5B89\u53D6\u6D88\u4EA4\u6613\u79C1\u94A5
 pingan.prod.payPrivateKey=MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBALurgHx3oQgxSjwArax2DFuZ2sXKSVVb7j7LYoj6N4eADAD1LAGfcpUhRrVpWsFxnNCHRGFILLyv69+Hrv8pVNT45pq/RkfcH9Z6bkOQsyuTPwgybXs2xQWFdkILILkpchvNyK54d1hM5ttXivigNrN/nbvTyNIhUoNJiSNxMSiJAgMBAAECgYAB3H+XvHACbsq3saIHVdxlhC8hSxJTIGhKgyXlCeZHF8QGtmfLVFOEmyHiZrsZtBDEGLNa66ZV8MC8JNJdgYFv3vZeYpLDgmAPmiKadEiCu4pg/QwpfeHGEDZfaxWfjWfNwyLv6RmXv310hP8WEMC9xv2Cx9DXIAcXg0SlNy4CoQJBAOLsicAop3i7LT+oGw6GoPTaHyTk20yJVXn/VMKXMLIT4371bcANrj1zj2EWjLUPOqYAApWxYDahg4hLIcD1e40CQQDTt16bagAJw/sShVXYcKuuf3vKIG/ZMXgfxddxFkd4aMmpImW6LwqFIV96J5jhYlcVwtXdWtDiuqHgsAgPD6PtAkBRxIfybPPDpjaszGdLeal/8STtx2VaE9ZwClhBcfdDA7Wi5s7wOD3DuOM+ScDT8TPh4vkLdYnExbg+oUv9Wrd1AkEAvC6k/Ob/Ga8FH7U8VKHxN61Azqx+PkNmTnd/w5jV9gTOGnPkj9T4ONUtFFrV3J+YYFNJ3PK38I+LCzfsMdbpEQJAWoJ7g9IMMu6yx4JyCzE15OdOcJDytqZ6gIiXvtkqEGywyxNdEyUOu/+BkAQElTdUCCWuVBllm09K/y95I6zG8A==
-#平安进件open_id
+#\u5E73\u5B89\u8FDB\u4EF6open_id
 pingan.prod.pluginOpenId=txafCXQt058248b3230c9081ff90ce80
-#平安进件open_key
+#\u5E73\u5B89\u8FDB\u4EF6open_key
 pingan.prod.pluginOpenKey=aG0ck19g2HdthGRdSCfmiloOoGXoOzWZ
-#平安进件公钥
+#\u5E73\u5B89\u8FDB\u4EF6\u516C\u94A5
 pingan.prod.pluginPublicKey=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuyohp+CrDTaz6tW2uMrWxs2lFwEbRCsPg69gObtjirgMuGtcB+vhzCFn6rN8IvohvpGkO8vjZw6qrmlbNrauaUuW5j82eyZ749ZfTggFjIqteL9MeF88sAY3rw0AItcUUP3XaYamedKGrdeellfbgvyaJJ+m2evY/yP9FRTVEKgmbi0UvNMvCqqiWty3H3WURFjjj2J+/4b5zI8od4rSTsHetD8psOViMbHuYoqhl583UW/6veu1+ZvKPkJ8ZneP/jGCWe3BNWUMH3Y9+rPSOn+pnWmV3R926qKReeZBdMfK9ExYMFZi7ZfypEASz5pG+Jh5lTAwvgEATznQ7iESNQIDAQAB
-#平安进件私钥
+#\u5E73\u5B89\u8FDB\u4EF6\u79C1\u94A5
 pingan.prod.pluginPrivateKey=MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC7KiGn4KsNNrPq1ba4ytbGzaUXARtEKw+Dr2A5u2OKuAy4a1wH6+HMIWfqs3wi+iG+kaQ7y+NnDqquaVs2tq5pS5bmPzZ7Jnvj1l9OCAWMiq14v0x4XzywBjevDQAi1xRQ/ddphqZ50oat156WV9uC/Jokn6bZ69j/I/0VFNUQqCZuLRS80y8KqqJa3LcfdZREWOOPYn7/hvnMjyh3itJOwd60Pymw5WIxse5iiqGXnzdRb/q967X5m8o+Qnxmd4/+MYJZ7cE1ZQwfdj36s9I6f6mdaZXdH3bqopF55kF0x8r0TFgwVmLtl/KkQBLPmkb4mHmVMDC+AQBPOdDuIRI1AgMBAAECggEAYH/ihmoCB3gS35t88F40yp+w5OF/K3CAOUcs99c0BYvLkzJXawYlj1gR+iK8eFQ7HcR9xw7imnonanGLw/QAjO2aSfCBqJE5A0m+Lb9ZDRNbSYxoYw/HfIJYJ3sufMgkA3Y9oHz6TIlNQ0iOzblSxoBzATsHjghaA4KMtFffWwxVgeY1ozHGwt4pOv5opdr7JfJHz4Xv/G2wbmDpYEwlHWn4Iu1QZgOcmnufzIjEK7OXSvfEc0Ohjta4TikpfJK9W4gZ28B3yPSUmNlszsRUbOT8R5sI2QIYHemlYuyY9h9d1ZxgMv6QVu2dYdZSGHOzqd04mueYzPIWRD4WRETvaQKBgQDk6xwaq0JnZBVy9UXbS9Kn75SaYferqgKClYbeu7GfzYyjj5N/XZEuj5DwfxQa2jijy7QqX7Tqskridh7+sTcNDZZ4J6dT5Tivgfb3YQCVXIWL16uqSdasG1thGOAI9/0tzkHjknpjIpMNcT3s15I7tx7b4kyUlhR1FTKHygh5IwKBgQDRTn1V0iwbi3P0hV3bqHRxcCLmO9Bhdf3UekDiVvegtihLVZoUGCx/aOlhWQa5+1SVMziB7ms+16vEB9QI0wZXhrHCBszknMvYJFp9AuErvFAVCkgL0cAnhvj6QBFji5AFElNyNlExZ+hUpj6nBB/kmvF/kyiOQdAQM6WInJv4xwKBgC+aJFH3YuuVCFDLaCdd8QQy8bfYv2PXCoaVCWKvrRQJ7kDkzksh7dq8x+r6wfeDgVuuNFzLYheb066b2X4k48m3FZ8Ov+DWPZ9hazWt2i00/CBETNIwYI+RcMMUJSI4T1GDHnhwMTsEKYgWEEZ73VDFl4kp2brcKozeR4+tF235AoGBAJsk9N5iVXNtYNwE51dkfDuBhTznZUR4s1eF7wZWtGKZ4zBEGVt/t6wRVbxkwwmkdEPLnb0hvrjsIFPEAbUwxmimXKiXZdSnLKnf+HrlYYaLpUiTQGgSZ75k27STPNBuqKg5t0TXYkOe46WrPJGMCx/mgc+wgsU/nzwDLFYgz7QNAoGAXNjnCWMvwDeIS4tMYDfrVUfmvjXRFZuiOm0+a92huKlu72azi3mIme0YyIVSFGLl+Lk/BeBJYWnLNo6CsGyPqLyi4Pkoftq+BZS3ls25pFl+8QGjrLXky+nIXbceqf1YwdNHEEIOU14jHZyPAJR2M2Trj1iKrqJIRhkTT6WtjgE=
-#平安交接口交易地址
+#\u5E73\u5B89\u4EA4\u63A5\u53E3\u4EA4\u6613\u5730\u5740
 pingan.prod.payUrl=https://api.orangebank.com.cn/mct1/
-#平安交接口进件地址
+#\u5E73\u5B89\u4EA4\u63A5\u53E3\u8FDB\u4EF6\u5730\u5740
 pingan.prod.pluginUrl=https://api.orangebank.com.cn/org1/
-#平安交文件上传地址
+#\u5E73\u5B89\u4EA4\u6587\u4EF6\u4E0A\u4F20\u5730\u5740
 pingan.prod.fileUrl=https://up.orangebank.com.cn/fileup1/
-#平安下单异步通知地址
+#\u5E73\u5B89\u4E0B\u5355\u5F02\u6B65\u901A\u77E5\u5730\u5740
 pingan.prod.notifyUrl=https://mp.k1net.cn/api/pay/pingan/notify
-#平安支付成功跳转地址
-pingan.prod.jumpUrl=
+#\u5E73\u5B89\u652F\u4ED8\u6210\u529F\u8DF3\u8F6C\u5730\u5740
+pingan.prod.jumpUrl=

kmall-manager/src/main/resources/conf/redis.properties

@@ -1,9 +1,9 @@
-########## redis 配置 ##########
+########## redis \u914D\u7F6E ##########
 
 # [dev, prod]
 redis.env = dev
 
-# 开发环境
+# \u5F00\u53D1\u73AF\u5883
 redis.dev.keyPrefix=platform
 redis.dev.host=127.0.0.1
 redis.dev.port=6379
@@ -13,16 +13,16 @@ redis.dev.pool.maxTotal=10000
 redis.dev.pool.testOnBorrow=true
 
 
-# 中网生产环境
+# \u4E2D\u7F51\u751F\u4EA7\u73AF\u5883
 redis.prod.keyPrefix=platform
-redis.prod.host=172.18.132.30
+redis.prod.host=183.62.225.124
 redis.prod.port=6379
 redis.prod.pool.maxIdle=200
 redis.prod.pool.maxWait=1000
 redis.prod.pool.maxTotal=10000
 redis.prod.pool.testOnBorrow=true
 
-## 中网国际生产环境
+## \u4E2D\u7F51\u56FD\u9645\u751F\u4EA7\u73AF\u5883
 #redis.prod.keyPrefix=platform
 #redis.prod.host=183.62.225.124
 #redis.prod.port=6379

kmall-manager/src/main/resources/conf/wx-global.properties

@@ -1,84 +1,84 @@
-########## 微信小程序配置 ##########
+########## \u5FAE\u4FE1\u5C0F\u7A0B\u5E8F\u914D\u7F6E ##########
 
 # [dev, prod]
 pay.wx.global.env = dev
 
 
-#========== 开发环境 ==========
-#小程序ID
+#========== \u5F00\u53D1\u73AF\u5883 ==========
+#\u5C0F\u7A0B\u5E8FID
 wx.global.dev.appId=wx59c05dcbb3ef2f36
-#小程序密钥
+#\u5C0F\u7A0B\u5E8F\u5BC6\u94A5
 wx.global.dev.secret=bb4029cd5149cbe5975bc14a99feaa9d
-#商户号
+#\u5546\u6237\u53F7
 wx.global.dev.mchId=103106626
-#支付签名
+#\u652F\u4ED8\u7B7E\u540D
 wx.global.dev.paySignKey=CAXRUxp7mzgc1LhOMezsvS3PXbqi7KhY
-#交易类型
+#\u4EA4\u6613\u7C7B\u578B
 wx.global.dev.tradeType=JSAPI
-#商户币种
+#\u5546\u6237\u5E01\u79CD
 wx.global.dev.feeType=CNY
-#证书名称，对应不同的商户号
+#\u8BC1\u4E66\u540D\u79F0\uFF0C\u5BF9\u5E94\u4E0D\u540C\u7684\u5546\u6237\u53F7
 wx.global.dev.certName=/cert/apiclient_cert.p12
-#支付回调地址
+#\u652F\u4ED8\u56DE\u8C03\u5730\u5740
 wx.global.dev.notifyUrl=http://qhdswl.f3322.net:9001/platform-framework/api/global/pay/notify
-#获取code的请求地址
+#\u83B7\u53D6code\u7684\u8BF7\u6C42\u5730\u5740
 wx.global.dev.getCode=https://open.weixin.qq.com/connect/oauth2/authorize?appid=%s&redirect_uri=%s&response_type=code&scope=%s&state=STAT#wechat_redirect
-#获取Web_access_tokenhttps的请求地址
+#\u83B7\u53D6Web_access_tokenhttps\u7684\u8BF7\u6C42\u5730\u5740
 wx.global.dev.webAccessTokenhttps = https://api.weixin.qq.com/sns/jscode2session?appid=%s&secret=%s&js_code=%s&grant_type=authorization_code
-#拉取用户信息的请求地址
+#\u62C9\u53D6\u7528\u6237\u4FE1\u606F\u7684\u8BF7\u6C42\u5730\u5740
 wx.global.dev.userMessage=https://api.weixin.qq.com/sns/userinfo?access_token=%s&openid=%s&lang=zh_CN
-#微信统一下单接口路径
+#\u5FAE\u4FE1\u7EDF\u4E00\u4E0B\u5355\u63A5\u53E3\u8DEF\u5F84
 wx.global.dev.uniformorder=https://api.mch.weixin.qq.com/pay/unifiedorder
-#退款地址
+#\u9000\u6B3E\u5730\u5740
 wx.global.dev.refundUrl=https://api.mch.weixin.qq.com/secapi/pay/refund
-#退款回调地址
+#\u9000\u6B3E\u56DE\u8C03\u5730\u5740
 wx.global.dev.refundNotifyUrl=http://qhdswl.f3322.net:9001/platform-framework/api/global/pay/refundNotify
-#退款查询地址
+#\u9000\u6B3E\u67E5\u8BE2\u5730\u5740
 wx.global.dev.refundqueryUrl=https://api.mch.weixin.qq.com/pay/refundquery
-#微信查询订单状态
+#\u5FAE\u4FE1\u67E5\u8BE2\u8BA2\u5355\u72B6\u6001
 wx.global.dev.orderquery=https://api.mch.weixin.qq.com/pay/orderquery
-#查询汇率
+#\u67E5\u8BE2\u6C47\u7387
 wx.global.dev.ratequery=https://api.mch.weixin.qq.com/pay/queryexchagerate
-#服务器Ip
+#\u670D\u52A1\u5668Ip
 wx.global.dev.spbillCreateIp=127.0.0.1
 
 
-#========== 生产环境 ==========
-#小程序ID
+#========== \u751F\u4EA7\u73AF\u5883 ==========
+#\u5C0F\u7A0B\u5E8FID
 wx.global.prod.appId=wx59c05dcbb3ef2f36
-#小程序密钥
+#\u5C0F\u7A0B\u5E8F\u5BC6\u94A5
 wx.global.prod.secret=bb4029cd5149cbe5975bc14a99feaa9d
-#商户号
+#\u5546\u6237\u53F7
 wx.global.prod.mchId=103106626
-#支付签名
+#\u652F\u4ED8\u7B7E\u540D
 wx.global.prod.paySignKey=CAXRUxp7mzgc1LhOMezsvS3PXbqi7KhY
-#交易类型
+#\u4EA4\u6613\u7C7B\u578B
 wx.global.prod.tradeType=JSAPI
-#商户币种
+#\u5546\u6237\u5E01\u79CD
 wx.global.prod.feeType=CNY
-#证书名称，对应不同的商户号
+#\u8BC1\u4E66\u540D\u79F0\uFF0C\u5BF9\u5E94\u4E0D\u540C\u7684\u5546\u6237\u53F7
 wx.global.prod.certName=/app/project/kmall_pt_global/cert/apiclient_cert.p12
-#支付回调地址
+#\u652F\u4ED8\u56DE\u8C03\u5730\u5740
 wx.global.prod.notifyUrl=https://mp.k1net.cn/api/global/pay/notify
-#获取code的请求地址
+#\u83B7\u53D6code\u7684\u8BF7\u6C42\u5730\u5740
 wx.global.prod.getCode=https://open.weixin.qq.com/connect/oauth2/authorize?appid=%s&redirect_uri=%s&response_type=code&scope=%s&state=STAT#wechat_redirect
-#获取Web_access_tokenhttps的请求地址
+#\u83B7\u53D6Web_access_tokenhttps\u7684\u8BF7\u6C42\u5730\u5740
 wx.global.prod.webAccessTokenhttps = https://api.weixin.qq.com/sns/jscode2session?appid=%s&secret=%s&js_code=%s&grant_type=authorization_code
-#拉取用户信息的请求地址
+#\u62C9\u53D6\u7528\u6237\u4FE1\u606F\u7684\u8BF7\u6C42\u5730\u5740
 wx.global.prod.userMessage=https://api.weixin.qq.com/sns/userinfo?access_token=%s&openid=%s&lang=zh_CN
-#微信统一下单接口路径
+#\u5FAE\u4FE1\u7EDF\u4E00\u4E0B\u5355\u63A5\u53E3\u8DEF\u5F84
 wx.global.prod.uniformorder=https://api.mch.weixin.qq.com/pay/unifiedorder
-#退款地址
+#\u9000\u6B3E\u5730\u5740
 wx.global.prod.refundUrl=https://api.mch.weixin.qq.com/secapi/pay/refund
-#退款回调地址
+#\u9000\u6B3E\u56DE\u8C03\u5730\u5740
 wx.global.prod.refundNotifyUrl=https://mp.k1net.cn/api/global/pay/refundNotify
-#退款查询地址
+#\u9000\u6B3E\u67E5\u8BE2\u5730\u5740
 wx.global.prod.refundqueryUrl=https://api.mch.weixin.qq.com/pay/refundquery
-#微信查询订单状态
+#\u5FAE\u4FE1\u67E5\u8BE2\u8BA2\u5355\u72B6\u6001
 wx.global.prod.orderquery=https://api.mch.weixin.qq.com/pay/orderquery
-#查询汇率
+#\u67E5\u8BE2\u6C47\u7387
 wx.global.prod.ratequery=https://api.mch.weixin.qq.com/pay/queryexchagerate
-#服务器Ip
+#\u670D\u52A1\u5668Ip
 wx.global.prod.spbillCreateIp=127.0.0.1