兔姬桑 пре 4 година
родитељ
комит
60ba5db997

+ 1 - 1
app/Channels/BarkChannel.php

@@ -33,7 +33,7 @@ class BarkChannel
             return false;
         }
         // 发送错误
-        Log::error('Bark消息推送异常:'.var_export($response, true));
+        Log::critical('Bark消息推送异常:'.var_export($response, true));
 
         return false;
     }

+ 1 - 1
app/Channels/PushBearChannel.php

@@ -31,7 +31,7 @@ class PushBearChannel
             return false;
         }
         // 发送错误
-        Log::error('Bark消息推送异常:'.var_export($response, true));
+        Log::critical('PushBear消息推送异常:'.var_export($response, true));
 
         return false;
     }

+ 4 - 3
app/Channels/PushPlusChannel.php

@@ -4,6 +4,7 @@ namespace App\Channels;
 
 use Helpers;
 use Http;
+use Illuminate\Mail\Markdown;
 use Illuminate\Notifications\Notification;
 use Log;
 
@@ -16,8 +17,8 @@ class PushPlusChannel
         $response = Http::timeout(15)->post('https://www.pushplus.plus/send', [
             'token'    => sysConfig('pushplus_token'),
             'title'    => $message['title'],
-            'content'  => $message['content'],
-            'template' => 'markdown',
+            'content'  => Markdown::parse($message['content'])->toHtml(),
+            'template' => 'html',
         ]);
 
         // 发送成功
@@ -34,7 +35,7 @@ class PushPlusChannel
             return false;
         }
         // 发送错误
-        Log::error('PushPlus消息推送异常:'.var_export($response, true));
+        Log::critical('PushPlus消息推送异常:'.var_export($response, true));
 
         return false;
     }

+ 2 - 2
app/Channels/ServerChanChannel.php

@@ -26,7 +26,7 @@ class ServerChanChannel
             $response = Http::timeout(15)
                 ->get('https://sctapi.ftqq.com/'.sysConfig('server_chan_key').'.send?title='.$message['title'].'&desp='.urlencode($message['content']));
         } else {
-            Log::error('ServerChan消息推送异常:今日500条限额已耗尽!');
+            Log::critical('ServerChan消息推送异常:今日500条限额已耗尽!');
 
             return false;
         }
@@ -45,7 +45,7 @@ class ServerChanChannel
             return false;
         }
         // 发送错误
-        Log::error('ServerChan消息推送异常:'.var_export($response, true));
+        Log::critical('ServerChan消息推送异常:'.var_export($response, true));
 
         return false;
     }

+ 2 - 2
app/Channels/TgChatChannel.php

@@ -13,7 +13,7 @@ class TgChatChannel
     {
         $message = $notification->toCustom($notifiable);
 
-        $response = Http::timeout(15)->get('https://tgbot-red.vercel.app/api?token='.sysConfig('tg_chat_token').'&message='.$message['content']);
+        $response = Http::timeout(15)->get('https://tgbot-red.vercel.app/api?token='.sysConfig('tg_chat_token').'&message='.$message['title'].PHP_EOL.'=========='.PHP_EOL.$message['content']);
 
         // 发送成功
         if ($response->ok()) {
@@ -29,7 +29,7 @@ class TgChatChannel
             return false;
         }
         // 发送错误
-        Log::error('TG酱消息推送异常:'.var_export($response, true));
+        Log::critical('TG酱消息推送异常:'.var_export($response, true));
 
         return false;
     }

+ 2 - 2
app/Channels/WeChatChannel.php

@@ -22,7 +22,7 @@ class WeChatChannel
             if ($response->ok() && isset($response->json()['access_token'])) {
                 Cache::put('wechat_access_token', $response->json()['access_token'], 7200); // 2小时
             } else {
-                Log::error('Wechat消息推送异常:获取access_token失败!'.PHP_EOL.'携带访问参数:'.$response->body());
+                Log::critical('Wechat消息推送异常:获取access_token失败!'.PHP_EOL.'携带访问参数:'.$response->body());
                 abort(400);
             }
         }
