From 9ac04e8335b18ffbe2a3d7bc16f9f51a7404ec85 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期三, 27 七月 2022 10:28:06 +0800
Subject: [PATCH] Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into genchuang
---
pom.xml | 48 +++++++++++-------------------------------------
1 files changed, 11 insertions(+), 37 deletions(-)
diff --git a/pom.xml b/pom.xml
index b732223..a755c62 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,6 @@
<module>emergency/emergency-service</module>
<module>emergency/emergency-rpc-provider</module>
<module>safePlatfrom-out-web</module>
- <module>incident-manage</module>
</modules>
<properties>
@@ -32,9 +31,7 @@
<guava.version>31.1-jre</guava.version>
<account.rpc.model.version>1.0-SNAPSHOT</account.rpc.model.version>
<mybatis.plus.version>3.5.2</mybatis.plus.version>
- <jta.starter.version>2.7.1</jta.starter.version>
- <rocketmq.starter.version>2.2.2</rocketmq.starter.version>
- <redission.version>3.17.4</redission.version>
+ <poi.version>4.1.2</poi.version>
<com.alibaba.cloud.version>2.2.8.RELEASE</com.alibaba.cloud.version>
</properties>
@@ -105,36 +102,25 @@
<artifactId>mybatis-plus-extension</artifactId>
<version>${mybatis.plus.version}</version>
</dependency>
+ <!-- https://mvnrepository.com/artifact/org.apache.poi/poi -->
<dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-jta-atomikos</artifactId>
- <version>${jta.starter.version}</version>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi</artifactId>
+ <version>${poi.version}</version>
</dependency>
+ <!-- https://mvnrepository.com/artifact/org.apache.poi/poi-ooxml -->
<dependency>
- <groupId>org.apache.rocketmq</groupId>
- <artifactId>rocketmq-spring-boot</artifactId>
- <version>${rocketmq.starter.version}</version>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi-ooxml</artifactId>
+ <version>${poi.version}</version>
</dependency>
- <dependency>
- <groupId>org.redisson</groupId>
- <artifactId>redisson-spring-boot-starter</artifactId>
- <version>${redission.version}</version>
- </dependency>
- <dependency>
- <groupId>com.alibaba.cloud</groupId>
- <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
- <version>${com.alibaba.cloud.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-starter-gateway</artifactId>
- <version>3.1.3</version>
- </dependency>
+
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
<version>${com.alibaba.cloud.version}</version>
</dependency>
+
</dependencies>
</dependencyManagement>
@@ -227,18 +213,6 @@
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.rocketmq</groupId>
- <artifactId>rocketmq-spring-boot</artifactId>
- </dependency>
- <dependency>
- <groupId>org.redisson</groupId>
- <artifactId>redisson-spring-boot-starter</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-jta-atomikos</artifactId>
</dependency>
<!-- 安全平台业务组件 -->
--
Gitblit v1.9.2