Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro

Conflicts: yudao-core-service/pom.xml yudao-dependencies/pom.xml yudao-framework/pom.xml
2025-07-24 16:05:08 +08:00 · 2021-12-15 10:07:21 +08:00
parent 9d97c0ccb4 a7254e0f05
commit a55c0cfca5
32 changed files with 424 additions and 148 deletions
--- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/controller/auth/SysAuthController.java
+++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/controller/auth/SysAuthController.java
@ -9,7 +9,7 @@ import cn.iocoder.yudao.adminserver.modules.system.service.auth.SysAuthService;
 import cn.iocoder.yudao.adminserver.modules.system.service.permission.SysPermissionService;
 import cn.iocoder.yudao.adminserver.modules.system.service.permission.SysRoleService;
 import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.user.SysUserDO;
-import cn.iocoder.yudao.coreservice.modules.system.service.social.SysSocialService;
+import cn.iocoder.yudao.coreservice.modules.system.service.social.SysSocialCoreService;
 import cn.iocoder.yudao.coreservice.modules.system.service.user.SysUserCoreService;
 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
@ -50,7 +50,7 @@ public class SysAuthController {
    @Resource
    private SysPermissionService permissionService;
    @Resource
-    private SysSocialService socialService;
+    private SysSocialCoreService socialCoreService;

    @PostMapping("/login")
    @ApiOperation("使用账号密码登录")
@ -102,7 +102,7 @@ public class SysAuthController {
    })
    public CommonResult<String> socialAuthRedirect(@RequestParam("type") Integer type,
                                                    @RequestParam("redirectUri") String redirectUri) {
-        return CommonResult.success(socialService.getAuthorizeUrl(type, redirectUri));
+        return CommonResult.success(socialCoreService.getAuthorizeUrl(type, redirectUri));
    }

    @PostMapping("/social-login")