@@ -55,7 +55,7 @@ class WeChatChannel
             return false;
         }
         // 发送错误
-        Log::error('Wechat消息推送异常:'.var_export($response, true));
+        Log::critical('Wechat消息推送异常:'.var_export($response, true));
 
         return false;
     }

+ 3 - 3
app/Components/DDNS.php

@@ -22,9 +22,9 @@ class DDNS
     public static function destroy(string $domain, $type = null)
     {
         if (self::dnsProvider($domain)->destroy($type)) {
-            Log::info("【DDNS】删除:{$domain} 成功");
+            Log::notice("【DDNS】删除:{$domain} 成功");
         } else {
-            Log::info("【DDNS】删除:{$domain} 失败,请手动删除!");
+            Log::alert("【DDNS】删除:{$domain} 失败,请手动删除!");
         }
     }
 
@@ -40,7 +40,7 @@ class DDNS
             case 'cloudflare':
                 return new CloudFlare($domain);
             default:
-                Log::error('【DDNS】未知渠道:'.sysConfig('ddns_mode'));
+                Log::emergency('【DDNS】未知渠道:'.sysConfig('ddns_mode'));
 
                 return false;
         }

+ 1 - 1
app/Components/IP.php

@@ -19,7 +19,7 @@ class IP
     {
         // IPv6 推荐使用ip.sb
         if (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
-            Log::info('识别到IPv6,尝试解析:'.$ip);
+            Log::notice('识别到IPv6,尝试解析:'.$ip);
             $ipInfo = self::IPSB($ip);
         } else {
             $ipInfo = self::ip2Region($ip);

+ 1 - 1
app/Console/Commands/AutoClearLogs.php

@@ -88,7 +88,7 @@ class AutoClearLogs extends Command
             // 清除用户流量日志
             UserDataFlowLog::where('log_time', '<=', strtotime(config('tasks.clean.traffic_logs')))->delete();
         } catch (Exception $e) {
-            Log::error('【清理日志】错误: '.$e->getMessage());
+            Log::emergency('【清理日志】错误: '.$e->getMessage());
         }
     }
 }

+ 2 - 2
app/Console/Commands/DailyJob.php

@@ -115,9 +115,9 @@ class DailyJob extends Command
                     if ($user->update((new OrderService($order))->resetTimeAndData($user->expired_at))) {
                         // 可用流量变动日志
                         Helpers::addUserTrafficModifyLog($order->user_id, $order->id, $oldData, $user->transfer_enable, '【流量重置】重置可用流量');
-                        Log::info('用户[ID:'.$user->id.'  昵称: '.$user->nickname.'  邮箱: '.$user->username.'] 流量重置为 '.flowAutoShow($user->transfer_enable).'. 重置日期为 '.($user->reset_time ?: '【无】'));
+                        Log::notice('用户[ID:'.$user->id.'  昵称: '.$user->nickname.'  邮箱: '.$user->username.'] 流量重置为 '.flowAutoShow($user->transfer_enable).'. 重置日期为 '.($user->reset_time ?: '【无】'));
                     } else {
-                        Log::warning('用户[ID:'.$user->id.'  昵称: '.$user->nickname.'  邮箱: '.$user->username.'] 流量重置失败');
+                        Log::alert('用户[ID:'.$user->id.'  昵称: '.$user->nickname.'  邮箱: '.$user->username.'] 流量重置失败');
                     }
                 }
             });

+ 6 - 8
app/Exceptions/Handler.php

