opt 1.2.3

This commit is contained in:
Tokumeikoi 2020-03-10 13:27:04 +08:00
parent 5b317478c6
commit a13809ac02
2 changed files with 13 additions and 5 deletions

View File

@ -40,18 +40,25 @@ class ServerController extends Controller
if (isset($params['tags'])) {
$params['tags'] = json_encode($params['tags']);
}
if (isset($params['rules'])) {
if (!is_object(json_decode($params['rules']))) {
if (isset($params['ruleSettings'])) {
if (!is_object(json_decode($params['ruleSettings']))) {
abort(500, '审计规则配置格式不正确');
}
}
if (isset($params['settings'])) {
if (!is_object(json_decode($params['settings']))) {
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'));
if (!$server) {

View File

@ -19,7 +19,8 @@ class ServerSave extends FormRequest
'rate' => 'required|numeric',
'network' => 'required|in:tcp,kcp,ws,http,domainsocket,quic',
'networkSettings' => '',
'ruleSettings' => ''
'ruleSettings' => '',
'tlsSettings' => ''
];
/**
* Get the validation rules that apply to the request.