From cfa86bd4fe96561a143a37ace8c85b7bd22d0f83 Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: 星期五, 03 九月 2021 09:39:40 +0800
Subject: [PATCH] !308 代码生成: 导入表时查询 新创建表的优先排序在前面 Merge pull request !308 from xiaoshitou/N/A
---
pom.xml | 95 ++++++++++++++++++++++++-----------------------
1 files changed, 48 insertions(+), 47 deletions(-)
diff --git a/pom.xml b/pom.xml
index ecc6df1..7017e51 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,28 +6,30 @@
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi</artifactId>
- <version>3.4.0</version>
+ <version>3.6.0</version>
<name>ruoyi</name>
<url>http://www.ruoyi.vip</url>
<description>鑻ヤ緷绠＄悊绯荤粺</description>
<properties>
- <ruoyi.version>3.4.0</ruoyi.version>
+ <ruoyi.version>3.6.0</ruoyi.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
- <druid.version>1.2.4</druid.version>
+ <druid.version>1.2.6</druid.version>
<bitwalker.version>1.21</bitwalker.version>
- <swagger.version>2.9.2</swagger.version>
+ <swagger.version>3.0.0</swagger.version>
<kaptcha.version>2.3.2</kaptcha.version>
- <pagehelper.boot.version>1.3.0</pagehelper.boot.version>
- <fastjson.version>1.2.75</fastjson.version>
- <oshi.version>5.6.0</oshi.version>
- <jna.version>5.7.0</jna.version>
- <commons.io.version>2.5</commons.io.version>
- <commons.fileupload.version>1.3.3</commons.fileupload.version>
+ <mybatis-spring-boot.version>2.1.4</mybatis-spring-boot.version>
+ <pagehelper.boot.version>1.3.1</pagehelper.boot.version>
+ <fastjson.version>1.2.76</fastjson.version>
+ <oshi.version>5.8.0</oshi.version>
+ <jna.version>5.8.0</jna.version>
+ <commons.io.version>2.11.0</commons.io.version>
+ <commons.fileupload.version>1.4</commons.fileupload.version>
+ <commons.collections.version>3.2.2</commons.collections.version>
<poi.version>4.1.2</poi.version>
<velocity.version>1.7</velocity.version>
<jwt.version>0.9.1</jwt.version>
@@ -36,7 +38,7 @@
<!-- 渚濊禆澹版槑 -->
<dependencyManagement>
<dependencies>
-
+
<!-- SpringBoot鐨勪緷璧栭厤缃�-->
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -45,28 +47,35 @@
<type>pom</type>
<scope>import</scope>
</dependency>
-
- <!--闃块噷鏁版嵁搴撹繛鎺ユ睜 -->
+
+ <!-- 闃块噷鏁版嵁搴撹繛鎺ユ睜 -->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid-spring-boot-starter</artifactId>
<version>${druid.version}</version>
</dependency>
-
+
<!-- 瑙ｆ瀽瀹㈡埛绔搷浣滅郴缁熴�佹祻瑙堝櫒绛� -->
<dependency>
<groupId>eu.bitwalker</groupId>
<artifactId>UserAgentUtils</artifactId>
<version>${bitwalker.version}</version>
</dependency>
-
+
+ <!-- SpringBoot闆嗘垚mybatis妗嗘灦 -->
+ <dependency>
+ <groupId>org.mybatis.spring.boot</groupId>
+ <artifactId>mybatis-spring-boot-starter</artifactId>
+ <version>${mybatis-spring-boot.version}</version>
+ </dependency>
+
<!-- pagehelper 鍒嗛〉鎻掍欢 -->
<dependency>
<groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper-spring-boot-starter</artifactId>
<version>${pagehelper.boot.version}</version>
</dependency>
-
+
<!-- 鑾峰彇绯荤粺淇℃伅 -->
<dependency>
<groupId>com.github.oshi</groupId>
@@ -85,53 +94,42 @@
<artifactId>jna-platform</artifactId>
<version>${jna.version}</version>
</dependency>
-
- <!-- swagger2-->
+
+ <!-- Swagger3渚濊禆 -->
<dependency>
<groupId>io.springfox</groupId>
- <artifactId>springfox-swagger2</artifactId>
+ <artifactId>springfox-boot-starter</artifactId>
<version>${swagger.version}</version>
<exclusions>
- <exclusion>
- <groupId>io.swagger</groupId>
- <artifactId>swagger-annotations</artifactId>
- </exclusion>
<exclusion>
<groupId>io.swagger</groupId>
<artifactId>swagger-models</artifactId>
</exclusion>
</exclusions>
</dependency>
-
- <!-- swagger2-UI-->
- <dependency>
- <groupId>io.springfox</groupId>
- <artifactId>springfox-swagger-ui</artifactId>
- <version>${swagger.version}</version>
- </dependency>
-
- <!--io甯哥敤宸ュ叿绫� -->
+
+ <!-- io甯哥敤宸ュ叿绫� -->
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>${commons.io.version}</version>
</dependency>
-
- <!--鏂囦欢涓婁紶宸ュ叿绫� -->
+
+ <!-- 鏂囦欢涓婁紶宸ュ叿绫� -->
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>${commons.fileupload.version}</version>
</dependency>
-
+
<!-- excel宸ュ叿 -->
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
<version>${poi.version}</version>
</dependency>
-
- <!--velocity浠ｇ爜鐢熸垚浣跨敤妯℃澘 -->
+
+ <!-- velocity浠ｇ爜鐢熸垚浣跨敤妯℃澘 -->
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
@@ -143,60 +141,63 @@
</exclusion>
</exclusions>
</dependency>
+
+ <!-- collections宸ュ叿绫� -->
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
- <version>3.2.2</version>
+ <version>${commons.collections.version}</version>
</dependency>
+
<!-- 闃块噷JSON瑙ｆ瀽鍣� -->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>${fastjson.version}</version>
</dependency>
-
- <!--Token鐢熸垚涓庤В鏋�-->
+
+ <!-- Token鐢熸垚涓庤В鏋�-->
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt</artifactId>
<version>${jwt.version}</version>
</dependency>
-
- <!--楠岃瘉鐮� -->
+
+ <!-- 楠岃瘉鐮� -->
<dependency>
<groupId>com.github.penggle</groupId>
<artifactId>kaptcha</artifactId>
<version>${kaptcha.version}</version>
</dependency>
-
+
<!-- 瀹氭椂浠诲姟-->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-quartz</artifactId>
<version>${ruoyi.version}</version>
</dependency>
-
+
<!-- 浠ｇ爜鐢熸垚-->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-generator</artifactId>
<version>${ruoyi.version}</version>
</dependency>
-
+
<!-- 鏍稿績妯″潡-->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-framework</artifactId>
<version>${ruoyi.version}</version>
</dependency>
-
+
<!-- 绯荤粺妯″潡-->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-system</artifactId>
<version>${ruoyi.version}</version>
</dependency>
-
+
<!-- 閫氱敤宸ュ叿-->
<dependency>
<groupId>com.ruoyi</groupId>
--
Gitblit v1.9.3