@@ -49,13 +49,11 @@ class Handler extends ExceptionHandler
      */
     public function report(Throwable $exception)
     {
-        // 记录异常来源
-        Log::info('异常来源:'.get_class($exception));
-
-        // 调试模式下记录错误详情
-        if (config('app.debug') || config('app.demo')) {
+        if (config('app.debug') || config('app.demo')) { // 调试模式下记录错误详情
             Log::debug('来自链接:'.url()->full());
             Log::debug($exception);
+        } else {
+            Log::error('异常来源:'.get_class($exception)); // 记录异常来源
         }
 
         parent::report($exception);
@@ -76,7 +74,7 @@ class Handler extends ExceptionHandler
         if (! config('app.debug')) {
             switch ($exception) {
                 case $exception instanceof NotFoundHttpException: // 捕获访问异常
-                    Log::info('异常请求:'.$request->fullUrl().',IP:'.IP::getClientIp());
+                    Log::warning('异常请求:'.$request->fullUrl().',IP:'.IP::getClientIp());
 
                     if ($request->ajax() || $request->wantsJson()) {
                         return Response::json(['status' => 'fail', 'message' => trans('error.missing_page')], 404);
@@ -92,7 +90,7 @@ class Handler extends ExceptionHandler
                 case $exception instanceof TokenMismatchException: // 捕获CSRF异常
                     if ($request->ajax() || $request->wantsJson()) {
                         return Response::json([
-                            'status' => 'fail',
+                            'status'  => 'fail',
                             'message' => trans('error.refresh_page').'<a href="'.route('login').'" target="_blank">'.trans('error.refresh').'</a>',
                         ], 419);
                     }
@@ -111,7 +109,7 @@ class Handler extends ExceptionHandler
                 case $exception instanceof ErrorException: // 捕获系统错误异常
                     if ($request->ajax() || $request->wantsJson()) {
                         return Response::json([
-                            'status' => 'fail',
+                            'status'  => 'fail',
                             'message' => trans('error.system').', '.trans('error.visit').'<a href="'.route('admin.log.viewer').'" target="_blank">'.trans('error.log').'</a>',
                         ], 500);
                     }

+ 24 - 24
app/Http/Controllers/Gateway/BitpayX.php

@@ -14,15 +14,15 @@ class BitpayX extends AbstractPayment
         $payment = $this->creatNewPayment(Auth::id(), $request->input('id'), $request->input('amount'));
 
         $data = [
-            'merchant_order_id'  => $payment->trade_no,
-            'price_amount'       => (float) $payment->amount,
-            'price_currency'     => 'CNY',
-            'title'              => '支付单号:'.$payment->trade_no,
-            'description'        => sysConfig('subject_name') ?: sysConfig('website_name'),
-            'callback_url'       => route('payment.notify', ['method' => 'bitpayx']),
-            'success_url'        => route('invoice'),
-            'cancel_url'         => route('invoice'),
-            'token'              => $this->sign($this->prepareSignId($payment->trade_no)),
+            'merchant_order_id' => $payment->trade_no,
+            'price_amount'      => (float) $payment->amount,
+            'price_currency'    => 'CNY',
+            'title'             => '支付单号:'.$payment->trade_no,
+            'description'       => sysConfig('subject_name') ?: sysConfig('website_name'),
+            'callback_url'      => route('payment.notify', ['method' => 'bitpayx']),
+            'success_url'       => route('invoice'),
+            'cancel_url'        => route('invoice'),
+            'token'             => $this->sign($this->prepareSignId($payment->trade_no)),
         ];
         if ($request->input('type') == 1) {
             $data['pay_currency'] = 'ALIPAY';
@@ -38,9 +38,14 @@ class BitpayX extends AbstractPayment
             return Response::json(['status' => 'success', 'url' => $result['payment_url'], 'message' => '创建订单成功!']);
         }
 
-        Log::warning('创建订单错误:'.var_export($result, true));
+        Log::alert('【BitpayX】创建订单错误:'.var_export($result, true));
 
-        return Response::json(['status' => 'fail', 'message' => '创建订单失败!'.$result['error']]);
+        return Response::json(['status' => 'fail', 'message' => '创建订单失败! 请联系管理员']);
+    }
+
+    private function sign($data)
+    {
+        return strtolower(md5(md5($data).sysConfig('bitpay_secret')));
     }
 
     private function prepareSignId($tradeNo): string
@@ -55,11 +60,6 @@ class BitpayX extends AbstractPayment
         return http_build_query($data);
     }
 
-    private function sign($data)
-    {
-        return strtolower(md5(md5($data).sysConfig('bitpay_secret')));
-    }
-
     private function sendRequest($data, $type = 'createOrder')
     {
         $bitpayGatewayUri = 'https://api.mugglepay.com/v1/';
@@ -86,13 +86,6 @@ class BitpayX extends AbstractPayment
         return json_decode($result, true);
     }
 
-    private function verify_bit($data, $signature)
-    {
-        $mySign = $this->sign($data);
-
-        return $mySign === $signature;
-    }
-
     public function notify($request): void
     {
         $tradeNo = $request->input(['merchant_order_id']);
@@ -103,8 +96,15 @@ class BitpayX extends AbstractPayment
                 exit(json_encode(['status' => 200]));
             }
         } else {
-            Log::info('BitpayX:交易失败');
+            Log::error('【BitpayX】交易失败:'.var_export($request->all(), true));
         }
         exit(json_encode(['status' => 400]));
     }
+
+    private function verify_bit($data, $signature)
+    {
+        $mySign = $this->sign($data);
+
+        return $mySign === $signature;
+    }
 }