@ -133,7 +133,7 @@ public class SysAuthController {
    @DeleteMapping("/social-unbind")
    @ApiOperation("取消社交绑定")
    public CommonResult<Boolean> socialUnbind(@RequestBody SysAuthSocialUnbindReqVO reqVO) {
-        socialService.unbindSocialUser(getLoginUserId(), reqVO.getType(), reqVO.getUnionId(), UserTypeEnum.ADMIN);
+        socialCoreService.unbindSocialUser(getLoginUserId(), reqVO.getType(), reqVO.getUnionId(), UserTypeEnum.ADMIN);
        return CommonResult.success(true);
    }

--- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/controller/user/SysUserProfileController.java
+++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/controller/user/SysUserProfileController.java
@ -15,7 +15,7 @@ import cn.iocoder.yudao.adminserver.modules.system.service.permission.SysRoleSer
 import cn.iocoder.yudao.adminserver.modules.system.service.user.SysUserService;
 import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.social.SysSocialUserDO;
 import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.user.SysUserDO;
-import cn.iocoder.yudao.coreservice.modules.system.service.social.SysSocialService;
+import cn.iocoder.yudao.coreservice.modules.system.service.social.SysSocialCoreService;
 import cn.iocoder.yudao.coreservice.modules.system.service.user.SysUserCoreService;
 import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
 import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil;
@ -56,7 +56,7 @@ public class SysUserProfileController {
    @Resource
    private SysRoleService roleService;
    @Resource
-    private SysSocialService socialService;
+    private SysSocialCoreService socialService;

    @GetMapping("/get")
    @ApiOperation("获得登录用户信息")
--- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/service/auth/impl/SysAuthServiceImpl.java
+++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/service/auth/impl/SysAuthServiceImpl.java
@ -19,7 +19,7 @@ import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.user.SysUserDO
 import cn.iocoder.yudao.coreservice.modules.system.service.auth.SysUserSessionCoreService;
 import cn.iocoder.yudao.coreservice.modules.system.service.logger.SysLoginLogCoreService;
 import cn.iocoder.yudao.coreservice.modules.system.service.logger.dto.SysLoginLogCreateReqDTO;
-import cn.iocoder.yudao.coreservice.modules.system.service.social.SysSocialService;
+import cn.iocoder.yudao.coreservice.modules.system.service.social.SysSocialCoreService;
 import cn.iocoder.yudao.coreservice.modules.system.service.user.SysUserCoreService;
 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
@ -60,6 +60,8 @@ import static java.util.Collections.singleton;
@Slf4j
 public class SysAuthServiceImpl implements SysAuthService {

+    private static final UserTypeEnum USER_TYPE_ENUM = UserTypeEnum.ADMIN;
+
    @Resource
    @Lazy // 延迟加载，因为存在相互依赖的问题
    private AuthenticationManager authenticationManager;
@ -79,10 +81,8 @@ public class SysAuthServiceImpl implements SysAuthService {
    @Resource
    private SysPostService postService;
    @Resource
-    private SysSocialService socialService;
+    private SysSocialCoreService socialService;

-    // TODO @timfruit：静态枚举类，需要都大写，例如说 USER_TYPE_ENUM；静态变量，放在普通变量前面；这个实践不错哈。
-    private static final UserTypeEnum userTypeEnum = UserTypeEnum.ADMIN;

    @Override
    public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
@ -216,7 +216,7 @@ public class SysAuthServiceImpl implements SysAuthService {

        // 如果未绑定 SysSocialUserDO 用户，则无法自动登录，进行报错
        String unionId = socialService.getAuthUserUnionId(authUser);
-        List<SysSocialUserDO> socialUsers = socialService.getAllSocialUserList(reqVO.getType(), unionId, userTypeEnum);
+        List<SysSocialUserDO> socialUsers = socialService.getAllSocialUserList(reqVO.getType(), unionId, USER_TYPE_ENUM);
        if (CollUtil.isEmpty(socialUsers)) {
            throw exception(AUTH_THIRD_LOGIN_NOT_BIND);
        }
@ -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);
@ -248,7 +248,7 @@ public class SysAuthServiceImpl implements SysAuthService {
        LoginUser loginUser = this.login0(reqVO.getUsername(), reqVO.getPassword());

        // 绑定社交用户（新增）
-        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);
@ -261,7 +261,7 @@ public class SysAuthServiceImpl implements SysAuthService {
        Assert.notNull(authUser, "授权用户不为空");

        // 绑定社交用户（新增）
-        socialService.bindSocialUser(userId, reqVO.getType(), authUser, userTypeEnum);
+        socialService.bindSocialUser(userId, reqVO.getType(), authUser, USER_TYPE_ENUM);
    }

    @Override
@ -282,7 +282,7 @@ public class SysAuthServiceImpl implements SysAuthService {
        reqDTO.setLogType(SysLoginLogTypeEnum.LOGOUT_SELF.getType());
        reqDTO.setTraceId(TracerUtils.getTraceId());
        reqDTO.setUserId(userId);
-        reqDTO.setUserType(userTypeEnum.getValue());
+        reqDTO.setUserType(USER_TYPE_ENUM.getValue());
        reqDTO.setUsername(username);
        reqDTO.setUserAgent(ServletUtils.getUserAgent());
        reqDTO.setUserIp(ServletUtils.getClientIP());
--- a/yudao-admin-server/src/test/java/cn/iocoder/yudao/adminserver/modules/system/service/auth/SysAuthServiceImplTest.java
+++ b/yudao-admin-server/src/test/java/cn/iocoder/yudao/adminserver/modules/system/service/auth/SysAuthServiceImplTest.java
@ -12,7 +12,7 @@ import cn.iocoder.yudao.adminserver.modules.system.service.user.SysUserService;
 import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.user.SysUserDO;
 import cn.iocoder.yudao.coreservice.modules.system.service.auth.SysUserSessionCoreService;
 import cn.iocoder.yudao.coreservice.modules.system.service.logger.SysLoginLogCoreService;
-import cn.iocoder.yudao.coreservice.modules.system.service.social.SysSocialService;
+import cn.iocoder.yudao.coreservice.modules.system.service.social.SysSocialCoreService;
 import cn.iocoder.yudao.coreservice.modules.system.service.user.SysUserCoreService;
 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.framework.security.core.LoginUser;
@ -68,7 +68,7 @@ public class SysAuthServiceImplTest extends BaseDbUnitTest {
    @MockBean
    private SysUserSessionCoreService userSessionCoreService;
    @MockBean
-    private SysSocialService socialService;
+    private SysSocialCoreService socialService;
    @MockBean
    private SysPostService postService;

--- a/yudao-admin-server/src/test/java/cn/iocoder/yudao/adminserver/modules/system/service/social/SysSocialServiceTest.java
+++ b/yudao-admin-server/src/test/java/cn/iocoder/yudao/adminserver/modules/system/service/social/SysSocialServiceTest.java
@ -1,172 +0,0 @@
-package cn.iocoder.yudao.adminserver.modules.system.service.social;
-
-import cn.iocoder.yudao.adminserver.BaseDbAndRedisUnitTest;
-import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.social.SysSocialUserDO;
-import cn.iocoder.yudao.coreservice.modules.system.dal.mysql.social.SysSocialUserMapper;
-import cn.iocoder.yudao.coreservice.modules.system.dal.redis.social.SysSocialAuthUserRedisDAO;
-import cn.iocoder.yudao.coreservice.modules.system.enums.social.SysSocialTypeEnum;
-import cn.iocoder.yudao.coreservice.modules.system.service.social.impl.SysSocialServiceImpl;
-import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
-import com.xkcoding.justauth.AuthRequestFactory;
-import me.zhyd.oauth.model.AuthUser;
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.context.annotation.Import;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-import static cn.hutool.core.util.RandomUtil.randomEle;
-import static cn.hutool.core.util.RandomUtil.randomString;
-import static cn.iocoder.yudao.framework.common.util.json.JsonUtils.toJsonString;
-import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomLongId;
-import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-// TODO @timfruit：这个单元测试，挪到 yudao-core-service
-/**
- * {@link SysSocialServiceImpl} 的单元测试类
- *
- * @author 芋道源码
- */
-@Import({SysSocialServiceImpl.class, SysSocialAuthUserRedisDAO.class})
-public class SysSocialServiceTest extends BaseDbAndRedisUnitTest {
-
-    @Resource
-    private SysSocialServiceImpl socialService;
-
-    @Resource
-    private SysSocialUserMapper socialUserMapper;
-
-    @MockBean
-    private AuthRequestFactory authRequestFactory;
-
-    /**
-     * 情况一，创建 SysSocialUserDO 的情况
-     */
-    @Test
-    public void testBindSocialUser_create() {
-        // mock 数据
-        // 准备参数
-        Long userId = randomLongId();
-        Integer type = randomEle(SysSocialTypeEnum.values()).getType();
-        AuthUser authUser = randomPojo(AuthUser.class);
-        // mock 方法
-
-        // 调用
-        socialService.bindSocialUser(userId, type, authUser, UserTypeEnum.ADMIN);
-        // 断言
-        List<SysSocialUserDO> socialUsers = socialUserMapper.selectList("user_id", userId);
-        assertEquals(1, socialUsers.size());
-        assertBindSocialUser(socialUsers.get(0), authUser, userId, type);
-    }
-
-    /**
-     * 情况二，更新 SysSocialUserDO 的情况
-     */
-    @Test
-    public void testBindSocialUser_update() {
-        // mock 数据
-        SysSocialUserDO dbSocialUser = randomPojo(SysSocialUserDO.class, socialUserDO -> {
-            socialUserDO.setUserType(UserTypeEnum.ADMIN.getValue());
-            socialUserDO.setType(randomEle(SysSocialTypeEnum.values()).getType());
-        });
-        socialUserMapper.insert(dbSocialUser);
-        // 准备参数
-        Long userId = dbSocialUser.getUserId();
-        Integer type = dbSocialUser.getType();
-        AuthUser authUser = randomPojo(AuthUser.class);
-        // mock 方法
-
-        // 调用
-        socialService.bindSocialUser(userId, type, authUser, UserTypeEnum.ADMIN);
-        // 断言
-        List<SysSocialUserDO> socialUsers = socialUserMapper.selectList("user_id", userId);
-        assertEquals(1, socialUsers.size());
-        assertBindSocialUser(socialUsers.get(0), authUser, userId, type);
-    }
-
-    /**
-     * 情况一和二都存在的，逻辑二的场景
-     */
-    @Test
-    public void testBindSocialUser_userId() {
-        // mock 数据
-        SysSocialUserDO dbSocialUser = randomPojo(SysSocialUserDO.class, socialUserDO -> {
-            socialUserDO.setUserType(UserTypeEnum.ADMIN.getValue());
-            socialUserDO.setType(randomEle(SysSocialTypeEnum.values()).getType());
-        });
-        socialUserMapper.insert(dbSocialUser);
-        // 准备参数
-        Long userId = randomLongId();
-        Integer type = dbSocialUser.getType();
-        AuthUser authUser = randomPojo(AuthUser.class);
-        // mock 方法
-
-        // 调用
-        socialService.bindSocialUser(userId, type, authUser, UserTypeEnum.ADMIN);
-        // 断言
-        List<SysSocialUserDO> socialUsers = socialUserMapper.selectList("user_id", userId);
-        assertEquals(1, socialUsers.size());
-    }
-
-    private void assertBindSocialUser(SysSocialUserDO socialUser, AuthUser authUser, Long userId,
-                                             Integer type) {
-        assertEquals(authUser.getToken().getAccessToken(), socialUser.getToken());
-        assertEquals(toJsonString(authUser.getToken()), socialUser.getRawTokenInfo());
-        assertEquals(authUser.getNickname(), socialUser.getNickname());
-        assertEquals(authUser.getAvatar(), socialUser.getAvatar());
-        assertEquals(toJsonString(authUser.getRawUserInfo()), socialUser.getRawUserInfo());
-        assertEquals(userId, socialUser.getUserId());
-        assertEquals(UserTypeEnum.ADMIN.getValue(), socialUser.getUserType());
-        assertEquals(type, socialUser.getType());
-        assertEquals(authUser.getUuid(), socialUser.getOpenid());
-        assertEquals(socialService.getAuthUserUnionId(authUser), socialUser.getUnionId());
-    }
-
-    /**
-     * 情况一，如果新老的 unionId 是一致的，无需解绑
-     */
-    @Test
-    public void testUnbindOldSocialUser_no() {
-        // mock 数据
-        SysSocialUserDO oldSocialUser = randomPojo(SysSocialUserDO.class, socialUserDO -> {
-            socialUserDO.setUserType(UserTypeEnum.ADMIN.getValue());
-            socialUserDO.setType(randomEle(SysSocialTypeEnum.values()).getType());
-        });
-        socialUserMapper.insert(oldSocialUser);
-        // 准备参数
-        Long userId = oldSocialUser.getUserId();
-        Integer type = oldSocialUser.getType();
-        String newUnionId = oldSocialUser.getUnionId();
-
-        // 调用
-        socialService.unbindOldSocialUser(userId, type, newUnionId, UserTypeEnum.ADMIN);
-        // 断言
-        assertEquals(1L, socialUserMapper.selectCount(null).longValue());
-    }
-
-
-    /**
-     * 情况二，如果新老的 unionId 不一致的，需解绑
-     */
-    @Test
-    public void testUnbindOldSocialUser_yes() {
-        // mock 数据
-        SysSocialUserDO oldSocialUser = randomPojo(SysSocialUserDO.class, socialUserDO -> {
-            socialUserDO.setUserType(UserTypeEnum.ADMIN.getValue());
-            socialUserDO.setType(randomEle(SysSocialTypeEnum.values()).getType());
-        });
-        socialUserMapper.insert(oldSocialUser);
-        // 准备参数
-        Long userId = oldSocialUser.getUserId();
-        Integer type = oldSocialUser.getType();
-        String newUnionId = randomString(10);
-
-        // 调用
-        socialService.unbindOldSocialUser(userId, type, newUnionId, UserTypeEnum.ADMIN);
-        // 断言
-        assertEquals(0L, socialUserMapper.selectCount(null).longValue());
-    }
-
-}