From d71e35893dae713987656a00786d759a7e73d5e2 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期三, 15 九月 2021 12:05:24 +0800 Subject: [PATCH] update 重写框架 README.md 格式更友好 通俗易懂 --- pom.xml | 61 +++++++----------------------- 1 files changed, 15 insertions(+), 46 deletions(-) diff --git a/pom.xml b/pom.xml index 7bdd167..6d1836c 100644 --- a/pom.xml +++ b/pom.xml @@ -6,14 +6,14 @@ <groupId>com.ruoyi</groupId> <artifactId>ruoyi-vue-plus</artifactId> - <version>3.0.0</version> + <version>3.1.0</version> <name>RuoYi-Vue-Plus</name> <url>https://gitee.com/JavaLionLi/RuoYi-Vue-Plus</url> <description>RuoYi-Vue-Plus鍚庡彴绠$悊绯荤粺</description> <properties> - <ruoyi-vue-plus.version>3.0.0</ruoyi-vue-plus.version> + <ruoyi-vue-plus.version>3.1.0</ruoyi-vue-plus.version> <spring-boot.version>2.5.4</spring-boot.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> @@ -32,9 +32,12 @@ <feign-okhttp.version>11.6</feign-okhttp.version> <okhttp.version>4.9.1</okhttp.version> <spring-boot-admin.version>2.5.1</spring-boot-admin.version> - <redisson.version>3.16.1</redisson.version> + <redisson.version>3.16.2</redisson.version> <lock4j.version>2.2.1</lock4j.version> <dynamic-ds.version>3.4.1</dynamic-ds.version> + + <!-- jdk11 缂哄け渚濊禆 jaxb--> + <jaxb.version>3.0.1</jaxb.version> <!-- OSS 閰嶇疆 --> <qiniu.version>7.8.0</qiniu.version> @@ -48,7 +51,7 @@ <docker.namespace>ruoyi</docker.namespace> <docker.plugin.version>1.2.2</docker.plugin.version> </properties> - + <!-- 渚濊禆澹版槑 --> <dependencyManagement> <dependencies> @@ -239,7 +242,12 @@ <dependencies> - + <!-- jdk11 缂哄け渚濊禆 jaxb--> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-impl</artifactId> + <version>${jaxb.version}</version> + </dependency> </dependencies> <build> @@ -318,48 +326,9 @@ <properties> <profiles.active>prod</profiles.active> <logging.level>warn</logging.level> - <endpoints.include>health,info</endpoints.include> + <endpoints.include>health, info, logfile</endpoints.include> </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> +</project> \ No newline at end of file -- Gitblit v1.9.3