From c882583d57d45ddee23fb8d3e12fe2928bc07ccf Mon Sep 17 00:00:00 2001 From: hellcat <> Date: Tue, 30 Dec 2025 18:57:14 +0800 Subject: [PATCH] no message --- src/Controllers/Admin/TicketController.php | 4 +- src/Controllers/AuthController.php | 2 +- src/Models/LoginIp.php | 2 +- src/Models/SubscribeLog.php | 2 +- src/Services/Cron.php | 92 +++++++++++----------- src/Services/Cron/Cron_meiyong.php | 42 +++++----- src/Services/Detect.php | 72 ++++++++--------- src/Services/Password.php | 2 +- 8 files changed, 109 insertions(+), 109 deletions(-) diff --git a/src/Controllers/Admin/TicketController.php b/src/Controllers/Admin/TicketController.php index 37bf3d052..940a33cda 100755 --- a/src/Controllers/Admin/TicketController.php +++ b/src/Controllers/Admin/TicketController.php @@ -96,7 +96,7 @@ final class TicketController extends BaseController Notification::notifyUser( $user, - $_ENV['appName'] . '-工单被回复', + $_ENV['appName'] . ' - 工单被回复', '你好,有人回复了工单

回复内容:'.$comment ); @@ -144,7 +144,7 @@ final class TicketController extends BaseController Notification::notifyUser( $user, - $_ENV['appName'] . '-工单被回复', + $_ENV['appName'] . ' - 工单被回复', '你好,AI 回复了工单,请你查看。' ); diff --git a/src/Controllers/AuthController.php b/src/Controllers/AuthController.php index 5c2cf9f99..a2903c159 100755 --- a/src/Controllers/AuthController.php +++ b/src/Controllers/AuthController.php @@ -207,7 +207,7 @@ final class AuthController extends BaseController try { Mail::send( $email, - $_ENV['appName'] . '- 验证邮件', + $_ENV['appName'] . ' - 验证邮件', 'verify_code.tpl', [ 'code' => $email_code, diff --git a/src/Models/LoginIp.php b/src/Models/LoginIp.php index f3b70ad25..63dea5c73 100755 --- a/src/Models/LoginIp.php +++ b/src/Models/LoginIp.php @@ -64,7 +64,7 @@ final class LoginIp extends Model try { Notification::notifyUser( (new User())->where('id', $user_id)->first(), - $_ENV['appName'] . '-新登录通知', + $_ENV['appName'] . ' - 新登录通知', '你的账号于 ' . date('Y-m-d H:i:s') . ' 通过 ' . $this->ip . ' 地址登录了用户面板', ); } catch (GuzzleException|ClientExceptionInterface|TelegramSDKException $e) { diff --git a/src/Models/SubscribeLog.php b/src/Models/SubscribeLog.php index 69e701826..80a72d1c5 100755 --- a/src/Models/SubscribeLog.php +++ b/src/Models/SubscribeLog.php @@ -67,7 +67,7 @@ final class SubscribeLog extends Model try { Notification::notifyUser( $user, - $_ENV['appName'] . '-新订阅通知', + $_ENV['appName'] . ' - 新订阅通知', '你的账号于 ' . date('Y-m-d H:i:s') . ' 通过 ' . $this->request_ip . ' 地址订阅了新的节点', ); } catch (GuzzleException|ClientExceptionInterface|TelegramSDKException $e) { diff --git a/src/Services/Cron.php b/src/Services/Cron.php index 265e338ab..f34600d74 100755 --- a/src/Services/Cron.php +++ b/src/Services/Cron.php @@ -408,28 +408,28 @@ final class Cron if ($node->getNodeOnlineStatus() === -1 && $node->online === 1) { echo 'Send Node Offline Email to admin users' . PHP_EOL; - try { - Notification::notifyAdmin( - $_ENV['appName'] . '-系统警告', - '管理员你好,系统发现节点 ' . $node->name . ' 掉线了,请你及时处理。' - ); - } catch (GuzzleException|ClientExceptionInterface|TelegramSDKException $e) { - echo $e->getMessage() . PHP_EOL; - } - - if (Config::obtain('telegram_node_offline')) { - $notice_text = str_replace( - '%node_name%', - $node->name, - Config::obtain('telegram_node_offline_text') - ); - - try { - (new Telegram())->send(0, $notice_text); - } catch (TelegramSDKException $e) { - echo $e->getMessage(); - } - } +// try { +// Notification::notifyAdmin( +// $_ENV['appName'] . '-系统警告', +// '管理员你好,系统发现节点 ' . $node->name . ' 掉线了,请你及时处理。' +// ); +// } catch (GuzzleException|ClientExceptionInterface|TelegramSDKException $e) { +// echo $e->getMessage() . PHP_EOL; +// } +// +// if (Config::obtain('telegram_node_offline')) { +// $notice_text = str_replace( +// '%node_name%', +// $node->name, +// Config::obtain('telegram_node_offline_text') +// ); +// +// try { +// (new Telegram())->send(0, $notice_text); +// } catch (TelegramSDKException $e) { +// echo $e->getMessage(); +// } +// } $node->online = 0; $node->save(); @@ -440,28 +440,28 @@ final class Cron if ($node->getNodeOnlineStatus() === 1 && $node->online === 0) { echo 'Send Node Online Email to admin user' . PHP_EOL; - try { - Notification::notifyAdmin( - $_ENV['appName'] . '-系统提示', - '管理员你好,系统发现节点 ' . $node->name . ' 恢复上线了。' - ); - } catch (GuzzleException|ClientExceptionInterface|TelegramSDKException $e) { - echo $e->getMessage() . PHP_EOL; - } +// try { +// Notification::notifyAdmin( +// $_ENV['appName'] . '-系统提示', +// '管理员你好,系统发现节点 ' . $node->name . ' 恢复上线了。' +// ); +// } catch (GuzzleException|ClientExceptionInterface|TelegramSDKException $e) { +// echo $e->getMessage() . PHP_EOL; +// } - if (Config::obtain('telegram_node_online')) { - $notice_text = str_replace( - '%node_name%', - $node->name, - Config::obtain('telegram_node_online_text') - ); - - try { - (new Telegram())->send(0, $notice_text); - } catch (TelegramSDKException $e) { - echo $e->getMessage(); - } - } +// if (Config::obtain('telegram_node_online')) { +// $notice_text = str_replace( +// '%node_name%', +// $node->name, +// Config::obtain('telegram_node_online_text') +// ); +// +// try { +// (new Telegram())->send(0, $notice_text); +// } catch (TelegramSDKException $e) { +// echo $e->getMessage(); +// } +// } $node->online = 1; $node->save(); @@ -519,7 +519,7 @@ final class Cron // 这里返水的话,等于是直接覆盖的用户不返水,自然过期的用户返水,这到合理,自然过期的才是好用户 try { - Notification::notifyUser($user, $_ENV['appName'] . '-您的套餐已经过期', $text); + Notification::notifyUser($user, $_ENV['appName'] . ' - 您的套餐已经过期', $text); } catch (GuzzleException|ClientExceptionInterface|TelegramSDKException $e) { echo $e->getMessage() . PHP_EOL; } @@ -1367,7 +1367,7 @@ final class Cron $oUser->class_expire = $iToExpire; $oUser->save(); - Notification::notifyUser($oUser, $_ENV['appName'] . '-您的套餐已经过期', $text); + Notification::notifyUser($oUser, $_ENV['appName'] . ' - 您的套餐已经过期', $text); // try { // Notification::notifyUser($oUser, $_ENV['appName'] . '-您的套餐已经过期', $text); @@ -1917,7 +1917,7 @@ final class Cron try { Notification::notifyUser( $user, - $_ENV['appName'] . '-你的剩余流量过低', + $_ENV['appName'] . ' - 你的剩余流量过低', '你好,系统发现你剩余流量已经低于 ' . $_ENV['notify_limit_value'] . $unit_text . ' 。', ); diff --git a/src/Services/Cron/Cron_meiyong.php b/src/Services/Cron/Cron_meiyong.php index 9609a7665..750f2c877 100755 --- a/src/Services/Cron/Cron_meiyong.php +++ b/src/Services/Cron/Cron_meiyong.php @@ -324,28 +324,28 @@ final class Cron if ($node->getNodeOnlineStatus() === 1 && $node->online === 0) { echo 'Send Node Online Email to admin user' . PHP_EOL; - try { - Notification::notifyAdmin( - $_ENV['appName'] . '-系统提示', - '管理员你好,系统发现节点 ' . $node->name . ' 恢复上线了。' - ); - } catch (GuzzleException|ClientExceptionInterface|TelegramSDKException $e) { - echo $e->getMessage() . PHP_EOL; - } +// try { +// Notification::notifyAdmin( +// $_ENV['appName'] . ' - 系统提示', +// '管理员你好,系统发现节点 ' . $node->name . ' 恢复上线了。' +// ); +// } catch (GuzzleException|ClientExceptionInterface|TelegramSDKException $e) { +// echo $e->getMessage() . PHP_EOL; +// } - if (Config::obtain('telegram_node_online')) { - $notice_text = str_replace( - '%node_name%', - $node->name, - Config::obtain('telegram_node_online_text') - ); - - try { - (new Telegram())->send(0, $notice_text); - } catch (TelegramSDKException $e) { - echo $e->getMessage(); - } - } +// if (Config::obtain('telegram_node_online')) { +// $notice_text = str_replace( +// '%node_name%', +// $node->name, +// Config::obtain('telegram_node_online_text') +// ); +// +// try { +// (new Telegram())->send(0, $notice_text); +// } catch (TelegramSDKException $e) { +// echo $e->getMessage(); +// } +// } $node->online = 1; $node->save(); diff --git a/src/Services/Detect.php b/src/Services/Detect.php index 161095383..53bc33877 100755 --- a/src/Services/Detect.php +++ b/src/Services/Detect.php @@ -51,24 +51,24 @@ final class Detect echo '检测到节点 #' . $node->id . ' 被 GFW 封锁' . PHP_EOL; echo 'Send gfw mail to admin' . PHP_EOL; - try { - Notification::notifyAdmin( - $_ENV['appName'] . '-系统警告', - '管理员你好,系统发现节点 ' . $node->name . ' 被墙了。' - ); - } catch (GuzzleException|ClientExceptionInterface|TelegramSDKException $e) { - echo $e->getMessage() . PHP_EOL; - } - - if (Config::obtain('telegram_node_gfwed')) { - $notice_text = str_replace( - '%node_name%', - $node->name, - Config::obtain('telegram_node_gfwed_text') - ); - - (new Telegram())->send(0, $notice_text); - } +// try { +// Notification::notifyAdmin( +// $_ENV['appName'] . '-系统警告', +// '管理员你好,系统发现节点 ' . $node->name . ' 被墙了。' +// ); +// } catch (GuzzleException|ClientExceptionInterface|TelegramSDKException $e) { +// echo $e->getMessage() . PHP_EOL; +// } +// +// if (Config::obtain('telegram_node_gfwed')) { +// $notice_text = str_replace( +// '%node_name%', +// $node->name, +// Config::obtain('telegram_node_gfwed_text') +// ); +// +// (new Telegram())->send(0, $notice_text); +// } $node->gfw_block = true; $node->save(); @@ -80,24 +80,24 @@ final class Detect echo '检测到节点 #' . $node->id . ' 被 GFW 解除封锁' . PHP_EOL; echo 'Send gfw mail to admin' . PHP_EOL; - try { - Notification::notifyAdmin( - $_ENV['appName'] . '-系统提示', - '管理员你好,系统发现节点 ' . $node->name . ' 溜出墙了。' - ); - } catch (GuzzleException|ClientExceptionInterface|TelegramSDKException $e) { - echo $e->getMessage() . PHP_EOL; - } - - if (Config::obtain('telegram_node_ungfwed')) { - $notice_text = str_replace( - '%node_name%', - $node->name, - Config::obtain('telegram_node_ungfwed_text') - ); - - (new Telegram())->send(0, $notice_text); - } +// try { +// Notification::notifyAdmin( +// $_ENV['appName'] . '-系统提示', +// '管理员你好,系统发现节点 ' . $node->name . ' 溜出墙了。' +// ); +// } catch (GuzzleException|ClientExceptionInterface|TelegramSDKException $e) { +// echo $e->getMessage() . PHP_EOL; +// } +// +// if (Config::obtain('telegram_node_ungfwed')) { +// $notice_text = str_replace( +// '%node_name%', +// $node->name, +// Config::obtain('telegram_node_ungfwed_text') +// ); +// +// (new Telegram())->send(0, $notice_text); +// } $node->gfw_block = false; $node->save(); diff --git a/src/Services/Password.php b/src/Services/Password.php index df2f01bee..b6895f359 100755 --- a/src/Services/Password.php +++ b/src/Services/Password.php @@ -22,7 +22,7 @@ final class Password $redis->setex('password_reset:' . $token, Config::obtain('email_password_reset_ttl'), $email); - $subject = $_ENV['appName'] . '-重置密码'; + $subject = $_ENV['appName'] . ' - 重置密码'; $resetUrl = $_ENV['baseUrl'] . '/password/token/' . $token; Mail::send(