diff --git a/plugins/yudao-module-iot-http-plugin-2.2.0-snapshot.jar b/plugins/yudao-module-iot-http-plugin-2.2.0-snapshot.jar
deleted file mode 100644
index 8b5e72b4a4..0000000000
Binary files a/plugins/yudao-module-iot-http-plugin-2.2.0-snapshot.jar and /dev/null differ
diff --git a/plugins/yudao-module-iot-plugin-http-1.0.0.jar b/plugins/yudao-module-iot-plugin-http-1.0.0.jar
new file mode 100644
index 0000000000..a1d4db6c8a
Binary files /dev/null and b/plugins/yudao-module-iot-plugin-http-1.0.0.jar differ
diff --git a/yudao-module-iot/yudao-module-iot-plugin/pom.xml b/yudao-module-iot/yudao-module-iot-plugin/pom.xml
index 4a46b61672..949ff13e6f 100644
--- a/yudao-module-iot/yudao-module-iot-plugin/pom.xml
+++ b/yudao-module-iot/yudao-module-iot-plugin/pom.xml
@@ -8,9 +8,9 @@
${revision}
- yudao-module-iot-demo-plugin
- yudao-module-iot-http-plugin
- yudao-module-iot-mqtt-plugin
+ yudao-module-iot-plugin-http
+ yudao-module-iot-plugin-mqtt
+ yudao-module-iot-plugin-emqx
4.0.0
diff --git a/yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-demo-plugin/plugin.properties b/yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-demo-plugin/plugin.properties
deleted file mode 100644
index 5a67270bb0..0000000000
--- a/yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-demo-plugin/plugin.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-plugin.id=demo-plugin
-plugin.class=cn.iocoder.yudao.module.iot.plugin.DemoPlugin
-plugin.version=0.0.1
-plugin.provider=ahh
-plugin.dependencies=
-plugin.description=demo-plugin
diff --git a/yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-demo-plugin/src/main/java/cn/iocoder/yudao/module/iot/plugin/DemoPlugin.java b/yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-demo-plugin/src/main/java/cn/iocoder/yudao/module/iot/plugin/DemoPlugin.java
deleted file mode 100644
index c97a5b9b5e..0000000000
--- a/yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-demo-plugin/src/main/java/cn/iocoder/yudao/module/iot/plugin/DemoPlugin.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package cn.iocoder.yudao.module.iot.plugin;
-
-import com.sun.net.httpserver.HttpServer;
-import lombok.extern.slf4j.Slf4j;
-import org.pf4j.Plugin;
-import org.pf4j.PluginWrapper;
-import org.pf4j.RuntimeMode;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.net.InetSocketAddress;
-
-/**
- * 一个启动 HTTP 服务器的简单插件。
- */
-@Slf4j
-public class DemoPlugin extends Plugin {
-
- private HttpServer server;
-
- public DemoPlugin(PluginWrapper wrapper) {
- super(wrapper);
- }
-
- @Override
- public void start() {
- log.info("Demo 插件启动");
- // for testing the development mode
- if (RuntimeMode.DEVELOPMENT.equals(wrapper.getRuntimeMode())) {
- log.info("DemoPlugin in DEVELOPMENT mode");
- }
- startDemoServer();
- }
-
- @Override
- public void stop() {
- log.info("Demo 插件停止");
- stopDemoServer();
- }
-
- private void startDemoServer() {
- try {
- server = HttpServer.create(new InetSocketAddress(9081), 0);
- server.createContext("/", exchange -> {
- String response = "Hello from DemoPlugin";
- exchange.sendResponseHeaders(200, response.getBytes().length);
- OutputStream os = exchange.getResponseBody();
- os.write(response.getBytes());
- os.close();
- });
- server.setExecutor(null);
- server.start();
- log.info("HTTP 服务器启动成功,端口为 9081");
- log.info("访问地址为 http://127.0.0.1:9081/");
- } catch (IOException e) {
- log.error("HTTP 服务器启动失败", e);
- }
- }
-
- private void stopDemoServer() {
- if (server != null) {
- server.stop(0);
- log.info("HTTP 服务器停止成功");
- }
- }
-
-// @Extension
-// public static class WelcomeGreeting implements Greeting {
-//
-// @Override
-// public String getGreeting() {
-// return "Welcome to DemoPlugin";
-// }
-//
-// }
-
-}
\ No newline at end of file
diff --git a/yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-http-plugin/dependency-reduced-pom.xml b/yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-http-plugin/dependency-reduced-pom.xml
deleted file mode 100644
index f4ec60d961..0000000000
--- a/yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-http-plugin/dependency-reduced-pom.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-
-
-
- yudao-module-iot-plugin
- cn.iocoder.boot
- 2.2.0-snapshot
-
- 4.0.0
- yudao-module-iot-http-plugin
- ${project.artifactId}
- 2.2.0-snapshot
- 物联网 插件模块 - http 插件
-
-
-
- maven-jar-plugin
- 2.4
-
-
-
- ${plugin.id}
- ${plugin.class}
- ${plugin.version}
- ${plugin.provider}
- ${plugin.description}
- ${plugin.dependencies}
-
-
-
-
-
- maven-deploy-plugin
-
- true
-
-
-
- maven-shade-plugin
- 3.4.1
-
-
- package
-
- shade
-
-
- true
- shaded
-
-
- cn.iocoder.yudao.module.iot.HttpPluginSpringbootApplication
-
-
-
-
-
-
-
-
-
-
- org.pf4j
- pf4j-spring
- 0.9.0
- provided
-
-
- org.projectlombok
- lombok
- 1.18.34
- provided
-
-
-
- cn.iocoder.yudao.module.iot.plugin.HttpVertxPlugin
- 0.0.1
- http-plugin
- http-plugin-0.0.1
- ahh
-
-
diff --git a/yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-http-plugin/plugin.properties b/yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-http-plugin/plugin.properties
deleted file mode 100644
index 44f221cb15..0000000000
--- a/yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-http-plugin/plugin.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-plugin.id=http-plugin
-plugin.class=cn.iocoder.yudao.module.iot.plugin.HttpVertxPlugin
-plugin.version=0.0.1
-plugin.provider=ahh
-plugin.dependencies=
-plugin.description=http-plugin-0.0.1
diff --git a/yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-http-plugin/pom.xml b/yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-http-plugin/pom.xml
deleted file mode 100644
index 4658a1f6bf..0000000000
--- a/yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-http-plugin/pom.xml
+++ /dev/null
@@ -1,157 +0,0 @@
-
-
-
- yudao-module-iot-plugin
- cn.iocoder.boot
- ${revision}
-
- 4.0.0
- jar
-
- yudao-module-iot-http-plugin
-
- ${project.artifactId}
-
- 物联网 插件模块 - http 插件
-
-
-
-
- http-plugin
- cn.iocoder.yudao.module.iot.plugin.HttpVertxPlugin
- 0.0.1
- ahh
- http-plugin-0.0.1
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-antrun-plugin
- 1.6
-
-
- unzip jar file
- package
-
-
-
-
-
-
- run
-
-
-
-
-
-
- maven-assembly-plugin
- 2.3
-
-
-
- src/main/assembly/assembly.xml
-
-
- false
-
-
-
- make-assembly
- package
-
- attached
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-jar-plugin
- 2.4
-
-
-
- ${plugin.id}
- ${plugin.class}
- ${plugin.version}
- ${plugin.provider}
- ${plugin.description}
- ${plugin.dependencies}
-
-
-
-
-
-
- maven-deploy-plugin
-
- true
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- org.springframework.boot
- spring-boot-starter
-
-
-
- org.pf4j
- pf4j-spring
- provided
-
-
-
- cn.iocoder.boot
- yudao-module-iot-api
- ${revision}
-
-
- org.projectlombok
- lombok
- ${lombok.version}
- provided
-
-
-
- io.vertx
- vertx-web
- 4.5.11
-
-
-
\ No newline at end of file
diff --git a/yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-http-plugin/src/main/resources/application.yml b/yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-http-plugin/src/main/resources/application.yml
deleted file mode 100644
index 9056af48a3..0000000000
--- a/yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-http-plugin/src/main/resources/application.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-spring:
- application:
- name: yudao-module-iot-http-plugin
-
-# MQTT-RPC 配置
-mqtt:
- broker: tcp://chaojiniu.top:1883
- username: haohao
- password: ahh@123456
- clientId: mqtt-rpc-client-${random.int}
- requestTopic: rpc/request
- responseTopicPrefix: rpc/response/
diff --git a/yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-mqtt-plugin/src/main/assembly/assembly.xml b/yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-mqtt-plugin/src/main/assembly/assembly.xml
deleted file mode 100644
index daec9e4315..0000000000
--- a/yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-mqtt-plugin/src/main/assembly/assembly.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
- plugin
-
- zip
-
- false
-
-
- false
- runtime
- lib
-
- *:jar:*
-
-
-
-
-
-
- target/plugin-classes
- classes
-
-
-
diff --git a/yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-emqx-plugin/plugin.properties b/yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-plugin-emqx/plugin.properties
similarity index 55%
rename from yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-emqx-plugin/plugin.properties
rename to yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-plugin-emqx/plugin.properties
index a23bafcf79..7f565b75e9 100644
--- a/yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-emqx-plugin/plugin.properties
+++ b/yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-plugin-emqx/plugin.properties
@@ -1,6 +1,6 @@
-plugin.id=emqx-plugin
+plugin.id=plugin-emqx
plugin.class=cn.iocoder.yudao.module.iot.plugin.EmqxPlugin
-plugin.version=0.0.1
+plugin.version=1.0.0
plugin.provider=ahh
plugin.dependencies=
-plugin.description=emqx-plugin-0.0.1
+plugin.description=plugin-emqx-1.0.0
diff --git a/yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-emqx-plugin/pom.xml b/yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-plugin-emqx/pom.xml
similarity index 98%
rename from yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-emqx-plugin/pom.xml
rename to yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-plugin-emqx/pom.xml
index 43d67f5207..266e45fd34 100644
--- a/yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-emqx-plugin/pom.xml
+++ b/yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-plugin-emqx/pom.xml
@@ -11,7 +11,7 @@
4.0.0
jar
- yudao-module-iot-emqx-plugin
+ yudao-module-iot-plugin-emqx
${project.artifactId}
diff --git a/yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-demo-plugin/src/main/assembly/assembly.xml b/yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-plugin-emqx/src/main/assembly/assembly.xml
similarity index 100%
rename from yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-demo-plugin/src/main/assembly/assembly.xml
rename to yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-plugin-emqx/src/main/assembly/assembly.xml
diff --git a/yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-emqx-plugin/src/main/java/cn/iocoder/yudao/module/iot/plugin/EmqxPlugin.java b/yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-plugin-emqx/src/main/java/cn/iocoder/yudao/module/iot/plugin/EmqxPlugin.java
similarity index 82%
rename from yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-emqx-plugin/src/main/java/cn/iocoder/yudao/module/iot/plugin/EmqxPlugin.java
rename to yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-plugin-emqx/src/main/java/cn/iocoder/yudao/module/iot/plugin/EmqxPlugin.java
index e64695b06d..27b90426b2 100644
--- a/yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-emqx-plugin/src/main/java/cn/iocoder/yudao/module/iot/plugin/EmqxPlugin.java
+++ b/yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-plugin-emqx/src/main/java/cn/iocoder/yudao/module/iot/plugin/EmqxPlugin.java
@@ -1,12 +1,11 @@
package cn.iocoder.yudao.module.iot.plugin;
-import cn.iocoder.yudao.module.iot.api.ServiceRegistry;
+import cn.hutool.extra.spring.SpringUtil;
import cn.iocoder.yudao.module.iot.api.device.DeviceDataApi;
import lombok.extern.slf4j.Slf4j;
import org.pf4j.Plugin;
import org.pf4j.PluginWrapper;
-import javax.annotation.Resource;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
@@ -14,8 +13,6 @@ import java.util.concurrent.Executors;
public class EmqxPlugin extends Plugin {
private ExecutorService executorService;
- @Resource
- private DeviceDataApi deviceDataApi;
public EmqxPlugin(PluginWrapper wrapper) {
super(wrapper);
@@ -30,7 +27,7 @@ public class EmqxPlugin extends Plugin {
executorService = Executors.newSingleThreadExecutor();
}
- deviceDataApi = ServiceRegistry.getService(DeviceDataApi.class);
+ DeviceDataApi deviceDataApi = SpringUtil.getBean(DeviceDataApi.class);
if (deviceDataApi == null) {
log.error("未能从 ServiceRegistry 获取 DeviceDataApi 实例,请确保主程序已正确注册!");
return;
diff --git a/yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-plugin-http/dependency-reduced-pom.xml b/yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-plugin-http/dependency-reduced-pom.xml
new file mode 100644
index 0000000000..260ef9c8d9
--- /dev/null
+++ b/yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-plugin-http/dependency-reduced-pom.xml
@@ -0,0 +1,43 @@
+
+
+
+ yudao-module-iot-plugin
+ cn.iocoder.boot
+ 2.2.0-snapshot
+
+ 4.0.0
+ yudao-module-iot-plugin-http
+ ${project.artifactId}
+ 1.0.0
+ 物联网 插件模块 - http 插件
+
+
+
+ maven-shade-plugin
+ 3.2.4
+
+
+ package
+
+ shade
+
+
+
+
+ com.example.HttpPluginSpringbootApplication
+
+
+
+
+
+
+
+
+
+ ${project.artifactId}
+ ${project.artifactId}-${project.version}
+ cn.iocoder.yudao.module.iot.config.HttpVertxPlugin
+ ${project.version}
+ yudao
+
+
diff --git a/yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-plugin-http/plugin.properties b/yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-plugin-http/plugin.properties
new file mode 100644
index 0000000000..49aef5b187
--- /dev/null
+++ b/yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-plugin-http/plugin.properties
@@ -0,0 +1,6 @@
+plugin.id=yudao-module-iot-plugin-http
+plugin.class=cn.iocoder.yudao.module.iot.config.HttpVertxPlugin
+plugin.version=1.0.0
+plugin.provider=yudao
+plugin.dependencies=
+plugin.description=yudao-module-iot-plugin-http-1.0.0
\ No newline at end of file
diff --git a/yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-demo-plugin/pom.xml b/yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-plugin-http/pom.xml
similarity index 72%
rename from yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-demo-plugin/pom.xml
rename to yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-plugin-http/pom.xml
index 3d58a1a75e..40bb303bc8 100644
--- a/yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-demo-plugin/pom.xml
+++ b/yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-plugin-http/pom.xml
@@ -11,45 +11,27 @@
4.0.0
jar
- yudao-module-iot-demo-plugin
+ yudao-module-iot-plugin-http
+ 1.0.0
${project.artifactId}
- 物联网 插件模块 - demo 插件
+ 物联网 插件模块 - http 插件
- demo-plugin
- cn.iocoder.yudao.module.iot.plugin.DemoPlugin
- 0.0.1
- ahh
+ ${project.artifactId}
+ cn.iocoder.yudao.module.iot.config.HttpVertxPlugin
+ ${project.version}
+ yudao
+ ${project.artifactId}-${project.version}
-
-
+
org.apache.maven.plugins
maven-antrun-plugin
@@ -60,7 +42,8 @@
package
-
+
@@ -92,6 +75,7 @@
+
org.apache.maven.plugins
maven-jar-plugin
@@ -103,12 +87,30 @@
${plugin.class}
${plugin.version}
${plugin.provider}
+ ${plugin.description}
${plugin.dependencies}
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+ ${spring.boot.version}
+
+
+
+ repackage
+
+
+ -standalone
+
+
+
+
+
maven-deploy-plugin
@@ -122,15 +124,12 @@
org.springframework.boot
- spring-boot-starter-web
- ${spring.boot.version}
- provided
+ spring-boot-starter
org.pf4j
pf4j-spring
- provided
@@ -141,8 +140,11 @@
org.projectlombok
lombok
- ${lombok.version}
- provided
+
+
+
+ io.vertx
+ vertx-web
\ No newline at end of file
diff --git a/yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-http-plugin/src/main/assembly/assembly.xml b/yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-plugin-http/src/main/assembly/assembly.xml
similarity index 74%
rename from yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-http-plugin/src/main/assembly/assembly.xml
rename to yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-plugin-http/src/main/assembly/assembly.xml
index daec9e4315..9b79e6152f 100644
--- a/yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-http-plugin/src/main/assembly/assembly.xml
+++ b/yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-plugin-http/src/main/assembly/assembly.xml
@@ -14,14 +14,7 @@
-
+
target/plugin-classes
diff --git a/yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-http-plugin/src/main/java/cn/iocoder/yudao/module/iot/HttpPluginSpringbootApplication.java b/yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-plugin-http/src/main/java/cn/iocoder/yudao/module/iot/HttpPluginSpringbootApplication.java
similarity index 100%
rename from yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-http-plugin/src/main/java/cn/iocoder/yudao/module/iot/HttpPluginSpringbootApplication.java
rename to yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-plugin-http/src/main/java/cn/iocoder/yudao/module/iot/HttpPluginSpringbootApplication.java
diff --git a/yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-http-plugin/src/main/java/cn/iocoder/yudao/module/iot/plugin/HttpVertxPlugin.java b/yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-plugin-http/src/main/java/cn/iocoder/yudao/module/iot/config/HttpVertxPlugin.java
similarity index 93%
rename from yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-http-plugin/src/main/java/cn/iocoder/yudao/module/iot/plugin/HttpVertxPlugin.java
rename to yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-plugin-http/src/main/java/cn/iocoder/yudao/module/iot/config/HttpVertxPlugin.java
index 54d9c7c2bc..d77f990c20 100644
--- a/yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-http-plugin/src/main/java/cn/iocoder/yudao/module/iot/plugin/HttpVertxPlugin.java
+++ b/yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-plugin-http/src/main/java/cn/iocoder/yudao/module/iot/config/HttpVertxPlugin.java
@@ -1,7 +1,8 @@
-package cn.iocoder.yudao.module.iot.plugin;
+package cn.iocoder.yudao.module.iot.config;
import cn.hutool.extra.spring.SpringUtil;
import cn.iocoder.yudao.module.iot.api.device.DeviceDataApi;
+import cn.iocoder.yudao.module.iot.service.HttpVertxHandler;
import io.vertx.core.Vertx;
import io.vertx.ext.web.Router;
import io.vertx.ext.web.handler.BodyHandler;
@@ -17,8 +18,6 @@ public class HttpVertxPlugin extends SpringPlugin {
private static final int PORT = 8092;
private Vertx vertx;
- private DeviceDataApi deviceDataApi;
-
public HttpVertxPlugin(PluginWrapper wrapper) {
super(wrapper);
}
@@ -28,7 +27,7 @@ public class HttpVertxPlugin extends SpringPlugin {
log.info("HttpVertxPlugin.start()");
// 获取 DeviceDataApi 实例
- deviceDataApi = SpringUtil.getBean(DeviceDataApi.class);
+ DeviceDataApi deviceDataApi = SpringUtil.getBean(DeviceDataApi.class);
if (deviceDataApi == null) {
log.error("未能从 ServiceRegistry 获取 DeviceDataApi 实例,请确保主程序已正确注册!");
return;
diff --git a/yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-http-plugin/src/main/java/cn/iocoder/yudao/module/iot/config/TestConfiguration.java b/yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-plugin-http/src/main/java/cn/iocoder/yudao/module/iot/config/TestConfiguration.java
similarity index 94%
rename from yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-http-plugin/src/main/java/cn/iocoder/yudao/module/iot/config/TestConfiguration.java
rename to yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-plugin-http/src/main/java/cn/iocoder/yudao/module/iot/config/TestConfiguration.java
index b32a1f59fb..1931268b60 100644
--- a/yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-http-plugin/src/main/java/cn/iocoder/yudao/module/iot/config/TestConfiguration.java
+++ b/yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-plugin-http/src/main/java/cn/iocoder/yudao/module/iot/config/TestConfiguration.java
@@ -2,7 +2,6 @@ package cn.iocoder.yudao.module.iot.config;
import cn.iocoder.yudao.module.iot.api.device.DeviceDataApi;
import cn.iocoder.yudao.module.iot.api.device.dto.DeviceDataCreateReqDTO;
-import cn.iocoder.yudao.module.iot.plugin.HttpVertxPlugin;
import org.pf4j.DefaultPluginManager;
import org.pf4j.PluginWrapper;
import org.springframework.context.annotation.Bean;
diff --git a/yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-http-plugin/src/main/java/cn/iocoder/yudao/module/iot/plugin/HttpVertxHandler.java b/yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-plugin-http/src/main/java/cn/iocoder/yudao/module/iot/service/HttpVertxHandler.java
similarity index 98%
rename from yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-http-plugin/src/main/java/cn/iocoder/yudao/module/iot/plugin/HttpVertxHandler.java
rename to yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-plugin-http/src/main/java/cn/iocoder/yudao/module/iot/service/HttpVertxHandler.java
index 335d6c95d2..8542cfefb1 100644
--- a/yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-http-plugin/src/main/java/cn/iocoder/yudao/module/iot/plugin/HttpVertxHandler.java
+++ b/yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-plugin-http/src/main/java/cn/iocoder/yudao/module/iot/service/HttpVertxHandler.java
@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.iot.plugin;
+package cn.iocoder.yudao.module.iot.service;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
diff --git a/yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-plugin-http/src/main/resources/application.yml b/yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-plugin-http/src/main/resources/application.yml
new file mode 100644
index 0000000000..c5a1ee84cf
--- /dev/null
+++ b/yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-plugin-http/src/main/resources/application.yml
@@ -0,0 +1,3 @@
+spring:
+ application:
+ name: yudao-module-iot-plugin-http
diff --git a/yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-mqtt-plugin/plugin.properties b/yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-plugin-mqtt/plugin.properties
similarity index 100%
rename from yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-mqtt-plugin/plugin.properties
rename to yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-plugin-mqtt/plugin.properties
diff --git a/yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-mqtt-plugin/pom.xml b/yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-plugin-mqtt/pom.xml
similarity index 98%
rename from yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-mqtt-plugin/pom.xml
rename to yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-plugin-mqtt/pom.xml
index 462fbd0901..7e4689b4ae 100644
--- a/yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-mqtt-plugin/pom.xml
+++ b/yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-plugin-mqtt/pom.xml
@@ -11,7 +11,7 @@
4.0.0
jar
- yudao-module-iot-mqtt-plugin
+ yudao-module-iot-plugin-mqtt
${project.artifactId}
diff --git a/yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-emqx-plugin/src/main/assembly/assembly.xml b/yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-plugin-mqtt/src/main/assembly/assembly.xml
similarity index 100%
rename from yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-emqx-plugin/src/main/assembly/assembly.xml
rename to yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-plugin-mqtt/src/main/assembly/assembly.xml
diff --git a/yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-mqtt-plugin/src/main/java/cn/iocoder/yudao/module/iot/plugin/MqttPlugin.java b/yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-plugin-mqtt/src/main/java/cn/iocoder/yudao/module/iot/plugin/MqttPlugin.java
similarity index 100%
rename from yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-mqtt-plugin/src/main/java/cn/iocoder/yudao/module/iot/plugin/MqttPlugin.java
rename to yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-plugin-mqtt/src/main/java/cn/iocoder/yudao/module/iot/plugin/MqttPlugin.java
diff --git a/yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-mqtt-plugin/src/main/java/cn/iocoder/yudao/module/iot/plugin/MqttServerExtension.java b/yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-plugin-mqtt/src/main/java/cn/iocoder/yudao/module/iot/plugin/MqttServerExtension.java
similarity index 100%
rename from yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-mqtt-plugin/src/main/java/cn/iocoder/yudao/module/iot/plugin/MqttServerExtension.java
rename to yudao-module-iot/yudao-module-iot-plugin/yudao-module-iot-plugin-mqtt/src/main/java/cn/iocoder/yudao/module/iot/plugin/MqttServerExtension.java