diff --git a/app/Http/Controllers/FriendLinkController.php b/app/Http/Controllers/FriendLinkController.php index 858e8da..51ee47f 100644 --- a/app/Http/Controllers/FriendLinkController.php +++ b/app/Http/Controllers/FriendLinkController.php @@ -7,6 +7,7 @@ use App\Http\Resources\FriendLinkResource; use App\Models\FriendLink; use Illuminate\Http\Request; use App\Http\Requestes\FriendLinkRequest; +use App\Http\Requestes\FriendLinkUpdateRequest; use App\Services\OperationLogService; use App\Enums\OperationType; @@ -35,7 +36,7 @@ class FriendLinkController extends Controller return $this->json(FriendLinkResource::make($friendLink)); } - public function update(FriendLink $friendLink, FriendLinkRequest $request){ + public function update(FriendLink $friendLink, FriendLinkUpdateRequest $request){ $friendLink->update($request->input()); (new OperationLogService())->inLog(OperationType::Update, '', $friendLink, $request->input()); diff --git a/app/Http/Requestes/FriendLinkRequest.php b/app/Http/Requestes/FriendLinkRequest.php index 5961d9b..b7ed0ad 100644 --- a/app/Http/Requestes/FriendLinkRequest.php +++ b/app/Http/Requestes/FriendLinkRequest.php @@ -18,9 +18,9 @@ class FriendLinkRequest extends FormRequest public function rules() { return [ - 'name' => 'required', + 'name' => 'required|string', 'type' => 'required|integer|min:1|max:3', - 'content' => 'required', + 'content' => 'required|string', 'sort' => 'required|integer', 'is_recommend' => 'required|boolean', 'is_show'=> 'required|boolean', diff --git a/app/Http/Requestes/FriendLinkUpdateRequest.php b/app/Http/Requestes/FriendLinkUpdateRequest.php new file mode 100644 index 0000000..9924387 --- /dev/null +++ b/app/Http/Requestes/FriendLinkUpdateRequest.php @@ -0,0 +1,49 @@ + 'filled|string', + 'type' => 'filled|integer|min:1|max:3', + 'content' => 'filled|string', + 'sort' => 'filled|integer', + 'is_recommend' => 'filled|boolean', + 'is_show'=> 'filled|boolean', + ]; + } + + public function messages() + { + $messages = [ + 'name' => '请填写标题', + 'type' => '请选择类型', + 'content' => '请填充内容', + 'sort' => '请填写排序', + 'is_recommend' => '请设置推荐', + 'is_show' => '请设置显示' + ]; + + return $messages; + } + + protected function failedValidation(Validator $validator) + { + $error = $validator->errors()->all(); + throw new HttpResponseException(response()->json(['data' => [], 'code' => 400, 'message' => $error[0]])); + } +}