+ 3 - 1
app/Http/Controllers/Gateway/CodePay.php

@@ -39,8 +39,10 @@ class CodePay extends AbstractPayment
             if ($this->paymentReceived($tradeNo)) {
                 exit('success');
             }
+
+            Log::error('【码支付】验签失败:'.var_export($request->all(), true));
         } else {
-            Log::error('码支付:交易失败');
+            Log::error('【码支付】交易失败:'.var_export($request->all(), true));
         }
         exit('fail');
     }

+ 4 - 1
app/Http/Controllers/Gateway/EPay.php

@@ -40,9 +40,12 @@ class EPay extends AbstractPayment
             if ($this->paymentReceived($request->input('out_trade_no'))) {
                 exit('SUCCESS');
             }
+
+            Log::error('【易支付】验签失败:'.var_export($request->all(), true));
         } else {
-            Log::error('易支付:交易失败');
+            Log::error('【易支付】交易失败:'.var_export($request->all(), true));
         }
+
         exit('FAIL');
     }
 

+ 10 - 10
app/Http/Controllers/Gateway/F2Fpay.php

@@ -45,13 +45,13 @@ class F2Fpay extends AbstractPayment
         try {
             $result = (new Client(Client::ALIPAY, self::$aliConfig))->pay(Client::ALI_CHANNEL_QR, $data);
         } catch (InvalidArgumentException $e) {
-            Log::error('【支付宝当面付】输入信息错误: '.$e->getMessage());
+            Log::alert('【支付宝当面付】输入信息错误:'.$e->getMessage());
             exit;
         } catch (ClassNotFoundException $e) {
-            Log::error('【支付宝当面付】未知类型: '.$e->getMessage());
+            Log::alert('【支付宝当面付】未知类型:'.$e->getMessage());
             exit;
         } catch (Exception $e) {
-            Log::error('【支付宝当面付】错误: '.$e->getMessage());
+            Log::alert('【支付宝当面付】错误:'.$e->getMessage());
             exit;
         }
 
