Merge branch 'cedar2025:dev' into dev

2026-02-22 03:20:08 +08:00
parent 46656fe4f7 cab76f1cf3
commit 66f34d7514
47 changed files with 613 additions and 272 deletions
@@ -31,6 +31,7 @@ class Server
        $request->validate([
            'token' => [
                "string",
+                "required",
                function ($attribute, $value, $fail) {
                    if ($value !== admin_setting('server_token')) {
                        $fail('The ' . $attribute . ' is invalid.');
@@ -39,10 +40,11 @@ class Server
            ],
            'node_id' => 'required',
            'node_type' => [
+                'required',
                'nullable',
                'regex:/^(?i)(hysteria|hysteria2|vless|trojan|vmess|v2ray|tuic|shadowsocks|shadowsocks-plugin)$/',
                function ($attribute, $value, $fail) use ($aliasTypes, $request) {
-                    $request->merge([$attribute => strtolower(isset ($aliasTypes[$value]) ? $aliasTypes[$value] : $value)]);
+                    $request->merge([$attribute => strtolower(isset($aliasTypes[$value]) ? $aliasTypes[$value] : $value)]);
                },
            ]
        ], [