更新Request规则

app/Http/Requests/Admin/ArticleRequest.php

@@ -9,11 +9,11 @@ class ArticleRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'type' => 'required|numeric|between:1,4',
-            'title' => 'required|string',
-            'summary' => 'string|nullable',
-            'sort' => 'required_if:type,1|numeric',
-            'logo' => 'nullable|exclude_if:type,4|image',
+            'type'    => 'required|numeric|between:1,4',
+            'title'   => 'required|string',
+            'summary' => 'nullable|string',
+            'sort'    => 'required_if:type,1|numeric',
+            'logo'    => 'nullable|exclude_if:type,4|image',
             'content' => 'required|string',
         ];
     }

app/Http/Requests/Admin/CertRequest.php

@@ -15,8 +15,8 @@ class CertRequest extends FormRequest
 
         return [
             'domain' => 'required|string|unique:node_certificate,domain'.$unq_domain,
-            'key'    => 'string|nullable',
-            'pem'    => 'string|nullable',
+            'key'    => 'nullable|string',
+            'pem'    => 'nullable|string',
         ];
     }
 }

app/Http/Requests/Admin/CouponRequest.php

@@ -9,16 +9,16 @@ class CouponRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'name' => 'required|string',
-            'sn' => 'unique:coupon',
-            'logo' => 'nullable|image',
-            'type' => 'required|numeric|between:1,3',
-            'usable_times' => 'numeric|nullable',
-            'value' => 'required|numeric|min:0',
-            'rule' => 'required_unless:type,3',
-            'num' => 'required|numeric|min:1',
-            'start_time' => 'required|date|before_or_equal:end_time',
-            'end_time' => 'required|date|after_or_equal:start_time',
+            'name'               => 'required|string',
+            'sn'                 => 'unique:coupon',
+            'logo'               => 'nullable|image',
+            'type'               => 'required|numeric|between:1,3',
+            'usable_times'       => 'nullable|numeric',
+            'value'              => 'required|numeric|min:0',
+            'rule'               => 'nullable|numeric',
+            'num'                => 'required|numeric|min:1',
+            'start_time'         => 'required|date|before_or_equal:end_time',
+            'end_time'           => 'required|date|after_or_equal:start_time',
         ];
     }
 }

app/Http/Requests/Admin/NodeRequest.php

@@ -16,7 +16,7 @@ class NodeRequest extends FormRequest
             'ipv6'           => 'nullable',
             'push_port'      => 'numeric|between:1,65535|different:port',
             'traffic_rate'   => 'required|numeric|min:0',
-            'level'          => 'required|numeric|exists:level,level',
+            'level'          => 'required|exists:level,level',
             'rule_group_id'  => 'nullable|exists:rule_group,id',
             'speed_limit'    => 'required|numeric|min:0',
             'client_limit'   => 'required|numeric|min:0',
@@ -41,11 +41,11 @@ class NodeRequest extends FormRequest
             'v2_method'      => 'required_if:type,2',
             'v2_net'         => 'required_if:type,2',
             'v2_type'        => 'required_if:type,2',
-            'v2_host'        => 'string|nullable',
-            'v2_path'        => 'string|nullable',
-            'v2_sni'         => 'string|nullable',
+            'v2_host'        => 'nullable|string',
+            'v2_path'        => 'nullable|string',
+            'v2_sni'         => 'nullable|string',
             'v2_tls'         => 'required_if:type,2|boolean',
-            'tls_provider'   => 'json|nullable',
+            'tls_provider'   => 'nullable|json',
             'relay_node_id'  => 'nullable|exists:node,id',
         ];
     }

app/Http/Requests/Admin/PermissionRequest.php

@@ -9,7 +9,7 @@ class PermissionRequest extends FormRequest
     public function rules()
     {
         return [
-            'name' => 'required|string',
+            'name'        => 'required|string',
             'description' => 'required|string',
         ];
     }

app/Http/Requests/Admin/RbacRequest.php

@@ -9,7 +9,7 @@ class RbacRequest extends FormRequest
     public function rules()
     {
         return [
-            'name' => 'required|string',
+            'name'        => 'required|string',
             'description' => 'required|string',
         ];
     }

app/Http/Requests/Admin/RoleRequest.php

@@ -16,7 +16,7 @@ class RoleRequest extends FormRequest
         return [
             'name'        => 'required|string|unique:roles,name'.$unq_name,
             'description' => 'required|string',
-            'permissions' => 'exists:permissions,name',
+            'permissions' => 'nullable|exists:permissions,name',
         ];
     }
 }

app/Http/Requests/Admin/RuleGroupRequest.php

@@ -9,9 +9,9 @@ class RuleGroupRequest extends FormRequest
     public function rules()
     {
         return [
-            'name' => 'required|string',
-            'type' => 'required|boolean',
-            'rules' => 'exists:rule,id',
+            'name'  => 'required|string',
+            'type'  => 'required|boolean',
+            'rules' => 'nullable|exists:rule,id',
         ];
     }
 }

app/Http/Requests/Admin/ShopStoreRequest.php

