From 19bf8ee1d791168b36c5c363a05be368af0e8403 Mon Sep 17 00:00:00 2001
From: hellcat <>
Date: Thu, 3 Apr 2025 20:16:07 +0800
Subject: [PATCH] no message

---
 src/Controllers/TestController.php    | 2 +-
 src/Services/Cron.php                 | 6 ++----
 src/Services/TomTool/TgSendFormat.php | 7 ++++++-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/Controllers/TestController.php b/src/Controllers/TestController.php
index 8253ef53..bb786f94 100755
--- a/src/Controllers/TestController.php
+++ b/src/Controllers/TestController.php
@@ -31,7 +31,7 @@ final class TestController extends BaseController
         
         $jobs->mergeBandWidth();
         
-        $jobs->reportBandWidth();
+//        $jobs->reportBandWidth();
         
         exit;
     }
diff --git a/src/Services/Cron.php b/src/Services/Cron.php
index 251f7c79..47d255c8 100755
--- a/src/Services/Cron.php
+++ b/src/Services/Cron.php
@@ -589,7 +589,7 @@ final class Cron
     public static function mergeBandWidth(): void
     {
         
-        $oNodeAll = Node::all();
+        $oNodeAll = Node::where('type', 1)->get();
         
         $aZhuanfaFlowNow = [];
         $aDuckFlowNow = [];
@@ -600,9 +600,7 @@ final class Cron
             
             if ($oNodeRow->node_bandwidth <= 1242880) {
                 
-                $sMsg .= "🚨🚨🚨🚨🚨🚨🚨🚨\n\n";
-                
-                $sMsg .= '【'.$oNodeRow->name."】1小时消耗流量不足1mb，可能存在异常。\n";
+                $sMsg .= '🚨【'.$oNodeRow->name."】小时耗流不足1mb，可能有异常。\n";
                 
             }
             
diff --git a/src/Services/TomTool/TgSendFormat.php b/src/Services/TomTool/TgSendFormat.php
index 0116146f..c23422f7 100755
--- a/src/Services/TomTool/TgSendFormat.php
+++ b/src/Services/TomTool/TgSendFormat.php
@@ -48,7 +48,12 @@ final class TgSendFormat
             $sFlowEmoji = '🔋';
         }
         
-        $sFlowMix = $sFlowEmoji.' '.(100 - $sFlowRate)."%（".$iMaxWidth."g总 - ".$iUseWidth."g用 = ".$iMaxWidth - $iUseWidth."g余）【 今日：".$iFlowToday."g 】";
+//        $sFlowMix = $sFlowEmoji.' '.(100 - $sFlowRate)."%（".$iMaxWidth."g - ".$iUseWidth."g = ".$iMaxWidth - $iUseWidth."g）【 今：".$iFlowToday."g 】";
+        $sFlowMix = $sFlowEmoji.' '.(100 - $sFlowRate)."%";
+        
+        $sFlowMix .= "【 今：".$iFlowToday."g 】";
+        $sFlowMix .= "【 总：".$iMaxWidth."g】";
+        $sFlowMix .= "【 余：".$iMaxWidth - $iUseWidth."g】";
         
         if ($iLimitDay > 0) {
             $sFlowMix .= "【 离重置：".$iLimitDay." 天 】";