添加插件信息

Author: xwintop

src/main/java/com/xwintop/xJavaFxTool/controller/IndexController.java

@@ -59,9 +59,9 @@ public void initialize(URL location, ResourceBundle resources) {
         initView();
         initEvent();
         initService();
-        new Thread(() -> {//启动SpringBoot
+//        new Thread(() -> {//启动SpringBoot
 //			SpringApplication.run(Main.class,new String[0]);
-        }).start();
+//        }).start();
         addNodepadAction(null);
     }
 

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

@@ -53,8 +53,7 @@ private void initView() {
         JavaFxViewUtil.setTableColumnButonFactory(downloadTableColumn, "下载", (me, index) -> {
             try {
                 Map<String, String> dataRow = pluginDataTableData.get(index);
-                String downloadUrl = dataRow.get("downloadUrl");
-                pluginManageService.downloadPluginJar(downloadUrl);
+                pluginManageService.downloadPluginJar(dataRow);
                 TooltipUtil.showToast("下载插件完成");
             } catch (Exception e) {
                 log.error("下载插件失败：", e);

src/main/java/com/xwintop/xJavaFxTool/model/PluginJarInfo.java

@@ -0,0 +1,22 @@
+package com.xwintop.xJavaFxTool.model;
+
+import lombok.Data;
+
+/**
+ * @ClassName: PluginJarInfo
+ * @Description: 插件信息
+ * @author: xufeng
+ * @date: 2020/1/20 17:28
+ */
+
+@Data
+public class PluginJarInfo {
+    private String name;//名称
+    private String synopsis;//简介
+    private String jarName;//jar包名称
+    private String version;//版本名称
+    private Integer versionNumber;//版本号（用来判断更新）
+    private String downloadUrl;//下载地址
+    private Boolean isDownload;//是否下载
+    private Boolean isEnable;//是否启用
+}

src/main/java/com/xwintop/xJavaFxTool/services/index/PluginManageService.java

@@ -5,12 +5,13 @@
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.xwintop.xJavaFxTool.controller.index.PluginManageController;
+import com.xwintop.xJavaFxTool.model.PluginJarInfo;
+import com.xwintop.xJavaFxTool.utils.XJavaFxSystemUtil;
 import com.xwintop.xcore.util.javafx.TooltipUtil;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 import okhttp3.OkHttpClient;
-import org.apache.commons.lang3.StringUtils;
 
 import java.io.File;
 import java.util.HashMap;
@@ -41,13 +42,25 @@ public void getPluginList() {
             JSONArray jsonArray = JSON.parseArray(jsonString);
             for (Object json : jsonArray) {
                 JSONObject data = (JSONObject) json;
+                PluginJarInfo pluginJarInfo = XJavaFxSystemUtil.pluginJarInfoMap.get(data.getString("jarName"));
                 Map<String, String> dataRow = new HashMap<String, String>();
                 dataRow.put("nameTableColumn", data.getString("name"));
                 dataRow.put("synopsisTableColumn", data.getString("synopsis"));
                 dataRow.put("versionTableColumn", data.getString("version"));
-                dataRow.put("isDownloadTableColumn", "否");
-                dataRow.put("isEnableTableColumn", "false");
+                if (pluginJarInfo == null) {
+                    dataRow.put("isDownloadTableColumn", "否");
+                    dataRow.put("isEnableTableColumn", "false");
+                } else {
+                    if (Integer.parseInt(data.getString("versionNumber")) > pluginJarInfo.getVersionNumber()) {
+                        dataRow.put("isDownloadTableColumn", "更新");
+                    } else {
+                        dataRow.put("isDownloadTableColumn", "是");
+                    }
+                    dataRow.put("isEnableTableColumn", pluginJarInfo.getIsDownload().toString());
+                }
+                dataRow.put("jarName", data.getString("jarName"));
                 dataRow.put("downloadUrl", data.getString("downloadUrl"));
+                dataRow.put("versionNumber", data.getString("versionNumber"));
                 pluginManageController.getPluginDataTableData().add(dataRow);
             }
         } catch (Exception e) {
@@ -56,8 +69,19 @@ public void getPluginList() {
         }
     }
 
-    public void downloadPluginJar(String downloadUrl) throws Exception {
-        File file = new File("libs/", StringUtils.substring(downloadUrl, 56, downloadUrl.length()));
-        HttpUtil.downloadFile(downloadUrl, file);
+    public void downloadPluginJar(Map<String, String> dataRow) throws Exception {
+        PluginJarInfo pluginJarInfo = new PluginJarInfo();
+        pluginJarInfo.setName(dataRow.get("nameTableColumn"));
+        pluginJarInfo.setSynopsis(dataRow.get("synopsisTableColumn"));
+        pluginJarInfo.setVersion(dataRow.get("versionTableColumn"));
+        pluginJarInfo.setVersionNumber(Integer.parseInt(dataRow.get("versionNumber")));
+        pluginJarInfo.setDownloadUrl(dataRow.get("downloadUrl"));
+        pluginJarInfo.setJarName(dataRow.get("jarName"));
+        pluginJarInfo.setIsDownload(true);
+        pluginJarInfo.setIsEnable(true);
+//        File file = new File("libs/", StringUtils.substring(downloadUrl, 56, downloadUrl.length()));
+        File file = new File("libs/", pluginJarInfo.getJarName() + "-" + pluginJarInfo.getVersion() + ".jar");
+        HttpUtil.downloadFile(pluginJarInfo.getDownloadUrl(), file);
+        XJavaFxSystemUtil.pluginJarInfoMap.put(pluginJarInfo.getJarName(), pluginJarInfo);
     }
 }

src/main/java/com/xwintop/xJavaFxTool/utils/XJavaFxSystemUtil.java

@@ -1,11 +1,16 @@
 package com.xwintop.xJavaFxTool.utils;
 
+import com.alibaba.fastjson.JSON;
+import com.xwintop.xJavaFxTool.model.PluginJarInfo;
 import com.xwintop.xJavaFxTool.model.ToolFxmlLoaderConfiguration;
+import lombok.Getter;
+import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.configuration.PropertiesConfiguration;
 import org.apache.commons.configuration.XMLConfiguration;
 import org.apache.commons.configuration.tree.ConfigurationNode;
+import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.dom4j.Document;
 import org.dom4j.Element;
@@ -21,9 +26,8 @@
 import java.lang.reflect.Method;
 import java.net.URL;
 import java.net.URLClassLoader;
-import java.util.ArrayList;
 import java.util.List;
-import java.util.Locale;
+import java.util.*;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 
@@ -35,6 +39,8 @@
  */
 @Slf4j
 public class XJavaFxSystemUtil {
+    public final static Map<String, PluginJarInfo> pluginJarInfoMap = new HashMap<>();
+
     /**
      * @Title: initSystemLocal
      * @Description: 初始化本地语言
@@ -143,14 +149,21 @@ public boolean accept(File dir, String name) {
      * @Description: 添加libs中jar包到系统中
      */
     public static void addJarByLibs() {
+        File systemPluginListfile = ConfigureUtil.getConfigureFile("system_plugin_list.json");
         try {
+            if (systemPluginListfile.exists()) {
+                List<PluginJarInfo> pluginJarInfoList = JSON.parseArray(FileUtils.readFileToString(systemPluginListfile, "utf-8"), PluginJarInfo.class);
+                for (PluginJarInfo pluginJarInfo : pluginJarInfoList) {
+                    pluginJarInfoMap.put(pluginJarInfo.getJarName(), pluginJarInfo);
+                }
+            }
             // 系统类库路径
             File libPath = new File("libs/");
             // 获取所有的.jar和.zip文件
             File[] jarFiles = libPath.listFiles(new FilenameFilter() {
                 @Override
                 public boolean accept(File dir, String name) {
-                    return name.endsWith(".jar") || name.endsWith(".zip");
+                    return name.endsWith(".jar");
                 }
             });
             if (jarFiles != null) {
@@ -165,6 +178,12 @@ public boolean accept(File dir, String name) {
                     // 获取系统类加载器
                     URLClassLoader classLoader = (URLClassLoader) ClassLoader.getSystemClassLoader();
                     for (File file : jarFiles) {
+                        String fileName = file.getName();
+                        String jarName = StringUtils.substring(fileName, 0, StringUtils.lastIndexOf(fileName, "-"));
+                        PluginJarInfo pluginJarInfo = pluginJarInfoMap.get(jarName);
+                        if (pluginJarInfo != null && !pluginJarInfo.getIsEnable()) {
+                            continue;
+                        }
                         URL url = file.toURI().toURL();
                         try {
                             method.invoke(classLoader, url);
@@ -177,7 +196,7 @@ public boolean accept(File dir, String name) {
                 }
             }
         } catch (Exception e) {
-            log.error("添加libs中jar包到系统中", e);
+            log.error("添加libs中jar包到系统中异常:", e);
         }
     }
 
@@ -191,20 +210,5 @@ public static void openDirectory(String directoryPath) {
         } catch (IOException e) {
             log.error("打开目录异常：" + directoryPath, e);
         }
-//        Runtime runtime = null;
-//        try {
-//            runtime = Runtime.getRuntime();
-//            if (File.separatorChar == '\\') {
-//                runtime.exec("cmd /c start explorer " + directoryPath);
-//            } else {
-//                runtime.exec("nautilus " + directoryPath);
-//            }
-//        } catch (IOException ex) {
-//            log.error("打开目录异常：" + ex.getMessage());
-//        } finally {
-//            if (null != runtime) {
-//                runtime.runFinalization();
-//            }
-//        }
     }
 }