From 4f34d52fe147cc73703404ab84eaf6caad9b81d3 Mon Sep 17 00:00:00 2001
From: jsasg <735273025@qq.com>
Date: Tue, 25 Mar 2025 17:20:26 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BF=AE=E6=94=B9=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E6=9B=B4=E6=96=B0=E5=9C=BA=E6=99=AF=E5=AF=86=E7=A0=81?=
 =?UTF-8?q?=E9=AA=8C=E8=AF=81=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/controller/v1/User.php          | 5 +++--
 app/admin/validate/v1/SysUserValidate.php | 4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/admin/controller/v1/User.php b/app/admin/controller/v1/User.php
index 36a48d4b..db96bf92 100644
--- a/app/admin/controller/v1/User.php
+++ b/app/admin/controller/v1/User.php
@@ -207,10 +207,10 @@ class User
             'role_id',
             'status' => 1,
         ]);
-        $data = array_merge($put, ['id' => $id, 'salt' => random_str(16)]);
+        $data = array_merge($put, ['id' => $id]);
 
         $validate = new SysUserValidate;
-        if (!$validate->check($data)) {
+        if (!$validate->scene('update')->check($data)) {
             return error($validate->getError());
         }
 
@@ -220,6 +220,7 @@ class User
         }
 
         if (!empty($data['password'])) {
+            $data['salt']     = random_str(16);
             $data['password'] = password_with_salt($data['password'], $data['salt']);
         } else {
             unset($data['password']);
diff --git a/app/admin/validate/v1/SysUserValidate.php b/app/admin/validate/v1/SysUserValidate.php
index 54528358..a50dcd21 100644
--- a/app/admin/validate/v1/SysUserValidate.php
+++ b/app/admin/validate/v1/SysUserValidate.php
@@ -63,6 +63,8 @@ class SysUserValidate extends Validate
     // 更新校验场景
     public function sceneUpdate()
     {
-        return $this->remove('repassword', 'requireWith:password|confirm:password');
+        return $this->remove('password', 'require')
+            ->remove('salt', 'require')
+            ->remove('repassword', 'requireWith:password|confirm:password');
     }
 }