xinyuxi/ZYZ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

登录：fix

Browse Source
This commit is contained in:
luying
2021-03-08 09:54:03 +08:00
parent 0e292b8bda
commit 9cc83a61a5
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
shared/db/Role.ts
View File

@@ -250,7 +250,7 @@ export default class Role extends BaseModel {
@prop({ required: true, default: 0 })
updatedMailAt: number;
public static async findAllByUid(uid: number, lean = true) {
const role: RoleType[] = await RoleModel.find({ 'userInfo.uid': uid }).select('roleId roleName serverId').lean(lean);
const role: RoleType[] = await RoleModel.find({ 'userInfo.uid': uid }).select('roleId roleName serverId headHid sHid lv updatedAt').lean(lean);
return role;
}

4
shared/db/User.ts
View File

@@ -160,7 +160,7 @@ export default class User extends BaseModel {
const curTime: Date = new Date();
let { salt } = user;
let { npassword } = await this.encryptPass(password, salt);
const checkUser: UserType = await UserModel.findOneAndUpdate({ tel, password: npassword }, { $set: { token, lastLoginTime: curTime }, $addToSet: {device: deviceId}}).select('uid username name token').lean(lean);
const checkUser: UserType = await UserModel.findOneAndUpdate({ tel, password: npassword }, { $set: { token, lastLoginTime: curTime }, $addToSet: {device: deviceId}}, { new: true }).lean(lean);
return checkUser;
} else {
return null
@@ -193,7 +193,7 @@ export default class User extends BaseModel {
}
public static async addAuth(uid: number, auth: number, lean = true) {
const user: UserType = await UserModel.findOneAndUpdate({ uid }, { auth }).select('uid tel').lean(lean);
const user: UserType = await UserModel.findOneAndUpdate({ uid }, { auth }, {new: true}).select('uid tel').lean(lean);
return user;
}

4
web-server/app/service/Auth.ts
View File

@@ -72,8 +72,10 @@ export default class Auth extends Service {
if(param.isGuest && param.guestTime > GUEST_MAX_TIME) {
loginType = 2;
}
let canLogin = true;
if(!user.isGuest && !user.hasSetPw) canLogin = false;
return this.ctx.service.utils.resResult(STATUS.SUCCESS, {
canLogin: user.hasSetPw, // 未设置密码等于未创建账号
canLogin, // 未设置密码等于未创建账号
loginType,
...param
});