From 129e203634a05d20a38b29fd8bdff277b5215bc7 Mon Sep 17 00:00:00 2001
From: root <root@root.com>
Date: Wed, 6 Nov 2019 00:59:49 +0800
Subject: [PATCH] update

---
 app/Http/Controllers/Admin/ServerController.php | 4 +++-
 app/Http/Requests/Admin/ServerSave.php          | 6 ++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/Http/Controllers/Admin/ServerController.php b/app/Http/Controllers/Admin/ServerController.php
index 444f1f16..d2ae9914 100755
--- a/app/Http/Controllers/Admin/ServerController.php
+++ b/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()
         ]);
diff --git a/app/Http/Requests/Admin/ServerSave.php b/app/Http/Requests/Admin/ServerSave.php
index ead245b0..620bfe8b 100755
--- a/app/Http/Requests/Admin/ServerSave.php
+++ b/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' => '传输协议格式不正确'
         ];
     }
 }