From 5bd5f3bcd6d2cb375feb0756505691b551339716 Mon Sep 17 00:00:00 2001
From: zhangfeng <1603559716@qq.com>
Date: 星期五, 23 十二月 2022 08:55:23 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into zf
---
pom.xml | 50 +++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 39 insertions(+), 11 deletions(-)
diff --git a/pom.xml b/pom.xml
index 164b1d2..25a525e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,11 +9,21 @@
<packaging>pom</packaging>
<version>1.0-SNAPSHOT</version>
+ <parent>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-parent</artifactId>
+ <version>2.7.1</version>
+ </parent>
+
<modules>
<module>goal-manage/goal-manage-service</module>
<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>
</modules>
@@ -21,9 +31,9 @@
<project.build.sourceencoding>UTF-8</project.build.sourceencoding>
<project.reporting.outputencoding>UTF-8</project.reporting.outputencoding>
<java.version>1.8</java.version>
- <dubbo.version>3.0.8</dubbo.version>
- <nacos.client.version>2.1.0</nacos.client.version>
- <minio.version>8.4.2</minio.version>
+ <dubbo.version>3.1.2</dubbo.version>
+ <nacos.client.version>2.1.2</nacos.client.version>
+ <minio.version>8.4.5</minio.version>
<okhttp.version>4.10.0</okhttp.version>
<fastjson.version>1.2.47</fastjson.version>
<mysql.connector.version>8.0.29</mysql.connector.version>
@@ -32,16 +42,12 @@
<account.rpc.model.version>1.0-SNAPSHOT</account.rpc.model.version>
<mybatis.plus.version>3.5.2</mybatis.plus.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>
+ <com.alibaba.cloud.version>2.2.9.RELEASE</com.alibaba.cloud.version>
+ <jta.starter.version>2.7.5</jta.starter.version>
<commons.utils.version>1.9.4</commons.utils.version>
+ <redission.version>3.18.0</redission.version>
+ <rocketmq.starter.version>2.2.2</rocketmq.starter.version>
</properties>
-
- <parent>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-parent</artifactId>
- <version>2.6.7</version>
- </parent>
<dependencyManagement>
<dependencies>
@@ -135,6 +141,12 @@
<version>${commons.utils.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.redisson</groupId>
+ <artifactId>redisson-spring-boot-starter</artifactId>
+ <version>${redission.version}</version>
+ </dependency>
+
</dependencies>
</dependencyManagement>
@@ -198,6 +210,10 @@
<artifactId>spring-boot-starter-data-redis</artifactId>
</dependency>
<dependency>
+ <groupId>org.redisson</groupId>
+ <artifactId>redisson-spring-boot-starter</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
<version>1.9.9.1</version>
@@ -253,6 +269,11 @@
<build>
<plugins>
+ <!-- 修改打包插件
+ 修改打包方式jar为pom后
+ 默认打包方式为spring-boot-maven-plugin
+ 等到后期打包的时候他会一直提示你，你引入的依赖不存在
+ -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
@@ -262,6 +283,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