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

jiaosong

2023-10-18 99f77c0fd2ee8ed8840be5e5f99309b184a09e9f

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

@@ -1,5 +1,6 @@
package com.doumee.core.mqtt.config;

import com.doumee.core.constants.Constants;
import lombok.Data;
import org.eclipse.paho.client.mqttv3.MqttClient;
import org.eclipse.paho.client.mqttv3.MqttConnectOptions;
@@ -8,6 +9,7 @@
import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;
import org.yaml.snakeyaml.scanner.Constant;


@Component
@@ -23,6 +25,10 @@
         */
        private String clientid;
        /**
         * 客户端编码用户订阅
         */
        private String subclientid;
        /**
         * 授权账号
         */
        private String username ;