From 9e4fb13fec8bf2732f4567e7e72eeb9fd94c840c Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期日, 29 九月 2024 16:31:22 +0800
Subject: [PATCH] Merge branch 'master-stander' into master-jiayan
---
pom.xml | 245 +++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 236 insertions(+), 9 deletions(-)
diff --git a/pom.xml b/pom.xml
index e100d27..5598480 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
<groupId>com.hx.gitee</groupId>
<artifactId>hx-parent</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>jiayan</version>
<packaging>pom</packaging>
<parent>
@@ -16,6 +16,11 @@
<relativePath/> <!-- lookup parent from repository -->
</parent>
+ <modules>
+ <module>hx_common</module>
+ <module>hx_auto</module>
+ <module>hx-redisson</module>
+ </modules>
<!-- 渚濊禆鐗堟湰缁熶竴绠＄悊 -->
<properties>
@@ -26,14 +31,15 @@
<sfjson.version>2.4</sfjson.version>
<orgApache.commons>3.9</orgApache.commons>
<commons-io>2.6</commons-io>
- <orgApache.poi>3.9</orgApache.poi>
<net.sourceforge>2.6.12</net.sourceforge>
<pinyin4j>2.5.1</pinyin4j>
<commons.lang.version>2.5</commons.lang.version>
<ezmorph.version>1.0.3</ezmorph.version>
<oss.version>2.8.3</oss.version>
<jstl.api.version>1.2</jstl.api.version>
- <spring.redis.version>1.4.2.RELEASE</spring.redis.version>
+ <spring.redis.version>2.7.0</spring.redis.version>
+ <redisson.version>3.17.4</redisson.version>
+ <jackson.databind.version>2.13.3</jackson.databind.version>
<cglib.version>3.1</cglib.version>
<shiro.version>1.3.2</shiro.version>
<commons-beanutils.version>1.9.3</commons-beanutils.version>
@@ -42,7 +48,7 @@
<java.jwt.version>3.10.3</java.jwt.version>
<jjwt.version>0.9.1</jjwt.version>
<pagehelper.version>5.1.11</pagehelper.version>
- <pagehelper-boot.version>1.2.13</pagehelper-boot.version>
+ <pagehelper-boot.version>1.4.1</pagehelper-boot.version>
<mail.version>1.6.2</mail.version>
<jdk15on.version>1.66</jdk15on.version>
<dom4j.version>2.1.3</dom4j.version>
@@ -52,18 +58,34 @@
<!--mybatis鑷姩鐢熸垚-->
<mybatis.actable>1.1.1.RELEASE</mybatis.actable>
<!--鑵捐浜慶os-->
- <cos.version>5.6.32</cos.version>
+ <cos.version>5.6.89</cos.version>
<!--鍗庝负浜慶os-->
<obs.version>3.20.6.2</obs.version>
<!--鍔犲瘑鍣�-->
<jasypt.version>2.1.2</jasypt.version>
<!--瀵硅薄涓嶺ML澶勭悊-->
<jaxb.version>2.3.1</jaxb.version>
+ <fileupload.version>1.4</fileupload.version>
+ <xlsx-streamer.version>2.2.0</xlsx-streamer.version>
+ <validation.version>2.0.1.Final</validation.version>
+ <openfeign.version>3.1.0</openfeign.version>
+ <loadbalancer.version>3.1.0</loadbalancer.version>
+ <fadada.version>5.4.0.0229</fadada.version>
+ <rocketmq.version>4.9.4</rocketmq.version>
+ <rocketmq.spring.versioin>2.2.2</rocketmq.spring.versioin>
+ <kuaidi100.version>1.0.5</kuaidi100.version>
</properties>
<!-- 澹版槑渚濊禆涓嶅紩鍏� -->
<dependencyManagement>
<dependencies>
+
+ <!--File杞琈ultipartFile-->
+ <dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ <version>${fileupload.version}</version>
+ </dependency>
<!-- https://mvnrepository.com/artifact/javax.xml.bind/jaxb-api -->
<dependency>
@@ -197,19 +219,24 @@
</dependency>
<!-- excel2003浣跨敤鐨刯ar -->
- <dependency>
+ <!--<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
<version>${orgApache.poi}</version>
</dependency>
- <!-- https://mvnrepository.com/artifact/org.apache.poi/poi-ooxml -->
+ <!– https://mvnrepository.com/artifact/org.apache.poi/poi-ooxml –>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
- <version>3.9</version>
- </dependency>
+ <version>${orgApache.poi}</version>
+ </dependency>-->
+ <dependency>
+ <groupId>com.monitorjbl</groupId>
+ <artifactId>xlsx-streamer</artifactId>
+ <version>${xlsx-streamer.version}</version>
+ </dependency>
<dependency>
@@ -223,12 +250,25 @@
<artifactId>spring-boot-starter-data-redis</artifactId>
<version>${spring.redis.version}</version>
</dependency>
+ <!-- https://mvnrepository.com/artifact/org.redisson/redisson-spring-boot-starter -->
+ <dependency>
+ <groupId>org.redisson</groupId>
+ <artifactId>redisson-spring-boot-starter</artifactId>
+ <version>${redisson.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>${jackson.databind.version}</version>
+ </dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>${lombok.version}</version>
</dependency>
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -331,6 +371,193 @@
<artifactId>ezmorph</artifactId>
<version>${ezmorph.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>javax.validation</groupId>
+ <artifactId>validation-api</artifactId>
+ <version>${validation.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-starter-openfeign</artifactId>
+ <version>${openfeign.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-starter-loadbalancer</artifactId>
+ <version>${loadbalancer.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.fadada.api</groupId>
+ <artifactId>fasc-openapi-java-sdk</artifactId>
+ <version>${fadada.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>com.aliyun</groupId>
+ <artifactId>aliyun-java-sdk-core</artifactId>
+ <version>3.2.3</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.aliyun</groupId>
+ <artifactId>aliyun-java-sdk-dyplsapi</artifactId>
+ <version>1.1.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.dtflys.forest</groupId>
+ <artifactId>spring-boot-starter-forest</artifactId>
+ <version>1.5.0-RC2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.alibaba.cloud</groupId>
+ <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+ <version>2.2.7.RELEASE</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-starter-netflix-ribbon</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>com.alibaba.cloud</groupId>
+ <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+ <version>2.2.7.RELEASE</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-starter-bootstrap</artifactId>
+ <version>3.1.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-context</artifactId>
+ <version>3.1.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-commons</artifactId>
+ <version>3.1.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.tencentcloudapi</groupId>
+ <artifactId>tencentcloud-sdk-java-ocr</artifactId>
+ <version>3.1.760</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.rocketmq</groupId>
+ <artifactId>rocketmq-client</artifactId>
+ <version>${rocketmq.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.rocketmq</groupId>
+ <artifactId>rocketmq-spring-boot-starter</artifactId>
+ <version>${rocketmq.spring.versioin}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.rocketmq</groupId>
+ <artifactId>rocketmq-common</artifactId>
+ <version>${rocketmq.version}</version>
+ </dependency>
+
+ <!-- 蹇��100 -->
+ <dependency>
+ <groupId>com.github.kuaidi100-api</groupId>
+ <artifactId>sdk</artifactId>
+ <version>${kuaidi100.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.thoughtworks.xstream</groupId>
+ <artifactId>xstream</artifactId>
+ <version>1.4.10</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.github.binarywang</groupId>
+ <artifactId>weixin-java-mp</artifactId>
+ <version>3.0.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>net.java.dev.jna</groupId>
+ <artifactId>jna</artifactId>
+ <version>5.3.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>cn.hutool</groupId>
+ <artifactId>hutool-all</artifactId>
+ <version>4.5.3</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.pdfbox</groupId>
+ <artifactId>pdfbox</artifactId>
+ <version>2.0.13</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.github.jai-imageio</groupId>
+ <artifactId>jai-imageio-jpeg2000</artifactId>
+ <version>1.3.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <version>RELEASE</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.itextpdf</groupId>
+ <artifactId>itextpdf</artifactId>
+ <version>5.5.13</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.itextpdf</groupId>
+ <artifactId>itext-asian</artifactId>
+ <version>5.2.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-data-mongodb</artifactId>
+ <version>2.6.2</version>
+ <!--鎺掗櫎浣跨敤logback鏃ュ織-->
+ <exclusions>
+ <exclusion>
+ <artifactId>logback-classic</artifactId>
+ <groupId>ch.qos.logback</groupId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
</dependencies>
</dependencyManagement>
--
Gitblit v1.8.0