From 85f4fc0df8a7b79f39dee6881a3799e2c7f1e131 Mon Sep 17 00:00:00 2001
From: JaguarJack <njphper@gmail.com>
Date: Sat, 21 Nov 2020 20:07:36 +0800
Subject: [PATCH] =?UTF-8?q?update:=E4=B8=AA=E4=BA=BA=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E9=82=AE=E7=AE=B1=E5=94=AF=E4=B8=80=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 catch/permissions/controller/User.php        | 20 +++-----------------
 catch/permissions/request/ProfileRequest.php | 17 +++++++++++++++++
 catch/permissions/request/UpdateRequest.php  |  5 -----
 3 files changed, 20 insertions(+), 22 deletions(-)
 create mode 100644 catch/permissions/request/ProfileRequest.php

diff --git a/catch/permissions/controller/User.php b/catch/permissions/controller/User.php
index 2318668..4afc41e 100644
--- a/catch/permissions/controller/User.php
+++ b/catch/permissions/controller/User.php
@@ -8,6 +8,7 @@ use catchAdmin\permissions\model\Roles;
 use catchAdmin\permissions\model\Users;
 use catchAdmin\permissions\request\CreateRequest;
 use catchAdmin\permissions\request\UpdateRequest;
+use catchAdmin\permissions\request\ProfileRequest;
 use catcher\base\CatchController;
 use catcher\CatchAuth;
 use catcher\CatchCacheKeys;
@@ -67,15 +68,6 @@ class User extends CatchController
         return CatchResponse::success($user);
     }
 
-    /**
-     *
-     * @time 2019年12月06日
-     * @throws \Exception
-     * @return string
-     */
-    public function create()
-    {}
-
     /**
      *
      * @param CreateRequest $request
@@ -109,12 +101,6 @@ class User extends CatchController
         return CatchResponse::success($user);
     }
 
-    /**
-     * @param $id
-     * @return string
-     * @throws \Exception
-     */
-    public function edit($id){}
     /**
      *
      * @time 2019年12月04日
@@ -248,10 +234,10 @@ class User extends CatchController
      * 更新个人信息
      *
      * @time 2020年09月20日
-     * @param Request $request
+     * @param ProfileRequest $request
      * @return \think\response\Json
      */
-    public function profile(Request $request)
+    public function profile(ProfileRequest $request)
     {
        return CatchResponse::success($this->user->updateBy($request->user()->id, $request->param()));
     }
diff --git a/catch/permissions/request/ProfileRequest.php b/catch/permissions/request/ProfileRequest.php
new file mode 100644
index 0000000..ca46d50
--- /dev/null
+++ b/catch/permissions/request/ProfileRequest.php
@@ -0,0 +1,17 @@
+<?php
+namespace catchAdmin\permissions\request;
+
+use catchAdmin\permissions\model\Users;
+use catcher\base\CatchRequest;
+
+class ProfileRequest extends CatchRequest
+{
+    protected function rules(): array
+    {
+        // TODO: Implement rules() method.
+        return [
+            'username|用户名' => 'require|max:20',
+            'email|邮箱'    => 'require|email|unique:'.Users::class . ',email,' . $this->user()->id,
+        ];
+    }
+}
diff --git a/catch/permissions/request/UpdateRequest.php b/catch/permissions/request/UpdateRequest.php
index be9b10b..8bde8bb 100644
--- a/catch/permissions/request/UpdateRequest.php
+++ b/catch/permissions/request/UpdateRequest.php
@@ -15,9 +15,4 @@ class UpdateRequest extends CatchRequest
             'email|邮箱'    => 'require|email|unique:'.Users::class,
         ];
     }
-
-    protected function message()
-    {
-        // TODO: Implement message() method.
-    }
 }