From 9699a6f81188b6279d4dcf82dca55b0b7c361a2f Mon Sep 17 00:00:00 2001
From: zm <1334717033@qq.com>
Date: Mon, 11 Mar 2024 16:45:45 +0800
Subject: [PATCH] =?UTF-8?q?2024=E5=B9=B43=E6=9C=8811=E6=97=A516:45:39?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       | 65 +++++++++++++------
 .../zhangmeng/minio/MiniToolsApplication.java |  4 --
 src/main/java/com/zhangmeng/minio/Start.java  | 15 +++++
 src/main/java/module-info.java                | 12 ----
 4 files changed, 61 insertions(+), 35 deletions(-)
 create mode 100644 src/main/java/com/zhangmeng/minio/Start.java
 delete mode 100644 src/main/java/module-info.java

diff --git a/pom.xml b/pom.xml
index 284f875..9ec2759 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,8 @@
     <version>1.0-SNAPSHOT</version>
 
     <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
         <javafx.version>19</javafx.version>
     </properties>
     <dependencies>
@@ -26,6 +27,12 @@
             <version>4.8.1</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.30</version>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
@@ -75,6 +82,13 @@
             <version>${javafx.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.github.leewyatt</groupId>
+            <artifactId>rxcontrols</artifactId>
+            <!-- 11.x.y -->
+            <version>11.0.2</version>
+        </dependency>
+
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
@@ -93,37 +107,50 @@
     </dependencies>
     <build>
         <plugins>
+
+            <!-- 使用maven-jar-plugin和maven-dependency-plugin插件打包 -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>3.1.0</version>
                 <configuration>
-                    <source>17</source>
-                    <target>17</target>
+                    <archive>
+                        <manifest>
+                            <addClasspath>true</addClasspath>
+                            <classpathPrefix>lib/</classpathPrefix>
+                            <mainClass>com.zhangmeng.minio.MiniToolsApplication</mainClass>
+                        </manifest>
+                    </archive>
                 </configuration>
             </plugin>
             <plugin>
-                <groupId>org.openjfx</groupId>
-                <artifactId>javafx-maven-plugin</artifactId>
-                <version>0.0.8</version>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>3.1.1</version>
                 <executions>
                     <execution>
-                        <!-- Default configuration for running with: mvn clean javafx:run -->
-                        <id>default-cli</id>
+                        <id>copy-dependencies</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
                         <configuration>
-                            <mainClass>
-                                com.zhangmeng.minio/com.zhangmeng.minio.MiniToolsApplication
-                            </mainClass>
-                            <launcher>app</launcher>
-                            <jlinkZipName>app</jlinkZipName>
-                            <jlinkImageName>app</jlinkImageName>
-                            <noManPages>true</noManPages>
-                            <stripDebug>true</stripDebug>
-                            <noHeaderFiles>true</noHeaderFiles>
+                            <outputDirectory>${project.build.directory}/lib</outputDirectory>
                         </configuration>
                     </execution>
                 </executions>
             </plugin>
+
         </plugins>
     </build>
+    <repositories>
+        <repository>
+            <id>jitpack.io</id>
+            <url>https://jitpack.io</url>
+        </repository>
+        <repository>
+            <id>zm</id>
+            <url>http://123.57.75.116:49000/repository/zm/</url>
+        </repository>
+    </repositories>
 </project>
\ No newline at end of file
diff --git a/src/main/java/com/zhangmeng/minio/MiniToolsApplication.java b/src/main/java/com/zhangmeng/minio/MiniToolsApplication.java
index ff20805..6a3755c 100644
--- a/src/main/java/com/zhangmeng/minio/MiniToolsApplication.java
+++ b/src/main/java/com/zhangmeng/minio/MiniToolsApplication.java
@@ -23,8 +23,4 @@ public class MiniToolsApplication extends Application {
         primaryStage.setTitle("javafx minio 工具");
         primaryStage.show();
     }
-
-    public static void main(String[] args) {
-        launch(args);
-    }
 }
diff --git a/src/main/java/com/zhangmeng/minio/Start.java b/src/main/java/com/zhangmeng/minio/Start.java
new file mode 100644
index 0000000..33964b1
--- /dev/null
+++ b/src/main/java/com/zhangmeng/minio/Start.java
@@ -0,0 +1,15 @@
+package com.zhangmeng.minio;
+
+import javafx.application.Application;
+
+/**
+ * @author zhangmeng
+ * @version 1.0
+ * @date 2024-03-11 16:44
+ */
+public class Start {
+
+    public static void main(String[] args) {
+        Application.launch(MiniToolsApplication.class,args);
+    }
+}
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
deleted file mode 100644
index 18fae3a..0000000
--- a/src/main/java/module-info.java
+++ /dev/null
@@ -1,12 +0,0 @@
-module com.zhangmeng.minio {
-    requires javafx.fxml;
-    requires javafx.controls;
-    requires javafx.base;
-    requires minio;
-    requires com.fasterxml.jackson.core;
-    requires tika.core;
-    requires org.apache.commons.lang3;
-
-    opens com.zhangmeng.minio to javafx.fxml;
-    exports com.zhangmeng.minio;
-}
\ No newline at end of file