@@ -69,28 +69,28 @@ class F2Fpay extends AbstractPayment
 
         try {
             $result = (new Client(Client::ALIPAY, self::$aliConfig))->tradeQuery($data);
-            Log::info('【支付宝当面付】回调验证查询:'.var_export($result, true));
+            Log::notice('【支付宝当面付】回调验证查询:'.var_export($result, true));
         } catch (InvalidArgumentException $e) {
-            Log::error('【支付宝当面付】回调信息错误: '.$e->getMessage());
+            Log::alert('【支付宝当面付】回调信息错误: '.$e->getMessage());
             exit;
         } catch (ClassNotFoundException $e) {
-            Log::error('【支付宝当面付】未知类型: '.$e->getMessage());
+            Log::alert('【支付宝当面付】未知类型: '.$e->getMessage());
             exit;
         } catch (Exception $e) {
-            Log::error('【支付宝当面付】错误: '.$e->getMessage());
+            Log::alert('【支付宝当面付】错误: '.$e->getMessage());
             exit;
         }
 
         if ($result['code'] == 10000 && $result['msg'] === 'Success') {
-            if (($_POST['trade_status'] === 'TRADE_FINISHED' || $_POST['trade_status'] === 'TRADE_SUCCESS') && $request->has('out_trade_no')) {
+            if ($request->has('out_trade_no') && in_array($request->input('trade_status'), ['TRADE_FINISHED', 'TRADE_SUCCESS'])) {
                 if ($this->paymentReceived($request->input('out_trade_no'))) {
                     exit('success');
                 }
             } else {
-                Log::info('支付宝当面付-POST:交易失败');
+                Log::error('【支付宝当面付】交易失败:'.var_export($request->all(), true));
             }
         } else {
-            Log::info('支付宝当面付-POST:验证失败');
+            Log::error('【支付宝当面付】验证失败:'.var_export($result, true));
         }
 
         // 返回验证结果

+ 5 - 5
app/Http/Controllers/Gateway/PayBeaver.php

@@ -38,13 +38,13 @@ class PayBeaver extends AbstractPayment
         ]);
 
         if (isset($result['message'])) {
-            Log::warning('创建订单错误:'.$result['message']);
+            Log::alert('【海狸支付】创建订单错误:'.$result['message']);
 
             return Response::json(['status' => 'fail', 'message' => '创建订单失败:'.$result['message']]);
         }
 
         if (! isset($result['data']['pay_url'])) {
-            Log::warning('创建订单错误:未知错误');
+            Log::alert('【海狸支付】创建订单错误:未获取到支付链接'.var_export($result, true));
 
             return Response::json(['status' => 'fail', 'message' => '创建订单失败:未知错误']);
         }
@@ -64,7 +64,7 @@ class PayBeaver extends AbstractPayment
             return $response->json();
         }
 
-        Log::error(var_export($response->json(), true));
+        Log::alert('【海狸支付】创建订单失败:'.var_export($response->json(), true));
 
         return ['status' => 'fail', 'message' => '获取失败!请检查配置信息'];
     }
@@ -74,7 +74,7 @@ class PayBeaver extends AbstractPayment
         if (isset($params['sign'])) {
             unset($params['sign']);
         }
-        ksort($params);
+        ksort($params, SORT_STRING);
         reset($params);
 
         return strtolower(md5(http_build_query($params).$this->appSecret));
@@ -90,7 +90,7 @@ class PayBeaver extends AbstractPayment
             exit(json_encode(['status' => 200]));
         }
 
-        Log::info('海狸支付:交易失败');
+        Log::error('【海狸支付】交易失败:'.var_export($request->all(), true));
 
         exit(json_encode(['status' => 500]));
     }

+ 1 - 1
app/Http/Controllers/Gateway/PayJs.php

@@ -47,7 +47,7 @@ class PayJs extends AbstractPayment
                 exit('success');
             }
         } else {
-            Log::info('PayJs:交易失败');
+            Log::error('【PayJs】交易失败:'.var_export($data, true));
         }
         exit('fail');
     }

+ 4 - 4
app/Http/Controllers/Gateway/PayPal.php

