no message

app/Http/Controllers/Api/v1/FreenodeHelperController.php

@@ -12,27 +12,49 @@ final class FreenodeHelperController
     public function urlFeedToday(Request $request, $sSiteCode = '', $sClient = '')
     {
         if ($sClient) {
-            $s = $this->urlFeedToday_a($sSiteCode, $sClient);
+            $a = FreenodeHelperService::urlFeedToday($sSiteCode, $sClient);
         } else {
-            $s = $this->urlFeedToday_b($sSiteCode);
+            $a = FreenodeHelperService::urlFeedToday_allClient($sSiteCode);
         }
         
-        return response()->json($s);
+        return response()->json($a);
     }
     
-    private function urlFeedToday_a($sSiteCode, $sClient)
-    {
-        $s = FreenodeHelperService::urlFeedToday($sSiteCode, $sClient);
-        
-        return $s;
-    }
-    
-    private function urlFeedToday_b($sSiteCode)
-    {
-        return;
+//    private function urlFeedToday_a($sSiteCode, $sClient)
+//    {
 //        $s = FreenodeHelperService::urlFeedToday($sSiteCode, $sClient);
 //        
 //        return $s;
-    }
+//    }
+//    
+//    private function urlFeedToday_b($sSiteCode)
+//    {
+//     
+//        
+//        $s = FreenodeHelperService::urlFeedToday_allClient($sSiteCode);
+//        
+//        
+////        $aData = [
+////            "code"  => "100",
+////            "clash" => $sFileClash,
+////            "v2ray" => $sFileV2ray
+////        ];
+////        
+//        return $s;
+////        $s = FreenodeHelperService::urlFeedToday($sSiteCode, $sClient);
+////        
+////        return $s;
+//    }
     
 }
+
+//        $aData = [
+//            "clash" => $sFileClash,
+//            "v2ray" => $sFileV2ray
+//        ];// 原数据这样
+//
+//        $aData = [
+//            "clash" => $sFileClash,
+//            "v2ray" => $sFileV2ray
+//        ];// 我想追究
+//"code"  => "100",

app/Services/Cron/ReportUmami.php

@@ -61,21 +61,24 @@ final class ReportUmami
 
                 // 获取单个网站的统计指标
                 $stats = $this->getWebsiteStats($token, $siteId, $startAt, $endAt);
+                
+//                tt($stats);
 
                 if ($stats) {
                     // 对齐结构：直接获取 int 值
                     $pageviews = $stats['pageviews'] ?? 0;
                     $pageviewsPrev = $stats['comparison']['pageviews'] ?? 0;
                     $visitors  = $stats['visitors'] ?? 0;
-                    $visits    = $stats['visits'] ?? 0;
-                    $bounces   = $stats['bounces'] ?? 0;
+                    $visitorsPrev  = $stats['comparison']['visitors'] ?? 0;
+//                    $visits    = $stats['visits'] ?? 0;
+//                    $bounces   = $stats['bounces'] ?? 0;
 
                     // 计算跳出率
-                    $bounceRate = $visits > 0 ? round(($bounces / $visits) * 100, 1) : 0;
+//                    $bounceRate = $visits > 0 ? round(($bounces / $visits) * 100, 1) : 0;
 
                     $msg .= "\n\n--------- {$domain} ---------";
-                    $msg .= "\n- 今日：{$pageviews}";
-                    $msg .= "\n- 昨日：{$pageviewsPrev}";
+                    $msg .= "\n- 今日：{$pageviews}p \ {$visitors}v";
+                    $msg .= "\n- 昨日：{$pageviewsPrev}p \ {$visitorsPrev}v";
                     
                 }
             }

app/Services/FreenodeHelperService.php

@@ -27,6 +27,23 @@ class FreenodeHelperService
         return $sFeedUrl;
     }
     
+    public static function urlFeedToday_allClient($sSiteCodeShort)
+    {
+        $cClient = self::getClients();
+        
+        $a = [];
+        foreach ($cClient as $sClient) {
+            $a[] = self::urlFeedToday($sSiteCodeShort, $sClient);
+        }
+        
+        $r = [
+            "code"  => 200,
+            "data"  => $a
+        ];
+        
+        return $r;
+    }
+    
     // 应该是没用上的，按理应该有code和groupcode映射
     public static function getClients()
     {