From 5c67b9c32ffba7ba8420f71392263e878dd81ee6 Mon Sep 17 00:00:00 2001
From: xiangwb <xiangwb@drore.com>
Date: Thu, 12 Apr 2018 11:18:27 +0800
Subject: [PATCH] merge

---
 .../main/java/com/xwbing/service/other/AliPayService.java  | 4 +++-
 boot-service/src/main/resources/pay.properties             | 7 ++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/boot-service/src/main/java/com/xwbing/service/other/AliPayService.java b/boot-service/src/main/java/com/xwbing/service/other/AliPayService.java
index 404287f..9ce0411 100644
--- a/boot-service/src/main/java/com/xwbing/service/other/AliPayService.java
+++ b/boot-service/src/main/java/com/xwbing/service/other/AliPayService.java
@@ -69,7 +69,7 @@ public class AliPayService {
             return result;
         }
         //获得初始化的aliPayClient
-        AlipayClient alipayClient = new DefaultAlipayClient(requestUrl, appId, privateKey, "json", "UTF-8", publicKey, "RSA2");
+        AlipayClient alipayClient = new DefaultAlipayClient(requestUrl, appId, privateKey, "json", "UTF-8", publicKey, "RSA");
         //创建API对应的request类
         AlipayTradePayRequest request = new AlipayTradePayRequest();
         request.setBizContent(JSONObject.toJSONString(param));
@@ -252,6 +252,8 @@ public class AliPayService {
             message = "产品名称为空";
         } else if (0 >= param.getTotalAmount()) {
             message = "金额必须大于0";
+        } else if (StringUtils.isEmpty(param.getScene())) {
+            message = "支付方式不能为空";
         } else {
             message = StringUtils.EMPTY;
         }
diff --git a/boot-service/src/main/resources/pay.properties b/boot-service/src/main/resources/pay.properties
index c755db9..f8a5193 100644
--- a/boot-service/src/main/resources/pay.properties
+++ b/boot-service/src/main/resources/pay.properties
@@ -12,10 +12,11 @@ wx.refundQueryUrl=https://api.mch.weixin.qq.com/pay/refundquery
 
 
 ###payAlipay pay set start##
-aliPay.appId=2017051807273744
+aliPay.appId=2016072801676318
 aliPay.requestUrl=https://openapi.alipay.com/gateway.do