@@ -51,7 +51,7 @@ class PayPal extends AbstractPayment
         try {
             $response = $this->provider->setExpressCheckout($data);
             if (! $response['paypal_link']) {
-                Log::error('Paypal处理错误:'.var_export($response, true));
+                Log::error('Paypal处理错误:'.var_export($response, true));
 
                 return Response::json(['status' => 'fail', 'message' => '创建订单失败,请使用其他方式或通知管理员!']);
             }
@@ -101,10 +101,10 @@ class PayPal extends AbstractPayment
             $status = $payment_status['PAYMENTINFO_0_PAYMENTSTATUS'];
 
             if (! strcasecmp($status, 'Completed') || ! strcasecmp($status, 'Processed')) {
-                Log::info("Order $payment->order_id has been paid successfully!");
+                Log::notice("【Paypal】Order $payment->order_id has been paid successfully!");
                 $payment->order->paid();
             } else {
-                Log::warning("Error processing PayPal payment for Order $payment->id!");
+                Log::alert("【PayPal】Error processing PayPal payment for Order $payment->id!");
             }
         }
 
@@ -128,7 +128,7 @@ class PayPal extends AbstractPayment
                 exit('success');
             }
         } else {
-            Log::info('Paypal:交易失败');
+            Log::error('【Paypal】交易失败');
         }
         exit('fail');
     }

+ 1 - 1
app/Http/Controllers/Gateway/Stripe.php

@@ -89,7 +89,7 @@ class Stripe extends AbstractPayment
             exit();
         }
 
-        Log::info('Passed signature verification!');
+        Log::info('【Stripe】Passed signature verification!');
         switch ($event->type) {
             case 'checkout.session.completed':
 

+ 3 - 3
app/Http/Controllers/Gateway/THeadPay.php

@@ -29,12 +29,12 @@ class THeadPay extends AbstractPayment
                 $payment->update(['qr_code' => 1, 'url' => $result['code_url']]);
 
                 return Response::json(['status' => 'success', 'data' => $payment->trade_no, 'message' => '创建订单成功!']);
-            } else {
-                Log::error('【平头哥支付】 返回错误信息:'.$result['message']);
             }
+
+            Log::error('【平头哥支付】 返回错误信息:'.$result['message']);
         }
 
-        Log::error('【平头哥支付】 支付渠道建立订单出现问题');
+        Log::alert('【平头哥支付】 支付渠道建立订单出现问题!');
 
         return Response::json(['status' => 'fail', 'message' => '创建在线订单失败,请工单通知管理员!']);
     }

+ 3 - 3
app/Http/Controllers/PaymentController.php

@@ -32,7 +32,7 @@ class PaymentController extends Controller
     {
         self::$method = $request->query('method') ?: $request->input('method');
 
-        Log::info(self::$method.'回调接口[POST]:'.self::$method.var_export($request->all(), true));
+        Log::notice(self::$method.'回调接口:'.self::$method.var_export($request->all(), true));
         self::getClient()->notify($request);
     }
 
@@ -60,7 +60,7 @@ class PaymentController extends Controller
             case 'theadpay':
                 return new THeadPay();
             default:
-                Log::warning('未知支付:'.self::$method);
+                Log::emergency('未知支付:'.self::$method);
 
                 return false;
         }
@@ -188,7 +188,7 @@ class PaymentController extends Controller
             // 生成支付单
             return self::getClient()->purchase($request);
         } catch (Exception $e) {
-            Log::error('订单生成错误:'.$e->getMessage());
+            Log::emergency('订单生成错误:'.$e->getMessage());
         }
 
         return Response::json(['status' => 'fail', 'message' => '订单创建失败']);

+ 6 - 6
app/Http/Middleware/isForbidden.php

