From e3930e07172dd7903cb0f6ff26e0e3e828ba3e77 Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Mon, 28 Apr 2025 16:57:30 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BA=8C=E6=AC=A1?=
 =?UTF-8?q?=E8=AE=A4=E8=AF=81=E7=99=BB=E5=BD=95=E8=BF=9B=E5=85=A5=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E8=B4=A6=E5=8F=B7=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/certd-client/src/views/certd/mine/security/index.vue | 1 +
 .../certd-server/src/modules/login/service/login-service.ts | 6 +++++-
 .../src/modules/sys/authority/service/user-service.ts       | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/ui/certd-client/src/views/certd/mine/security/index.vue b/packages/ui/certd-client/src/views/certd/mine/security/index.vue
index aab10450..0a4ccf6a 100644
--- a/packages/ui/certd-client/src/views/certd/mine/security/index.vue
+++ b/packages/ui/certd-client/src/views/certd/mine/security/index.vue
@@ -127,6 +127,7 @@ const doAuthenticatorSave = async (form: any) => {
     message: "保存成功",
   });
   authenticatorForm.open = false;
+  formState.authenticator.verified = true;
 };
 
 function onAuthenticatorEnabledChanged(value: any) {
diff --git a/packages/ui/certd-server/src/modules/login/service/login-service.ts b/packages/ui/certd-server/src/modules/login/service/login-service.ts
index ea86f4bd..ed7cc39b 100644
--- a/packages/ui/certd-server/src/modules/login/service/login-service.ts
+++ b/packages/ui/certd-server/src/modules/login/service/login-service.ts
@@ -176,7 +176,11 @@ export class LoginService {
     }
     await this.twoFactorService.verifyAuthenticatorCode(userId, req.verifyCode)
 
-    return this.generateToken(await this.userService.findOne(userId))
+    const user = await this.userService.info(userId);
+    if (!user) {
+      throw new AuthException('用户不存在')
+    }
+    return this.generateToken(user)
   }
 
   private async onLoginSuccess(info: UserEntity) {
diff --git a/packages/ui/certd-server/src/modules/sys/authority/service/user-service.ts b/packages/ui/certd-server/src/modules/sys/authority/service/user-service.ts
index 436fc859..21926c43 100644
--- a/packages/ui/certd-server/src/modules/sys/authority/service/user-service.ts
+++ b/packages/ui/certd-server/src/modules/sys/authority/service/user-service.ts
@@ -135,7 +135,7 @@ export class UserService extends BaseService<UserEntity> {
     return bcrypt.hashSync(plainPassword, salt);
   }
 
-  async findOne(param: any) {
+  async findOne(param: Record<string,any>) {
     return this.repository.findOne({
       where: param,
     });