|
@@ -18,6 +18,17 @@ export class LoginService {
|
|
|
adminModel: Repository<Admin>;
|
|
|
@InjectEntityModel(User)
|
|
|
userModel: Repository<User>;
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 用户忘记密码
|
|
|
+ * @param data 账号和新密码
|
|
|
+ */
|
|
|
+ async forgetPwd(data) {
|
|
|
+ // TODO: 需要验证手机验证码
|
|
|
+ const username = get(data, 'username')
|
|
|
+ const password = get(data, 'password')
|
|
|
+ return await this.userModel.update({ username }, { password })
|
|
|
+ }
|
|
|
/**
|
|
|
* 账密登录
|
|
|
* @param data 用户名和密码
|
|
@@ -31,7 +42,9 @@ export class LoginService {
|
|
|
const user = await model.createQueryBuilder('t').where('t.account = :account', { account: data.account }).addSelect('t.password').getOne();
|
|
|
if (!user) throw new ServiceError(ErrorCode.USER_NOT_FOUND);
|
|
|
await this.checkAccountCanLogin(user, type);
|
|
|
- const result = bcrypt.compareSync(data.password, user.password);
|
|
|
+ // 密码不加密,不需要处理
|
|
|
+ // const result = bcrypt.compareSync(data.password, user.password);
|
|
|
+ const result = data.password === user.password
|
|
|
if (!result) throw new ServiceError(ErrorCode.BAD_PASSWORD);
|
|
|
return user;
|
|
|
}
|
|
@@ -40,7 +53,9 @@ export class LoginService {
|
|
|
const user = await this.adminModel.createQueryBuilder('t').where('t.account = :account', { account: data.account }).addSelect('t.password').getOne();
|
|
|
if (!user) throw new ServiceError(ErrorCode.USER_NOT_FOUND);
|
|
|
await this.checkAccountCanLogin(user, LoginType.Admin);
|
|
|
- const result = bcrypt.compareSync(data.password, user.password);
|
|
|
+ // 密码不加密,不需要处理
|
|
|
+ // const result = bcrypt.compareSync(data.password, user.password);
|
|
|
+ const result = data.password === user.password
|
|
|
if (!result) throw new ServiceError(ErrorCode.BAD_PASSWORD);
|
|
|
return user;
|
|
|
}
|