1、优化社交客户端模块

citu-module-member/citu-module-member-biz/src/main/java/com/citu/module/member/controller/app/social/AppSocialUserController.java

@@ -40,7 +40,7 @@ public class AppSocialUserController {
     @PermitAll
     public CommonResult<String> socialBind(@RequestBody @Valid AppSocialUserBindReqVO reqVO) {
         SocialUserBindReqDTO reqDTO = new SocialUserBindReqDTO(getLoginUserId(), UserTypeEnum.MEMBER.getValue(),
-                reqVO.getType(), reqVO.getCode(), reqVO.getState());
+                reqVO.getType(), reqVO.getCode(), reqVO.getState(),null);
         String openid = socialUserApi.bindSocialUser(reqDTO).getCheckedData();
         return success(openid);
     }
@@ -49,7 +49,7 @@ public class AppSocialUserController {
     @Operation(summary = "取消社交绑定")
     public CommonResult<Boolean> socialUnbind(@RequestBody AppSocialUserUnbindReqVO reqVO) {
         SocialUserUnbindReqDTO reqDTO = new SocialUserUnbindReqDTO(getLoginUserId(), UserTypeEnum.MEMBER.getValue(),
-                reqVO.getType(), reqVO.getOpenid());
+                reqVO.getType(), reqVO.getOpenid(),null);
         socialUserApi.unbindSocialUser(reqDTO);
         return success(true);
     }

citu-module-member/citu-module-member-biz/src/main/java/com/citu/module/member/service/auth/MemberAuthServiceImpl.java

@@ -70,7 +70,7 @@ public class MemberAuthServiceImpl implements MemberAuthService {
         String openid = null;
         if (reqVO.getSocialType() != null) {
             openid = socialUserApi.bindSocialUser(new SocialUserBindReqDTO(user.getId(), getUserType().getValue(),
-                    reqVO.getSocialType(), reqVO.getSocialCode(), reqVO.getSocialState())).getCheckedData();
+                    reqVO.getSocialType(), reqVO.getSocialCode(), reqVO.getSocialState(),null)).getCheckedData();
         }
 
         // 创建 Token 令牌，记录登录日志
@@ -92,7 +92,7 @@ public class MemberAuthServiceImpl implements MemberAuthService {
         String openid = null;
         if (reqVO.getSocialType() != null) {
             openid = socialUserApi.bindSocialUser(new SocialUserBindReqDTO(user.getId(), getUserType().getValue(),
-                    reqVO.getSocialType(), reqVO.getSocialCode(), reqVO.getSocialState())).getCheckedData();
+                    reqVO.getSocialType(), reqVO.getSocialCode(), reqVO.getSocialState(),null)).getCheckedData();
         }
 
         // 创建 Token 令牌，记录登录日志
@@ -117,7 +117,7 @@ public class MemberAuthServiceImpl implements MemberAuthService {
         } else {
             user = userService.createUser(socialUser.getNickname(), socialUser.getAvatar(), getClientIP(), getTerminal());
             socialUserApi.bindSocialUser(new SocialUserBindReqDTO(user.getId(), getUserType().getValue(),
-                    reqVO.getType(), reqVO.getCode(), reqVO.getState()));
+                    reqVO.getType(), reqVO.getCode(), reqVO.getState(),null));
         }
         if (user == null) {
             throw exception(USER_NOT_EXISTS);
@@ -141,7 +141,7 @@ public class MemberAuthServiceImpl implements MemberAuthService {
 
         // 绑定社交用户
         String openid = socialUserApi.bindSocialUser(new SocialUserBindReqDTO(user.getId(), getUserType().getValue(),
-                SocialTypeEnum.WECHAT_MINI_APP.getType(), reqVO.getLoginCode(), reqVO.getState())).getCheckedData();
+                SocialTypeEnum.WECHAT_MINI_APP.getType(), reqVO.getLoginCode(), reqVO.getState(),null)).getCheckedData();
 
         // 创建 Token 令牌，记录登录日志
         return createTokenAfterLoginSuccess(user, user.getMobile(), LoginLogTypeEnum.LOGIN_SOCIAL, openid);