@@ -23,14 +23,14 @@ class isForbidden
     {
         // 拒绝机器人访问
         if (sysConfig('is_forbid_robot') && Agent::isRobot()) {
-            Log::info('识别到机器人访问('.IP::getClientIp().')');
+            Log::warning('识别到机器人访问('.IP::getClientIp().')');
 
             return Response::view('auth.error', ['message' => trans('error.forbidden.bots')], 403);
         }
 
         // 拒绝通过订阅链接域名访问网站,防止网站被探测
         if (config('app.env') === 'production' && sysConfig('website_url') && ! str_contains(sysConfig('website_url'), $request->getHost())) {
-            Log::info('识别到通过订阅链接访问,强制跳转至百度('.IP::getClientIp().')');
+            Log::warning('识别到通过订阅链接访问,强制跳转至百度('.IP::getClientIp().')');
 
             return redirect('https://www.baidu.com');
         }
@@ -48,27 +48,27 @@ class isForbidden
             switch (sysConfig('forbid_mode')) {
                 case 'ban_mainland':
                     if (in_array($ipLocation['country'], ['China', '中国']) && ! in_array($ipLocation['province'], ['香港', '澳门', '台湾', '台湾省'])) {
-                        Log::info('识别到大陆IP,拒绝访问:'.$ip);
+                        Log::warning('识别到大陆IP,拒绝访问:'.$ip);
 
                         return Response::view('auth.error', ['message' => trans('error.forbidden.china')], 403);
                     }
                     break;
                 case 'ban_china':
                     if (in_array($ipLocation['country'], ['China', '中国', 'Taiwan', 'Hong Kong', 'Macao'])) {
-                        Log::info('识别到中国IP,拒绝访问:'.$ip);
+                        Log::warning('识别到中国IP,拒绝访问:'.$ip);
 
                         return Response::view('auth.error', ['message' => trans('error.forbidden.china')], 403);
                     }
                     break;
                 case 'ban_oversea':
                     if (! in_array($ipLocation['country'], ['China', '中国', 'Taiwan', 'Hong Kong', 'Macao'])) {
-                        Log::info('识别到海外IP,拒绝访问:'.$ip.' - '.$ipLocation['country']);
+                        Log::warning('识别到海外IP,拒绝访问:'.$ip.' - '.$ipLocation['country']);
 
                         return Response::view('auth.error', ['message' => trans('error.forbidden.oversea')], 403);
                     }
                     break;
                 default:
-                    Log::warning('未知禁止访问模式!请在系统设置中修改【禁止访问模式】!');
+                    Log::emergency('未知禁止访问模式!请在系统设置中修改【禁止访问模式】!');
                     break;
             }
         }

+ 1 - 1
app/Http/Middleware/isSecurity.php

@@ -27,7 +27,7 @@ class isSecurity
 
         if ($websiteSecurityCode && ! Cache::has($cacheKey)) {
             if ($code !== $websiteSecurityCode) {
-                Log::info(trans('error.unsafe_enter').$ip);
+                Log::warning(trans('error.unsafe_enter').$ip);
 
                 return Response::view('auth.safe');
             }

+ 3 - 3
app/Jobs/VNet/addUser.php

@@ -56,9 +56,9 @@ class addUser implements ShouldQueue
         $message = $response->json();
         if ($message && Arr::has($message, ['success', 'content']) && $response->ok()) {
             if ($message['success'] === 'false') {
-                Log::warning('【新增用户】推送失败(推送地址:'.$host.',返回内容:'.$message['content'].')');
+                Log::alert('【新增用户】推送失败(推送地址:'.$host.',返回内容:'.$message['content'].')');
             } else {
-                Log::info('【新增用户】推送成功(推送地址:'.$host.',内容:'.json_encode($this->data, true).')');
+                Log::notice('【新增用户】推送成功(推送地址:'.$host.',内容:'.json_encode($this->data, true).')');
             }
         }
     }
@@ -66,6 +66,6 @@ class addUser implements ShouldQueue
     // 队列失败处理
     public function failed(Throwable $exception)
     {
-        Log::error('【新增用户】推送异常:'.$exception->getMessage());
+        Log::alert('【新增用户】推送异常:'.$exception->getMessage());
     }
 }

+ 3 - 3
app/Jobs/VNet/delUser.php

