diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TestController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TestController.java index 9d909c5..0959671 100644 --- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TestController.java +++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TestController.java @@ -25,7 +25,7 @@ public class TestController extends BaseController { @GetMapping("sendMsg") @ApiOperation("发送消息") public void sendMsg(String msg) { - webSocketServer.sendNotice(msg); + webSocketServer.sendNotice(null, msg); } @GetMapping("test") diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/MessageModel.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/MessageModel.java index 828784a..c0eb971 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/MessageModel.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/MessageModel.java @@ -6,4 +6,5 @@ import lombok.Data; public class MessageModel { int type; String content; + String action; } diff --git a/xymanager_framework/src/main/java/com/shxy/xymanager_framework/socket/WebSocketServer.java b/xymanager_framework/src/main/java/com/shxy/xymanager_framework/socket/WebSocketServer.java index f40bb1b..46ca434 100644 --- a/xymanager_framework/src/main/java/com/shxy/xymanager_framework/socket/WebSocketServer.java +++ b/xymanager_framework/src/main/java/com/shxy/xymanager_framework/socket/WebSocketServer.java @@ -46,10 +46,11 @@ public class WebSocketServer { } } - public void sendNotice(String message) { + public void sendNotice(String action, String message) { MessageModel msg = new MessageModel(); msg.setType(2); msg.setContent(message); + msg.setAction(action); String json = JSONUtil.object2Json(msg); Iterator it = sessionPools.listIterator(); while (it.hasNext()) {