Merge remote-tracking branch 'origin/dev' into dev

jiangping

2025-03-18 1b0cf0db5c82ea8308d2f338973a91555787c34d

 server/services/src/main/java/com/doumee/core/mqtt/config/MqttClientInit.java

@@ -18,8 +18,7 @@
            }
            try {
                // host为主机名，clientid即连接MQTT的客户端ID，一般以唯一标识符表示，MemoryPersistence设置clientid的保存形式，默认为以内存保存
//                String clientId =config.getClientid()+ Constants.getUUID();
                String clientId =config.getClientid()+(int)(Math.random()*10000);
                String clientId =config.getClientid() +config.getVersion();
                client = new org.eclipse.paho.client.mqttv3.MqttClient(config.getHost(), clientId,new MemoryPersistence());
                // MQTT的连接设置
                MqttConnectOptions   options = new MqttConnectOptions();
@@ -50,8 +49,7 @@
            }
            try {
                // host为主机名，clientid即连接MQTT的客户端ID，一般以唯一标识符表示，MemoryPersistence设置clientid的保存形式，默认为以内存保存
//                String clientId =config.getClientid()+ Constants.getUUID();
                String clientId =config.getClientid()+(int)(Math.random()*10000);
                String clientId =config.getSubclientid() +config.getVersion();
                subClient = new org.eclipse.paho.client.mqttv3.MqttClient(config.getHost(), clientId,new MemoryPersistence());
                // MQTT的连接设置
                MqttConnectOptions   options = new MqttConnectOptions();