Merge pull request #23 from 864381832/jdk17dev

Jdk17dev
864381832 · Apr 9, 2022 · 8fbd282 · 8fbd282
2 parents 1246e8d + 2b0fab5
commit 8fbd282
Show file tree

Hide file tree

Showing 48 changed files with 519 additions and 783 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,6 +6,7 @@
 logs/
 target/
 libs/
+devLibs
 
 system_plugin_list.json
 RUNNING_PID

diff --git a/LICENSE b/LICENSE
@@ -53,8 +53,8 @@
 
       3， 请将如下声明文本放入每个源文件的头部注释中。
 
-   Copyright (c) [Year] [name of copyright holder]
-   [Software Name] is licensed under Mulan PSL v2.
+   Copyright (c) [2019] [xufeng]
+   [xJavaFxTool] is licensed under Mulan PSL v2.
    You can use this software according to the terms and conditions of the Mulan PSL v2. 
    You may obtain a copy of Mulan PSL v2 at:
             http://license.coscl.org.cn/MulanPSL2 
@@ -118,8 +118,8 @@
       iii Attach the statement to the appropriate annotated syntax at the beginning of each source file.
 
 
-   Copyright (c) [Year] [name of copyright holder]
-   [Software Name] is licensed under Mulan PSL v2.
+   Copyright (c) [2019] [xufeng]
+   [xJavaFxTool] is licensed under Mulan PSL v2.
    You can use this software according to the terms and conditions of the Mulan PSL v2. 
    You may obtain a copy of Mulan PSL v2 at:
                http://license.coscl.org.cn/MulanPSL2 