citu-module-system/citu-module-system-biz/src/main/java/com/citu/module/system/service/auth/AdminAuthServiceImpl.java

@@ -103,7 +103,7 @@ public class AdminAuthServiceImpl implements AdminAuthService {
         // 如果 socialType 非空，说明需要绑定社交用户
         if (reqVO.getSocialType() != null) {
             socialUserService.bindSocialUser(new SocialUserBindReqDTO(user.getId(), getUserType().getValue(),
-                    reqVO.getSocialType(), reqVO.getSocialCode(), reqVO.getSocialState()));
+                    reqVO.getSocialType(), reqVO.getSocialCode(), reqVO.getSocialState(),null));
         }
         // 创建 Token 令牌，记录登录日志
         return createTokenAfterLoginSuccess(user.getId(), reqVO.getUsername(), LoginLogTypeEnum.LOGIN_USERNAME);

citu-module-system/citu-module-system-biz/src/test/java/com/citu/module/system/service/auth/AdminAuthServiceImplTest.java

@@ -183,7 +183,7 @@ public class AdminAuthServiceImplTest extends BaseDbUnitTest {
         );
         verify(socialUserService).bindSocialUser(eq(new SocialUserBindReqDTO(
                 user.getId(), UserTypeEnum.ADMIN.getValue(),
-                reqVO.getSocialType(), reqVO.getSocialCode(), reqVO.getSocialState())));
+                reqVO.getSocialType(), reqVO.getSocialCode(), reqVO.getSocialState(),null)));
     }
 
     @Test

citu-module-system/citu-module-system-biz/src/test/java/com/citu/module/system/service/social/SocialClientServiceImplTest.java

@@ -111,7 +111,7 @@ public class SocialClientServiceImplTest extends BaseDbUnitTest {
         }))).thenReturn(authResponse);
 
         // 调用
-        AuthUser result = socialClientService.getAuthUser(socialType, userType, code, state);
+        AuthUser result = socialClientService.getAuthUser(null,socialType, userType, code, state);
         // 断言
         assertSame(authUser, result);
     }
@@ -136,7 +136,7 @@ public class SocialClientServiceImplTest extends BaseDbUnitTest {
 
         // 调用并断言
         assertServiceException(
-                () -> socialClientService.getAuthUser(socialType, userType, code, state),
+                () -> socialClientService.getAuthUser(null,socialType, userType, code, state),
                 SOCIAL_USER_AUTH_FAILURE, "模拟失败");
     }
 

citu-module-system/citu-module-system-biz/src/test/java/com/citu/module/system/service/social/SocialUserServiceImplTest.java

@@ -197,7 +197,7 @@ public class SocialUserServiceImplTest extends BaseDbUnitTest {
         String state = "yuanma";
         // mock 方法
         AuthUser authUser = randomPojo(AuthUser.class);
-        when(socialClientService.getAuthUser(eq(socialType), eq(userType), eq(code), eq(state))).thenReturn(authUser);
+        when(socialClientService.getAuthUser(null,eq(socialType), eq(userType), eq(code), eq(state))).thenReturn(authUser);
 
         // 调用
         SocialUserDO result = socialUserService.authSocialUser(socialType, userType, code, state);
@@ -218,7 +218,7 @@ public class SocialUserServiceImplTest extends BaseDbUnitTest {
         socialUserMapper.insert(randomPojo(SocialUserDO.class).setType(socialType).setOpenid("test_openid"));
         // mock 方法
         AuthUser authUser = randomPojo(AuthUser.class);
-        when(socialClientService.getAuthUser(eq(socialType), eq(userType), eq(code), eq(state))).thenReturn(authUser);
+        when(socialClientService.getAuthUser(null,eq(socialType), eq(userType), eq(code), eq(state))).thenReturn(authUser);
 
         // 调用
         SocialUserDO result = socialUserService.authSocialUser(socialType, userType, code, state);