Merge remote-tracking branch 'origin/master'
commit
9fbb1a7850
16
pom.xml
16
pom.xml
|
|
@ -12,7 +12,7 @@
|
||||||
<maven.compiler.source>17</maven.compiler.source>
|
<maven.compiler.source>17</maven.compiler.source>
|
||||||
<maven.compiler.target>17</maven.compiler.target>
|
<maven.compiler.target>17</maven.compiler.target>
|
||||||
<netty.version>4.1.48.Final</netty.version>
|
<netty.version>4.1.48.Final</netty.version>
|
||||||
<fastjson.version>1.2.75</fastjson.version>
|
<fastjson.version>2.0.27</fastjson.version>
|
||||||
<jwt.version>0.9.1</jwt.version>
|
<jwt.version>0.9.1</jwt.version>
|
||||||
<druid.version>1.2.5</druid.version>
|
<druid.version>1.2.5</druid.version>
|
||||||
<swagger.version>2.8.0</swagger.version>
|
<swagger.version>2.8.0</swagger.version>
|
||||||
|
|
@ -25,14 +25,14 @@
|
||||||
<poi.version>3.17</poi.version>
|
<poi.version>3.17</poi.version>
|
||||||
<tk.mybatis.version>2.1.5</tk.mybatis.version>
|
<tk.mybatis.version>2.1.5</tk.mybatis.version>
|
||||||
<pagehelper.version>1.3.0</pagehelper.version>
|
<pagehelper.version>1.3.0</pagehelper.version>
|
||||||
<hutool.version>5.5.7</hutool.version>
|
<hutool.version>5.8.15</hutool.version>
|
||||||
<gson-version>2.8.5</gson-version>
|
<gson-version>2.8.5</gson-version>
|
||||||
|
|
||||||
<commons-io.version>2.8.0</commons-io.version>
|
<commons-io.version>2.8.0</commons-io.version>
|
||||||
<commons-lang3.version>3.11</commons-lang3.version>
|
<commons-lang3.version>3.11</commons-lang3.version>
|
||||||
<commons-codec.version>1.15</commons-codec.version>
|
<commons-codec.version>1.15</commons-codec.version>
|
||||||
<commons-collections.version>3.2.2</commons-collections.version>
|
<commons-collections.version>3.2.2</commons-collections.version>
|
||||||
<commons-fileupload.version>1.4</commons-fileupload.version>
|
<commons-fileupload.version>1.5</commons-fileupload.version>
|
||||||
<commons-pool2.version>2.9.0</commons-pool2.version>
|
<commons-pool2.version>2.9.0</commons-pool2.version>
|
||||||
<commons-beanutils.version>1.9.4</commons-beanutils.version>
|
<commons-beanutils.version>1.9.4</commons-beanutils.version>
|
||||||
|
|
||||||
|
|
@ -52,7 +52,7 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>mysql</groupId>
|
<groupId>mysql</groupId>
|
||||||
<artifactId>mysql-connector-java</artifactId>
|
<artifactId>mysql-connector-java</artifactId>
|
||||||
<version>5.1.47</version>
|
<version>8.0.30</version>
|
||||||
<scope>runtime</scope>
|
<scope>runtime</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
|
@ -233,7 +233,7 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.java-websocket</groupId>
|
<groupId>org.java-websocket</groupId>
|
||||||
<artifactId>Java-WebSocket</artifactId>
|
<artifactId>Java-WebSocket</artifactId>
|
||||||
<version>1.3.5</version>
|
<version>1.5.3</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|
@ -245,12 +245,12 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.cronutils</groupId>
|
<groupId>com.cronutils</groupId>
|
||||||
<artifactId>cron-utils</artifactId>
|
<artifactId>cron-utils</artifactId>
|
||||||
<version>9.1.5</version>
|
<version>9.2.1</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.jsoup</groupId>
|
<groupId>org.jsoup</groupId>
|
||||||
<artifactId>jsoup</artifactId>
|
<artifactId>jsoup</artifactId>
|
||||||
<version>1.14.3</version>
|
<version>1.15.4</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|
@ -280,7 +280,7 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>commons-net</groupId>
|
<groupId>commons-net</groupId>
|
||||||
<artifactId>commons-net</artifactId>
|
<artifactId>commons-net</artifactId>
|
||||||
<version>3.6</version>
|
<version>3.9.0</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|
|
||||||
|
|
@ -25,7 +25,6 @@
|
||||||
|
|
||||||
package com.zhangmeng.tools;
|
package com.zhangmeng.tools;
|
||||||
|
|
||||||
import com.zhangmeng.tools.views.HomeView;
|
|
||||||
import com.zhangmeng.tools.views.LoadView;
|
import com.zhangmeng.tools.views.LoadView;
|
||||||
import javafx.application.Application;
|
import javafx.application.Application;
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue