update server stat and app default config

2025-06-13 21:28:27 +08:00 · 2020-06-05 00:25:15 +08:00
parent 78f8bd6906
commit d6b22011ba
12 changed files with 79 additions and 76 deletions
--- a/app/Console/Commands/V2boardCache.php
+++ b/app/Console/Commands/V2boardCache.php
@ -2,13 +2,12 @@

 namespace App\Console\Commands;

+use App\Utils\CacheKey;
 use Illuminate\Console\Command;
-use App\Models\User;
-use App\Models\Order;
-use App\Models\Server;
 use App\Models\ServerLog;
-use App\Utils\Helper;
+use App\Models\ServerStat;
 use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\DB;

 class V2boardCache extends Command
 {
@ -43,5 +42,29 @@ class V2boardCache extends Command
     */
    public function handle()
    {
+        $this->serverStat();
+    }
+
+    private function serverStat()
+    {
+        $serverLogs = ServerLog::select(
+            'server_id',
+            DB::raw("sum(u) as u"),
+            DB::raw("sum(d) as d"),
+            DB::raw("count(*) as online")
+        )
+            ->where('updated_at', '>=', time() - 3600)
+            ->groupBy('server_id')
+            ->get();
+        foreach ($serverLogs as $serverLog) {
+            $data = [
+                'server_id' => $serverLog->server_id,
+                'u' => $serverLog->u,
+                'd' => $serverLog->d,
+                'online' => $serverLog->online
+            ];
+            Cache::put(CacheKey::get('SERVER_STAT', $serverLog->server_id), json_encode($data), 3600);
+            ServerStat::create($data);
+        }
    }
 }
--- a/app/Http/Controllers/Admin/ServerController.php
+++ b/app/Http/Controllers/Admin/ServerController.php
@ -6,6 +6,7 @@ use App\Http\Requests\Admin\ServerSave;
 use App\Http\Requests\Admin\ServerSort;
 use App\Http\Requests\Admin\ServerUpdate;
 use App\Services\ServerService;
+use App\Utils\CacheKey;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use App\Models\ServerGroup;
@ -25,6 +26,14 @@ class ServerController extends Controller
                $server[$i]['tags'] = json_decode($server[$i]['tags']);
            }
            $server[$i]['group_id'] = json_decode($server[$i]['group_id']);
+            $serverStat = Cache::get(CacheKey::get('SERVER_STAT', $server[$i]['id']));
+            dd($serverStat);
+            if ($serverStat) {
+                $serverStat = json_decode($serverStat, true);
+                $server[$i]['u'] = $serverStat['u'];
+                $server[$i]['d'] = $serverStat['d'];
+                $server[$i]['online'] = $serverStat['online'];
+            }
            if ($server[$i]['parent_id']) {
                $server[$i]['last_check_at'] = Cache::get('server_last_check_at_' . $server[$i]['parent_id']);
            } else {
--- a/app/Http/Controllers/Client/AppController.php
+++ b/app/Http/Controllers/Client/AppController.php
@ -12,7 +12,7 @@ use App\Utils\Helper;

 class AppController extends Controller
 {
-    CONST CLIENT_CONFIG = '{"policy":{"levels":{"0":{"uplinkOnly":0}}},"dns":{"servers":["114.114.114.114","8.8.8.8"]},"outboundDetour":[{"protocol":"freedom","tag":"direct","settings":{}}],"inbound":{"listen":"0.0.0.0","port":31211,"protocol":"socks","settings":{"auth":"noauth","udp":true,"ip":"127.0.0.1"}},"inboundDetour":[{"listen":"0.0.0.0","allocate":{"strategy":"always","refresh":5,"concurrency":3},"port":31210,"protocol":"http","tag":"httpDetour","domainOverride":["http","tls"],"streamSettings":{},"settings":{"timeout":0}}],"routing":{"strategy":"rules","settings":{"domainStrategy":"IPIfNonMatch","rules":[{"type":"field","ip":["geoip:cn"],"outboundTag":"direct"},{"type":"field","ip":["0.0.0.0/8","10.0.0.0/8","100.64.0.0/10","127.0.0.0/8","169.254.0.0/16","172.16.0.0/12","192.0.0.0/24","192.0.2.0/24","192.168.0.0/16","198.18.0.0/15","198.51.100.0/24","203.0.113.0/24","::1/128","fc00::/7","fe80::/10"],"outboundTag":"direct"}]}},"outbound":{"tag":"proxy","sendThrough":"0.0.0.0","mux":{"enabled":false,"concurrency":8},"protocol":"vmess","settings":{"vnext":[{"address":"server","port":443,"users":[{"id":"uuid","alterId":2,"security":"auto","level":0}],"remark":"remark"}]},"streamSettings":{"network":"tcp","tcpSettings":{"header":{"type":"none"}},"security":"none","tlsSettings":{"allowInsecure":true,"allowInsecureCiphers":true},"kcpSettings":{"header":{"type":"none"},"mtu":1350,"congestion":false,"tti":20,"uplinkCapacity":5,"writeBufferSize":1,"readBufferSize":1,"downlinkCapacity":20},"wsSettings":{"path":"","headers":{"Host":"server.cc"}}}}}';
+    CONST CLIENT_CONFIG = '{"policy":{"levels":{"0":{"uplinkOnly":0}}},"dns":{"servers":["8.8.8.8","localhost"]},"outboundDetour":[{"protocol":"freedom","tag":"direct","settings":{}}],"inbound":{"listen":"0.0.0.0","port":31211,"protocol":"socks","settings":{"auth":"noauth","udp":true,"ip":"127.0.0.1"}},"inboundDetour":[{"listen":"0.0.0.0","allocate":{"strategy":"always","refresh":5,"concurrency":3},"port":31210,"protocol":"http","tag":"httpDetour","domainOverride":["http","tls"],"streamSettings":{},"settings":{"timeout":0}}],"routing":{"strategy":"rules","settings":{"domainStrategy":"IPIfNonMatch","rules":[{"type":"field","ip":["geoip:cn"],"outboundTag":"direct"},{"type":"field","ip":["0.0.0.0/8","10.0.0.0/8","100.64.0.0/10","127.0.0.0/8","169.254.0.0/16","172.16.0.0/12","192.0.0.0/24","192.0.2.0/24","192.168.0.0/16","198.18.0.0/15","198.51.100.0/24","203.0.113.0/24","::1/128","fc00::/7","fe80::/10"],"outboundTag":"direct"}]}},"outbound":{"tag":"proxy","sendThrough":"0.0.0.0","mux":{"enabled":false,"concurrency":8},"protocol":"vmess","settings":{"vnext":[{"address":"server","port":443,"users":[{"id":"uuid","alterId":2,"security":"auto","level":0}],"remark":"remark"}]},"streamSettings":{"network":"tcp","tcpSettings":{"header":{"type":"none"}},"security":"none","tlsSettings":{"allowInsecure":true,"allowInsecureCiphers":true},"kcpSettings":{"header":{"type":"none"},"mtu":1350,"congestion":false,"tti":20,"uplinkCapacity":5,"writeBufferSize":1,"readBufferSize":1,"downlinkCapacity":20},"wsSettings":{"path":"","headers":{"Host":"server.cc"}}}}}';
    CONST SOCKS_PORT = 10010;
    CONST HTTP_PORT = 10011;

--- a/app/Http/Controllers/User/CommController.php
+++ b/app/Http/Controllers/User/CommController.php
@ -11,7 +11,8 @@ class CommController extends Controller
    {
        return response([
            'data' => [
-                'isTelegram' => (int)config('v2board.telegram_bot_enable', 0)
+                'isTelegram' => (int)config('v2board.telegram_bot_enable', 0),
+                'stripePk' => config('v2board.stripe_pk_live')
            ]
        ]);
    }
--- a/app/Models/ServerLog.php
+++ b/app/Models/ServerLog.php
@ -9,6 +9,4 @@ class ServerLog extends Model
 {
    protected $table = 'v2_server_log';
    protected $dateFormat = 'U';
-    protected $dispatchesEvents = [
-    ];
 }
--- a/app/Models/ServerStat.php
+++ b/app/Models/ServerStat.php
@ -0,0 +1,12 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class ServerStat extends Model
+{
+    protected $table = 'v2_server_stat';
+    protected $dateFormat = 'U';
+    protected $guarded = ['id'];
+}
--- a/app/Utils/CacheKey.php
+++ b/app/Utils/CacheKey.php
@ -6,7 +6,8 @@ class CacheKey
 {
    CONST KEYS = [
        'EMAIL_VERIFY_CODE' => '邮箱验证吗',
-        'LAST_SEND_EMAIL_VERIFY_TIMESTAMP' => '最后一次发送邮箱验证码时间'
+        'LAST_SEND_EMAIL_VERIFY_TIMESTAMP' => '最后一次发送邮箱验证码时间',
+        'SERVER_STAT' => '节点统计信息'
    ];

    public static function get(string $key, $uniqueValue)