Merge remote-tracking branch 'origin/cjl' into qa

cjl

2023-08-30 6dc7dc3670300ec7949f8134ab80166107b2f705

 screen-api/src/main/java/com/moral/api/config/websocket/WebSocketConfig.java

@@ -1,6 +1,8 @@
/*
package com.moral.api.config.websocket;

import com.moral.api.websocket.CruiserWebSocketServer;


import com.moral.api.websocket.SingleDeviceServer;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
@@ -8,13 +10,15 @@
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.web.socket.server.standard.ServerEndpointExporter;

*/
/**
 * @ClassName WebSocketConfig
 * @Description TODO
 * @Author 陈凯裕
 * @Date 2021/6/15 13:53
 * @Version TODO
 **/
 **//*

@Configuration
public class WebSocketConfig {

@@ -30,3 +34,4 @@
    }

}
*/