From c0f23e8f867c89bc6fed3e80129cd47c779253bd Mon Sep 17 00:00:00 2001 From: hellcat <> Date: Sat, 19 Apr 2025 20:33:22 +0800 Subject: [PATCH] no message --- public/tests/hook.php | 4 ++-- src/Services/Tg/Hook/Mod/Visitor.php | 15 ++++++++++++++- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/public/tests/hook.php b/public/tests/hook.php index a056a81c..01b022af 100644 --- a/public/tests/hook.php +++ b/public/tests/hook.php @@ -65,8 +65,8 @@ $oHttp->aData['message']['text'] = '\/user#find 1'; $oHttp->aData['message']['text'] = '\/cmd#list'; $oHttp->aData['message']['text'] = '\/visitor#all'; -$oHttp->aData['message']['text'] = '\/user#report__day'; -$oHttp->aData['message']['text'] = '\/user#countReg__date__2021-03-28__2028-03-28'; +//$oHttp->aData['message']['text'] = '\/user#report__day'; +//$oHttp->aData['message']['text'] = '\/user#countReg__date__2021-03-28__2028-03-28'; //{ // "update_id": 761180998, diff --git a/src/Services/Tg/Hook/Mod/Visitor.php b/src/Services/Tg/Hook/Mod/Visitor.php index 234e284c..39560c18 100644 --- a/src/Services/Tg/Hook/Mod/Visitor.php +++ b/src/Services/Tg/Hook/Mod/Visitor.php @@ -14,11 +14,24 @@ final class Visitor { $aVisitors = ModelVisitor::select('from', DB::raw('count(*) as total')) ->groupBy('from') + ->orderBy('total', 'desc') // 按 total 降序排序 ->get() ->toArray(); - return json_encode($aVisitors, JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT); + $sPre = "\n\n---------------------------"; + $sMsg = ''; + $iTotalCount = 0; + foreach ($aVisitors as $row) { + $sMsg .= "\n\n" . $row['from'] . ":" . $row['total']; + $iTotalCount += $row['total'] ?? 0; + } + + $sTotal = "\n\n总数:".$row['total']; + + $str = $sPre.$sTotal.$sMsg.$sPre; + + return $str; } }