Merge remote-tracking branch 'origin/master'

zhoushihao

2024-07-16 353acdfceab45a94d9f5d71e353bd06bf7c2eba6

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/tools/WebSocketServer.java

@@ -22,12 +22,6 @@

    public static ConfigurableApplicationContext applicationContext;

    // 解决无法注入mapper问题 //使用方法
    // homeMapper=WebSocketServer.applicationContext.getBean(HomeMapper.class);
    public static void setApplicationContext(ConfigurableApplicationContext configurableApplicationContext) {
        WebSocketServer.applicationContext = configurableApplicationContext;
    }

    private static final Logger log = LoggerFactory.getLogger(WebSocketServer.class);
    private List<String> messages;
    /**
@@ -102,7 +96,7 @@
     *
     * @param message 客户端发送过来的消息
     */
    @OnMessage
    @OnMessage(maxMessageSize = 5242880)
    public void onMessage(String message, Session session, @PathParam("username") String username) {
        log.info("服务端收到用户username={}的消息:{}", username, message);
        JSONObject obj = JSONUtil.parseObj(message);
@@ -111,8 +105,6 @@
        JSONObject jsonObject = new JSONObject();
        jsonObject.set("message", text);
        this.messages.add(text);
        this.sendMessage(jsonObject.toString()); // JSONUtil.toJsonStr(jsonObject)

    }

    @OnError