-aliPay.rsaPublicKey=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsa1COluDzLH7GhYCWZp4HclR9x2nJ51UNVx7nmDwjr4Gg4miAOiEHYjZ4ILOUavo2EPN0/pcGRhMa8U87xICWcHQr26Q8cYkZgIfb5DC7l2b8MROxUYzdk82Y+3c8mbZ/6I5LfJeztDWtnXLQUZihTqaI2hPeGL9WEeMxqxaXMge1ho1BF4LfylUlO0WOle9grWYv0Xqpz0zKz6kCiVj2gdvNpL6ULj/C8BHZtY+aHd0Pd1dOdFPft8c+uTs7ESpAwClvoS9Go2LXJGPZUNGd0FnzRSyjpbi905rOjDQbUlUdcSbcg/qiFHaH1+GF3yRD4RAIO8pgzTj8RLsrbj/MQIDAQAB
-aliPay.rsaPrivateKey=MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCxrUI6W4PMsfsaFgJZmngdyVH3HacnnVQ1XHueYPCOvgaDiaIA6IQdiNnggs5Rq+jYQ83T+lwZGExrxTzvEgJZwdCvbpDxxiRmAh9vkMLuXZvwxE7FRjN2TzZj7dzyZtn/ojkt8l7O0Na2dctBRmKFOpojaE94Yv1YR4zGrFpcyB7WGjUEXgt/KVSU7RY6V72CtZi/ReqnPTMrPqQKJWPaB282kvpQuP8LwEdm1j5od3Q93V050U9+3xz65OzsRKkDAKW+hL0ajYtckY9lQ0Z3QWfNFLKOluL3Tms6MNBtSVR1xJtyD+qIUdofX4YXfJEPhEAg7ymDNOPxEuytuP8xAgMBAAECggEAJ3k2nYB3Z6KjBsic/Qs0ZGm1rBEKceKiMri5PhaLWysch1ysgUcnEui0fwyQidSHhoSJ1e5pR6n+UHMhdnupygclNdR6nzxGGeOe2EpxBEQHwRXb6jgOdtpiWxEdZT00cXa4/Vw7c/cxvJeu8HGSscazN+qUvUpAvrwmqnzgFnx/9jnji+tpPPahBD9uqJuKEg4cfvuR7sOtkcV4OyTfV1ASpec4Fsu0SXUSugP7ApSpKRZqIIpYIT/G8jqTxZ73tf2tnj6f9PoxzpbgN7kocxAzELxRpZi5G+CTqtc1AX6DKh173BhNqnAlfW7rGbF2IfUEsqbtsOksSor3+BRlgQKBgQDvf0QoG1CqO7xTokHFO1MWjYsfFxDQ7PeJtMdr/Jp2dYNpUT9B4Yl09DcLSEwDwn15VR4/NYlpiJvlOIrpYDWI0/ZvkSPy6hQmOP6WYTH1cdUwxSetX+MNBsi5PHUUa9ObvXBYZWOVLAuHieSJDcmJuDiGFdJvo2X+0ul68piVgwKBgQC963sDPk9mLgxD/en/1cQu4HxdS4MCelBqogRD24TV1DWkLFPBeK8QMLCvwd5BSN2kTXdTEEyHPCwBbe3hyQ6cKHmM5SUujomXnzOgbNWshCU3A7eHHjQjyK+eqSWDTsK4kX7q1A4Pi5MftTEiBUI5EwVHsXLNtcVhHTC24bsuOwKBgBb6jv+KH2M1+AvONaFG3+H6Eq8Y93QUSGvd/IRP6EIVZFZmhTs8+INQKzfZ5/E0Z/WMRSqraFPH161Wj310za4jKDHsKxbTfrtsHIExMinqkhnr0LLB0Hcff4LGWjVrYxI+StkwYS2e3DxU7qh3ui6Mjl/PGDG967tXYS96t0khAoGAXEuY322jlmugaFZ4Jm1TRtivd4Nf6o9Yj0mnOvbuaiAT5XHpTieBJCQVaYSUpzNrCxLef053cm0qkZNDvKtB31/IGlGtrR91/GpQ45CgkpMxpre2tAJYol9AAaH/6f0XoiyK+kINhz50RD+A3iCiGyyEL2AsA45nmpdd+jJfDcsCgYEA3ZPASHIfbnflQkWzzvUbzKLFqZB/NulDJTK4QvHne2canOac2oyOivBXQBgio9sqTolQo5W+6SxH9YqpH8GjPcPMsEF9PVsn4o/Gm3hY68sf2gSgpVfQzLM6KYDJ6asO93ZmJ6z0fu6qwUGdACpcSlZzCy0QQ6+QhHVobR2Uma8=
+aliPay.rsaPublicKey=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDDI6d306Q8fIfCOaTXyiUeJHkrIvYISRcc73s3vF1ZT7XN8RNPwJxo8pWaJMmvyTn9N4HQ632qJBVHf8sxHi/fEsraprwCtzvzQETrNRwVxLO5jVmRGi60j8Ue1efIlzPXV9je9mkjzOmdssymZkh2QhUrCmZYI/FCEa3/cNMW0QIDAQAB
+#支付宝私钥 rsa_private_key_pkcs8
+aliPay.rsaPrivateKey=MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBANJxjfSizAZz86isSRl+rcYmDBT5JIjeL09LusOxfZuQLZz4lOxbQf8d4cA4GtyUDeYFtOJEVjYP1H91kX0le6gaJYyzf52RVCLp3Ov/AkYnezPkfm/gwy9RJtHZDDmNzITrJCOlxgTsU8IeuKBg9XNAy35fvZeItisBDk8tGETPAgMBAAECgYEAj58OCbJ9Wb4Swb/rF6o8AKqAvmOWio5QbWa6rMnadqu8ZY/FW1WgwfLr2hqwQnAM2Dp2y6Fl0PmWxfI/+8/0BnW2svSMvZlwzPbk6nDyX+VwkfzYHGJgaiOYXQHKJuOlMko6Yey73Kc2P1kg5VNmr/icA1aJ1TmCQwcHYsZ7/nECQQDzzeZH+tB78DsCHNXVukl05aZfTkwY76IqC1z3/HxKLq4zVdp+xS+m9zw8cc0J8WNqFP1lbJyAUdoTZL0FI8RnAkEA3PhyBk3b+ygab2CzXeTJTmyNWJ+ZnwkMChpTV/f3G608UjU09XMOl63RZioaE4pF0QA2eeIaqNVXy4e2Dij7WQJAWV8pA0nWExjFCMk5OdfIBaoJivZQvvNZJsBznBRaG3dxNDBMoBv4k+QdmKq+1t496y02lm9yDzfyERnkkHXEEQJAfKJxhhbCXk5HYszzPqF93gsiSnty5Z3vuX8RxUtqiKTUojW6kjr8Xxc+Rda3cJAMQw9QqryaduImq/j2+dOpuQJAWAaL8yR+cfrot5dmafSZpmo6D6OFyRpu4qTJqq0v0UqNMz8LugqCRcWST35wJo5XY87rRVB5KcW/FcGqs2yhdg==
 ###payAlipay end set start##