refactor: 更新校验写法为多行

miaoxing · Jul 14, 2022 · 87b600c · 87b600c
1 parent f10ce26
commit 87b600c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 14 deletions.
diff --git a/pages/admin-api/admins/[id].php b/pages/admin-api/admins/[id].php
@@ -26,19 +26,15 @@ public function patch(Req $req)
         // 添加用户,编辑用户时,提交了密码,才检验密码是否合法
         $validatePassword = $user->isNew() || ($data['password'] ?? false);
 
-        $ret = V
-            ::key('username', '用户名')->required($validateUsername)->when($validateUsername, function (V $v) {
-                $v->length(1, 32)
-                    ->alnum()
-                    ->notRecordExists('users', 'username');
-            })
-            ->key('password', '密码')->required($validatePassword)->minLength(6)
-            ->key('passwordAgain', '重复密码')->required($validatePassword)->equalTo($data['password'] ?? null)->message(
-                'equalTo',
-                '两次输入的密码不相等'
-            )
-            ->char('nickName', ' 昵称')->optional()->maxCharLength(32)
-            ->check($data);
+        $v = V::new();
+        $v->string('username', '用户名')->required($validateUsername)->when($validateUsername, function (V $v) {
+            $v->length(1, 32)->alnum()->notRecordExists('users', 'username');
+        });
+        $v->string('password', '密码')->required($validatePassword)->minLength(6);
+        $v->string('passwordAgain', '重复密码')->required($validatePassword)
+            ->equalTo($data['password'] ?? null)->message('equalTo', '两次输入的密码不相等');
+        $v->char('nickName', ' 昵称')->optional()->maxCharLength(32);
+        $ret = $v->check($data);
         $this->tie($ret);
 
         if (isset($data['isEnabled']) && !$data['isEnabled'] && $user->isSuperAdmin()) {

diff --git a/pages/admin-api/groups/[id].php b/pages/admin-api/groups/[id].php
@@ -19,7 +19,9 @@ public function patch()
     {
         return UpdateAction::new()
             ->beforeFind(function () {
-                return V::key('name', '名称')->check($this->req);
+                $v = V::new();
+                $v->tinyChar('name', '名称');
+                return $v->check($this->req);
             })
             ->beforeSave(function (BaseModel $model) {
                 return Event::until('groupUpdate', [$model]);