From 32cb4992eee7060bffcf9cadd9c785acb7438254 Mon Sep 17 00:00:00 2001
From: weiz <736250432@qq.com>
Date: Tue, 28 May 2024 10:38:56 +0800
Subject: [PATCH] update

---
 .../controller/auth/AdminController.php       | 16 +++++++++++
 app/adminapi/logic/auth/AdminLogic.php        | 27 ++++++++++++++-----
 app/adminapi/validate/auth/AdminValidate.php  |  7 ++++-
 3 files changed, 43 insertions(+), 7 deletions(-)

diff --git a/app/adminapi/controller/auth/AdminController.php b/app/adminapi/controller/auth/AdminController.php
index c1fd57fa4..efd10007e 100755
--- a/app/adminapi/controller/auth/AdminController.php
+++ b/app/adminapi/controller/auth/AdminController.php
@@ -93,6 +93,22 @@ class AdminController extends BaseAdminController
         }
         return $this->fail(AdminLogic::getError());
     }
+	
+	/**
+	 * @notes 删除管理员
+	 * @return \think\response\Json
+	 * @author 段誉
+	 * @date 2021/12/29 11:03
+	 */
+	public function pwd()
+	{
+		$params = (new AdminValidate())->post()->goCheck('pwd');
+		$result = AdminLogic::pwd($params);
+		if (true === $result) {
+			return $this->success('操作成功', [], 1, 1);
+		}
+		return $this->fail(AdminLogic::getError());
+	}
 
 
     /**
diff --git a/app/adminapi/logic/auth/AdminLogic.php b/app/adminapi/logic/auth/AdminLogic.php
index 6e643c948..51380961b 100755
--- a/app/adminapi/logic/auth/AdminLogic.php
+++ b/app/adminapi/logic/auth/AdminLogic.php
@@ -130,12 +130,6 @@ class AdminLogic extends BaseLogic
             // 头像
             $data['avatar'] = !empty($params['avatar']) ? FileService::setFileUrl($params['avatar']) : '';
 
-            // 密码
-            if (!empty($params['password'])) {
-                $passwordSalt = Config::get('project.unique_identification');
-                $data['password'] = create_password($params['password'], $passwordSalt);
-            }
-
             // 禁用或更换角色后.设置token过期
             $roleId = AdminRole::where('admin_id', $params['id'])->column('role_id');
             $editRole = false;
@@ -162,6 +156,27 @@ class AdminLogic extends BaseLogic
             return false;
         }
     }
+	
+	public static function pwd(array $params): bool
+	{
+		$passwordSalt = Config::get('project.unique_identification');
+		$password = create_password($params['password'], $passwordSalt);
+		Db::startTrans();
+		try {
+			// 基础信息
+			$data = [
+				'id' => $params['id'],
+				'password' => $password,
+			];
+			Admin::update($data);
+			Db::commit();
+			return true;
+		} catch (\Exception $e) {
+			Db::rollback();
+			self::setError($e->getMessage());
+			return false;
+		}
+	}
 
 
     /**
diff --git a/app/adminapi/validate/auth/AdminValidate.php b/app/adminapi/validate/auth/AdminValidate.php
index d9d958929..383eb1d00 100755
--- a/app/adminapi/validate/auth/AdminValidate.php
+++ b/app/adminapi/validate/auth/AdminValidate.php
@@ -32,7 +32,7 @@
 			'account' => 'require|length:1,32|unique:' . Admin::class,
 			'name' => 'require|length:1,16|unique:' . Admin::class,
 			'password' => 'require|length:6,32',
-			'password_confirm' => 'requireWith:password|confirm',
+			'password_confirm' => 'require|confirm:password',
 			'role_id' => 'require',
 			'disable' => 'require|in:0,1|checkAbleDisable',
 			'multipoint_login' => 'require|in:0,1',
@@ -129,6 +129,11 @@
 				->append('id', 'require|checkAdmin');
 		}
 		
+		public function scenePwd()
+		{
+			return $this->only(['id', 'password', 'password_confirm']);
+		}
+		
 		
 		/**
 		 * @notes 删除场景