From b86a6637540442e9ef3d01b6bb6239c27cef7694 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Fri, 15 Aug 2025 17:40:31 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=85=BC=E5=AE=B9=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/model/Orders.php | 8 ++-- app/czg/app/controller/WuyouController.php | 9 ++-- app/functions.php | 3 +- config/exception.php | 2 +- support/MyExceptionHandle.php | 53 ++++++++++++++++++++++ 5 files changed, 62 insertions(+), 13 deletions(-) create mode 100644 support/MyExceptionHandle.php diff --git a/app/api/model/Orders.php b/app/api/model/Orders.php index 01f5c3c..7469e74 100644 --- a/app/api/model/Orders.php +++ b/app/api/model/Orders.php @@ -134,8 +134,7 @@ class Orders extends BaseModel public static function updateOrderStatus($payDetail, $order, $userId) { if ($payDetail['state'] == 1) { - // TODO 测试 -// return; + return; } $userInfo = DatabaseRoute::getDb('tb_user', $userId, true)->find(); @@ -198,7 +197,6 @@ class Orders extends BaseModel } - // TODO 异步领取奖励 pushQueue(ActivitiesQueue::class, [ 'userInfo' => $userInfo, 'sourceUser' => $byUser @@ -313,8 +311,8 @@ class Orders extends BaseModel $signCount = $commonModel->getByCodeToInt(913); Log::info("活动领取: 用户{$user['user_name']}, 上级{$sourceUser['user_name']}, 达标次数{$inviteAchievement['count']}"); // 首次达标发放奖励 -// if ($inviteAchievement['state'] == 0 && $inviteAchievement['count'] >= $signCount) { - if (true) { + if ($inviteAchievement['state'] == 0 && $inviteAchievement['count'] >= $signCount) { +// if (true) { Log::info('开始领取达标奖励'); $amount = $commonModel->getByCode(912)['value']; // 记录资金明细 diff --git a/app/czg/app/controller/WuyouController.php b/app/czg/app/controller/WuyouController.php index 6dcf6c3..9b27940 100644 --- a/app/czg/app/controller/WuyouController.php +++ b/app/czg/app/controller/WuyouController.php @@ -214,6 +214,7 @@ class WuyouController extends BaseController Log::info("无忧支付回调，验签失败， 签名结果: {$sign}"); // return 'success'; } + throw new SysException("1"); if ($params['callbacks'] != 'CODE_SUCCESS') { Log::info("无忧支付回调，支付失败"); @@ -244,9 +245,7 @@ class WuyouController extends BaseController $payDetail = $payDetails[0]; if ($payDetail['state'] == 1) { Log::info("无忧支付回调，重复回调"); - // TODO 测试 - -// return 'success'; + return 'success'; } $order = DatabaseRoute::getDb('orders', $userId)->where([ @@ -261,9 +260,7 @@ class WuyouController extends BaseController if ($order['status'] != 0) { Log::info("无忧支付回调，订单已支付"); - // TODO 测试 - -// return '订单已支付'; + return '订单已支付'; } $payDetail['third_order_no'] = $params['order_sn']; diff --git a/app/functions.php b/app/functions.php index 7c02422..0fe9f53 100644 --- a/app/functions.php +++ b/app/functions.php @@ -1,6 +1,7 @@ support\exception\Handler::class, + '' => support\MyExceptionHandle::class, ]; \ No newline at end of file diff --git a/support/MyExceptionHandle.php b/support/MyExceptionHandle.php new file mode 100644 index 0000000..f56f8ef --- /dev/null +++ b/support/MyExceptionHandle.php @@ -0,0 +1,53 @@ + + * @copyright walkor + * @link http://www.workerman.net/ + * @license http://www.opensource.org/licenses/mit-license.php MIT License + */ + +namespace support; + +use app\exception\SysException; +use Throwable; +use Webman\Exception\ExceptionHandler; +use Webman\Exception\ExceptionHandlerInterface; +use Webman\Http\Request; +use Webman\Http\Response; +use Webman\Exception\BusinessException; + +/** + * Class Handler + * @package support\exception + */ +class MyExceptionHandle extends ExceptionHandler implements ExceptionHandlerInterface +{ + public $dontReport = [ + BusinessException::class, + ]; + + public function report(Throwable $exception) + { + Log::error("捕获到全局异常，异常信息: ".$exception->getMessage()); + Log::error($exception->getTraceAsString()); + parent::report($exception); + } + + public function render(Request $request, Throwable $exception): Response + { + return json( [ + 'code' => -1, + 'message' => $exception->getMessage(), + 'time' => time(), + 'data' => [], + ]); + + } + +} \ No newline at end of file From a677d253daa2aa0629dbef5833df0c1c0bd04c2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Fri, 15 Aug 2025 17:47:00 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=85=BC=E5=AE=B9=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- support/MyExceptionHandle.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/support/MyExceptionHandle.php b/support/MyExceptionHandle.php index f56f8ef..3614a2b 100644 --- a/support/MyExceptionHandle.php +++ b/support/MyExceptionHandle.php @@ -14,6 +14,7 @@ namespace support; +use app\exception\MyBusinessException; use app\exception\SysException; use Throwable; use Webman\Exception\ExceptionHandler; @@ -34,13 +35,15 @@ class MyExceptionHandle extends ExceptionHandler implements ExceptionHandlerInte public function report(Throwable $exception) { - Log::error("捕获到全局异常，异常信息: ".$exception->getMessage()); - Log::error($exception->getTraceAsString()); parent::report($exception); } public function render(Request $request, Throwable $exception): Response { + if (!($exception instanceof MyBusinessException)) { + Log::error("捕获到全局异常，异常信息: ".$exception->getMessage()); + Log::error($exception->getTraceAsString()); + } return json( [ 'code' => -1, 'message' => $exception->getMessage(), From 0dfe8f743df2637ac2c91fc420ad8b6dd842e1d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Fri, 15 Aug 2025 17:51:23 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=85=BC=E5=AE=B9=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- support/MyExceptionHandle.php | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/support/MyExceptionHandle.php b/support/MyExceptionHandle.php index 3614a2b..5157565 100644 --- a/support/MyExceptionHandle.php +++ b/support/MyExceptionHandle.php @@ -41,15 +41,20 @@ class MyExceptionHandle extends ExceptionHandler implements ExceptionHandlerInte public function render(Request $request, Throwable $exception): Response { if (!($exception instanceof MyBusinessException)) { - Log::error("捕获到全局异常，异常信息: ".$exception->getMessage()); + Log::error("捕获到全局异常，异常类,".$exception::class." 异常信息: ".$exception->getMessage()); Log::error($exception->getTraceAsString()); + return json( [ + 'code' => -1, + 'message' => $exception->getMessage(), + 'time' => time(), + 'data' => [], + ]); } - return json( [ - 'code' => -1, - 'message' => $exception->getMessage(), - 'time' => time(), - 'data' => [], - ]); + + // 非json请求则返回一个页面 + return new Response(200, [], $exception->getMessage()); + + }