Merge remote-tracking branch 'origin/master'

app/api/model/TbUserBlacklist.php

@@ -4,7 +4,7 @@ namespace app\api\model;
 
 
 use app\common\library\DatabaseRoute;
-use think\facade\Log;
+use support\Log;
 use think\Model;
 
 class TbUserBlacklist extends Model

app/czg/app/controller/WuyouController.php

@@ -47,7 +47,7 @@ class WuyouController extends BaseController
         $params = $this->request->get();
         (new WuyouValidate())->scene('payOrder')->check($params);
         $userId = $this->getUserId();
-//        debounce('payOrder' . $params['orderId']);
+        debounce('payOrder' . $params['orderId']);
         Log::info(format('生成商品订单信息接口入参为: {}', $params));
 
         $order = DatabaseRoute::getDb('orders', $userId)->where([
@@ -63,8 +63,7 @@ class WuyouController extends BaseController
         }
 
         if (RedisUtils::setCreateOrderFlagAndCheckLimit($userId, $params['orderId'])) {
-            //todo 待办
-//            (new TbUserBlacklist())->addBlackUser($userId, '一分钟频繁下单超22次');
+            (new TbUserBlacklist())->addBlackUser($userId, '一分钟频繁下单超22次');
         }
 
         $orderDetail = DatabaseRoute::getDb('pay_details', $userId)->where([
@@ -214,8 +213,6 @@ class WuyouController extends BaseController
                 Log::info("无忧支付回调，验签失败， 签名结果: {$sign}");
 //            return 'success';
             }
-            throw new SysException("1");
-
             if ($params['callbacks'] != 'CODE_SUCCESS') {
                 Log::info("无忧支付回调，支付失败");
                 return 'success';

support/MyExceptionHandle.php

@@ -53,9 +53,6 @@ class MyExceptionHandle extends ExceptionHandler implements ExceptionHandlerInte
 
         // 非json请求则返回一个页面
         return new Response(200, ['Content-Type' => 'application/json'], $exception->getMessage());
-
-
-
     }
 
 }