From 5703d0e9865df3ba05bb02bc382ce59fbf5f7da0 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: Fri, 12 Aug 2022 16:59:06 +0800
Subject: [PATCH] Merge branch 'genchuang' of https://sinanoaq.cn:8888/r/safePlatform-out into master
---
pom.xml | 92 +++++++++++++++++++++++++++------------------
1 files changed, 55 insertions(+), 37 deletions(-)
diff --git a/pom.xml b/pom.xml
index b732223..44d62fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,8 +14,11 @@
<module>goal-manage/goal-manage-rpc-provider</module>
<module>emergency/emergency-service</module>
<module>emergency/emergency-rpc-provider</module>
+ <module>equipment/equipment-service</module>
+ <module>equipment/equipment-rpc-provider</module>
+ <module>incident-manage/incident-manage-service</module>
+ <module>incident-manage/incident-manage-rpc-provider</module>
<module>safePlatfrom-out-web</module>
- <module>incident-manage</module>
</modules>
<properties>
@@ -32,10 +35,10 @@
<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>
+ <jta.starter.version>2.7.1</jta.starter.version>
+ <commons.utils.version>1.9.4</commons.utils.version>
</properties>
<parent>
@@ -50,6 +53,11 @@
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-spring-boot-starter</artifactId>
<version>${dubbo.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-jta-atomikos</artifactId>
+ <version>${jta.starter.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -105,36 +113,32 @@
<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>
+
+
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>${commons.utils.version}</version>
+ </dependency>
+
</dependencies>
</dependencyManagement>
@@ -164,6 +168,10 @@
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-jta-atomikos</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId>
</dependency>
<dependency>
@@ -179,6 +187,12 @@
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
<version>${mybatisPlusStarter.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi</artifactId>
+ <version>${poi.version}</version>
</dependency>
@@ -221,24 +235,16 @@
<artifactId>dubbo-registry-nacos</artifactId>
</dependency>
<dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ </dependency>
+ <dependency>
<groupId>io.minio</groupId>
<artifactId>minio</artifactId>
</dependency>
<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>
<!-- 安全平台业务组件 -->
@@ -251,6 +257,11 @@
<build>
<plugins>
+ <!-- 修改打包插件
+ 修改打包方式jar为pom后
+ 默认打包方式为spring-boot-maven-plugin
+ 等到后期打包的时候他会一直提示你，你引入的依赖不存在
+ -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
@@ -260,6 +271,13 @@
<target>1.8</target>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skipTests>true</skipTests> <!--默认关掉单元测试 -->
+ </configuration>
+ </plugin>
</plugins>
</build>
--
Gitblit v1.9.2