diff --git a/yudao-module-im/yudao-module-im-server/pom.xml b/yudao-module-im/yudao-module-im-server/pom.xml index 17a010f33..9a5421d75 100644 --- a/yudao-module-im/yudao-module-im-server/pom.xml +++ b/yudao-module-im/yudao-module-im-server/pom.xml @@ -35,6 +35,11 @@ yudao-module-system-api ${revision} + + cn.iocoder.cloud + yudao-module-infra-api + ${revision} + @@ -47,10 +52,6 @@ cn.iocoder.cloud yudao-spring-boot-starter-security - - cn.iocoder.cloud - yudao-spring-boot-starter-websocket - org.springframework.boot spring-boot-starter-validation diff --git a/yudao-module-im/yudao-module-im-server/src/main/java/cn/iocoder/yudao/module/im/framework/rpc/config/RpcConfiguration.java b/yudao-module-im/yudao-module-im-server/src/main/java/cn/iocoder/yudao/module/im/framework/rpc/config/RpcConfiguration.java new file mode 100644 index 000000000..4448aa35a --- /dev/null +++ b/yudao-module-im/yudao-module-im-server/src/main/java/cn/iocoder/yudao/module/im/framework/rpc/config/RpcConfiguration.java @@ -0,0 +1,11 @@ +package cn.iocoder.yudao.module.im.framework.rpc.config; + +import cn.iocoder.yudao.module.infra.api.websocket.WebSocketSenderApi; +import cn.iocoder.yudao.module.system.api.user.AdminUserApi; +import org.springframework.cloud.openfeign.EnableFeignClients; +import org.springframework.context.annotation.Configuration; + +@Configuration(value = "imRpcConfiguration", proxyBeanMethods = false) +@EnableFeignClients(clients = {AdminUserApi.class, WebSocketSenderApi.class}) +public class RpcConfiguration { +} diff --git a/yudao-module-im/yudao-module-im-server/src/main/java/cn/iocoder/yudao/module/im/framework/security/config/SecurityConfiguration.java b/yudao-module-im/yudao-module-im-server/src/main/java/cn/iocoder/yudao/module/im/framework/security/config/SecurityConfiguration.java new file mode 100644 index 000000000..a0c9184e7 --- /dev/null +++ b/yudao-module-im/yudao-module-im-server/src/main/java/cn/iocoder/yudao/module/im/framework/security/config/SecurityConfiguration.java @@ -0,0 +1,36 @@ +package cn.iocoder.yudao.module.im.framework.security.config; + +import cn.iocoder.yudao.framework.security.config.AuthorizeRequestsCustomizer; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configurers.AuthorizeHttpRequestsConfigurer; + +/** + * IM 模块的 Security 配置 + */ +@Configuration(proxyBeanMethods = false, value = "imSecurityConfiguration") +public class SecurityConfiguration { + + @Bean("imAuthorizeRequestsCustomizer") + public AuthorizeRequestsCustomizer authorizeRequestsCustomizer() { + return new AuthorizeRequestsCustomizer() { + + @Override + public void customize(AuthorizeHttpRequestsConfigurer.AuthorizationManagerRequestMatcherRegistry registry) { + // Swagger 接口文档 + registry.requestMatchers("/v3/api-docs/**").permitAll() + .requestMatchers("/webjars/**").permitAll() + .requestMatchers("/swagger-ui").permitAll() + .requestMatchers("/swagger-ui/**").permitAll(); + // Spring Boot Actuator 的安全配置 + registry.requestMatchers("/actuator").permitAll() + .requestMatchers("/actuator/**").permitAll(); + // Druid 监控 + registry.requestMatchers("/druid/**").permitAll(); + } + + }; + } + +} diff --git a/yudao-module-im/yudao-module-im-server/src/main/java/cn/iocoder/yudao/module/im/service/websocket/ImWebSocketServiceImpl.java b/yudao-module-im/yudao-module-im-server/src/main/java/cn/iocoder/yudao/module/im/service/websocket/ImWebSocketServiceImpl.java index 2bf32229f..2253943c5 100644 --- a/yudao-module-im/yudao-module-im-server/src/main/java/cn/iocoder/yudao/module/im/service/websocket/ImWebSocketServiceImpl.java +++ b/yudao-module-im/yudao-module-im-server/src/main/java/cn/iocoder/yudao/module/im/service/websocket/ImWebSocketServiceImpl.java @@ -2,10 +2,10 @@ package cn.iocoder.yudao.module.im.service.websocket; import cn.hutool.extra.spring.SpringUtil; import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; -import cn.iocoder.yudao.framework.websocket.core.sender.WebSocketMessageSender; import cn.iocoder.yudao.module.im.service.websocket.dto.ImChannelMessageDTO; import cn.iocoder.yudao.module.im.service.websocket.dto.ImGroupMessageDTO; import cn.iocoder.yudao.module.im.service.websocket.dto.ImPrivateMessageDTO; +import cn.iocoder.yudao.module.infra.api.websocket.WebSocketSenderApi; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.scheduling.annotation.Async; @@ -33,7 +33,7 @@ import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils. public class ImWebSocketServiceImpl implements ImWebSocketService { @Resource - private WebSocketMessageSender webSocketMessageSender; + private WebSocketSenderApi webSocketSenderApi; @Override public void sendPrivateMessageAsync(Collection userIds, ImPrivateMessageDTO dto) { @@ -64,7 +64,7 @@ public class ImWebSocketServiceImpl implements ImWebSocketService { public void doSendPrivateMessage(Collection userIds, ImPrivateMessageDTO dto) { for (Long userId : getDistinctUserIds(userIds)) { try { - webSocketMessageSender.sendObject(UserTypeEnum.ADMIN.getValue(), userId, + webSocketSenderApi.sendObject(UserTypeEnum.ADMIN.getValue(), userId, ImPrivateMessageDTO.TYPE, dto); } catch (Exception e) { log.error("[doSendPrivateMessage][userId({}) dto({}) 发送失败]", userId, dto, e); @@ -79,7 +79,7 @@ public class ImWebSocketServiceImpl implements ImWebSocketService { public void doSendGroupMessage(Collection userIds, ImGroupMessageDTO dto) { for (Long userId : getDistinctUserIds(userIds)) { try { - webSocketMessageSender.sendObject(UserTypeEnum.ADMIN.getValue(), userId, + webSocketSenderApi.sendObject(UserTypeEnum.ADMIN.getValue(), userId, ImGroupMessageDTO.TYPE, dto); } catch (Exception e) { log.error("[doSendGroupMessage][userId({}) dto({}) 发送失败]", userId, dto, e); @@ -94,7 +94,7 @@ public class ImWebSocketServiceImpl implements ImWebSocketService { public void doSendChannelMessage(Collection userIds, ImChannelMessageDTO dto) { for (Long userId : getDistinctUserIds(userIds)) { try { - webSocketMessageSender.sendObject(UserTypeEnum.ADMIN.getValue(), userId, + webSocketSenderApi.sendObject(UserTypeEnum.ADMIN.getValue(), userId, ImChannelMessageDTO.TYPE, dto); } catch (Exception e) { log.error("[doSendChannelMessage][userId({}) dto({}) 发送失败]", userId, dto, e); @@ -104,12 +104,12 @@ public class ImWebSocketServiceImpl implements ImWebSocketService { /** * 异步广播频道 WebSocket 消息给当前所有在线管理端用户； - * 依赖 WebSocketMessageSender 按 UserType 广播能力，离线用户由客户端上线 pull 兜底 + * 依赖 infra WebSocketSenderApi 按 UserType 广播能力，离线用户由客户端上线 pull 兜底 */ @Async public void doBroadcastChannelMessage(ImChannelMessageDTO dto) { try { - webSocketMessageSender.sendObject(UserTypeEnum.ADMIN.getValue(), + webSocketSenderApi.sendObject(UserTypeEnum.ADMIN.getValue(), ImChannelMessageDTO.TYPE, dto); } catch (Exception e) { log.error("[doBroadcastChannelMessage][dto({}) 广播失败]", dto, e); diff --git a/yudao-module-im/yudao-module-im-server/src/test/java/cn/iocoder/yudao/module/im/service/websocket/ImWebSocketServiceImplTest.java b/yudao-module-im/yudao-module-im-server/src/test/java/cn/iocoder/yudao/module/im/service/websocket/ImWebSocketServiceImplTest.java index f1c333916..a210d1217 100644 --- a/yudao-module-im/yudao-module-im-server/src/test/java/cn/iocoder/yudao/module/im/service/websocket/ImWebSocketServiceImplTest.java +++ b/yudao-module-im/yudao-module-im-server/src/test/java/cn/iocoder/yudao/module/im/service/websocket/ImWebSocketServiceImplTest.java @@ -3,9 +3,9 @@ package cn.iocoder.yudao.module.im.service.websocket; import cn.hutool.extra.spring.SpringUtil; import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest; -import cn.iocoder.yudao.framework.websocket.core.sender.WebSocketMessageSender; import cn.iocoder.yudao.module.im.service.websocket.dto.ImGroupMessageDTO; import cn.iocoder.yudao.module.im.service.websocket.dto.ImPrivateMessageDTO; +import cn.iocoder.yudao.module.infra.api.websocket.WebSocketSenderApi; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; import org.mockito.InjectMocks; @@ -33,7 +33,7 @@ public class ImWebSocketServiceImplTest extends BaseMockitoUnitTest { private ImWebSocketServiceImpl imWebSocketService; @Mock - private WebSocketMessageSender webSocketMessageSender; + private WebSocketSenderApi webSocketSenderApi; @AfterEach public void tearDown() { @@ -58,7 +58,7 @@ public class ImWebSocketServiceImplTest extends BaseMockitoUnitTest { imWebSocketService.sendPrivateMessageAsync(2L, dto); // 断言 - verify(webSocketMessageSender).sendObject( + verify(webSocketSenderApi).sendObject( eq(UserTypeEnum.ADMIN.getValue()), eq(2L), eq(ImPrivateMessageDTO.TYPE), eq(dto)); } } @@ -78,7 +78,7 @@ public class ImWebSocketServiceImplTest extends BaseMockitoUnitTest { imWebSocketService.sendPrivateMessageAsync(2L, dto); // 断言：事务未提交，未推送 - verify(webSocketMessageSender, never()).sendObject(anyInt(), anyLong(), anyString(), any()); + verify(webSocketSenderApi, never()).sendObject(anyInt(), anyLong(), anyString(), any()); // 模拟事务提交 List syncs = @@ -87,7 +87,7 @@ public class ImWebSocketServiceImplTest extends BaseMockitoUnitTest { syncs.forEach(TransactionSynchronization::afterCommit); // 断言：提交后推送 - verify(webSocketMessageSender).sendObject( + verify(webSocketSenderApi).sendObject( eq(UserTypeEnum.ADMIN.getValue()), eq(2L), eq(ImPrivateMessageDTO.TYPE), eq(dto)); } finally { TransactionSynchronizationManager.clear(); @@ -109,11 +109,11 @@ public class ImWebSocketServiceImplTest extends BaseMockitoUnitTest { imWebSocketService.sendGroupMessageAsync(List.of(1L, 2L, 3L), dto); - verify(webSocketMessageSender).sendObject( + verify(webSocketSenderApi).sendObject( eq(UserTypeEnum.ADMIN.getValue()), eq(1L), eq(ImGroupMessageDTO.TYPE), eq(dto)); - verify(webSocketMessageSender).sendObject( + verify(webSocketSenderApi).sendObject( eq(UserTypeEnum.ADMIN.getValue()), eq(2L), eq(ImGroupMessageDTO.TYPE), eq(dto)); - verify(webSocketMessageSender).sendObject( + verify(webSocketSenderApi).sendObject( eq(UserTypeEnum.ADMIN.getValue()), eq(3L), eq(ImGroupMessageDTO.TYPE), eq(dto)); } } @@ -128,13 +128,13 @@ public class ImWebSocketServiceImplTest extends BaseMockitoUnitTest { dto.setGroupId(10L); // 给 1 号用户推送时抛异常，不能影响 2/3 号 doThrow(new RuntimeException("user offline")) - .when(webSocketMessageSender).sendObject(anyInt(), eq(1L), anyString(), any()); + .when(webSocketSenderApi).sendObject(anyInt(), eq(1L), anyString(), any()); imWebSocketService.sendGroupMessageAsync(List.of(1L, 2L, 3L), dto); // 2L 和 3L 也都被推送 - verify(webSocketMessageSender).sendObject(anyInt(), eq(2L), anyString(), any()); - verify(webSocketMessageSender).sendObject(anyInt(), eq(3L), anyString(), any()); + verify(webSocketSenderApi).sendObject(anyInt(), eq(2L), anyString(), any()); + verify(webSocketSenderApi).sendObject(anyInt(), eq(3L), anyString(), any()); } } @@ -145,7 +145,7 @@ public class ImWebSocketServiceImplTest extends BaseMockitoUnitTest { imWebSocketService.doSendGroupMessage(Collections.emptyList(), dto); imWebSocketService.doSendGroupMessage(null, dto); - verifyNoInteractions(webSocketMessageSender); + verifyNoInteractions(webSocketSenderApi); } @Test @@ -154,11 +154,11 @@ public class ImWebSocketServiceImplTest extends BaseMockitoUnitTest { imWebSocketService.doSendGroupMessage(Arrays.asList(1L, 2L, 1L, null), dto); - verify(webSocketMessageSender).sendObject( + verify(webSocketSenderApi).sendObject( eq(UserTypeEnum.ADMIN.getValue()), eq(1L), eq(ImGroupMessageDTO.TYPE), eq(dto)); - verify(webSocketMessageSender).sendObject( + verify(webSocketSenderApi).sendObject( eq(UserTypeEnum.ADMIN.getValue()), eq(2L), eq(ImGroupMessageDTO.TYPE), eq(dto)); - verifyNoMoreInteractions(webSocketMessageSender); + verifyNoMoreInteractions(webSocketSenderApi); } @Test @@ -170,12 +170,12 @@ public class ImWebSocketServiceImplTest extends BaseMockitoUnitTest { // 准备：sender 抛异常 ImPrivateMessageDTO dto = new ImPrivateMessageDTO().setSenderId(1L).setReceiverId(2L); doThrow(new RuntimeException("user offline")) - .when(webSocketMessageSender).sendObject(anyInt(), anyLong(), anyString(), any()); + .when(webSocketSenderApi).sendObject(anyInt(), anyLong(), anyString(), any()); // 调用：异常应被吞掉，不向上抛 imWebSocketService.sendPrivateMessageAsync(2L, dto); - verify(webSocketMessageSender).sendObject(anyInt(), eq(2L), anyString(), any()); + verify(webSocketSenderApi).sendObject(anyInt(), eq(2L), anyString(), any()); } } @@ -190,7 +190,7 @@ public class ImWebSocketServiceImplTest extends BaseMockitoUnitTest { imWebSocketService.sendGroupMessageAsync(42L, dto); - verify(webSocketMessageSender).sendObject( + verify(webSocketSenderApi).sendObject( eq(UserTypeEnum.ADMIN.getValue()), eq(42L), eq(ImGroupMessageDTO.TYPE), eq(dto)); } } diff --git a/yudao-server/src/main/resources/application-local.yaml b/yudao-server/src/main/resources/application-local.yaml index 74f90ed6e..cc630a15b 100644 --- a/yudao-server/src/main/resources/application-local.yaml +++ b/yudao-server/src/main/resources/application-local.yaml @@ -164,6 +164,7 @@ logging: cn.iocoder.yudao.module.iot.dal.mysql: debug cn.iocoder.yudao.module.iot.dal.tdengine: DEBUG cn.iocoder.yudao.module.ai.dal.mysql: debug + cn.iocoder.yudao.module.im.dal.mysql: debug org.springframework.context.support.PostProcessorRegistrationDelegate: ERROR # TODO 芋艿：先禁用，Spring Boot 3.X 存在部分错误的 WARN 提示 debug: false @@ -253,4 +254,4 @@ justauth: --- #################### iot相关配置 TODO 芋艿【IOT】：再瞅瞅 #################### pf4j: # pluginsDir: /tmp/ - pluginsDir: ../plugins \ No newline at end of file + pluginsDir: ../plugins