From 1c070487eb9100c407b7aeadaff5bfb4436fd105 Mon Sep 17 00:00:00 2001
From: colin <colin.in@foxmail.com>
Date: Thu, 19 Dec 2024 18:05:05 +0800
Subject: [PATCH] =?UTF-8?q?fix(hooks):=20=E5=90=8C=E6=AD=A5=20useSettings?=
 =?UTF-8?q?=20=E5=AF=BC=E5=87=BA=E5=AD=97=E6=AE=B5.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/hooks/usePasswordValidator.ts         |  3 +--
 .../identity/src/hooks/useRandomPassword.ts   | 20 ++++++-------------
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/apps/vben5/packages/@abp/identity/src/hooks/usePasswordValidator.ts b/apps/vben5/packages/@abp/identity/src/hooks/usePasswordValidator.ts
index 93cf39b1f..0e64dbd55 100644
--- a/apps/vben5/packages/@abp/identity/src/hooks/usePasswordValidator.ts
+++ b/apps/vben5/packages/@abp/identity/src/hooks/usePasswordValidator.ts
@@ -13,8 +13,7 @@ import {
 } from '@abp/core';
 
 export function usePasswordValidator() {
-  const { settingProvider } = useSettings();
-  const { getNumber, isTrue } = settingProvider;
+  const { getNumber, isTrue } = useSettings();
   const { L } = useLocalization(['AbpIdentity', 'AbpUi']);
 
   const passwordSetting = computed(() => {
diff --git a/apps/vben5/packages/@abp/identity/src/hooks/useRandomPassword.ts b/apps/vben5/packages/@abp/identity/src/hooks/useRandomPassword.ts
index 4d0a21e5c..ba1913b84 100644
--- a/apps/vben5/packages/@abp/identity/src/hooks/useRandomPassword.ts
+++ b/apps/vben5/packages/@abp/identity/src/hooks/useRandomPassword.ts
@@ -31,26 +31,18 @@ export function useRandomPassword() {
   }
 
   function generatePassword() {
-    const { settingProvider } = useSettings();
+    const { getNumber, isTrue } = useSettings();
     // 根据配置项生成随机密码
     // 密码长度
-    const length = settingProvider.getNumber(
-      'Abp.Identity.Password.RequiredLength',
-    );
+    const length = getNumber('Abp.Identity.Password.RequiredLength');
     // 需要小写字母
-    const lower = settingProvider.isTrue(
-      'Abp.Identity.Password.RequireLowercase',
-    );
+    const lower = isTrue('Abp.Identity.Password.RequireLowercase');
     // 需要大写字母
-    const upper = settingProvider.isTrue(
-      'Abp.Identity.Password.RequireUppercase',
-    );
+    const upper = isTrue('Abp.Identity.Password.RequireUppercase');
     // 需要数字
-    const number = settingProvider.isTrue('Abp.Identity.Password.RequireDigit');
+    const number = isTrue('Abp.Identity.Password.RequireDigit');
     // 需要符号
-    const symbol = settingProvider.isTrue(
-      'Abp.Identity.Password.RequireNonAlphanumeric',
-    );
+    const symbol = isTrue('Abp.Identity.Password.RequireNonAlphanumeric');
     // 默认生成数字
     const defaultNumber = !lower && !upper && !number && !symbol;