Browse Source

fix(admin/trojan-node)

兩足大貓貓 4 years ago
parent
commit
80c5b5ea90
2 changed files with 5 additions and 3 deletions
  1. 1 1
      src/Command/Tool.php
  2. 4 2
      src/Services/Analytics.php

+ 1 - 1
src/Command/Tool.php

@@ -37,7 +37,7 @@ class Tool extends Command
             $telegram = new \Telegram\Bot\Api($_ENV['telegram_token']);
             $telegram->removeWebhook();
             if ($telegram->setWebhook(['url' => $WebhookUrl])) {
-                echo ('New Bot @' . $telegram->getMe()->getUsername() . ' 设置成功!');
+                echo ('New Bot @' . $telegram->getMe()->getUsername() . ' 设置成功!' . PHP_EOL);
             }
         } else {
             $bot = new \TelegramBot\Api\BotApi($_ENV['telegram_token']);

+ 4 - 2
src/Services/Analytics.php

@@ -100,7 +100,8 @@ class Analytics
                     ->orWhere('sort', '=', 10)
                     ->orWhere('sort', '=', 11)
                     ->orWhere('sort', '=', 12)
-                    ->orWhere('sort', '=', 13);
+                    ->orWhere('sort', '=', 13)
+                    ->orWhere('sort', '=', 14);
             }
         )->count();
     }
@@ -113,7 +114,8 @@ class Analytics
                     ->orWhere('sort', '=', 10)
                     ->orWhere('sort', '=', 11)
                     ->orWhere('sort', '=', 12)
-                    ->orWhere('sort', '=', 13);
+                    ->orWhere('sort', '=', 13)
+                    ->orWhere('sort', '=', 14);
             }
         )->where('node_heartbeat', '>', time() - 90)->count();
     }