From a85890d958417e90564fe4ab075fdf6216cd1c9f 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, 20 Jan 2025 17:03:27 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E5=AE=8C=E5=96=84?=
 =?UTF-8?q?=E3=80=91IoT:=20=E6=B7=BB=E5=8A=A0=E6=8F=92=E4=BB=B6=E7=9B=AE?=
 =?UTF-8?q?=E5=BD=95=E9=85=8D=E7=BD=AE=EF=BC=8C=E9=87=8D=E6=9E=84=20Spring?=
 =?UTF-8?q?PluginManager=20=E5=AE=9E=E4=BE=8B=E5=8C=96=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=EF=BC=8C=E5=88=A0=E9=99=A4=E4=B8=8D=E5=86=8D=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E7=9A=84=20ExampleService=20=E7=B1=BB=E4=BB=A5=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E4=BB=A3=E7=A0=81=E7=BB=93=E6=9E=84=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../plugin/UnifiedConfiguration.java          |  6 ++-
 .../iot/service/plugin/ExampleService.java    | 43 -------------------
 2 files changed, 5 insertions(+), 44 deletions(-)
 delete mode 100644 yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/plugin/ExampleService.java

diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/plugin/UnifiedConfiguration.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/plugin/UnifiedConfiguration.java
index 374e3856a1..e02ec9be05 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/plugin/UnifiedConfiguration.java
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/plugin/UnifiedConfiguration.java
@@ -5,11 +5,13 @@ import cn.iocoder.yudao.module.iot.api.device.DeviceDataApi;
 import cn.iocoder.yudao.module.iot.framework.plugin.listener.CustomPluginStateListener;
 import lombok.extern.slf4j.Slf4j;
 import org.pf4j.spring.SpringPluginManager;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.DependsOn;
 
 import javax.annotation.Resource;
+import java.nio.file.Paths;
 
 @Slf4j
 @Configuration
@@ -19,6 +21,8 @@ public class UnifiedConfiguration {
 
     @Resource
     private DeviceDataApi deviceDataApi;
+    @Value("${pf4j.pluginsDir:pluginsDir}")
+    private String pluginsDir;
 
     @Bean(SERVICE_REGISTRY_INITIALIZED_MARKER)
     public Object serviceRegistryInitializedMarker() {
@@ -31,7 +35,7 @@ public class UnifiedConfiguration {
     @DependsOn(SERVICE_REGISTRY_INITIALIZED_MARKER)
     public SpringPluginManager pluginManager() {
         log.info("[init][实例化 SpringPluginManager]");
-        SpringPluginManager springPluginManager = new SpringPluginManager() {
+        SpringPluginManager springPluginManager = new SpringPluginManager(Paths.get(pluginsDir)) {
             @Override
             public void startPlugins() {
                 // 禁用插件启动，避免插件启动时，启动所有插件
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/plugin/ExampleService.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/plugin/ExampleService.java
deleted file mode 100644
index 22ebe8b4f2..0000000000
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/plugin/ExampleService.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package cn.iocoder.yudao.module.iot.service.plugin;
-
-import cn.iocoder.yudao.module.iot.mqttrpc.server.RpcServer;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.PostConstruct;
-
-@Service
-@RequiredArgsConstructor
-public class ExampleService {
-
-    private final RpcServer rpcServer;
-
-    @PostConstruct
-    public void registerMethods() {
-        rpcServer.registerMethod("add", params -> {
-            if (params.length != 2) {
-                throw new IllegalArgumentException("add方法需要两个参数");
-            }
-            int a = ((Number) params[0]).intValue();
-            int b = ((Number) params[1]).intValue();
-            return add(a, b);
-        });
-
-        rpcServer.registerMethod("concat", params -> {
-            if (params.length != 2) {
-                throw new IllegalArgumentException("concat方法需要两个参数");
-            }
-            String str1 = params[0].toString();
-            String str2 = params[1].toString();
-            return concat(str1, str2);
-        });
-    }
-
-    private int add(int a, int b) {
-        return a + b;
-    }
-
-    private String concat(String a, String b) {
-        return a + b;
-    }
-}
\ No newline at end of file