From 676ecd90525e72b3865bf4f8f7f27bfb390cc37d Mon Sep 17 00:00:00 2001 From: 朱杰 <693337446@qq.com> Date: 星期四, 24 六月 2021 17:06:49 +0800 Subject: [PATCH] update 修改readme加入提问四部曲 --- pom.xml | 65 +++++++++++++++++++++++++++++--- 1 files changed, 59 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 4beed40..2a8521c 100644 --- a/pom.xml +++ b/pom.xml @@ -13,8 +13,8 @@ <description>RuoYi-Vue-Plus鍚庡彴绠$悊绯荤粺</description> <properties> - <ruoyi-vue-plus.version>2.3.2</ruoyi-vue-plus.version> - <spring-boot.version>2.3.11.RELEASE</spring-boot.version> + <ruoyi-vue-plus.version>2.4.0</ruoyi-vue-plus.version> + <spring-boot.version>2.4.7</spring-boot.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <java.version>1.8</java.version> @@ -25,11 +25,13 @@ <velocity.version>1.7</velocity.version> <jwt.version>0.9.1</jwt.version> <mybatis-plus.version>3.4.3</mybatis-plus.version> - <hutool.version>5.6.5</hutool.version> - <feign.version>2.2.6.RELEASE</feign.version> + <hutool.version>5.7.2</hutool.version> + <feign.version>3.0.3</feign.version> <feign-okhttp.version>11.0</feign-okhttp.version> - <spring-boot-admin.version>2.3.1</spring-boot-admin.version> + <spring-boot-admin.version>2.4.1</spring-boot-admin.version> <redisson.version>3.15.2</redisson.version> + <lock4j.version>2.2.1</lock4j.version> + <datasource.version>3.4.0</datasource.version> </properties> <!-- 渚濊禆澹版槑 --> @@ -79,6 +81,13 @@ <version>${jwt.version}</version> </dependency> + <!-- dynamic-datasource 澶氭暟鎹簮--> + <dependency> + <groupId>com.baomidou</groupId> + <artifactId>dynamic-datasource-spring-boot-starter</artifactId> + <version>${datasource.version}</version> + </dependency> + <dependency> <groupId>com.baomidou</groupId> <artifactId>mybatis-plus-boot-starter</artifactId> @@ -89,6 +98,7 @@ <artifactId>mybatis-plus-extension</artifactId> <version>${mybatis-plus.version}</version> </dependency> + <dependency> <groupId>cn.hutool</groupId> <artifactId>hutool-all</artifactId> @@ -124,7 +134,11 @@ <artifactId>redisson-spring-boot-starter</artifactId> <version>${redisson.version}</version> </dependency> - + <dependency> + <groupId>com.baomidou</groupId> + <artifactId>lock4j-redisson-spring-boot-starter</artifactId> + <version>${lock4j.version}</version> + </dependency> <!-- 瀹氭椂浠诲姟--> <dependency> <groupId>com.ruoyi</groupId> @@ -262,6 +276,45 @@ <logging.level>warn</logging.level> </properties> </profile> + + <!-- jdk澶氱増鏈厤缃� --> + <profile> + <id>jdk8</id> + <activation> + <activeByDefault>true</activeByDefault> + <jdk>1.8</jdk> + </activation> + <properties> + <java.version>1.8</java.version> + </properties> + </profile> + <profile> + <id>jdk11</id> + <activation> + <jdk>11</jdk> + </activation> + <properties> + <java.version>11</java.version> + <jaxb.version>3.0.1</jaxb.version> + </properties> + <dependencyManagement> + <dependencies> + <!-- jdk11 缂哄け渚濊禆 jaxb--> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-impl</artifactId> + <version>${jaxb.version}</version> + </dependency> + </dependencies> + </dependencyManagement> + <dependencies> + <!--jaxb--> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-impl</artifactId> + </dependency> + </dependencies> + </profile> </profiles> </project> -- Gitblit v1.9.3