Browse Source

update: fix editor

tokumeikoi 3 years ago
parent
commit
b6e9260464

+ 0 - 23
app/Http/Controllers/Admin/Server/V2rayController.php

@@ -14,29 +14,6 @@ class V2rayController extends Controller
     public function save(ServerV2raySave $request)
     {
         $params = $request->validated();
-        if (isset($params['dnsSettings'])) {
-            if (!is_object(json_decode($params['dnsSettings']))) {
-                abort(500, 'DNS规则配置格式不正确');
-            }
-        }
-
-        if (isset($params['ruleSettings'])) {
-            if (!is_object(json_decode($params['ruleSettings']))) {
-                abort(500, '审计规则配置格式不正确');
-            }
-        }
-
-        if (isset($params['networkSettings'])) {
-            if (!is_object(json_decode($params['networkSettings']))) {
-                abort(500, '传输协议配置格式不正确');
-            }
-        }
-
-        if (isset($params['tlsSettings'])) {
-            if (!is_object(json_decode($params['tlsSettings']))) {
-                abort(500, 'TLS配置格式不正确');
-            }
-        }
 
         if ($request->input('id')) {
             $server = Server::find($request->input('id'));

+ 9 - 5
app/Http/Requests/Admin/ServerV2raySave.php

@@ -26,10 +26,10 @@ class ServerV2raySave extends FormRequest
             'rate' => 'required|numeric',
             'alter_id' => 'required|integer',
             'network' => 'required|in:tcp,kcp,ws,http,domainsocket,quic,grpc',
-            'networkSettings' => '',
-            'ruleSettings' => '',
-            'tlsSettings' => '',
-            'dnsSettings' => ''
+            'networkSettings' => 'nullable|array',
+            'ruleSettings' => 'nullable|array',
+            'tlsSettings' => 'nullable|array',
+            'dnsSettings' => 'nullable|array'
         ];
     }
 
@@ -48,7 +48,11 @@ class ServerV2raySave extends FormRequest
             'rate.required' => '倍率不能为空',
             'rate.numeric' => '倍率格式不正确',
             'network.required' => '传输协议不能为空',
-            'network.in' => '传输协议格式不正确'
+            'network.in' => '传输协议格式不正确',
+            'networkSettings.array' => '传输协议配置有误',
+            'ruleSettings.array' => '规则配置有误',
+            'tlsSettings.array' => 'tls配置有误',
+            'dnsSettings.array' => 'dns配置有误'
         ];
     }
 }

File diff suppressed because it is too large
+ 0 - 0
public/assets/admin/umi.js


Some files were not shown because too many files changed in this diff