From 5494ec36e514fe53334ff175782c2a512b4cbb87 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 09 三月 2021 09:32:49 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
---
pom.xml | 94 ++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 85 insertions(+), 9 deletions(-)
diff --git a/pom.xml b/pom.xml
index e5954a9..c648de5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,31 +6,35 @@
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi</artifactId>
- <version>3.3.0</version>
+ <version>3.4.0</version>
<name>ruoyi</name>
<url>http://www.ruoyi.vip</url>
<description>鑻ヤ緷绠＄悊绯荤粺</description>
<properties>
- <ruoyi.version>3.3.0</ruoyi.version>
+ <ruoyi.version>3.4.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.2</druid.version>
+ <druid.version>1.2.4</druid.version>
<bitwalker.version>1.21</bitwalker.version>
<swagger.version>2.9.2</swagger.version>
<kaptcha.version>2.3.2</kaptcha.version>
<pagehelper.boot.version>1.3.0</pagehelper.boot.version>
- <fastjson.version>1.2.74</fastjson.version>
- <oshi.version>5.3.6</oshi.version>
- <jna.version>5.6.0</jna.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>
<poi.version>4.1.2</poi.version>
<velocity.version>1.7</velocity.version>
<jwt.version>0.9.1</jwt.version>
+ <mybatis-plus.version>3.4.2</mybatis-plus.version>
+ <hutool.version>5.4.0</hutool.version>
+ <feign.version>2.2.6.RELEASE</feign.version>
+ <feign-okhttp.version>11.0</feign-okhttp.version>
</properties>
<!-- 渚濊禆澹版槑 -->
@@ -41,7 +45,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
- <version>2.1.18.RELEASE</version>
+ <version>2.2.13.RELEASE</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -65,6 +69,12 @@
<groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper-spring-boot-starter</artifactId>
<version>${pagehelper.boot.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.mybatis</groupId>
+ <artifactId>mybatis</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- 鑾峰彇绯荤粺淇℃伅 -->
@@ -151,14 +161,42 @@
<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.baomidou</groupId>
+ <artifactId>mybatis-plus-boot-starter</artifactId>
+ <version>${mybatis-plus.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.baomidou</groupId>
+ <artifactId>mybatis-plus-extension</artifactId>
+ <version>${mybatis-plus.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>cn.hutool</groupId>
+ <artifactId>hutool-all</artifactId>
+ <version>${hutool.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-starter-openfeign</artifactId>
+ <version>${feign.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>io.github.openfeign</groupId>
+ <artifactId>feign-okhttp</artifactId>
+ <version>${feign-okhttp.version}</version>
+ </dependency>
+
<!-- 瀹氭椂浠诲姟-->
<dependency>
<groupId>com.ruoyi</groupId>
@@ -194,6 +232,13 @@
<version>${ruoyi.version}</version>
</dependency>
+ <!-- demo妯″潡 -->
+ <dependency>
+ <groupId>com.ruoyi</groupId>
+ <artifactId>ruoyi-demo</artifactId>
+ <version>${ruoyi.version}</version>
+ </dependency>
+
</dependencies>
</dependencyManagement>
@@ -204,6 +249,7 @@
<module>ruoyi-quartz</module>
<module>ruoyi-generator</module>
<module>ruoyi-common</module>
+ <module>ruoyi-demo</module>
</modules>
<packaging>pom</packaging>
@@ -225,6 +271,14 @@
</configuration>
</plugin>
</plugins>
+ <resources>
+ <resource>
+ <!--鎵撳寘璇ョ洰褰曚笅鐨� application.yml -->
+ <directory>src/main/resources</directory>
+ <!-- 鍚敤杩囨护 鍗宠璧勬簮涓殑鍙橀噺灏嗕細琚繃婊ゅ櫒涓殑鍊兼浛鎹� -->
+ <filtering>true</filtering>
+ </resource>
+ </resources>
</build>
<repositories>
@@ -252,4 +306,26 @@
</pluginRepository>
</pluginRepositories>
+ <profiles>
+ <profile>
+ <id>dev</id>
+ <properties>
+ <!-- 鐜鏍囪瘑锛岄渶瑕佷笌閰嶇疆鏂囦欢鐨勫悕绉扮浉瀵瑰簲 -->
+ <profiles.active>dev</profiles.active>
+ <logging.level>debug</logging.level>
+ </properties>
+ <activation>
+ <!-- 榛樿鐜 -->
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ </profile>
+ <profile>
+ <id>prod</id>
+ <properties>
+ <profiles.active>prod</profiles.active>
+ <logging.level>warn</logging.level>
+ </properties>
+ </profile>
+ </profiles>
+
</project>
\ No newline at end of file
--
Gitblit v1.9.3