diff --git a/modules/User/Http/Controllers/UserController.php b/modules/User/Http/Controllers/UserController.php index b07c59e..7486516 100644 --- a/modules/User/Http/Controllers/UserController.php +++ b/modules/User/Http/Controllers/UserController.php @@ -6,13 +6,14 @@ use Catch\Base\CatchController as Controller; use Catch\Support\Module\ModuleRepository; use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Contracts\Pagination\LengthAwarePaginator; -use Illuminate\Http\Request; use Modules\Permissions\Models\Departments; use Modules\User\Models\LogLogin; use Modules\User\Models\LogOperate; use Modules\User\Models\User; use Psr\Container\ContainerExceptionInterface; use Psr\Container\NotFoundExceptionInterface; +use Modules\User\Http\Requests\UserRequest; +use Illuminate\Http\Request; class UserController extends Controller { @@ -47,10 +48,10 @@ class UserController extends Controller /** * store * - * @param Request $request + * @param UserRequest $request * @return false|mixed */ - public function store(Request $request) + public function store(UserRequest $request) { return $this->user->storeBy($request->all()); } @@ -80,10 +81,10 @@ class UserController extends Controller * update * * @param $id - * @param Request $request + * @param UserRequest $request * @return mixed */ - public function update($id, Request $request) + public function update($id, UserRequest $request) { return $this->user->updateBy($id, $request->all()); } diff --git a/modules/User/Http/Requests/UserRequest.php b/modules/User/Http/Requests/UserRequest.php new file mode 100644 index 0000000..b1ca7f6 --- /dev/null +++ b/modules/User/Http/Requests/UserRequest.php @@ -0,0 +1,44 @@ + [ + 'required', + Rule::unique('users')->where(function ($query) { + return $query->when($this->get('id'), function ($query){ + $query->where('id', '<>', $this->get('id')); + })->where('deleted_at', 0); + }) + ], + ]; + } + + + /** + * messages + * + * @return string[] + */ + public function messages(): array + { + return [ + 'email.required' => '邮箱必须填写', + + 'email.unique' => '邮箱已存在', + ]; + } +}