From 990fcb563a357b0cb27637836064aeeb1b693ce3 Mon Sep 17 00:00:00 2001
From: zhangzq <zhangzhiqiang@yoycol.com>
Date: Mon, 19 Feb 2024 14:36:33 +0800
Subject: [PATCH] =?UTF-8?q?add:=E6=8E=A5=E5=85=A5mqtt2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/nl/config/{mqtt => mqtt2}/MQServer.java     | 8 ++++----
 .../java/org/nl/config/{mqtt => mqtt2}/PublishDemo.java  | 3 +--
 .../config/{mqtt => mqtt2}/callback/PublishCallback.java | 4 +---
 .../{mqtt => mqtt2}/callback/SubsribeCallback.java       | 6 +++---
 .../org/nl/config/{mqtt => mqtt2}/config/MqttConfig.java | 7 +------
 .../nl/config/{mqtt => mqtt2}/msg/MsgPoolManager.java    | 9 ++-------
 .../org/nl/config/{mqtt => mqtt2}/msg/MsgWorker.java     | 2 +-
 7 files changed, 13 insertions(+), 26 deletions(-)
 rename wcs/nladmin-system/src/main/java/org/nl/config/{mqtt => mqtt2}/MQServer.java (93%)
 rename wcs/nladmin-system/src/main/java/org/nl/config/{mqtt => mqtt2}/PublishDemo.java (86%)
 rename wcs/nladmin-system/src/main/java/org/nl/config/{mqtt => mqtt2}/callback/PublishCallback.java (87%)
 rename wcs/nladmin-system/src/main/java/org/nl/config/{mqtt => mqtt2}/callback/SubsribeCallback.java (88%)
 rename wcs/nladmin-system/src/main/java/org/nl/config/{mqtt => mqtt2}/config/MqttConfig.java (86%)
 rename wcs/nladmin-system/src/main/java/org/nl/config/{mqtt => mqtt2}/msg/MsgPoolManager.java (86%)
 rename wcs/nladmin-system/src/main/java/org/nl/config/{mqtt => mqtt2}/msg/MsgWorker.java (94%)

diff --git a/wcs/nladmin-system/src/main/java/org/nl/config/mqtt/MQServer.java b/wcs/nladmin-system/src/main/java/org/nl/config/mqtt2/MQServer.java
similarity index 93%
rename from wcs/nladmin-system/src/main/java/org/nl/config/mqtt/MQServer.java
rename to wcs/nladmin-system/src/main/java/org/nl/config/mqtt2/MQServer.java
index c610dfb3..e2c55619 100644
--- a/wcs/nladmin-system/src/main/java/org/nl/config/mqtt/MQServer.java
+++ b/wcs/nladmin-system/src/main/java/org/nl/config/mqtt2/MQServer.java
@@ -1,12 +1,12 @@
-package org.nl.config.mqtt;
+package org.nl.config.mqtt2;
 
 import org.apache.commons.lang3.StringUtils;
 import org.eclipse.paho.client.mqttv3.MqttClient;
 import org.eclipse.paho.client.mqttv3.MqttMessage;
 import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence;
