From 03cc06f009f0645faea85297e8660afc1bf82846 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期二, 24 九月 2024 11:29:38 +0800
Subject: [PATCH] Merge branch 'master-jiayan' into master-jiayan-test
---
pom.xml | 42 +++++++++++++++++++++++++++++++++---------
1 files changed, 33 insertions(+), 9 deletions(-)
diff --git a/pom.xml b/pom.xml
index ba62efd..f941efd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>com.hx.gitee</groupId>
<artifactId>hx-parent</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>jiayan</version>
</parent>
<artifactId>hx-common</artifactId>
@@ -21,7 +21,7 @@
<artifactId>jaxb-api</artifactId>
</dependency>
- <dependency>
+ <!-- <dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
<version>3.9</version>
@@ -31,12 +31,17 @@
<groupId>dom4j</groupId>
</exclusion>
</exclusions>
- </dependency>
+ </dependency>-->
<!--鑵捐浜� cos-->
<dependency>
<groupId>com.qcloud</groupId>
<artifactId>cos_api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
</dependency>
<!--鍙戦�侀偖浠�-->
@@ -54,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 -->
@@ -108,11 +118,6 @@
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
- <!-- excel2003浣跨敤鐨刯ar -->
- <dependency>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi</artifactId>
- </dependency>
<dependency>
<groupId>redis.clients</groupId>
<artifactId>jedis</artifactId>
@@ -134,6 +139,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鑷姩鐢熸垚 -->
@@ -273,10 +284,23 @@
<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>
+
+ <!-- https://mvnrepository.com/artifact/com.monitorjbl/xlsx-streamer -->
+ <dependency>
+ <groupId>com.monitorjbl</groupId>
+ <artifactId>xlsx-streamer</artifactId>
+ </dependency>
+
</dependencies>
<build>
- <finalName>hx-demoboot</finalName>
+ <finalName>hx-common</finalName>
<resources>
<resource>
<directory>src/main/java</directory>
--
Gitblit v1.8.0