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 { return bcrypt.hashSync(plainPassword, salt); } - async findOne(param: any) { + async findOne(param: Record) { return this.repository.findOne({ where: param, });