yanyu/v2board
1
0
Fork 0
mirror of https://github.com/v2board/v2board.git synced 2024-11-15 00:09:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

update: fix editor

Browse Source
This commit is contained in:
tokumeikoi 2021-08-06 13:51:30 +09:00
parent 6aa96fe856
commit b6e9260464
3 changed files with 10 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/Http/Controllers/Admin/Server/V2rayController.php
View File

@ -14,29 +14,6 @@ class V2rayController extends Controller
public function save(ServerV2raySave $request) public function save(ServerV2raySave $request)
{ {
$params = $request->validated(); $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')) { if ($request->input('id')) {
$server = Server::find($request->input('id')); $server = Server::find($request->input('id'));

14
app/Http/Requests/Admin/ServerV2raySave.php
View File

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

2
public/assets/admin/umi.js vendored
View File

File diff suppressed because one or more lines are too long