diff --git a/yudao-module-im/pom.xml b/yudao-module-im/pom.xml
index c64c05e..6fdb223 100644
--- a/yudao-module-im/pom.xml
+++ b/yudao-module-im/pom.xml
@@ -23,6 +23,11 @@
yudao-module-system
${revision}
+
+ cn.iocoder.boot
+ yudao-module-infra
+ ${revision}
+
cn.iocoder.boot
@@ -40,11 +45,6 @@
yudao-spring-boot-starter-security
-
- cn.iocoder.boot
- yudao-spring-boot-starter-websocket
-
-
cn.iocoder.boot
diff --git a/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/service/websocket/ImWebSocketServiceImpl.java b/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/service/websocket/ImWebSocketServiceImpl.java
index 2bf3222..2253943 100644
--- a/yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/service/websocket/ImWebSocketServiceImpl.java
+++ b/yudao-module-im/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/src/test/java/cn/iocoder/yudao/module/im/service/websocket/ImWebSocketServiceImplTest.java b/yudao-module-im/src/test/java/cn/iocoder/yudao/module/im/service/websocket/ImWebSocketServiceImplTest.java
index ba11735..df2125a 100644
--- a/yudao-module-im/src/test/java/cn/iocoder/yudao/module/im/service/websocket/ImWebSocketServiceImplTest.java
+++ b/yudao-module-im/src/test/java/cn/iocoder/yudao/module/im/service/websocket/ImWebSocketServiceImplTest.java
@@ -4,9 +4,9 @@ import cn.hutool.core.collection.ListUtil;
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;
@@ -34,7 +34,7 @@ public class ImWebSocketServiceImplTest extends BaseMockitoUnitTest {
private ImWebSocketServiceImpl imWebSocketService;
@Mock
- private WebSocketMessageSender webSocketMessageSender;
+ private WebSocketSenderApi webSocketSenderApi;
@AfterEach
public void tearDown() {
@@ -59,7 +59,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));
}
}
@@ -79,7 +79,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 =
@@ -88,7 +88,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();
@@ -110,11 +110,11 @@ public class ImWebSocketServiceImplTest extends BaseMockitoUnitTest {
imWebSocketService.sendGroupMessageAsync(ListUtil.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));
}
}
@@ -129,13 +129,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(ListUtil.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());
}
}
@@ -146,7 +146,7 @@ public class ImWebSocketServiceImplTest extends BaseMockitoUnitTest {
imWebSocketService.doSendGroupMessage(Collections.emptyList(), dto);
imWebSocketService.doSendGroupMessage(null, dto);
- verifyNoInteractions(webSocketMessageSender);
+ verifyNoInteractions(webSocketSenderApi);
}
@Test
@@ -155,11 +155,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
@@ -171,12 +171,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());
}
}
@@ -191,7 +191,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));
}
}