From 58494fbf65b149bfc9cdbef1661c6bb1432bb369 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期二, 10 一月 2023 19:14:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pom.xml | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/pom.xml b/pom.xml
index 852c3fe..8352058 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,6 +39,11 @@
<artifactId>cos_api</artifactId>
</dependency>
+ <dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ </dependency>
+
<!--鍙戦�侀偖浠�-->
<dependency>
<groupId>com.sun.mail</groupId>
@@ -139,6 +144,12 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-tomcat</artifactId>
+ <!--<scope>provided</scope>-->
</dependency>
<!-- mybatis鑷姩鐢熸垚 -->
@@ -278,10 +289,16 @@
<artifactId>spring-boot-starter-forest</artifactId>
<version>1.5.0-RC2</version>
</dependency>
+
+ <!-- redis -->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-data-redis</artifactId>
+ </dependency>
</dependencies>
<build>
- <finalName>hx-demoboot</finalName>
+ <finalName>hx-common</finalName>
<resources>
<resource>
<directory>src/main/java</directory>
--
Gitblit v1.8.0