From 8d42b23c07433f11cb0b1e16d9c74b0e29fd35ce Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 05 七月 2024 09:57:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
pom.xml | 47 ++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 40 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 1c672d7..e34a11a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,9 +17,10 @@
<java.version>1.8</java.version>
<mysql.version>8.0.17</mysql.version>
<spring.boot.version>2.1.6.RELEASE</spring.boot.version>
- <mybatisplus.version>3.5.1</mybatisplus.version>
+ <mybatisplus.version>3.5.4</mybatisplus.version>
<lombok.version>1.18.24</lombok.version>
<knife.version>3.0.3</knife.version>
+ <easyexcel.version>3.3.2</easyexcel.version>
</properties>
@@ -41,6 +42,38 @@
<dependencies>
+ <!-- caffeine -->
+ <dependency>
+ <groupId>com.github.ben-manes.caffeine</groupId>
+ <artifactId>caffeine</artifactId>
+ <version>3.0.5</version>
+ </dependency>
+
+ <!-- rabbitmq -->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-amqp</artifactId>
+ </dependency>
+
+ <!-- websocket -->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-websocket</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>fastjson</artifactId>
+ <version>2.0.43</version>
+ </dependency>
+
+ <!-- fastjson -->
+ <dependency>
+ <groupId>com.alibaba.fastjson2</groupId>
+ <artifactId>fastjson2</artifactId>
+ <version>2.0.41</version>
+ </dependency>
+
<!-- swagger -->
<dependency>
@@ -92,12 +125,6 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-undertow</artifactId>
<version>${spring.boot.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.mybatis.spring.boot</groupId>
- <artifactId>mybatis-spring-boot-starter</artifactId>
- <version>2.1.0</version>
</dependency>
<dependency>
@@ -165,6 +192,12 @@
<optional>true</optional>
</dependency>
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>easyexcel</artifactId>
+ <version>${easyexcel.version}</version>
+ </dependency>
+
</dependencies>
--
Gitblit v1.8.0