:sparkles: 添加新特性。bom 管理，升级Cairo-SR7

pigx-auth/pom.xml

@@ -42,25 +42,21 @@
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pigx-upms-api</artifactId>
-			<version>2.2.0</version>
 		</dependency>
 		<!--security-->
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pigx-common-security</artifactId>
-			<version>2.2.0</version>
 		</dependency>
 		<!--mysql 驱动-->
 		<dependency>
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>
-			<version>${mysql.connector.version}</version>
 		</dependency>
 		<!--缓存操作-->
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pigx-common-data</artifactId>
-			<version>2.2.0</version>
 		</dependency>
 		<!--JDBC相关-->
 		<dependency>

pigx-common/pigx-common-bom/pom.xml

@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+		 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>spring-cloud-dependencies-parent</artifactId>
+		<groupId>org.springframework.cloud</groupId>
+		<version>2.0.4.RELEASE</version>
+		<relativePath/>
+	</parent>
+
+	<artifactId>pigx-common-bom</artifactId>
+	<packaging>pom</packaging>
+	<version>2.2.0</version>
+	<description>pigx 公共版本控制</description>
+
+	<properties>
+		<pigx.version>2.2.0</pigx.version>
+		<jackson.modules>2.9.6</jackson.modules>
+		<mybatis-plus.version>3.0.6</mybatis-plus.version>
+		<mysql.connector.version>8.0.13</mysql.connector.version>
+	</properties>
+
+	<dependencyManagement>
+		<dependencies>
+			<!--pigx 工具包-->
+			<dependency>
+				<groupId>com.pig4cloud</groupId>
+				<artifactId>pigx-common-core</artifactId>
+				<version>${pigx.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>com.pig4cloud</groupId>
+				<artifactId>pigx-common-data</artifactId>
+				<version>${pigx.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>com.pig4cloud</groupId>
+				<artifactId>pigx-common-gateway</artifactId>
+				<version>${pigx.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>com.pig4cloud</groupId>
+				<artifactId>pigx-common-job</artifactId>
+				<version>${pigx.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>com.pig4cloud</groupId>
+				<artifactId>pigx-common-log</artifactId>
+				<version>${pigx.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>com.pig4cloud</groupId>
+				<artifactId>pigx-common-minio</artifactId>
+				<version>${pigx.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>com.pig4cloud</groupId>
+				<artifactId>pigx-common-security</artifactId>
+				<version>${pigx.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>com.pig4cloud</groupId>
+				<artifactId>pigx-common-swagger</artifactId>
+				<version>${pigx.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>com.pig4cloud</groupId>
+				<artifactId>pigx-common-transaction</artifactId>
+				<version>${pigx.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>com.pig4cloud</groupId>
+				<artifactId>pigx-upms-api</artifactId>
+				<version>${pigx.version}</version>
+			</dependency>
+
+			<!--jackson模块-->
+			<dependency>
+				<groupId>com.fasterxml.jackson.module</groupId>
+				<artifactId>jackson-modules-java8</artifactId>
+				<version>${jackson.modules}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+			<!--mybatis plus extension,包含了mybatis plus core-->
+			<dependency>
+				<groupId>com.baomidou</groupId>
+				<artifactId>mybatis-plus-extension</artifactId>
+				<version>${mybatis-plus.version}</version>
+			</dependency>
+			<!--mybatis-->
+			<dependency>
+				<groupId>com.baomidou</groupId>
+				<artifactId>mybatis-plus-boot-starter</artifactId>
+				<version>${mybatis-plus.version}</version>
+			</dependency>
+			<!--mysql 驱动-->
+			<dependency>
+				<groupId>mysql</groupId>
+				<artifactId>mysql-connector-java</artifactId>
+				<version>${mysql.connector.version}</version>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+</project>

pigx-common/pigx-common-core/pom.xml

@@ -40,11 +40,6 @@
 			<artifactId>hutool-all</artifactId>
 			<version>${hutool.version}</version>
 		</dependency>
-		<!--redis-->
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-data-redis</artifactId>
-		</dependency>
 		<!--server-api-->
 		<dependency>
 			<groupId>javax.servlet</groupId>

pigx-common/pigx-common-data/pom.xml

@@ -38,19 +38,16 @@
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pigx-common-core</artifactId>
-			<version>2.2.0</version>
 		</dependency>
 		<!--mybatis plus extension,包含了mybatis plus core-->
 		<dependency>
 			<groupId>com.baomidou</groupId>
 			<artifactId>mybatis-plus-extension</artifactId>
-			<version>${mybatis-plus.version}</version>
 		</dependency>
 		<!--安全依赖获取上下文信息-->
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pigx-common-security</artifactId>
-			<version>2.2.0</version>
 		</dependency>
 		<!--缓存依赖-->
 		<dependency>

pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/tenant/TenantContextHolderFilter.java

@@ -19,6 +19,7 @@ package com.pig4cloud.pigx.common.data.tenant;
 
 import cn.hutool.core.util.StrUtil;
 import com.pig4cloud.pigx.common.core.constant.CommonConstants;
+import com.pig4cloud.pigx.common.security.util.SecurityUtils;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.Ordered;
@@ -50,6 +51,10 @@ public class TenantContextHolderFilter extends GenericFilterBean {
 		String tenantId = request.getHeader(CommonConstants.TENANT_ID);
 		log.debug("获取header中的租户ID为:{}", tenantId);
 
+		if (SecurityUtils.getUser() != null) {
+			tenantId = String.valueOf(SecurityUtils.getUser().getTenantId());
+		}
+
 		if (StrUtil.isNotBlank(tenantId)) {
 			TenantContextHolder.setTenantId(Integer.parseInt(tenantId));
 		} else {

pigx-common/pigx-common-gateway/pom.xml

@@ -36,11 +36,14 @@
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pigx-common-core</artifactId>
-			<version>2.2.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-gateway-core</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-data-redis-reactive</artifactId>
+		</dependency>
 	</dependencies>
 </project>

pigx-common/pigx-common-log/pom.xml

@@ -38,13 +38,11 @@
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pigx-common-core</artifactId>
-			<version>2.2.0</version>
 		</dependency>
 		<!--UPMS接口模块-->
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pigx-upms-api</artifactId>
-			<version>2.2.0</version>
 		</dependency>
 		<!--安全依赖获取上下文信息-->
 		<dependency>

pigx-common/pigx-common-security/pom.xml

@@ -38,7 +38,6 @@
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pigx-common-core</artifactId>
-			<version>2.2.0</version>
 		</dependency>
 		<!--安全模块-->
 		<dependency>
@@ -53,7 +52,6 @@
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pigx-upms-api</artifactId>
-			<version>2.2.0</version>
 		</dependency>
 	</dependencies>
 </project>

pigx-common/pigx-common-transaction/pom.xml

@@ -17,7 +17,6 @@
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pigx-common-core</artifactId>
-			<version>2.2.0</version>
 		</dependency>
 		<!--lcn 模块端控制依赖-->
 		<dependency>

pigx-common/pom.xml

@@ -33,6 +33,7 @@
 	<description>pigx 公共聚合模块</description>
 
 	<modules>
+		<module>pigx-common-bom</module>
 		<module>pigx-common-core</module>
 		<module>pigx-common-data</module>
 		<module>pigx-common-gateway</module>

pigx-gateway/pom.xml

@@ -46,7 +46,6 @@
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pigx-common-gateway</artifactId>
-			<version>2.2.0</version>
 		</dependency>
 		<!--配置中心客户端-->
 		<dependency>
@@ -63,7 +62,6 @@
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pigx-common-core</artifactId>
-			<version>2.2.0</version>
 		</dependency>
 		<!--缓存-->
 		<dependency>

pigx-upms/pigx-upms-api/pom.xml

@@ -38,13 +38,11 @@
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pigx-common-core</artifactId>
-			<version>2.2.0</version>
 		</dependency>
 		<!--mybatis plus extension,包含了mybatis plus core-->
 		<dependency>
 			<groupId>com.baomidou</groupId>
 			<artifactId>mybatis-plus-extension</artifactId>
-			<version>${mybatis-plus.version}</version>
 		</dependency>
 	</dependencies>
 </project>

pigx-upms/pigx-upms-biz/pom.xml

@@ -37,36 +37,25 @@
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pigx-upms-api</artifactId>
-			<version>2.2.0</version>
 		</dependency>
 		<!--日志处理-->
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pigx-common-log</artifactId>
-			<version>2.2.0</version>
-		</dependency>
-		<!--数据库操作-->
-		<dependency>
-			<groupId>mysql</groupId>
-			<artifactId>mysql-connector-java</artifactId>
-			<version>${mysql.connector.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pigx-common-data</artifactId>
-			<version>2.2.0</version>
 		</dependency>
 		<!--swagger-->
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pigx-common-swagger</artifactId>
-			<version>2.2.0</version>
 		</dependency>
 		<!--文件系统-->
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pigx-common-minio</artifactId>
-			<version>2.2.0</version>
 		</dependency>
 		<!--eureka 客户端-->
 		<dependency>
@@ -82,25 +71,21 @@
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pigx-common-security</artifactId>
-			<version>2.2.0</version>
 		</dependency>
 		<!--支持动态路由配置 -->
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pigx-common-gateway</artifactId>
-			<version>2.2.0</version>
 		</dependency>
 		<!--mybatis-->
 		<dependency>
 			<groupId>com.baomidou</groupId>
 			<artifactId>mybatis-plus-boot-starter</artifactId>
-			<version>${mybatis-plus.version}</version>
 		</dependency>
 		<!--数据库-->
 		<dependency>
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>
-			<version>${mysql.connector.version}</version>
 		</dependency>
 		<!--web 模块-->
 		<dependency>

pigx-visual/pigx-activiti/pom.xml

@@ -41,29 +41,20 @@
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pigx-common-core</artifactId>
-			<version>2.2.0</version>
 		</dependency>
 		<!--数据依赖-->
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pigx-common-data</artifactId>
-			<version>2.2.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pigx-upms-api</artifactId>
-			<version>2.2.0</version>
 		</dependency>
 		<!--mybatis-->
 		<dependency>
 			<groupId>com.baomidou</groupId>
 			<artifactId>mybatis-plus-boot-starter</artifactId>
-			<version>${mybatis-plus.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>com.pig4cloud</groupId>
-			<artifactId>pigx-common-swagger</artifactId>
-			<version>2.2.0</version>
 		</dependency>
 		<!--websocket-->
 		<dependency>
@@ -85,7 +76,6 @@
 		<dependency>
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>
-			<version>${mysql.connector.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.activiti</groupId>
@@ -133,12 +123,10 @@
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pigx-common-swagger</artifactId>
-			<version>2.2.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pigx-common-security</artifactId>
-			<version>2.2.0</version>
 		</dependency>
 		<!--undertow容器-->
 		<dependency>

pigx-visual/pigx-codegen/pom.xml

@@ -24,36 +24,30 @@
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pigx-common-data</artifactId>
-			<version>2.2.0</version>
 		</dependency>
 		<!--mybatis-->
 		<dependency>
 			<groupId>com.baomidou</groupId>
 			<artifactId>mybatis-plus-boot-starter</artifactId>
-			<version>${mybatis-plus.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>
-			<version>${mysql.connector.version}</version>
 		</dependency>
 		<!--common-->
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pigx-common-core</artifactId>
-			<version>2.2.0</version>
 		</dependency>
 		<!--swagger-->
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pigx-common-swagger</artifactId>
-			<version>2.2.0</version>
 		</dependency>
 		<!--安全模块-->
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pigx-common-security</artifactId>
-			<version>2.2.0</version>
 		</dependency>
 		<!--代码生成模板引擎-->
 		<dependency>

pigx-visual/pigx-daemon/pom.xml

@@ -41,29 +41,24 @@
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pigx-common-job</artifactId>
-			<version>2.2.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pigx-common-swagger</artifactId>
-			<version>2.2.0</version>
 		</dependency>
 		<!--数据库-->
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pigx-common-data</artifactId>
-			<version>2.2.0</version>
 		</dependency>
 		<!--mybatis-->
 		<dependency>
 			<groupId>com.baomidou</groupId>
 			<artifactId>mybatis-plus-boot-starter</artifactId>
-			<version>${mybatis-plus.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>
-			<version>${mysql.connector.version}</version>
 		</dependency>
 		<!--ZK 依赖-->
 		<dependency>
@@ -76,17 +71,10 @@
 			<artifactId>curator-recipes</artifactId>
 			<version>${curator.version}</version>
 		</dependency>
-		<!--swagger -->
-		<dependency>
-			<groupId>com.pig4cloud</groupId>
-			<artifactId>pigx-common-swagger</artifactId>
-			<version>2.2.0</version>
-		</dependency>
 		<!-- 安全模块-->
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pigx-common-security</artifactId>
-			<version>2.2.0</version>
 		</dependency>
 		<!--web 模块-->
 		<dependency>

pigx-visual/pigx-tx-manager/pom.xml

@@ -63,7 +63,11 @@
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pigx-common-core</artifactId>
-			<version>2.2.0</version>
+		</dependency>
+		<!--缓存-->
+		<dependency>
+			<groupId>com.pig4cloud</groupId>
+			<artifactId>pigx-common-data</artifactId>
 		</dependency>
 	</dependencies>
 	<build>

pom.xml

@@ -44,13 +44,12 @@
 	<properties>
 		<spring-boot.version>2.1.2.RELEASE</spring-boot.version>
 		<spring-cloud.version>Greenwich.RELEASE</spring-cloud.version>
-		<spring-platform.version>Cairo-SR6</spring-platform.version>
+		<spring-platform.version>Cairo-SR7</spring-platform.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<maven.compiler.target>1.8</maven.compiler.target>
 		<spring-boot-admin.version>2.1.2</spring-boot-admin.version>
 		<hutool.version>4.3.2</hutool.version>
-		<mybatis-plus.version>3.0.6</mybatis-plus.version>
 		<kaptcha.version>0.0.9</kaptcha.version>
 		<swagger.version>2.9.2</swagger.version>
 		<curator.version>2.10.0</curator.version>
@@ -60,9 +59,7 @@
 		<ttl.version>2.10.1</ttl.version>
 		<minio.version>3.0.12</minio.version>
 		<elastic-job-lite.version>2.1.5</elastic-job-lite.version>
-		<mysql.connector.version>8.0.13</mysql.connector.version>
 		<security.oauth.version>2.3.4.RELEASE</security.oauth.version>
-		<jackson.modules>2.9.6</jackson.modules>
 		<activiti.version>5.22.0</activiti.version>
 		<docker.url>http://192.168.0.13:4243</docker.url>
 		<registry.url>192.168.0.13:5000</registry.url>
@@ -149,14 +146,14 @@
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
-			<!--jackson模块-->
 			<dependency>
-				<groupId>com.fasterxml.jackson.module</groupId>
-				<artifactId>jackson-modules-java8</artifactId>
-				<version>${jackson.modules}</version>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>pigx-common-bom</artifactId>
+				<version>${project.version}</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
+			<!--稳定版本，替代spring security 内置-->
 			<dependency>
 				<groupId>org.springframework.security.oauth</groupId>
 				<artifactId>spring-security-oauth2</artifactId>