mirror of
https://github.com/cool-team-official/cool-admin-midway.git
synced 2025-12-10 16:12:50 +00:00
fix app login
This commit is contained in:
parent
76b509e853
commit
1c6af4a5fa
@ -229,7 +229,6 @@ export class UserLoginService extends BaseService {
|
|||||||
nickName: wxUserInfo.nickName,
|
nickName: wxUserInfo.nickName,
|
||||||
avatarUrl,
|
avatarUrl,
|
||||||
gender: wxUserInfo.gender,
|
gender: wxUserInfo.gender,
|
||||||
tenantId: userInfo['tenantId'],
|
|
||||||
loginType: wxUserInfo.type,
|
loginType: wxUserInfo.type,
|
||||||
};
|
};
|
||||||
await this.userInfoEntity.insert(userInfo);
|
await this.userInfoEntity.insert(userInfo);
|
||||||
@ -297,9 +296,11 @@ export class UserLoginService extends BaseService {
|
|||||||
*/
|
*/
|
||||||
async generateToken(info, isRefresh = false) {
|
async generateToken(info, isRefresh = false) {
|
||||||
const { expire, refreshExpire, secret } = this.jwtConfig;
|
const { expire, refreshExpire, secret } = this.jwtConfig;
|
||||||
|
const user = await this.userInfoEntity.findOneBy({ id: Equal(info.id) });
|
||||||
const tokenInfo = {
|
const tokenInfo = {
|
||||||
isRefresh,
|
isRefresh,
|
||||||
...info,
|
...info,
|
||||||
|
tenantId: user?.tenantId,
|
||||||
};
|
};
|
||||||
return jwt.sign(tokenInfo, secret, {
|
return jwt.sign(tokenInfo, secret, {
|
||||||
expiresIn: isRefresh ? refreshExpire : expire,
|
expiresIn: isRefresh ? refreshExpire : expire,
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user