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

jiaosong

2023-10-16 aa6febca297b0e1a68b1877fc9f41885e9fc0c7a

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

@@ -1,21 +1,26 @@
package com.doumee.core.mqtt.config;

import com.doumee.core.constants.Constants;
import com.doumee.core.mqtt.service.MqttPushCallback;
import org.eclipse.paho.client.mqttv3.MqttClient;
import org.eclipse.paho.client.mqttv3.MqttConnectOptions;
import org.eclipse.paho.client.mqttv3.MqttException;
import org.eclipse.paho.client.mqttv3.MqttTopic;
import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence;

public class MqttClientInit {
        static MqttClient client;
        static MqttClient subClient;

        public static synchronized MqttClient getInstance(MqttConfig config,MqttPushCallback callBack){
        public static synchronized MqttClient getInstance(MqttConfig config ){
            if(client !=null){
                return  client;
            }
            try {
                // host为主机名，clientid即连接MQTT的客户端ID，一般以唯一标识符表示，MemoryPersistence设置clientid的保存形式，默认为以内存保存
                client = new org.eclipse.paho.client.mqttv3.MqttClient(config.getHost(), config.getClientid() ,new MemoryPersistence());
//                String clientId =config.getClientid()+ Constants.getUUID();
                String clientId =config.getClientid()+"001";
                client = new org.eclipse.paho.client.mqttv3.MqttClient(config.getHost(), clientId,new MemoryPersistence());
                // MQTT的连接设置
                MqttConnectOptions   options = new MqttConnectOptions();
                // 设置是否清空session,这里如果设置为false表示服务器会保留客户端的连接记录，设置为true表示每次连接到服务器都以新的身份连接
@@ -28,11 +33,9 @@
                options.setConnectionTimeout(10);
                // 设置会话心跳时间 单位为秒 服务器会每隔1.5*20秒的时间向客户端发送个消息判断客户端是否在线，但这个方法并没有重连的机制
                options.setKeepAliveInterval(20);
                // 设置回调
                client.setCallback(callBack);
                //设置断开后重新连接
                options.setAutomaticReconnect(true);
                MqttTopic topic = client.getTopic(config.getClientid()+"_close");
                MqttTopic topic = client.getTopic(clientId+"_close");
                //遗嘱
                options.setWill(topic, "close".getBytes(), 1, true);
                client.connect(options);
@@ -41,13 +44,15 @@
            }
            return  client;
        }
        public static synchronized MqttClient refreshClient(MqttConfig config,MqttPushCallback callBack){
            if(client !=null){
                return  client;
        public static synchronized MqttClient getSubInstance(MqttConfig config,MqttPushCallback callBack){
            if(subClient !=null){
                return  subClient;
            }
            try {
                // host为主机名，clientid即连接MQTT的客户端ID，一般以唯一标识符表示，MemoryPersistence设置clientid的保存形式，默认为以内存保存
                client = new org.eclipse.paho.client.mqttv3.MqttClient(config.getHost(), config.getClientid() ,new MemoryPersistence());
//                String clientId =config.getClientid()+ Constants.getUUID();
                String clientId =config.getSubclientid()+"001";
                subClient = new org.eclipse.paho.client.mqttv3.MqttClient(config.getHost(), clientId,new MemoryPersistence());
                // MQTT的连接设置
                MqttConnectOptions   options = new MqttConnectOptions();
                // 设置是否清空session,这里如果设置为false表示服务器会保留客户端的连接记录，设置为true表示每次连接到服务器都以新的身份连接
@@ -61,17 +66,26 @@
                // 设置会话心跳时间 单位为秒 服务器会每隔1.5*20秒的时间向客户端发送个消息判断客户端是否在线，但这个方法并没有重连的机制
                options.setKeepAliveInterval(20);
                // 设置回调
                client.setCallback(callBack);
                subClient.setCallback(callBack);
                //设置断开后重新连接
                options.setAutomaticReconnect(true);
                MqttTopic topic = client.getTopic(config.getClientid()+"_close");
                MqttTopic topic = subClient.getTopic(clientId+"_close");
                //遗嘱
                options.setWill(topic, "close".getBytes(), 1, true);
                client.connect(options);
                subClient.connect(options);
            } catch (Exception e) {
                e.printStackTrace();
            }
            return  client;
            return  subClient;
        }



        public static synchronized void refreshClient() throws MqttException {
            if(client !=null){
                boolean result = client.isConnected();
                   client.reconnect();
            }
        }

}