合并 master 代码

修复单测报错的问题
This commit is contained in:
YunaiV
2021-12-15 09:45:37 +08:00
parent 712067979c
commit 52631a0af8
10 changed files with 36 additions and 21 deletions

View File

@ -232,7 +232,7 @@ public class SysAuthServiceImpl implements SysAuthService {
LoginUser loginUser = this.buildLoginUser(user);
// 绑定社交用户(更新)
socialService.bindSocialUser(loginUser.getId(), reqVO.getType(), authUser, userTypeEnum);
socialService.bindSocialUser(loginUser.getId(), reqVO.getType(), authUser, USER_TYPE_ENUM);
// 缓存登录用户到 Redis 中,返回 sessionId 编号
return userSessionCoreService.createUserSession(loginUser, userIp, userAgent);

View File

@ -69,7 +69,6 @@ public class SysAuthServiceImplTest extends BaseDbUnitTest {
private SysUserSessionCoreService userSessionCoreService;
@MockBean
private SysSocialCoreService socialService;
private SysSocialService socialService;
@MockBean
private SysPostService postService;