From fff73372b4b443d2920f09d2e83702fec07521a6 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 22 五月 2024 12:02:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pom.xml | 46 ++++++++++++++++++++++++++++++++++------------
1 files changed, 34 insertions(+), 12 deletions(-)
diff --git a/pom.xml b/pom.xml
index f29c10f..3ad2269 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,6 +21,7 @@
<mysql.version>8.0.17</mysql.version>
<spring.boot.version>2.1.6.RELEASE</spring.boot.version>
<mapstruct.version>1.4.1.Final</mapstruct.version>
+ <easyExcel.version>3.3.2</easyExcel.version>
</properties>
@@ -69,6 +70,15 @@
<dependencies>
+
+ <!-- easy excel -->
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>easyexcel</artifactId>
+ <version>${easyExcel.version}</version>
+ </dependency>
+
+
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId>
@@ -95,17 +105,32 @@
<artifactId>spring-boot-starter-undertow</artifactId>
<version>${spring.boot.version}</version>
</dependency>
+
+ <!--MyBatis Plus 渚濊禆-->
<dependency>
- <groupId>org.mybatis.spring.boot</groupId>
- <artifactId>mybatis-spring-boot-starter</artifactId>
- <version>2.1.0</version>
+ <groupId>com.baomidou</groupId>
+ <artifactId>mybatis-plus-boot-starter</artifactId>
+ <version>3.5.4</version>
</dependency>
+
<dependency>
<groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper-spring-boot-starter</artifactId>
<version>1.2.12</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>jsqlparser</artifactId>
+ <groupId>com.github.jsqlparser</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
+ <!-- https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-aop -->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-aop</artifactId>
+ <version>3.1.0</version>
+ </dependency>
<!--swagger 渚濊禆-->
<dependency>
<groupId>io.springfox</groupId>
@@ -222,6 +247,10 @@
<artifactId>mapstruct-processor</artifactId>
<version>${mapstruct.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ </dependency>
</dependencies>
@@ -230,17 +259,10 @@
<build>
<plugins>
<plugin>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
- <configuration>
- <fork>true</fork>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.8.1</version>
<configuration>
- <skipTests>true</skipTests>
</configuration>
</plugin>
</plugins>
--
Gitblit v1.8.0