optimization: validated

This commit is contained in:
Tokumeikoi 2020-07-15 15:57:12 +08:00
parent e2a07cc4d1
commit bb9b1c4a57
14 changed files with 148 additions and 156 deletions

View File

@ -121,7 +121,7 @@ class ConfigController extends Controller
$data = $request->input(); $data = $request->input();
$array = \Config::get('v2board'); $array = \Config::get('v2board');
foreach ($data as $k => $v) { foreach ($data as $k => $v) {
if (!in_array($k, array_keys(ConfigSave::RULES))) { if (!in_array($k, array_keys($request->validated()))) {
abort(500, '参数' . $k . '不在规则内,禁止修改'); abort(500, '参数' . $k . '不在规则内,禁止修改');
} }
$array[$k] = $v; $array[$k] = $v;

View File

@ -23,7 +23,7 @@ class CouponController extends Controller
public function save(CouponSave $request) public function save(CouponSave $request)
{ {
$params = $request->only(array_keys(CouponSave::RULES)); $params = $request->validated();
if (isset($params['limit_plan_ids'])) { if (isset($params['limit_plan_ids'])) {
$params['limit_plan_ids'] = json_encode($params['limit_plan_ids']); $params['limit_plan_ids'] = json_encode($params['limit_plan_ids']);
} }

View File

@ -42,7 +42,7 @@ class PlanController extends Controller
public function save(PlanSave $request) public function save(PlanSave $request)
{ {
$params = $request->only(array_keys(PlanSave::RULES)); $params = $request->validated();
if ($request->input('id')) { if ($request->input('id')) {
$plan = Plan::find($request->input('id')); $plan = Plan::find($request->input('id'));
if (!$plan) { if (!$plan) {

View File

@ -37,7 +37,7 @@ class TrojanController extends Controller
public function save(ServerTrojanSave $request) public function save(ServerTrojanSave $request)
{ {
$params = $request->only(array_keys(ServerTrojanSave::RULES)); $params = $request->validated();
$params['group_id'] = json_encode($params['group_id']); $params['group_id'] = json_encode($params['group_id']);
if (isset($params['tags'])) { if (isset($params['tags'])) {
$params['tags'] = json_encode($params['tags']); $params['tags'] = json_encode($params['tags']);

View File

@ -37,7 +37,7 @@ class V2rayController extends Controller
public function save(ServerV2raySave $request) public function save(ServerV2raySave $request)
{ {
$params = $request->only(array_keys(ServerV2raySave::RULES)); $params = $request->validated();
$params['group_id'] = json_encode($params['group_id']); $params['group_id'] = json_encode($params['group_id']);
if (isset($params['tags'])) { if (isset($params['tags'])) {
$params['tags'] = json_encode($params['tags']); $params['tags'] = json_encode($params['tags']);

View File

@ -20,7 +20,7 @@ class TutorialController extends Controller
public function save(TutorialSave $request) public function save(TutorialSave $request)
{ {
$params = $request->only(array_keys(TutorialSave::RULES)); $params = $request->validated();
if (!$request->input('id')) { if (!$request->input('id')) {
if (!Tutorial::create($params)) { if (!Tutorial::create($params)) {

View File

@ -53,7 +53,7 @@ class UserController extends Controller
public function update(UserUpdate $request) public function update(UserUpdate $request)
{ {
$params = $request->only(array_keys(UserUpdate::RULES)); $params = $request->validated();
$user = User::find($request->input('id')); $user = User::find($request->input('id'));
if (!$user) { if (!$user) {
abort(500, '用户不存在'); abort(500, '用户不存在');

View File

@ -6,7 +6,14 @@ use Illuminate\Foundation\Http\FormRequest;
class ConfigSave extends FormRequest class ConfigSave extends FormRequest
{ {
CONST RULES = [ /**
* Get the validation rules that apply to the request.
*
* @return array
*/
public function rules()
{
return [
// invite & commission // invite & commission
'safe_mode_enable' => 'in:0,1', 'safe_mode_enable' => 'in:0,1',
'invite_force' => 'in:0,1', 'invite_force' => 'in:0,1',
@ -74,15 +81,6 @@ class ConfigSave extends FormRequest
'telegram_discuss_id' => '', 'telegram_discuss_id' => '',
'telegram_channel_id' => '' 'telegram_channel_id' => ''
]; ];
/**
* Get the validation rules that apply to the request.
*
* @return array
*/
public function rules()
{
return self::RULES;
} }
public function messages() public function messages()

View File

@ -6,7 +6,14 @@ use Illuminate\Foundation\Http\FormRequest;
class CouponSave extends FormRequest class CouponSave extends FormRequest
{ {
const RULES = [ /**
* Get the validation rules that apply to the request.
*
* @return array
*/
public function rules()
{
return [
'name' => 'required', 'name' => 'required',
'type' => 'required|in:1,2', 'type' => 'required|in:1,2',
'value' => 'required|integer', 'value' => 'required|integer',
@ -16,14 +23,6 @@ class CouponSave extends FormRequest
'limit_plan_ids' => 'nullable|array', 'limit_plan_ids' => 'nullable|array',
'code' => '' 'code' => ''
]; ];
/**
* Get the validation rules that apply to the request.
*
* @return array
*/
public function rules()
{
return self::RULES;
} }
public function messages() public function messages()

View File

@ -6,7 +6,14 @@ use Illuminate\Foundation\Http\FormRequest;
class PlanSave extends FormRequest class PlanSave extends FormRequest
{ {
CONST RULES = [ /**
* Get the validation rules that apply to the request.
*
* @return array
*/
public function rules()
{
return [
'name' => 'required', 'name' => 'required',
'content' => '', 'content' => '',
'group_id' => 'required', 'group_id' => 'required',
@ -18,14 +25,6 @@ class PlanSave extends FormRequest
'onetime_price' => 'nullable|integer', 'onetime_price' => 'nullable|integer',
'reset_price' => 'nullable|integer' 'reset_price' => 'nullable|integer'
]; ];
/**
* Get the validation rules that apply to the request.
*
* @return array
*/
public function rules()
{
return self::RULES;
} }
public function messages() public function messages()

View File

@ -6,7 +6,14 @@ use Illuminate\Foundation\Http\FormRequest;
class ServerTrojanSave extends FormRequest class ServerTrojanSave extends FormRequest
{ {
CONST RULES = [ /**
* Get the validation rules that apply to the request.
*
* @return array
*/
public function rules()
{
return [
'show' => '', 'show' => '',
'name' => 'required', 'name' => 'required',
'group_id' => 'required|array', 'group_id' => 'required|array',
@ -19,14 +26,6 @@ class ServerTrojanSave extends FormRequest
'tags' => 'nullable|array', 'tags' => 'nullable|array',
'rate' => 'required|numeric' 'rate' => 'required|numeric'
]; ];
/**
* Get the validation rules that apply to the request.
*
* @return array
*/
public function rules()
{
return self::RULES;
} }
public function messages() public function messages()

View File

@ -6,7 +6,14 @@ use Illuminate\Foundation\Http\FormRequest;
class ServerV2raySave extends FormRequest class ServerV2raySave extends FormRequest
{ {
CONST RULES = [ /**
* Get the validation rules that apply to the request.
*
* @return array
*/
public function rules()
{
return [
'show' => '', 'show' => '',
'name' => 'required', 'name' => 'required',
'group_id' => 'required|array', 'group_id' => 'required|array',
@ -23,14 +30,6 @@ class ServerV2raySave extends FormRequest
'tlsSettings' => '', 'tlsSettings' => '',
'dnsSettings' => '' 'dnsSettings' => ''
]; ];
/**
* Get the validation rules that apply to the request.
*
* @return array
*/
public function rules()
{
return self::RULES;
} }
public function messages() public function messages()

View File

@ -6,12 +6,6 @@ use Illuminate\Foundation\Http\FormRequest;
class TutorialSave extends FormRequest class TutorialSave extends FormRequest
{ {
CONST RULES = [
'title' => 'required',
// 1:windows 2:macos 3:ios 4:android 5:linux 6:router
'category_id' => 'required|in:1,2,3,4,5,6',
'steps' => 'required'
];
/** /**
* Get the validation rules that apply to the request. * Get the validation rules that apply to the request.
* *
@ -19,7 +13,12 @@ class TutorialSave extends FormRequest
*/ */
public function rules() public function rules()
{ {
return self::RULES; return [
'title' => 'required',
// 1:windows 2:macos 3:ios 4:android 5:linux 6:router
'category_id' => 'required|in:1,2,3,4,5,6',
'steps' => 'required'
];
} }
public function messages() public function messages()

View File

@ -6,7 +6,14 @@ use Illuminate\Foundation\Http\FormRequest;
class UserUpdate extends FormRequest class UserUpdate extends FormRequest
{ {
CONST RULES = [ /**
* Get the validation rules that apply to the request.
*
* @return array
*/
public function rules()
{
return [
'email' => 'required|email', 'email' => 'required|email',
'password' => 'nullable', 'password' => 'nullable',
'transfer_enable' => 'numeric', 'transfer_enable' => 'numeric',
@ -21,14 +28,6 @@ class UserUpdate extends FormRequest
'balance' => 'integer', 'balance' => 'integer',
'commission_balance' => 'integer' 'commission_balance' => 'integer'
]; ];
/**
* Get the validation rules that apply to the request.
*
* @return array
*/
public function rules()
{
return self::RULES;
} }
public function messages() public function messages()