mqtt配置

zgzt-sys-java/jeecg-module-conn/src/main/java/org/jeecg/modules/push/utils/MqttClientUtil.java

@@ -6,6 +6,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.eclipse.paho.client.mqttv3.*;
 import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence;
+import org.jeecg.common.util.DateUtils;
 import org.jeecg.modules.connConfig.configMqtt.entity.ConfigMqtt;
 import org.jeecg.modules.connConfig.configMqtt.mapper.ConfigMqttMapper;
 import org.jeecg.modules.push.dataPushConfig.entity.PointData;
@@ -29,7 +30,10 @@ public class MqttClientUtil implements ApplicationRunner {
     @Autowired
     private ConfigMqttMapper configMqttMapper;
 
-    public MqttClient getMqttClient(ConfigMqtt configMqtt) throws MqttException {
+    public MqttClient getMqttClient(ConfigMqtt configMqttInfo) throws MqttException {
+
+        ConfigMqtt configMqtt = createDefaultMqttConfig();
+
         MqttConnectOptions options = new MqttConnectOptions();
         options.setUserName(configMqtt.getUsername());
         options.setPassword(configMqtt.getPassword().toCharArray());
@@ -67,7 +71,8 @@ public class MqttClientUtil implements ApplicationRunner {
     }
 
 
-    public void sub(ConfigMqtt configMqtt) throws MqttException {
+    public void sub(ConfigMqtt configMqttInfo) throws MqttException {
+        ConfigMqtt configMqtt = createDefaultMqttConfig();
         //创建mqtt连接url
         StringBuffer url = new StringBuffer();
         url.append("tcp://").append(configMqtt.getIp()).append(":").append(configMqtt.getHost());
@@ -122,6 +127,20 @@ public class MqttClientUtil implements ApplicationRunner {
         }
     }
 
+
+    // 创建默认MQTT配置
+    private ConfigMqtt createDefaultMqttConfig() {
+        ConfigMqtt configMqtt = new ConfigMqtt();
+        // id添加时间戳
+        configMqtt.setId("186893" + DateUtils.date2Str(new Date(), DateUtils.yyyymmddhhmmss.get()));
+        configMqtt.setIp("127.0.0.1");
+        configMqtt.setHost("1883");
+        configMqtt.setUsername("admin");
+        configMqtt.setPassword("public");
+        configMqtt.setTopic("trace/performance/converter/add,trace/performance/billet/add,trace/billet/billetAssemblyNumber/add,syn/storageBill/add,syn/storageBill/update,syn/billetHotsendBase/shipp/depart");
+        configMqtt.setPushOrSub("1");
+        return configMqtt;
+    }
     /**
      * 发布消息
      *

zgzt-sys-java/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml

@@ -175,9 +175,9 @@ spring:
           slow-sql-millis: 5000
       datasource:
         master:
-#          url: jdbc:mysql://192.168.1.53/lg_0416?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
-          url: jdbc:mysql://127.0.0.1/lg?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
-          username: lg
+          url: jdbc:mysql://192.168.1.53/lg_0416?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+#          url: jdbc:mysql://127.0.0.1/lg?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+          username: root
           password: 1qaz2wsx@..
           driver-class-name: com.mysql.cj.jdbc.Driver
           # 多数据源配置