newui: 修复不加载 jar 到 classpath 后出现的下载插件无法启用的问题

Author: yiding-he

src/main/java/com/xwintop/xJavaFxTool/controller/index/PluginManageController.java

@@ -4,7 +4,9 @@
 import com.xwintop.xJavaFxTool.event.AppEvents;
 import com.xwintop.xJavaFxTool.event.PluginEvent;
 import com.xwintop.xJavaFxTool.model.PluginJarInfo;
+import com.xwintop.xJavaFxTool.plugin.PluginClassLoader;
 import com.xwintop.xJavaFxTool.plugin.PluginManager;
+import com.xwintop.xJavaFxTool.plugin.PluginParser;
 import com.xwintop.xJavaFxTool.services.index.PluginManageService;
 import com.xwintop.xJavaFxTool.view.index.PluginManageView;
 import com.xwintop.xcore.util.javafx.JavaFxViewUtil;
@@ -135,6 +137,9 @@ private void afterDownload(
         PluginManager.getInstance().saveToFile();
         TooltipUtil.showToast("插件 " + dataRow.get("nameTableColumn") + " 下载完成");
 
+        PluginClassLoader tempClassLoader = new PluginClassLoader(pluginJarInfo.getFile());
+        PluginParser.parse(pluginJarInfo.getFile(), pluginJarInfo, tempClassLoader);
+
         AppEvents.fire(new PluginEvent(PluginEvent.PLUGIN_DOWNLOADED, pluginJarInfo));
     }
 

src/main/java/com/xwintop/xJavaFxTool/newui/NewLauncherController.java

@@ -66,8 +66,6 @@ public void initialize() {
         startWebView.getEngine().load(IndexController.QQ_URL); // 额外再打开一个反馈页面，可关闭
 
         AppEvents.addEventHandler(PluginEvent.PLUGIN_DOWNLOADED, pluginEvent -> {
-            PluginJarInfo pluginJarInfo = pluginEvent.getPluginJarInfo();
-            PluginParser.parse(pluginJarInfo.getFile(), pluginJarInfo);
             loadPlugins();
         });
     }

src/main/java/com/xwintop/xJavaFxTool/plugin/PluginClassLoader.java

@@ -21,4 +21,8 @@ private static URL fromFile(File file) {
     public PluginClassLoader(ClassLoader parent, File appFile) {
         super(new URL[]{fromFile(appFile)}, parent);
     }
+
+    public PluginClassLoader(File appFile) {
+        this(getSystemClassLoader(), appFile);
+    }
 }

src/main/java/com/xwintop/xJavaFxTool/plugin/PluginContainer.java

