From 528175df22e9c0b9b6d20d83468f2985463105f3 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 26 十二月 2022 16:46:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pom.xml | 35 ++++++++++++++++++++++++++++++++++-
1 files changed, 34 insertions(+), 1 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7a164ce..8352058 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,11 +21,27 @@
<artifactId>jaxb-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi-ooxml</artifactId>
+ <version>3.9</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>dom4j</artifactId>
+ <groupId>dom4j</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<!--鑵捐浜� cos-->
<dependency>
<groupId>com.qcloud</groupId>
<artifactId>cos_api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
</dependency>
<!--鍙戦�侀偖浠�-->
@@ -43,6 +59,11 @@
<dependency>
<groupId>com.aliyun.oss</groupId>
<artifactId>aliyun-sdk-oss</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>com.huaweicloud</groupId>
+ <artifactId>esdk-obs-java</artifactId>
</dependency>
<!-- https://mvnrepository.com/artifact/org.bouncycastle/bcprov-jdk15on -->
@@ -123,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鑷姩鐢熸垚 -->
@@ -262,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