root 5 years ago
parent
commit
129e203634

+ 3 - 1
app/Http/Controllers/Admin/ServerController.php

@@ -43,7 +43,9 @@ class ServerController extends Controller
         $server->tags = $request->input('tags') ? json_encode($request->input('tags')) : NULL;
         $server->rate = $request->input('rate');
         $server->network = $request->input('network');
-        $server->settings = $request->input('settings');
+        if ($request->input('settings') && is_object(json_decode($request->input('settings')))) {
+            $server->settings = $request->input('settings');
+        }
         return response([
             'data' => $server->save()
         ]);

+ 2 - 4
app/Http/Requests/Admin/ServerSave.php

@@ -22,8 +22,7 @@ class ServerSave extends FormRequest
             'tls' => 'required',
             'tags' => 'array',
             'rate' => 'required|numeric',
-            'network' => 'required|in:tcp,mkcp,websocket,http2,domainsocket,quic',
-            'settings' => 'json'
+            'network' => 'required|in:tcp,mkcp,websocket,http2,domainsocket,quic'
         ];
     }
     
@@ -41,8 +40,7 @@ class ServerSave extends FormRequest
             'rate.required' => '倍率不能为空',
             'rate.numeric' => '倍率格式不正确',
             'network.required' => '传输协议不能为空',
-            'network.in' => '传输协议格式不正确',
-            'settings.json' => '传输协议配置格式不正确'
+            'network.in' => '传输协议格式不正确'
         ];
     }
 }