From d262634363777dc30f4470120e44552bd6b3d5ee Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 31 七月 2024 15:58:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pom.xml | 73 +++++++++++++++++-------------------
1 files changed, 35 insertions(+), 38 deletions(-)
diff --git a/pom.xml b/pom.xml
index 99a7e90..614ed78 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,6 +23,7 @@
</modules>
<properties>
+ <spring-boot.version>3.0.6</spring-boot.version>
<commons.io.version>2.13.0</commons.io.version>
<bitwalker.version>1.21</bitwalker.version>
<mybatis.spring.version>3.0.0</mybatis.spring.version>
@@ -30,7 +31,7 @@
<fastjson.version>2.0.43</fastjson.version>
<commons.lang.version>2.6</commons.lang.version>
<druid.version>1.2.20</druid.version>
- <pagehelper.version>1.3.0</pagehelper.version>
+ <pagehelper.boot.version>1.4.6</pagehelper.boot.version>
<aliyun.sdk.oss.version>3.10.2</aliyun.sdk.oss.version>
<knife4j.version>3.0.2</knife4j.version>
<aspectj.version>1.9.4</aspectj.version>
@@ -125,12 +126,6 @@
</dependencyManagement>
<dependencies>
- <!-- Activiti7 -->
- <dependency>
- <groupId>org.activiti</groupId>
- <artifactId>activiti-spring-boot-starter</artifactId>
- <version>7.0.0.GA</version>
- </dependency>
<!-- jpa -->
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -147,6 +142,10 @@
<version>${mybatis.spring.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-data-mongodb</artifactId>
+ </dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
@@ -172,14 +171,19 @@
<version>${druid.version}</version>
</dependency>
+ <!-- pagehelper 鍒嗛〉鎻掍欢 -->
<dependency>
<groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper-spring-boot-starter</artifactId>
- <version>${pagehelper.version}</version>
+ <version>${pagehelper.boot.version}</version>
<exclusions>
<exclusion>
- <artifactId>jsqlparser</artifactId>
- <groupId>com.github.jsqlparser</groupId>
+ <groupId>org.mybatis</groupId>
+ <artifactId>mybatis</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.mybatis</groupId>
+ <artifactId>mybatis-spring</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -242,6 +246,20 @@
<artifactId>jaxb-api</artifactId>
<version>${jaxb-api.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>easyexcel</artifactId>
+ <version>${easyexcel.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-starter-openfeign</artifactId>
+ <version>${spring-boot.version}</version>
+ </dependency>
+
+
</dependencies>
<build>
@@ -249,50 +267,29 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>${maven-compiler-plugin.verison}</version>
+ <version>3.8.0</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
<encoding>${project.build.sourceEncoding}</encoding>
<annotationProcessorPaths>
+ <!-- Lombok 娉ㄨВ澶勭悊鍣� -->
<path>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
- <version>${lombok.version}</version>
+ <version>1.18.26</version>
</path>
- <path>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-configuration-processor</artifactId>
- <version>${spring-boot.version}</version>
- </path>
- <path>
- <groupId>io.github.linpeilie</groupId>
- <artifactId>mapstruct-plus-processor</artifactId>
- <version>${mapstruct-plus.version}</version>
- </path>
+ <!-- MapStruct 鍜� Lombok 娉ㄨВ缁戝畾澶勭悊鍣� -->
<path>
<groupId>org.projectlombok</groupId>
<artifactId>lombok-mapstruct-binding</artifactId>
- <version>${mapstruct-plus.lombok.version}</version>
+ <version>0.2.0</version>
</path>
</annotationProcessorPaths>
- <compilerArgs>
- <arg>-parameters</arg>
- </compilerArgs>
</configuration>
- </plugin>
- <!-- 鍗曞厓娴嬭瘯浣跨敤 -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${maven-surefire-plugin.version}</version>
- <configuration>
- <!-- 鏍规嵁鎵撳寘鐜鎵ц瀵瑰簲鐨凘Tag娴嬭瘯鏂规硶 -->
- <groups>${profiles.active}</groups>
- <!-- 鎺掗櫎鏍囩 -->
- <excludedGroups>exclude</excludedGroups>
- </configuration>
+
</plugin>
</plugins>
+ <finalName>${project.artifactId}</finalName>
</build>
</project>
--
Gitblit v1.8.0