From ce4912304388f6dd4b38cdd1718b90019aa7578b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E6=B5=A9=E6=B5=A9?= <1036606149@qq.com> Date: Mon, 16 Dec 2024 18:43:08 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E3=80=91IoT=EF=BC=9A=E6=9B=B4=E6=96=B0=E9=97=AE=E5=80=99?= =?UTF-8?q?=E8=AF=AD=E6=89=93=E5=8D=B0=E6=96=B9=E6=B3=95=EF=BC=8C=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E9=97=AE=E5=80=99=E8=AF=AD=E6=95=B0=E9=87=8F=EF=BC=9B?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B8=8D=E5=86=8D=E4=BD=BF=E7=94=A8=E7=9A=84?= =?UTF-8?q?=E6=8F=92=E4=BB=B6=E6=8E=A7=E5=88=B6=E5=99=A8=E5=92=8C=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/plugininfo/Greetings.java | 5 +-- .../admin/plugininfo/PluginController.java | 6 ++-- .../iot/plugin/IoTHttpPluginController.java | 22 ------------- .../yudao/module/iot/plugin/IoTPlugin.java | 33 ------------------- .../module/iot/plugin/IotPluginConfig.java | 16 --------- 5 files changed, 6 insertions(+), 76 deletions(-) delete mode 100644 yudao-module-iot/yudao-module-iot-plugin/src/main/java/cn/iocoder/yudao/module/iot/plugin/IoTHttpPluginController.java delete mode 100644 yudao-module-iot/yudao-module-iot-plugin/src/main/java/cn/iocoder/yudao/module/iot/plugin/IoTPlugin.java delete mode 100644 yudao-module-iot/yudao-module-iot-plugin/src/main/java/cn/iocoder/yudao/module/iot/plugin/IotPluginConfig.java diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/plugininfo/Greetings.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/plugininfo/Greetings.java index a8e557f15f..1b29a34475 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/plugininfo/Greetings.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/plugininfo/Greetings.java @@ -30,11 +30,12 @@ public class Greetings { @Autowired private List greetings; - public void printGreetings() { + public Integer printGreetings() { System.out.printf("找到扩展点的 %d 个扩展 '%s'%n", greetings.size(), Greeting.class.getName()); for (Greeting greeting : greetings) { System.out.println(">>> " + greeting.getGreeting()); } + return greetings.size(); } -} +} \ No newline at end of file diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/plugininfo/PluginController.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/plugininfo/PluginController.java index c4f9ab4653..4cd22bccaf 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/plugininfo/PluginController.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/plugininfo/PluginController.java @@ -123,12 +123,12 @@ public class PluginController { /** * 打印问候语 * - * @return 1 + * @return 问候语数量 */ @PermitAll @GetMapping("/printGreetings") public ResponseEntity printGreetings() { - greetings.printGreetings(); - return ResponseEntity.ok(1); + Integer count = greetings.printGreetings(); + return ResponseEntity.ok(count); } } diff --git a/yudao-module-iot/yudao-module-iot-plugin/src/main/java/cn/iocoder/yudao/module/iot/plugin/IoTHttpPluginController.java b/yudao-module-iot/yudao-module-iot-plugin/src/main/java/cn/iocoder/yudao/module/iot/plugin/IoTHttpPluginController.java deleted file mode 100644 index a6633388e5..0000000000 --- a/yudao-module-iot/yudao-module-iot-plugin/src/main/java/cn/iocoder/yudao/module/iot/plugin/IoTHttpPluginController.java +++ /dev/null @@ -1,22 +0,0 @@ -package cn.iocoder.yudao.module.iot.plugin; - - -import org.pf4j.Extension; -import org.pf4j.ExtensionPoint; -import org.springframework.web.bind.annotation.*; - -@RestController -@RequestMapping("/iot/plugin-demo") -@Extension -public class IoTHttpPluginController implements ExtensionPoint { - - @GetMapping("/greet") - public String greet() { - return "Hello from MyPlugin!"; - } - - @PostMapping("/message") - public void receiveMessage(@RequestBody String message) { - System.out.println("Received message: " + message); - } -} diff --git a/yudao-module-iot/yudao-module-iot-plugin/src/main/java/cn/iocoder/yudao/module/iot/plugin/IoTPlugin.java b/yudao-module-iot/yudao-module-iot-plugin/src/main/java/cn/iocoder/yudao/module/iot/plugin/IoTPlugin.java deleted file mode 100644 index 78c07c404f..0000000000 --- a/yudao-module-iot/yudao-module-iot-plugin/src/main/java/cn/iocoder/yudao/module/iot/plugin/IoTPlugin.java +++ /dev/null @@ -1,33 +0,0 @@ -package cn.iocoder.yudao.module.iot.plugin; - -import org.pf4j.PluginWrapper; -import org.pf4j.spring.SpringPlugin; -import org.springframework.context.ApplicationContext; -import org.springframework.context.annotation.AnnotationConfigApplicationContext; - -public class IoTPlugin extends SpringPlugin { - public IoTPlugin(PluginWrapper wrapper) { - super(wrapper); - } - - @Override - public void start() { - System.out.println("IoTPlugin 启动"); - } - - @Override - public void stop() { - System.out.println("IoTPlugin 停止"); - super.stop(); // to close applicationContext - } - - @Override - protected ApplicationContext createApplicationContext() { - AnnotationConfigApplicationContext applicationContext = new AnnotationConfigApplicationContext(); - applicationContext.setClassLoader(getWrapper().getPluginClassLoader()); - applicationContext.register(IoTHttpPluginController.class); // 注册 IoTPluginConfig - applicationContext.refresh(); - System.out.println("IoTPlugin 加载完成"); - return applicationContext; - } -} diff --git a/yudao-module-iot/yudao-module-iot-plugin/src/main/java/cn/iocoder/yudao/module/iot/plugin/IotPluginConfig.java b/yudao-module-iot/yudao-module-iot-plugin/src/main/java/cn/iocoder/yudao/module/iot/plugin/IotPluginConfig.java deleted file mode 100644 index 02b8bb5a04..0000000000 --- a/yudao-module-iot/yudao-module-iot-plugin/src/main/java/cn/iocoder/yudao/module/iot/plugin/IotPluginConfig.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.iocoder.yudao.module.iot.plugin; - -import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.Configuration; -import org.springframework.boot.web.server.WebServerFactoryCustomizer; -import org.springframework.boot.web.server.ConfigurableWebServerFactory; -import org.springframework.context.annotation.Bean; - -@Configuration -public class IoTPluginConfig { - - @Bean - public IoTHttpPluginController ioTHttpPluginController() { - return new IoTHttpPluginController(); - } -}