From f362601d18abfafe04be1406c1d6d9810022d839 Mon Sep 17 00:00:00 2001
From: hellcat <>
Date: Fri, 4 Apr 2025 15:43:30 +0800
Subject: [PATCH] no message

---
 src/Controllers/TomApi/Tg/HookController.php | 2 +-
 src/Services/Cron.php                        | 3 ++-
 src/Services/TomTool/TgSendFormat.php        | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/Controllers/TomApi/Tg/HookController.php b/src/Controllers/TomApi/Tg/HookController.php
index ddf31dd8..5b551077 100755
--- a/src/Controllers/TomApi/Tg/HookController.php
+++ b/src/Controllers/TomApi/Tg/HookController.php
@@ -207,7 +207,7 @@ final class HookController
             
             $r = @json_decode($oHttp->send(), true);
             
-            // 不论失败成功都清除step
+            // 不论失败成功都清除 step
             $oTgStep->clearByFromId($aUpdate["message"]["from"]["id"]);
             
             if ($r["ret"] == 1) {
diff --git a/src/Services/Cron.php b/src/Services/Cron.php
index 47d255c8..77431bac 100755
--- a/src/Services/Cron.php
+++ b/src/Services/Cron.php
@@ -700,7 +700,8 @@ final class Cron
                                $oDucksRow->today_width,
                                $oDucksRow->use_width,
                                $oDucksRow->max_width,
-                               $iWidthResetDay
+                               $iWidthResetDay,
+                               $oDucksRow->memo
                            );
             
         }
diff --git a/src/Services/TomTool/TgSendFormat.php b/src/Services/TomTool/TgSendFormat.php
index acfa5d2a..b26f927c 100755
--- a/src/Services/TomTool/TgSendFormat.php
+++ b/src/Services/TomTool/TgSendFormat.php
@@ -30,7 +30,7 @@ final class TgSendFormat
         
     }
     
-    public function rowAdd($sName, $iFlowToday, $iUseWidth, $iMaxWidth, $iLimitDay = false) {
+    public function rowAdd($sName, $iFlowToday, $iUseWidth, $iMaxWidth, $iLimitDay = false, $sMemo = false) {
         
         $iUseWidth = Tools::flowToGB($iUseWidth);
         $iMaxWidth = Tools::flowToGB($iMaxWidth);
@@ -49,7 +49,7 @@ final class TgSendFormat
         }
         
 //        $sFlowMix = $sFlowEmoji.' '.(100 - $sFlowRate)."%（".$iMaxWidth."g - ".$iUseWidth."g = ".$iMaxWidth - $iUseWidth."g）【 今：".$iFlowToday."g 】";
-        $sFlowMix = $sFlowEmoji.' '.(100 - $sFlowRate)."%";
+        $sFlowMix = $sFlowEmoji.'@'.$sMemo.' '.(100 - $sFlowRate)."%";
         
         $sFlowMix .= " [ ";