feature: update plugin module

flowerfine · Oct 17, 2024 · 37979d5 · 37979d5
1 parent ee83b4f
commit 37979d5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 94 deletions.
diff --git a/...-plugin/src/main/java/cn/sliew/carp/module/plugin/plugin/CustomLegacyExtensionFinder.java b/...-plugin/src/main/java/cn/sliew/carp/module/plugin/plugin/CustomLegacyExtensionFinder.java
diff --git a/...p-module-plugin/src/main/java/cn/sliew/carp/module/plugin/plugin/CustomPluginManager.java b/...p-module-plugin/src/main/java/cn/sliew/carp/module/plugin/plugin/CustomPluginManager.java
@@ -31,15 +31,6 @@ protected PluginRepository createPluginRepository() {
                 .add(new CustomPluginRepository());
     }
 
-//    @Override
-//    protected ExtensionFinder createExtensionFinder() {
-//        DefaultExtensionFinder extensionFinder = new DefaultExtensionFinder(this);
-//        extensionFinder.addServiceProviderExtensionFinder();
-//        addPluginStateListener(extensionFinder);
-//
-//        return extensionFinder;
-//    }
-
     @Override
     protected PluginStatusProvider createPluginStatusProvider() {
         return new CustomPluginStatusProvider();

diff --git a/...dule-plugin/src/main/java/cn/sliew/carp/module/plugin/service/impl/PluginServiceImpl.java b/...dule-plugin/src/main/java/cn/sliew/carp/module/plugin/service/impl/PluginServiceImpl.java
@@ -143,17 +143,17 @@ public boolean enable(Long id) {
             update(updateWrapper);
             // 启用插件信息
             return pf4jService.enablePlugin(pluginId);
+            // 插件启用完毕后，不能删除通过 http 下载的 jar。插件后续仍需读取 LegacyExtensionFinder.EXTENSIONS_RESOURCE
         } catch (IOException e) {
             log.error(e.getMessage(), e);
-            throw new RuntimeException(e);
-        } finally {
             if (path != null) {
                 try {
                     FileUtil.deleteFile(path);
-                } catch (IOException e) {
-                    throw new RuntimeException(e);
+                } catch (IOException ex) {
+                    throw new RuntimeException(ex);
                 }
             }
+            throw new RuntimeException(e);
         }
     }