@@ -9,25 +9,25 @@ class ShopStoreRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'type' => 'required|numeric|between:1,2',
-            'name' => 'required|string',
-            'price' => 'required|numeric|min:0',
-            'level' => 'required|numeric|exists:level,level',
-            'renew' => 'required_unless:type,2|numeric|min:0|nullable',
-            'period' => 'required_unless:type,2|numeric|min:0|nullable',
-            'traffic' => 'required|numeric|min:1|max:10240000',
-            'traffic_unit' => 'numeric|nullable',
-            'invite_num' => 'numeric',
-            'limit_num' => 'numeric',
-            'speed_limit' => 'numeric',
-            'days' => 'required|numeric',
-            'is_hot' => 'nullable|string',
-            'status' => 'nullable|string',
-            'sort' => 'numeric',
-            'color' => 'nullable|string',
-            'logo' => 'nullable|image',
-            'description' => 'nullable|string',
-            'info' => 'nullable|string',
+            'type'         => 'required|numeric|between:1,2',
+            'name'         => 'required|string',
+            'price'        => 'required|numeric|min:0',
+            'level'        => 'required|exists:level,level',
+            'renew'        => 'required_unless:type,2|numeric|min:0|nullable',
+            'period'       => 'required_unless:type,2|numeric|min:0|nullable',
+            'traffic'      => 'required|numeric|min:1|max:10240000',
+            'traffic_unit' => 'nullable|numeric',
+            'invite_num'   => 'numeric',
+            'limit_num'    => 'numeric',
+            'speed_limit'  => 'numeric',
+            'days'         => 'required|numeric',
+            'is_hot'       => 'nullable|string',
+            'status'       => 'nullable|string',
+            'sort'         => 'numeric',
+            'color'        => 'nullable|string',
+            'logo'         => 'nullable|image',
+            'description'  => 'nullable|string',
+            'info'         => 'nullable|string',
         ];
     }
 }

app/Http/Requests/Admin/ShopUpdateRequest.php

@@ -9,21 +9,21 @@ class ShopUpdateRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'name' => 'required|string',
-            'price' => 'required|numeric|min:0',
-            'level' => 'required|numeric|exists:level,level',
-            'renew' => 'required_unless:type,2|numeric|min:0|nullable',
-            'period' => 'required_unless:type,2|numeric|min:0|nullable',
-            'invite_num' => 'numeric',
-            'limit_num' => 'numeric',
-            'is_hot' => 'nullable|string',
-            'status' => 'nullable|string',
-            'sort' => 'numeric',
+            'name'        => 'required|string',
+            'price'       => 'required|numeric|min:0',
+            'level'       => 'required|exists:level,level',
+            'renew'       => 'required_unless:type,2|numeric|min:0|nullable',
+            'period'      => 'required_unless:type,2|numeric|min:0|nullable',
+            'invite_num'  => 'numeric',
+            'limit_num'   => 'numeric',
+            'is_hot'      => 'nullable|string',
+            'status'      => 'nullable|string',
+            'sort'        => 'numeric',
             'speed_limit' => 'numeric',
-            'color' => 'nullable|string',
-            'logo' => 'nullable|image',
+            'color'       => 'nullable|string',
+            'logo'        => 'nullable|image',
             'description' => 'nullable|string',
-            'info' => 'nullable|string',
+            'info'        => 'nullable|string',
         ];
     }
 }

app/Http/Requests/Admin/SystemRequest.php

@@ -9,7 +9,7 @@ class SystemRequest extends FormRequest
     public function rules()
     {
         return [
-            'name' => 'required|string|exists:config,name',
+            'name'  => 'required|exists:config,name',
             'value' => 'nullable',
         ];
     }

app/Http/Requests/Admin/TicketRequest.php

@@ -9,10 +9,10 @@ class TicketRequest extends FormRequest
     public function rules()
     {
         return [
-            'uid' => 'required_without:username|exists:user,id|numeric|nullable',
+            'uid'      => 'required_without:username|exists:user,id|numeric|nullable',
             'username' => 'required_without:uid|exists:user,username||nullable',
-            'title' => 'required|string',
-            'content' => 'required|string',
+            'title'    => 'required|string',
+            'content'  => 'required|string',
         ];
     }
 }

app/Http/Requests/Admin/UserGroupRequest.php

@@ -9,8 +9,8 @@ class UserGroupRequest extends FormRequest
     public function rules()
     {
         return [
-            'name' => 'required|string',
-            'nodes' => 'exists:node,id',
+            'name'  => 'required|string',
+            'nodes' => 'nullable|exists:node,id',
         ];
     }
 }

app/Http/Requests/Admin/UserStoreRequest.php

@@ -9,28 +9,28 @@ class UserStoreRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'nickname' => 'required',
-            'username' => 'required|unique:user,username,'.$this->user,
-            'password' => 'nullable|string|nullable',
-            'port' => 'nullable|numeric',
-            'passwd' => 'nullable|string',
-            'uuid' => 'nullable|uuid',
+            'nickname'        => 'required|string',
+            'username'        => 'required|'.(sysConfig('username_type') ?? 'email').'|unique:user,username,'.$this->user,
+            'password'        => 'nullable|string',
+            'port'            => 'nullable|numeric',
+            'passwd'          => 'nullable|string',
+            'uuid'            => 'nullable|uuid',
             'transfer_enable' => 'required|numeric|min:0',