-import org.nl.config.mqtt.callback.PublishCallback;
-import org.nl.config.mqtt.callback.SubsribeCallback;
-import org.nl.config.mqtt.config.MqttConfig;
+import org.nl.config.mqtt2.callback.PublishCallback;
+import org.nl.config.mqtt2.callback.SubsribeCallback;
+import org.nl.config.mqtt2.config.MqttConfig;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.stereotype.Service;
diff --git a/wcs/nladmin-system/src/main/java/org/nl/config/mqtt/PublishDemo.java b/wcs/nladmin-system/src/main/java/org/nl/config/mqtt2/PublishDemo.java
similarity index 86%
rename from wcs/nladmin-system/src/main/java/org/nl/config/mqtt/PublishDemo.java
rename to wcs/nladmin-system/src/main/java/org/nl/config/mqtt2/PublishDemo.java
index dc87a7ea..995a0bb1 100644
--- a/wcs/nladmin-system/src/main/java/org/nl/config/mqtt/PublishDemo.java
+++ b/wcs/nladmin-system/src/main/java/org/nl/config/mqtt2/PublishDemo.java
@@ -1,9 +1,8 @@
-package org.nl.config.mqtt;
+package org.nl.config.mqtt2;
 
 import cn.dev33.satoken.annotation.SaIgnore;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 /*
  * @author ZZQ
diff --git a/wcs/nladmin-system/src/main/java/org/nl/config/mqtt/callback/PublishCallback.java b/wcs/nladmin-system/src/main/java/org/nl/config/mqtt2/callback/PublishCallback.java
similarity index 87%
rename from wcs/nladmin-system/src/main/java/org/nl/config/mqtt/callback/PublishCallback.java
rename to wcs/nladmin-system/src/main/java/org/nl/config/mqtt2/callback/PublishCallback.java
index c3b69f96..023db756 100644
--- a/wcs/nladmin-system/src/main/java/org/nl/config/mqtt/callback/PublishCallback.java
+++ b/wcs/nladmin-system/src/main/java/org/nl/config/mqtt2/callback/PublishCallback.java
@@ -1,10 +1,8 @@
-package org.nl.config.mqtt.callback;
+package org.nl.config.mqtt2.callback;
 
 import org.eclipse.paho.client.mqttv3.IMqttDeliveryToken;
 import org.eclipse.paho.client.mqttv3.MqttCallback;
 import org.eclipse.paho.client.mqttv3.MqttMessage;
-import org.nl.config.mqtt.msg.MsgWorker;
-import org.nl.config.mqtt.msg.MsgPoolManager;
 
 /*
  * @author ZZQ
diff --git a/wcs/nladmin-system/src/main/java/org/nl/config/mqtt/callback/SubsribeCallback.java b/wcs/nladmin-system/src/main/java/org/nl/config/mqtt2/callback/SubsribeCallback.java
similarity index 88%
rename from wcs/nladmin-system/src/main/java/org/nl/config/mqtt/callback/SubsribeCallback.java
rename to wcs/nladmin-system/src/main/java/org/nl/config/mqtt2/callback/SubsribeCallback.java
index f29e79de..68316daf 100644
--- a/wcs/nladmin-system/src/main/java/org/nl/config/mqtt/callback/SubsribeCallback.java
+++ b/wcs/nladmin-system/src/main/java/org/nl/config/mqtt2/callback/SubsribeCallback.java
@@ -1,10 +1,10 @@
-package org.nl.config.mqtt.callback;
+package org.nl.config.mqtt2.callback;
 
 import org.eclipse.paho.client.mqttv3.IMqttDeliveryToken;
 import org.eclipse.paho.client.mqttv3.MqttCallback;
 import org.eclipse.paho.client.mqttv3.MqttMessage;
-import org.nl.config.mqtt.msg.MsgPoolManager;
-import org.nl.config.mqtt.msg.MsgWorker;
+import org.nl.config.mqtt2.msg.MsgPoolManager;
+import org.nl.config.mqtt2.msg.MsgWorker;
 
 /*
  * @author ZZQ
diff --git a/wcs/nladmin-system/src/main/java/org/nl/config/mqtt/config/MqttConfig.java b/wcs/nladmin-system/src/main/java/org/nl/config/mqtt2/config/MqttConfig.java
similarity index 86%
rename from wcs/nladmin-system/src/main/java/org/nl/config/mqtt/config/MqttConfig.java
rename to wcs/nladmin-system/src/main/java/org/nl/config/mqtt2/config/MqttConfig.java
index 1e34964e..4ab39b02 100644
--- a/wcs/nladmin-system/src/main/java/org/nl/config/mqtt/config/MqttConfig.java
+++ b/wcs/nladmin-system/src/main/java/org/nl/config/mqtt2/config/MqttConfig.java
@@ -1,15 +1,10 @@
-package org.nl.config.mqtt.config;
+package org.nl.config.mqtt2.config;
 
 import lombok.Data;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.eclipse.paho.client.mqttv3.MqttConnectOptions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.stereotype.Component;
 
 import javax.annotation.PostConstruct;
 
diff --git a/wcs/nladmin-system/src/main/java/org/nl/config/mqtt/msg/MsgPoolManager.java b/wcs/nladmin-system/src/main/java/org/nl/config/mqtt2/msg/MsgPoolManager.java
similarity index 86%
rename from wcs/nladmin-system/src/main/java/org/nl/config/mqtt/msg/MsgPoolManager.java
rename to wcs/nladmin-system/src/main/java/org/nl/config/mqtt2/msg/MsgPoolManager.java
index a9f134ac..5d9ba37c 100644
--- a/wcs/nladmin-system/src/main/java/org/nl/config/mqtt/msg/MsgPoolManager.java
+++ b/wcs/nladmin-system/src/main/java/org/nl/config/mqtt2/msg/MsgPoolManager.java
@@ -1,13 +1,8 @@
-package org.nl.config.mqtt.msg;
+package org.nl.config.mqtt2.msg;
 
-import org.checkerframework.checker.units.qual.C;
-import org.nl.config.mqtt.MQServer;
+import org.nl.config.mqtt2.MQServer;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.context.SmartLifecycle;
-import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.PostConstruct;
diff --git a/wcs/nladmin-system/src/main/java/org/nl/config/mqtt/msg/MsgWorker.java b/wcs/nladmin-system/src/main/java/org/nl/config/mqtt2/msg/MsgWorker.java
similarity index 94%
rename from wcs/nladmin-system/src/main/java/org/nl/config/mqtt/msg/MsgWorker.java
rename to wcs/nladmin-system/src/main/java/org/nl/config/mqtt2/msg/MsgWorker.java
index 77973383..d826fad7 100644
--- a/wcs/nladmin-system/src/main/java/org/nl/config/mqtt/msg/MsgWorker.java
+++ b/wcs/nladmin-system/src/main/java/org/nl/config/mqtt2/msg/MsgWorker.java
@@ -1,4 +1,4 @@
-package org.nl.config.mqtt.msg;
+package org.nl.config.mqtt2.msg;
 
 /*
  * @author ZZQ