From c1ade366428ade752213c196f3c76b49020a9839 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 29 八月 2024 16:42:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pom.xml | 54 ++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 44 insertions(+), 10 deletions(-)
diff --git a/pom.xml b/pom.xml
index c45efd7..82b6100 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,11 +31,11 @@
<fastjson.version>2.0.43</fastjson.version>
<commons.lang.version>2.6</commons.lang.version>
<druid.version>1.2.20</druid.version>
- <pagehelper.version>1.3.0</pagehelper.version>
+ <pagehelper.boot.version>1.4.6</pagehelper.boot.version>
<aliyun.sdk.oss.version>3.10.2</aliyun.sdk.oss.version>
<knife4j.version>3.0.2</knife4j.version>
<aspectj.version>1.9.4</aspectj.version>
- <mybatis-plus.version>3.5.4</mybatis-plus.version>
+ <mybatis-plus.version>3.5.4.1</mybatis-plus.version>
<jwt.version>0.9.1</jwt.version>
<jaxb-api.version>2.3.1</jaxb-api.version>
<poi.version>4.1.2</poi.version>
@@ -126,11 +126,23 @@
</dependencyManagement>
<dependencies>
- <!-- Activiti7 -->
<dependency>
- <groupId>org.activiti</groupId>
- <artifactId>activiti-spring-boot-starter</artifactId>
- <version>7.0.0.GA</version>
+ <groupId>org.bytedeco</groupId>
+ <artifactId>javacv-platform</artifactId>
+ <version>1.5.1</version>
+ <type>pom</type>
+ </dependency>
+ <!-- sip鍗忚鏍� -->
+ <dependency>
+ <groupId>javax.sip</groupId>
+ <artifactId>jain-sip-ri</artifactId>
+ <version>1.3.0-91</version>
+ </dependency>
+ <!-- 娴峰悍client -->
+ <dependency>
+ <groupId>com.hikvision.ga</groupId>
+ <artifactId>artemis-http-client</artifactId>
+ <version>1.1.3</version>
</dependency>
<!-- jpa -->
<dependency>
@@ -148,6 +160,10 @@
<version>${mybatis.spring.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-data-mongodb</artifactId>
+ </dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
@@ -173,14 +189,19 @@
<version>${druid.version}</version>
</dependency>
+ <!-- pagehelper 鍒嗛〉鎻掍欢 -->
<dependency>
<groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper-spring-boot-starter</artifactId>
- <version>${pagehelper.version}</version>
+ <version>${pagehelper.boot.version}</version>
<exclusions>
<exclusion>
- <artifactId>jsqlparser</artifactId>
- <groupId>com.github.jsqlparser</groupId>
+ <groupId>org.mybatis</groupId>
+ <artifactId>mybatis</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.mybatis</groupId>
+ <artifactId>mybatis-spring</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -243,11 +264,24 @@
<artifactId>jaxb-api</artifactId>
<version>${jaxb-api.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>easyexcel</artifactId>
+ <version>${easyexcel.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-starter-openfeign</artifactId>
+ <version>4.0.4</version>
+ </dependency>
+
+
</dependencies>
<build>
<plugins>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
--
Gitblit v1.8.0