From 383dbb2d4e03b8f8a8895e8d7454920d524899d4 Mon Sep 17 00:00:00 2001
From: Chopper <liushuai711@gmail.com>
Date: Thu, 17 Jun 2021 15:05:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=8E=AF=E5=A2=83=E7=9F=AD?=
 =?UTF-8?q?=E4=BF=A1=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86=20=EF=BC=8C?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A46=E4=B8=AA1=E5=8F=91=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common-api/src/main/resources/application.yml     |  3 +--
 .../common/sms/impl/SmsUtilAliImplService.java    | 15 ++++++++++++---
 .../cn/lili/config/properties/SystemSetting.java  |  6 ++++++
 .../payment/kit/plugin/alipay/AliPayPlugin.java   |  9 ++++++---
 4 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/common-api/src/main/resources/application.yml b/common-api/src/main/resources/application.yml
index 36d03d74..23bbc5c0 100644
--- a/common-api/src/main/resources/application.yml
+++ b/common-api/src/main/resources/application.yml
@@ -225,8 +225,7 @@ lili:
     #支付密码
     WALLET_PASSWORD: SMS_205755301
   system:
-    isDemoSite: true
-    licences: 'temporary'
+    isTestModel: true
   statistics:
     # 在线人数统计 X 小时。这里设置48，即统计过去48小时每小时在线人数
     onlineMember: 48
diff --git a/framework/src/main/java/cn/lili/common/sms/impl/SmsUtilAliImplService.java b/framework/src/main/java/cn/lili/common/sms/impl/SmsUtilAliImplService.java
index 5e62b76e..6a64bfaf 100644
--- a/framework/src/main/java/cn/lili/common/sms/impl/SmsUtilAliImplService.java
+++ b/framework/src/main/java/cn/lili/common/sms/impl/SmsUtilAliImplService.java
@@ -11,6 +11,7 @@ import cn.lili.common.sms.SmsUtil;
 import cn.lili.common.utils.CommonUtil;
 import cn.lili.common.verification.enums.VerificationEnums;
 import cn.lili.config.properties.SmsTemplateSetting;
+import cn.lili.config.properties.SystemSetting;
 import cn.lili.modules.connect.util.Base64Utils;
 import cn.lili.modules.member.entity.dos.Member;
 import cn.lili.modules.member.service.MemberService;
@@ -55,6 +56,9 @@ public class SmsUtilAliImplService implements SmsUtil, AliSmsUtil {
     @Autowired
     private SmsTemplateSetting smsTemplateSetting;
 
+    @Autowired
+    private SystemSetting systemSetting;
+
     @Override
     public void sendSmsCode(String mobile, VerificationEnums verificationEnums, String uuid) {
         //获取短信配置
@@ -115,11 +119,16 @@ public class SmsUtilAliImplService implements SmsUtil, AliSmsUtil {
             default:
                 return;
         }
+
+        //如果是测试模式 默认验证码 6个1
+        if (systemSetting.getIsTestModel()) {
+            code = "111111";
+        } else {
+            //发送短信
+            this.sendSmsCode(smsSetting.getSignName(), mobile, params, templateCode);
+        }
         //缓存中写入要验证的信息
         cache.put(cacheKey(verificationEnums, mobile, uuid), code, 300L);
-        //发送短信
-        this.sendSmsCode(smsSetting.getSignName(), mobile, params, templateCode);
-
     }
 
     @Override
diff --git a/framework/src/main/java/cn/lili/config/properties/SystemSetting.java b/framework/src/main/java/cn/lili/config/properties/SystemSetting.java
index 955ff058..17186884 100644
--- a/framework/src/main/java/cn/lili/config/properties/SystemSetting.java
+++ b/framework/src/main/java/cn/lili/config/properties/SystemSetting.java
@@ -20,6 +20,12 @@ public class SystemSetting {
      */
     private Boolean isDemoSite = false;
 
+    /**
+     * 测试模式
+     * 验证码短信为6个1
+     */
+    private Boolean isTestModel = false;
+
     /**
      * 授权信息
      */
diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/alipay/AliPayPlugin.java b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/alipay/AliPayPlugin.java
index d4953bae..c622b008 100644
--- a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/alipay/AliPayPlugin.java
+++ b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/alipay/AliPayPlugin.java
@@ -10,6 +10,7 @@ import cn.lili.common.utils.SnowFlake;
 import cn.lili.common.utils.StringUtils;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.config.properties.ApiProperties;
+import cn.lili.config.properties.DomainProperties;
 import cn.lili.modules.payment.entity.RefundLog;
 import cn.lili.modules.payment.kit.CashierSupport;
 import cn.lili.modules.payment.kit.Payment;
@@ -62,7 +63,9 @@ public class AliPayPlugin implements Payment {
     //API域名
     @Autowired
     private ApiProperties apiProperties;
-
+    //域名配置
+    @Autowired
+    private DomainProperties domainProperties;
 
     @Override
     public ResultMessage<Object> h5pay(HttpServletRequest request, HttpServletResponse response, PayParam payParam) {
@@ -78,11 +81,11 @@ public class AliPayPlugin implements Payment {
         //回传数据
         payModel.setPassbackParams(URLEncoder.createAll().encode(JSONUtil.toJsonStr(payParam), StandardCharsets.UTF_8));
         //3分钟超时
-//        payModel.setTimeoutExpress("30m");
+        payModel.setTimeoutExpress("3m");
         payModel.setOutTradeNo(outTradeNo);
         payModel.setProductCode("QUICK_WAP_PAY");
         try {
-            log.info("支付宝H5支付：{}", payModel);
+            log.info("支付宝H5支付：{}", JSONUtil.toJsonStr(payModel));
             AliPayRequest.wapPay(response, payModel, callbackUrl(apiProperties.getBuyer(), PaymentMethodEnum.ALIPAY),
                     notifyUrl(apiProperties.getBuyer(), PaymentMethodEnum.ALIPAY));
         } catch (Exception e) {