-            'enable' => 'required|boolean',
-            'method' => 'required|string|exists:ss_config,name',
-            'protocol' => 'required|string|exists:ss_config,name',
-            'obfs' => 'required|string|exists:ss_config,name',
-            'speed_limit' => 'required|numeric|min:0',
-            'wechat' => 'nullable|string',
-            'qq' => 'nullable|string',
-            'expired_at' => 'nullable|date_format:Y-m-d',
-            'remark' => 'nullable|string',
-            'level' => 'required|exists:level,level',
-            'user_group_id' => 'nullable|exists:user_group,id',
-            'roles' => 'nullable|exists:roles,name',
-            'reset_time' => 'nullable|date_format:Y-m-d',
-            'invite_num' => 'required|numeric|min:0',
-            'status' => 'required|numeric|between:-1,1',
+            'enable'          => 'required|boolean',
+            'method'          => 'required|exists:ss_config,name',
+            'protocol'        => 'required|exists:ss_config,name',
+            'obfs'            => 'required|exists:ss_config,name',
+            'speed_limit'     => 'required|numeric|min:0',
+            'wechat'          => 'nullable|string',
+            'qq'              => 'nullable|string',
+            'expired_at'      => 'nullable|date_format:Y-m-d',
+            'remark'          => 'nullable|string',
+            'level'           => 'required|exists:level,level',
+            'user_group_id'   => 'nullable|exists:user_group,id',
+            'roles'           => 'nullable|exists:roles,name',
+            'reset_time'      => 'nullable|date_format:Y-m-d',
+            'invite_num'      => 'required|numeric|min:0',
+            'status'          => 'required|numeric|between:-1,1',
         ];
     }
 }

app/Http/Requests/Admin/UserUpdateRequest.php

@@ -9,28 +9,28 @@ class UserUpdateRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'nickname' => 'required',
-            'username' => 'required|unique:user,username,'.$this->user->id,
-            'password' => 'nullable|string',
-            'port' => 'required|numeric|exclude_if:port,0|gt:0|unique:user,port,'.$this->user->id,
-            'passwd' => 'required|string',
-            'uuid' => 'required|uuid',
+            'nickname'        => 'required|string',
+            'username'        => 'required|'.(sysConfig('username_type') ?? 'email').'|unique:user,username,'.$this->user->id,
+            'password'        => 'nullable|string',
+            'port'            => 'required|numeric|exclude_if:port,0|gt:0|unique:user,port,'.$this->user->id,
+            'passwd'          => 'required|string',
+            'uuid'            => 'required|uuid',
             'transfer_enable' => 'required|numeric|min:0',
-            'enable' => 'required|boolean',
-            'method' => 'required|string|exists:ss_config,name',
-            'protocol' => 'required|string|exists:ss_config,name',
-            'obfs' => 'required|string|exists:ss_config,name',
-            'speed_limit' => 'required|numeric|min:0',
-            'wechat' => 'nullable|string',
-            'qq' => 'nullable|string',
-            'expired_at' => 'required|date_format:Y-m-d',
-            'remark' => 'nullable|string',
-            'level' => 'required|exists:level,level',
-            'user_group_id' => 'nullable|exists:user_group,id',
-            'roles' => 'nullable|exists:roles,name',
-            'reset_time' => 'nullable|date_format:Y-m-d',
-            'invite_num' => 'required|numeric|min:0',
-            'status' => 'required|numeric|between:-1,1',
+            'enable'          => 'required|boolean',
+            'method'          => 'required|exists:ss_config,name',
+            'protocol'        => 'required|exists:ss_config,name',
+            'obfs'            => 'required|exists:ss_config,name',
+            'speed_limit'     => 'required|numeric|min:0',
+            'wechat'          => 'nullable|string',
+            'qq'              => 'nullable|string',
+            'expired_at'      => 'required|date_format:Y-m-d',
+            'remark'          => 'nullable|string',
+            'level'           => 'required|exists:level,level',
+            'user_group_id'   => 'nullable|exists:user_group,id',
+            'roles'           => 'nullable|exists:roles,name',
+            'reset_time'      => 'nullable|date_format:Y-m-d',
+            'invite_num'      => 'required|numeric|min:0',
+            'status'          => 'required|numeric|between:-1,1',
         ];
     }
 }

app/Http/Requests/Auth/RegisterRequest.php

@@ -9,9 +9,9 @@ class RegisterRequest extends FormRequest
     public function rules()
     {
         return [
-            'nickname' => 'required',
+            'nickname' => 'required|string',
             'username' => 'required|'.(sysConfig('username_type') ?? 'email').'|unique:user,username',
-            'password' => 'required|min:6|confirmed',
+            'password' => 'required|string|min:6|confirmed',
             'term'     => 'accepted',
         ];
     }