diff --git a/app/Http/Controllers/Admin/GroupController.php b/app/Http/Controllers/Admin/GroupController.php index 40d2eafb..32c68b86 100644 --- a/app/Http/Controllers/Admin/GroupController.php +++ b/app/Http/Controllers/Admin/GroupController.php @@ -57,18 +57,18 @@ class GroupController extends Controller return view('admin.group.edit', compact('group')); } - public function create(): Response + public function create(Request $request): Response { - + return $this->success('success', $request->all()); } - public function update(): Response + public function update(Request $request): Response { - + return $this->success('success', $request->all()); } public function delete(Request $request): Response { - + return $this->success('success', $request->all()); } } diff --git a/app/Http/Requests/AlbumRequest.php b/app/Http/Requests/AlbumRequest.php index de5ae0a9..3449e446 100644 --- a/app/Http/Requests/AlbumRequest.php +++ b/app/Http/Requests/AlbumRequest.php @@ -2,25 +2,8 @@ namespace App\Http\Requests; -use App\Http\Api; -use Illuminate\Contracts\Validation\Validator; -use Illuminate\Foundation\Http\FormRequest; -use Illuminate\Http\Exceptions\HttpResponseException; - class AlbumRequest extends FormRequest { - use Api; - - /** - * Determine if the user is authorized to make this request. - * - * @return bool - */ - public function authorize() - { - return true; - } - /** * Get the validation rules that apply to the request. * @@ -42,9 +25,4 @@ class AlbumRequest extends FormRequest 'intro.max' => '简介字符过长,最大不能超过 600' ]; } - - protected function failedValidation(Validator $validator) - { - throw (new HttpResponseException($this->error($validator->errors()->first()))); - } } diff --git a/app/Http/Requests/FormRequest.php b/app/Http/Requests/FormRequest.php new file mode 100644 index 00000000..d1722b87 --- /dev/null +++ b/app/Http/Requests/FormRequest.php @@ -0,0 +1,22 @@ +error($validator->errors()->first()))); + } +} diff --git a/app/Http/Requests/ImageRenameRequest.php b/app/Http/Requests/ImageRenameRequest.php index 6de5bce9..72e35e0d 100644 --- a/app/Http/Requests/ImageRenameRequest.php +++ b/app/Http/Requests/ImageRenameRequest.php @@ -2,15 +2,8 @@ namespace App\Http\Requests; -use App\Http\Api; -use Illuminate\Contracts\Validation\Validator; -use Illuminate\Foundation\Http\FormRequest; -use Illuminate\Http\Exceptions\HttpResponseException; - class ImageRenameRequest extends FormRequest { - use Api; - /** * Determine if the user is authorized to make this request. * @@ -44,9 +37,4 @@ class ImageRenameRequest extends FormRequest 'name.string' => '名称格式不正确' ]; } - - protected function failedValidation(Validator $validator) - { - throw (new HttpResponseException($this->error($validator->errors()->first()))); - } } diff --git a/app/Http/Requests/UserSettingRequest.php b/app/Http/Requests/UserSettingRequest.php index dd3e76c4..ccca58bb 100644 --- a/app/Http/Requests/UserSettingRequest.php +++ b/app/Http/Requests/UserSettingRequest.php @@ -2,25 +2,8 @@ namespace App\Http\Requests; -use App\Http\Api; -use Illuminate\Contracts\Validation\Validator; -use Illuminate\Foundation\Http\FormRequest; -use Illuminate\Http\Exceptions\HttpResponseException; - class UserSettingRequest extends FormRequest { - use Api; - - /** - * Determine if the user is authorized to make this request. - * - * @return bool - */ - public function authorize() - { - return true; - } - /** * Get the validation rules that apply to the request. * @@ -55,9 +38,4 @@ class UserSettingRequest extends FormRequest 'configs.is_auto_clear_preview.boolean' => '是否自动清除预览选择错误' ]; } - - protected function failedValidation(Validator $validator) - { - throw (new HttpResponseException($this->error($validator->errors()->first()))); - } } diff --git a/resources/views/admin/group/add.blade.php b/resources/views/admin/group/add.blade.php index 8849dc6f..7db8fb47 100644 --- a/resources/views/admin/group/add.blade.php +++ b/resources/views/admin/group/add.blade.php @@ -15,7 +15,7 @@ 水印配置 -
+
@@ -71,14 +71,14 @@
- +
@foreach($extensions as $extension) - + {{ strtoupper($extension) }} @endforeach @@ -89,7 +89,7 @@