✨ 简化代码

lets-mica · Mar 23, 2024 · db8b49f · db8b49f
1 parent 41854e5
commit db8b49f
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 20 deletions.
diff --git a/example/mica-mqtt-client-spring-boot-example/src/main/resources/application.yml b/example/mica-mqtt-client-spring-boot-example/src/main/resources/application.yml
@@ -23,7 +23,6 @@ mqtt:
     keep-alive-secs: 60         # keep-alive 时间，单位：秒
     clean-session: true         # mqtt clean session，默认：true
     will-message:
-
       topic: /test/offline
       message: down
     ssl:

diff --git a/...ing-boot-starter/src/main/java/net/dreamlu/iot/mqtt/spring/client/MqttClientTemplate.java b/...ing-boot-starter/src/main/java/net/dreamlu/iot/mqtt/spring/client/MqttClientTemplate.java
@@ -26,7 +26,6 @@
 import org.tio.client.TioClient;
 import org.tio.client.TioClientConfig;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -39,7 +38,6 @@ public class MqttClientTemplate implements SmartInitializingSingleton, Disposabl
 	private final ObjectProvider<IMqttClientConnectListener> clientConnectListenerObjectProvider;
 	private final ObjectProvider<IMqttClientGlobalMessageListener> globalMessageListenerObjectProvider;
 	private final ObjectProvider<MqttClientCustomizer> customizersObjectProvider;
-	private final List<MqttClientSubscription> tempSubscriptionList;
 	private MqttClient client;
 
 	public MqttClientTemplate(MqttClientCreator clientCreator,
@@ -55,7 +53,6 @@ public MqttClientTemplate(MqttClientCreator clientCreator,
 		this.clientConnectListenerObjectProvider = clientConnectListenerObjectProvider;
 		this.globalMessageListenerObjectProvider = globalMessageListenerObjectProvider;
 		this.customizersObjectProvider = customizersObjectProvider;
-		this.tempSubscriptionList = new ArrayList<>();
 	}
 
 	/**
@@ -271,19 +268,6 @@ public MqttClient getMqttClient() {
 		return client;
 	}
 
-	/**
-	 * 添加启动时的临时订阅
-	 *
-	 * @param topicFilters    topicFilters
-	 * @param qos             MqttQoS
-	 * @param messageListener IMqttClientMessageListener
-	 */
-	void addSubscriptionList(String[] topicFilters, MqttQoS qos, IMqttClientMessageListener messageListener) {
-		for (String topicFilter : topicFilters) {
-			tempSubscriptionList.add(new MqttClientSubscription(qos, topicFilter, messageListener));
-		}
-	}
-
 	@Override
 	public void afterSingletonsInstantiated() {
 		// 配置客户端连接监听器
@@ -303,9 +287,6 @@ public void afterSingletonsInstantiated() {
 		}
 		// 使用同步连接，不过如果连不上会卡一会
 		client = clientCreator.connectSync();
-		// 添加订阅并清理零时订阅存储
-		client.subscribe(tempSubscriptionList);
-		tempSubscriptionList.clear();
 	}
 
 	@Override