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

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/config/DefaultMqttStarter.java

@@ -8,6 +8,7 @@ import org.eclipse.paho.client.mqttv3.MqttException;
 import org.springframework.boot.context.event.ApplicationReadyEvent;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationListener;
+import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
@@ -26,6 +27,7 @@ public class DefaultMqttStarter implements ApplicationListener<ApplicationReadyE
 
     @SneakyThrows
     @Override
+    @Order(1) //client先启动后，再订阅
     public void onApplicationEvent(ApplicationReadyEvent applicationReadyEvent) {
         // catch异常，不然连不上emqx项目就跑不起来
         try {

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/consumer/impl/MqttserviceImpl.java

@@ -18,6 +18,7 @@ import org.springframework.boot.context.event.ApplicationReadyEvent;
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.annotation.DependsOn;
 import org.springframework.context.annotation.Lazy;
+import org.springframework.core.annotation.Order;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.stereotype.Service;
 
@@ -46,6 +47,7 @@ public class MqttserviceImpl implements IMqttservice, ApplicationListener<Applic
 
 
     @Override
+    @Order(2)
     public void onApplicationEvent(ApplicationReadyEvent applicationReadyEvent) {
         new Thread(() -> {
             subscribeMysqlTopic();