@@ -48,9 +48,9 @@ class delUser implements ShouldQueue
         $message = $response->json();
         if ($message && Arr::has($message, ['success', 'content']) && $response->ok()) {
             if ($message['success'] === 'false') {
-                Log::warning('【删除用户】推送失败(推送地址:'.$host.',返回内容:'.$message['content'].')');
+                Log::alert('【删除用户】推送失败(推送地址:'.$host.',返回内容:'.$message['content'].')');
             } else {
-                Log::info('【删除用户】推送成功(推送地址:'.$host.',内容:'.json_encode($this->userIds, true).')');
+                Log::notice('【删除用户】推送成功(推送地址:'.$host.',内容:'.json_encode($this->userIds, true).')');
             }
         }
     }
@@ -58,6 +58,6 @@ class delUser implements ShouldQueue
     // 队列失败处理
     public function failed(Throwable $exception)
     {
-        Log::error('【删除用户】推送异常:'.$exception->getMessage());
+        Log::alert('【删除用户】推送异常:'.$exception->getMessage());
     }
 }

+ 2 - 2
app/Jobs/VNet/reloadNode.php

@@ -73,7 +73,7 @@ class reloadNode implements ShouldQueue
                 return false;
             }
 
-            Log::info('【重载节点】成功:'.$host.' 反馈:'.$message['content']);
+            Log::notice('【重载节点】成功:'.$host.' 反馈:'.$message['content']);
 
             return true;
         }
@@ -85,6 +85,6 @@ class reloadNode implements ShouldQueue
     // 队列失败处理
     public function failed(Throwable $exception)
     {
-        Log::error('【重载节点】推送异常:'.$exception);
+        Log::error('【重载节点】推送异常:'.$exception->getMessage());
     }
 }

+ 1 - 1
app/Notifications/NodeBlocked.php

@@ -34,7 +34,7 @@ class NodeBlocked extends Notification implements ShouldQueue
 
     private function markdownMessage()
     {
-        $content = '| '.trans('user.attribute.node').' | IP | ICMP | TCP'." |\r\n| ------ | :------: | :------: |\r\n";
+        $content = '| '.trans('user.attribute.node').' | IP | ICMP | TCP'." |\r\n| :------ | :------: | :------: | :------: | \r\n";
         $tail = '';
         foreach ($this->data as $node) {
             $case = $node;

+ 1 - 1
app/Notifications/NodeDailyReport.php

@@ -33,7 +33,7 @@ class NodeDailyReport extends Notification implements ShouldQueue
 
     private function markdownMessage()
     {
-        $content = '| '.trans('user.attribute.node').' | '.trans('notification.node.upload').' | '.trans('notification.node.download').' | '.trans('notification.node.total')." |\r\n| ------ | :------: | :------: | ------: |\r\n";
+        $content = '| '.trans('user.attribute.node').' | '.trans('notification.node.upload').' | '.trans('notification.node.download').' | '.trans('notification.node.total')." |\r\n| :------ | :------: | :------: | ------: |\r\n";
         foreach ($this->data as $node) {
             $content .= "| {$node['name']} | {$node['upload']} | {$node['download']} | {$node['total']} |\r\n";
         }

+ 1 - 1
app/Observers/NodeObserver.php

@@ -19,7 +19,7 @@ class NodeObserver
     public function created(Node $node): void
     {
         if (! $node->auth()->create(['key' => Str::random(), 'secret' => Str::random(8)])) {
-            Log::warning('节点生成-自动生成授权时出现错误,请稍后自行生成授权!');
+            Log::error('节点生成-自动生成授权时出现错误,请稍后自行生成授权!');
         }
 
         if ($node->is_ddns === '0' && $node->server && sysConfig('ddns_mode')) {

+ 1 - 1
app/Services/OrderService.php

@@ -53,7 +53,7 @@ class OrderService
                 $this->setCommissionExpense(self::$user); // 返利
                 break;
             default:
-                Log::warning('【处理订单】出现错误-未知套餐类型');
+                Log::emergency('【处理订单】出现错误-未知套餐类型');
         }
 
         return true;