diff --git a/README.md b/README.md
@@ -23,10 +23,10 @@ xJavaFxTool是使用javaFx开发的实用小工具集，利用业余时间把工
 由于SpringBoot的火热，项目已经出SpringBoot-javafx版本，[xJavaFxTool-spring](https://gitee.com/xwintop/xJavaFxTool-spring) 欢迎参考，谢谢。
 
 #### 下载地址：
-- 可直接运行的jar包(本地需要有jdk17环境)[xJavaFxTool-0.3.1.jar](https://gitee.com/xwintop/xJavaFxTool/attach_files/1011054/download/xJavaFxTool-0.3.1.jar)
-- Windows x64安装包(兼容windows7、8、10、11等系统)[xJavaFxTool-0.3.1-windows-x64.exe](https://gitee.com/xwintop/xJavaFxTool/attach_files/1011059/download/xJavaFxTool-0.3.1-windows-x64.exe)
-- Linux x64 [xJavaFxTool-0.3.1-linux-x64.zip](https://gitee.com/xwintop/xJavaFxTool/attach_files/1011058/download/xJavaFxTool-0.3.1-linux-x64.zip)
-- Mac OS x64 [xJavaFxTool-0.3.1-macos.dmg](https://gitee.com/xwintop/xJavaFxTool/attach_files/1011060/download/xJavaFxTool-0.3.1-macos.dmg)
+- 可直接运行的jar包(本地需要有jdk17环境)[xJavaFxTool-0.3.2.jar](https://gitee.com/xwintop/xJavaFxTool/attach_files/1022632/download/xJavaFxTool-0.3.2.jar)
+- Windows x64安装包(兼容windows7、8、10、11等系统)[xJavaFxTool-0.3.2-windows-x64.exe](https://gitee.com/xwintop/xJavaFxTool/attach_files/1022629/download/xJavaFxTool_0.3.2-windows-x64.exe)
+- Linux x64 [xJavaFxTool-0.3.2-linux-x64.zip](https://gitee.com/xwintop/xJavaFxTool/attach_files/1022631/download/xJavaFxTool-0.3.2-linux-x64.zip)
+- Mac OS x64 [xJavaFxTool-0.3.2-macos.dmg](https://gitee.com/xwintop/xJavaFxTool/attach_files/1022635/download/xJavaFxTool_0.3.2-macos.dmg)
 - 更多下载地址见[发布页面](https://gitee.com/xwintop/xJavaFxTool/releases)
 #### 若上面下链接失效可使用下面下载链接：
 - 百度云链接：[https://pan.baidu.com/s/193fhGnJL4dDWcqDnFJcHbA](https://pan.baidu.com/s/193fhGnJL4dDWcqDnFJcHbA)  提取码：mokl

diff --git a/README_EN.md b/README_EN.md
@@ -21,9 +21,10 @@ xJavaFxTool is a practical gadget set developed by javaFx. It uses some time to
 Due to the hot SpringBoot, the project has been released SpringBoot-javafx version, [xJavaFxTool-spring](https://gitee.com/xwintop/xJavaFxTool-spring) welcome reference, thank you.
 
 #### Download trial address：
-- Jar package that can be run directly (local need to have jdk1.8 environment)[xJavaFxTool-0.2.3.jar](https://xwintop.gitee.io/maven/package/xJavaFxTool/xJavaFxTool-0.2.3.jar)
-- Windows x64 installation package (compatible with xp, windows7, 8, 10, etc.)[xJavaFxTool-0.2.3-windows-x64.exe](https://xwintop.gitee.io/maven/package/xJavaFxTool/xJavaFxTool-0.2.3-windows-x64.exe)
-- Mac OS X x64 [xJavaFxTool-0.2.3-macosx-x64.pkg](https://xwintop.gitee.io/maven/package/xJavaFxTool/xJavaFxTool-0.2.3-macosx-x64.pkg)
+- Jar package that can be run directly (local need to have jdk1.8 environment)[xJavaFxTool-0.3.2.jar](https://github.com/864381832/xJavaFxTool/releases/download/0.3.2/xJavaFxTool-0.3.2.jar)
+- Windows x64 installation package (compatible with xp, windows7, 8, 10, etc.)[xJavaFxTool-0.3.2-windows-x64.exe](https://github.com/864381832/xJavaFxTool/releases/download/0.3.2/xJavaFxTool-0.3.2-windows-x64.exe)
+- Mac OS x64 [xJavaFxTool-0.3.2-macos.pkg](https://github.com/864381832/xJavaFxTool/releases/download/0.3.2/xJavaFxTool-0.3.2-macos.pkg)
+- Linux x64 [xJavaFxTool-0.3.2-linux-x64.zip](https://github.com/864381832/xJavaFxTool/releases/download/0.3.2/xJavaFxTool-0.3.2-linux-x64.zip)
 #### If the above link fails, use the download link below:
 - Baidu cloud link: [https://pan.baidu.com/s/193fhGnJL4dDWcqDnFJcHbA](https://pan.baidu.com/s/193fhGnJL4dDWcqDnFJcHbA)  extraction code: mokl
 - Tencent micro cloud link: [https://share.weiyun.com/5T6FPLW](https://share.weiyun.com/5T6FPLW) extraction code: java
@@ -36,8 +37,7 @@ the plug-in jar package can be automatically loaded under the root directory lib
 - Developed with eclipase or Intellij Idea (Recommended to use [Intellij Idea](https://www.jetbrains.com/idea/) )
 - This project uses [lombok](https://projectlombok.org/) . If you have not downloaded the lombok plugin when viewing this project, please install it first, otherwise you can't find the get/set method.
 - The dependent [xcore](https://gitee.com/xwintop/xcore) package has been uploaded to the git-hosted maven platform. The git hosting maven can refer to the tutorial (if you can't download it, please pull the project to compile it yourself ). Tutorial address: Click to enter
-- Package using the [javafx-maven-plugin](https://github.com/javafx-maven-plugin/javafx-maven-plugin) (can be packaged for windows, Linux, Mac installation packages)
-- Use [exe4j](https://www.ej-technologies.com/download/exe4j/files) to convert the jar package into an exe executable file (for reference only, you can use other programs to package)
+- Package using the [javapackager](https://github.com/fvarrui/JavaPackager) (can be packaged for windows, Linux, Mac installation packages)
 - Use [InnoSetup](http://www.jrsoftware.org/) to make windows installation packages
 
 #### The currently integrated gadgets are:

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>com.xwintop</groupId>
   <artifactId>xJavaFxTool</artifactId>
-  <version>0.3.1</version>
+  <version>0.3.2</version>
   <packaging>jar</packaging>
   <name>xJavaFxTool</name>
   <description>基于JavaFx搭建的实用小工具集合</description>
@@ -19,7 +19,6 @@
     <maven.test.skip>true</maven.test.skip>
     <maven.compiler.source>17</maven.compiler.source>
     <maven.compiler.target>17</maven.compiler.target>
-    <javafx.version>17.0.2</javafx.version>
   </properties>
   <repositories>
     <repository>
@@ -48,17 +47,16 @@
       <groupId>org.projectlombok</groupId>
       <artifactId>lombok</artifactId>
       <version>1.18.22</version>
-      <optional>true</optional>
       <scope>provided</scope>
     </dependency>
 
     <!-- https://mvnrepository.com/artifact/io.github.classgraph/classgraph -->
     <!-- https://github.com/classgraph/classgraph -->
-    <dependency>
-      <groupId>io.github.classgraph</groupId>
-      <artifactId>classgraph</artifactId>
-      <version>4.8.100</version>
-    </dependency>
+<!--    <dependency>-->
+<!--      <groupId>io.github.classgraph</groupId>-->
+<!--      <artifactId>classgraph</artifactId>-->
+<!--      <version>4.8.100</version>-->
+<!--    </dependency>-->
   </dependencies>
   <build>
     <plugins>

diff --git a/src/main/java/com/xwintop/xJavaFxTool/XJavaFxToolApplication.java b/src/main/java/com/xwintop/xJavaFxTool/XJavaFxToolApplication.java
@@ -1,3 +1,13 @@
+/**
+ *    Copyright (c) [2019] [xufeng]
+ *    [xJavaFxTool] is licensed under Mulan PSL v2.
+ *    You can use this software according to the terms and conditions of the Mulan PSL v2.
+ *    You may obtain a copy of Mulan PSL v2 at:
+ *             http://license.coscl.org.cn/MulanPSL2
+ *    THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+ *    See the Mulan PSL v2 for more details.
+ */
+
 package com.xwintop.xJavaFxTool;
 
 import com.xwintop.xJavaFxTool.controller.IndexController;
@@ -40,7 +50,7 @@ public void start(Stage primaryStage) throws Exception {
         FxApp.styleSheets.add(XJavaFxToolApplication.class.getResource("/css/jfoenix-main.css").toExternalForm());
 
 //        if (SystemUtil.getOsInfo().isMac()) {
-            //Mac下设置dock栏图标
+        //Mac下设置dock栏图标
 //            Taskbar.getTaskbar().setIconImage(ImageIO.read(XJavaFxToolApplication.class.getResourceAsStream(LOGO_PATH)));
 //        }
 

diff --git a/src/main/java/com/xwintop/xJavaFxTool/XJavaFxToolMain.java b/src/main/java/com/xwintop/xJavaFxTool/XJavaFxToolMain.java
@@ -1,3 +1,12 @@
+/**
+ *    Copyright (c) [2019] [xufeng]
+ *    [xJavaFxTool] is licensed under Mulan PSL v2.
+ *    You can use this software according to the terms and conditions of the Mulan PSL v2.
+ *    You may obtain a copy of Mulan PSL v2 at:
+ *             http://license.coscl.org.cn/MulanPSL2
+ *    THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+ *    See the Mulan PSL v2 for more details.
+ */
 package com.xwintop.xJavaFxTool;
 
 import com.xwintop.xJavaFxTool.utils.XJavaFxSystemUtil;

diff --git a/src/main/java/com/xwintop/xJavaFxTool/controller/IndexController.java b/src/main/java/com/xwintop/xJavaFxTool/controller/IndexController.java
@@ -12,8 +12,10 @@
 import com.xwintop.xJavaFxTool.services.IndexService;
 import com.xwintop.xJavaFxTool.services.index.SystemSettingService;
 import com.xwintop.xJavaFxTool.utils.Config;
+import com.xwintop.xJavaFxTool.utils.VersionChecker;
 import com.xwintop.xJavaFxTool.view.IndexView;
 import com.xwintop.xcore.javafx.FxApp;
+import com.xwintop.xcore.javafx.dialog.FxAlerts;
 import com.xwintop.xcore.javafx.dialog.FxDialog;
 import com.xwintop.xcore.util.ConfigureUtil;
 import com.xwintop.xcore.util.HttpClientUtil;
@@ -74,16 +76,12 @@ public void initialize(URL location, ResourceBundle resources) {
         initView();
         initEvent();
         initService();
-        initNotepad();
-    }
-
-    private void initNotepad() {
-//        if (Config.getBoolean(Config.Keys.NotepadEnabled, true)) {
-//            addNodepadAction(null);
-//        }
     }
 
     private void initView() {
+        if (Config.getBoolean(Config.Keys.NotepadEnabled, true)) {
+            addNodepadAction(null);
+        }
         this.indexService.addWebView(XJavaFxToolApplication.RESOURCE_BUNDLE.getString("feedback"), QQ_URL, null);
         this.tongjiWebView.getEngine().load(STATISTICS_URL);
         this.tabPaneMain.getSelectionModel().select(0);
@@ -95,6 +93,8 @@ private void initEvent() {
     }
 
     private void initService() {
+        PluginManager pluginManager = PluginManager.getInstance();
+        pluginManager.loadLocalDevPluginConfiguration();
         loadPlugins();  // 加载插件列表到界面上
         AppEvents.addEventHandler(PluginEvent.PLUGIN_DOWNLOADED, pluginEvent -> {
             loadPlugins();
@@ -114,6 +114,7 @@ public void loadPlugins() {
         PluginManager pluginManager = PluginManager.getInstance();
         pluginManager.loadLocalPlugins();
         pluginManager.getEnabledPluginList().forEach(this::loadPlugin);
+        pluginManager.getDevPluginList().forEach(this::loadPlugin);
     }
 
     /**
@@ -164,24 +165,24 @@ private void addCategory(PluginCategoryController category) {
     }
 
     private void addMenu(PluginJarInfo jarInfo) {
-            MenuItem menu = moreToolsMenu.getItems().stream().filter(menuItem1 -> jarInfo.getMenuParentId().equals(menuItem1.getId())).findAny().orElse(null);
-            if (menu == null) {
-                menu = new Menu(XJavaFxToolApplication.RESOURCE_BUNDLE.getString(jarInfo.getMenuParentTitle()));
-                menu.setId(jarInfo.getMenuParentId());
-                moreToolsMenu.getItems().add(menu);
-            }
-            MenuItem menuItem = new MenuItem(jarInfo.getTitle());
-            if (StringUtils.isNotEmpty(jarInfo.getIconPath())) {
-                ImageView imageView = new ImageView(new Image(jarInfo.getIconPath()));
-                imageView.setFitHeight(18);
-                imageView.setFitWidth(18);
-                menuItem.setGraphic(imageView);
-            }
-            menuItem.setOnAction((ActionEvent event) -> {
-                indexService.loadPlugin(jarInfo);
-            });
-            ((Menu)menu).getItems().add(menuItem);
-            menuItemMap.put(menuItem.getText(), menuItem);
+        MenuItem menu = moreToolsMenu.getItems().stream().filter(menuItem1 -> jarInfo.getMenuParentId().equals(menuItem1.getId())).findAny().orElse(null);
+        if (menu == null) {
+            menu = new Menu(XJavaFxToolApplication.RESOURCE_BUNDLE.getString(jarInfo.getMenuParentTitle()));
+            menu.setId(jarInfo.getMenuParentId());
+            moreToolsMenu.getItems().add(menu);
+        }
+        MenuItem menuItem = new MenuItem(jarInfo.getTitle());
+        if (jarInfo.getIconImage() != null || StringUtils.isNotEmpty(jarInfo.getIconPath())) {
+            ImageView imageView = new ImageView(jarInfo.getIconImage() == null ? new Image(jarInfo.getIconPath()) : jarInfo.getIconImage());
+            imageView.setFitHeight(18);
+            imageView.setFitWidth(18);
+            menuItem.setGraphic(imageView);
+        }
+        menuItem.setOnAction((ActionEvent event) -> {
+            indexService.loadPlugin(jarInfo);
+        });
+        ((Menu) menu).getItems().add(menuItem);
+        menuItemMap.put(menuItem.getText(), menuItem);
     }
 
     public void selectAction(String selectText) {
@@ -239,6 +240,13 @@ private void SettingAction() {
         SystemSettingService.openSystemSettings(bundle.getString("Setting"));
     }
 
+    @FXML
+    private void checkerVersionAction() {
+        if (!VersionChecker.checkNewVersion()) {
+            FxAlerts.info("提示", "已经是新版本");
+        }
+    }
+
     @FXML
     private void aboutAction() {
         AlertUtil.showInfoAlert(bundle.getString("aboutText") + Config.xJavaFxToolVersions);
@@ -270,6 +278,11 @@ private void openConfigFolderAction() {
     private void openPluginFolderAction() {
         JavaFxSystemUtil.openDirectory("libs/");
     }
+
+    @FXML
+    private void openDevPluginFolderAction() {
+        JavaFxSystemUtil.openDirectory("devLibs/");
+    }
 
     @FXML
     private void xwintopLinkOnAction() throws Exception {