From 5382a2a15ea7995b22672638706070dbdc51bad0 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 28 九月 2021 18:23:43 +0800
Subject: [PATCH] update 优化代码生成 导入表 列表返回 主键默认选中
---
pom.xml | 138 ++++++++++++++++++++++++---------------------
1 files changed, 74 insertions(+), 64 deletions(-)
diff --git a/pom.xml b/pom.xml
index 1c32623..c6db868 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,40 +6,44 @@
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-vue-plus</artifactId>
- <version>2.6.0</version>
+ <version>3.2.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>2.6.0</ruoyi-vue-plus.version>
- <spring-boot.version>2.5.3</spring-boot.version>
+ <ruoyi-vue-plus.version>3.2.0</ruoyi-vue-plus.version>
+ <spring-boot.version>2.5.5</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>
- <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
+ <maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
<druid.version>1.2.6</druid.version>
<knife4j.version>3.0.3</knife4j.version>
+ <swagger-annotations.version>1.5.22</swagger-annotations.version>
<poi.version>4.1.2</poi.version>
- <easyexcel.version>2.2.10</easyexcel.version>
+ <easyexcel.version>2.2.11</easyexcel.version>
<velocity.version>1.7</velocity.version>
- <jwt.version>0.9.1</jwt.version>
- <mybatis-plus.version>3.4.3</mybatis-plus.version>
+ <satoken.version>1.26.0</satoken.version>
+ <mybatis-plus.version>3.4.3.4</mybatis-plus.version>
<p6spy.version>3.9.1</p6spy.version>
- <hutool.version>5.7.6</hutool.version>
+ <hutool.version>5.7.13</hutool.version>
<feign.version>3.0.3</feign.version>
- <feign-okhttp.version>11.2</feign-okhttp.version>
+ <feign-okhttp.version>11.6</feign-okhttp.version>
<okhttp.version>4.9.1</okhttp.version>
- <spring-boot-admin.version>2.4.3</spring-boot-admin.version>
- <redisson.version>3.16.1</redisson.version>
+ <spring-boot-admin.version>2.5.1</spring-boot-admin.version>
+ <redisson.version>3.16.3</redisson.version>
<lock4j.version>2.2.1</lock4j.version>
- <datasource.version>3.4.1</datasource.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>
- <aliyun.oss.version>3.13.0</aliyun.oss.version>
- <qcloud.cos.version>5.6.47</qcloud.cos.version>
+ <aliyun.oss.version>3.13.1</aliyun.oss.version>
+ <qcloud.cos.version>5.6.55</qcloud.cos.version>
<minio.version>8.3.0</minio.version>
<!-- docker 閰嶇疆 -->
@@ -48,7 +52,7 @@
<docker.namespace>ruoyi</docker.namespace>
<docker.plugin.version>1.2.2</docker.plugin.version>
</properties>
-
+
<!-- 渚濊禆澹版槑 -->
<dependencyManagement>
<dependencies>
@@ -73,6 +77,18 @@
<groupId>com.github.xiaoymin</groupId>
<artifactId>knife4j-spring-boot-starter</artifactId>
<version>${knife4j.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>swagger-annotations</artifactId>
+ <groupId>io.swagger</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>io.swagger</groupId>
+ <artifactId>swagger-annotations</artifactId>
+ <version>${swagger-annotations.version}</version>
</dependency>
<!-- excel宸ュ叿 -->
@@ -86,6 +102,16 @@
<groupId>com.alibaba</groupId>
<artifactId>easyexcel</artifactId>
<version>${easyexcel.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi-ooxml-schemas</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- velocity浠ｇ爜鐢熸垚浣跨敤妯℃澘 -->
@@ -95,18 +121,30 @@
<version>${velocity.version}</version>
</dependency>
- <!-- Token鐢熸垚涓庤В鏋�-->
+ <!-- Sa-Token 鏉冮檺璁よ瘉, 鍦ㄧ嚎鏂囨。锛歨ttp://sa-token.dev33.cn/ -->
<dependency>
- <groupId>io.jsonwebtoken</groupId>
- <artifactId>jjwt</artifactId>
- <version>${jwt.version}</version>
+ <groupId>cn.dev33</groupId>
+ <artifactId>sa-token-spring-boot-starter</artifactId>
+ <version>${satoken.version}</version>
+ </dependency>
+ <!-- Sa-Token 鏁村悎 Redis 锛堜娇鐢╦ackson搴忓垪鍖栨柟寮忥級 -->
+ <dependency>
+ <groupId>cn.dev33</groupId>
+ <artifactId>sa-token-dao-redis-jackson</artifactId>
+ <version>${satoken.version}</version>
+ </dependency>
+ <!-- Sa-Token鏁村悎SpringAOP瀹炵幇娉ㄨВ閴存潈 -->
+ <dependency>
+ <groupId>cn.dev33</groupId>
+ <artifactId>sa-token-spring-aop</artifactId>
+ <version>${satoken.version}</version>
</dependency>
<!-- dynamic-datasource 澶氭暟鎹簮-->
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>dynamic-datasource-spring-boot-starter</artifactId>
- <version>${datasource.version}</version>
+ <version>${dynamic-ds.version}</version>
</dependency>
<dependency>
@@ -136,6 +174,12 @@
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-openfeign</artifactId>
<version>${feign.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>feign-core</artifactId>
+ <groupId>io.github.openfeign</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -239,7 +283,12 @@
<dependencies>
-
+ <!-- jdk11 缂哄け渚濊禆 jaxb-->
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>${jaxb.version}</version>
+ </dependency>
</dependencies>
<build>
@@ -269,7 +318,7 @@
<repository>
<id>public</id>
<name>aliyun nexus</name>
- <url>http://maven.aliyun.com/nexus/content/groups/public/</url>
+ <url>https://maven.aliyun.com/repository/public/</url>
<releases>
<enabled>true</enabled>
</releases>
@@ -280,7 +329,7 @@
<pluginRepository>
<id>public</id>
<name>aliyun nexus</name>
- <url>http://maven.aliyun.com/nexus/content/groups/public/</url>
+ <url>https://maven.aliyun.com/repository/public/</url>
<releases>
<enabled>true</enabled>
</releases>
@@ -318,48 +367,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