Merge branch 'schedule' of http://61.169.135.146:8081/git/xymp/backend into schedule

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")

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;
 }

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<Session> it = sessionPools.listIterator();
         while (it.hasNext()) {