@@ -39,6 +39,8 @@ public FXMLLoader createFXMLLoader() {
             FXMLLoader pluginFxmlLoader = (FXMLLoader)
                 pluginClassLoader.loadClass("javafx.fxml.FXMLLoader").newInstance();
 
+            pluginFxmlLoader.setClassLoader(pluginClassLoader);
+
             // 必须去掉前缀的 "/" 才能正确读取
             String fxmlPathFixed = StringUtils.removeStart(pluginJarInfo.getFxmlPath(), "/");
 

src/main/java/com/xwintop/xJavaFxTool/plugin/PluginLoader.java

@@ -85,12 +85,6 @@ public static Tab loadPluginAsTab(PluginJarInfo plugin, TabPane tabPane) {
      */
     public static Tab loadIsolatedPluginAsTab(PluginJarInfo plugin, TabPane tabPane) {
         try {
-            URL resource = PluginLoader.class.getResource(plugin.getFxmlPath());
-            if (resource == null) {
-                FxAlerts.error("加载插件失败", "无法读取资源文件 '" + plugin.getFxmlPath() + "'");
-                return null;
-            }
-
             Tab tab = new Tab(plugin.getTitle());
 
             if (StringUtils.isNotEmpty(plugin.getIconPath())) {
@@ -119,8 +113,8 @@ public static Tab loadIsolatedPluginAsTab(PluginJarInfo plugin, TabPane tabPane)
                     JavaFxViewUtil.setControllerOnCloseRequest(controller, event);
                     PluginContainer container = containerRef.get();
                     if (container != null) {
-                        log.info("插件关闭：" + pluginContainer.getPluginJarInfo().getName());
-                        pluginContainer.unload();
+                        log.info("插件关闭：" + container.getPluginJarInfo().getName());
+                        container.unload();
                     }
                 }
             );

src/main/java/com/xwintop/xJavaFxTool/plugin/PluginManager.java

@@ -113,7 +113,7 @@ private void loadLocalPluginConfiguration() {
     }
 
     /**
-     * 解析本地插件文件（必须在这之前先加入 classpath）
+     * 解析本地插件文件
      */
     public void loadLocalPlugins() {
         this.pluginList.forEach(plugin -> {
@@ -167,23 +167,6 @@ private void addOrUpdatePlugin(PluginJarInfo pluginJarInfo, Consumer<PluginJarIn
 
     ////////////////////////////////////////////////////////////// 下载插件
 
-    public File downloadPlugin(PluginJarInfo pluginJarInfo) throws IOException {
-        PluginJarInfo plugin = getPlugin(pluginJarInfo.getJarName());
-        if (plugin == null) {
-            throw new IllegalStateException("没有找到插件 " + pluginJarInfo.getJarName());
-        }
-
-        File file = pluginJarInfo.getFile();
-        HttpUtil.downloadFile(pluginJarInfo.getDownloadUrl(), file);
-
-        plugin.setIsDownload(true);
-        plugin.setIsEnable(true);
-        plugin.setLocalVersionNumber(plugin.getVersionNumber());
-        this.saveToFile();
-
-        return file;
-    }
-
     public File downloadPlugin(
         PluginJarInfo pluginJarInfo, BiConsumer<Long, Long> onProgressUpdate
     ) throws IOException {

src/main/java/com/xwintop/xJavaFxTool/plugin/PluginParser.java

@@ -1,13 +1,10 @@
 package com.xwintop.xJavaFxTool.plugin;
 
+import static org.apache.commons.lang.StringUtils.defaultString;
+
 import com.xwintop.xJavaFxTool.AppException;
 import com.xwintop.xJavaFxTool.model.PluginJarInfo;
 import com.xwintop.xJavaFxTool.utils.Config;
-import org.dom4j.Document;
-import org.dom4j.DocumentException;
-import org.dom4j.Element;
-import org.dom4j.io.SAXReader;
-
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -18,8 +15,10 @@
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 import java.util.stream.Collectors;
-
-import static org.apache.commons.lang.StringUtils.defaultString;
+import org.dom4j.Document;
+import org.dom4j.DocumentException;
+import org.dom4j.Element;
+import org.dom4j.io.SAXReader;
 
 /**
  * 用来解析插件文件中的 toolFxmlLoaderConfiguration.xml
@@ -32,6 +31,13 @@ public class PluginParser {
      * 解析插件文件，补完 pluginJarInfo 属性
      */
     public static void parse(File pluginFile, PluginJarInfo pluginJarInfo) {
+        parse(pluginFile, pluginJarInfo, ClassLoader.getSystemClassLoader());
+    }
+
+    /**
+     * 解析插件文件，补完 pluginJarInfo 属性
+     */
+    public static void parse(File pluginFile, PluginJarInfo pluginJarInfo, ClassLoader classLoader) {
         try (JarFile jarFile = new JarFile(pluginFile)) {
 
             JarEntry entry = jarFile.getJarEntry(ENTRY_NAME);
@@ -49,7 +55,8 @@ public static void parse(File pluginFile, PluginJarInfo pluginJarInfo) {
             }
 
             String resourceBundleName = getChildNodeText(pluginElement, "resourceBundleName");
-            ResourceBundle pluginResourceBundle = ResourceBundle.getBundle(resourceBundleName, Config.defaultLocale);
+            ResourceBundle pluginResourceBundle =
+                ResourceBundle.getBundle(resourceBundleName, Config.defaultLocale, classLoader);
 
             String menuId = getChildNodeText(pluginElement, "menuParentId");
             String url = getChildNodeText(pluginElement, "url");