diff --git a/pigx-auth/pom.xml b/pigx-auth/pom.xml
index 9b6b628b3..066a46317 100644
--- a/pigx-auth/pom.xml
+++ b/pigx-auth/pom.xml
@@ -42,25 +42,21 @@
com.pig4cloud
pigx-upms-api
- 2.2.0
com.pig4cloud
pigx-common-security
- 2.2.0
mysql
mysql-connector-java
- ${mysql.connector.version}
com.pig4cloud
pigx-common-data
- 2.2.0
diff --git a/pigx-common/pigx-common-bom/pom.xml b/pigx-common/pigx-common-bom/pom.xml
new file mode 100644
index 000000000..862f033e4
--- /dev/null
+++ b/pigx-common/pigx-common-bom/pom.xml
@@ -0,0 +1,107 @@
+
+
+ 4.0.0
+
+ spring-cloud-dependencies-parent
+ org.springframework.cloud
+ 2.0.4.RELEASE
+
+
+
+ pigx-common-bom
+ pom
+ 2.2.0
+ pigx 公共版本控制
+
+
+ 2.2.0
+ 2.9.6
+ 3.0.6
+ 8.0.13
+
+
+
+
+
+
+ com.pig4cloud
+ pigx-common-core
+ ${pigx.version}
+
+
+ com.pig4cloud
+ pigx-common-data
+ ${pigx.version}
+
+
+ com.pig4cloud
+ pigx-common-gateway
+ ${pigx.version}
+
+
+ com.pig4cloud
+ pigx-common-job
+ ${pigx.version}
+
+
+ com.pig4cloud
+ pigx-common-log
+ ${pigx.version}
+
+
+ com.pig4cloud
+ pigx-common-minio
+ ${pigx.version}
+
+
+ com.pig4cloud
+ pigx-common-security
+ ${pigx.version}
+
+
+ com.pig4cloud
+ pigx-common-swagger
+ ${pigx.version}
+
+
+ com.pig4cloud
+ pigx-common-transaction
+ ${pigx.version}
+
+
+ com.pig4cloud
+ pigx-upms-api
+ ${pigx.version}
+
+
+
+
+ com.fasterxml.jackson.module
+ jackson-modules-java8
+ ${jackson.modules}
+ pom
+ import
+
+
+
+ com.baomidou
+ mybatis-plus-extension
+ ${mybatis-plus.version}
+
+
+
+ com.baomidou
+ mybatis-plus-boot-starter
+ ${mybatis-plus.version}
+
+
+
+ mysql
+ mysql-connector-java
+ ${mysql.connector.version}
+
+
+
+
diff --git a/pigx-common/pigx-common-core/pom.xml b/pigx-common/pigx-common-core/pom.xml
index fd60b47b2..089c7a359 100644
--- a/pigx-common/pigx-common-core/pom.xml
+++ b/pigx-common/pigx-common-core/pom.xml
@@ -40,11 +40,6 @@
hutool-all
${hutool.version}
-
-
- org.springframework.boot
- spring-boot-starter-data-redis
-
javax.servlet
diff --git a/pigx-common/pigx-common-data/pom.xml b/pigx-common/pigx-common-data/pom.xml
index 145ad7d44..d497c7040 100644
--- a/pigx-common/pigx-common-data/pom.xml
+++ b/pigx-common/pigx-common-data/pom.xml
@@ -38,19 +38,16 @@
com.pig4cloud
pigx-common-core
- 2.2.0
com.baomidou
mybatis-plus-extension
- ${mybatis-plus.version}
com.pig4cloud
pigx-common-security
- 2.2.0
diff --git a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/tenant/TenantContextHolderFilter.java b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/tenant/TenantContextHolderFilter.java
index 2587decb4..22be47424 100644
--- a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/tenant/TenantContextHolderFilter.java
+++ b/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 {
diff --git a/pigx-common/pigx-common-gateway/pom.xml b/pigx-common/pigx-common-gateway/pom.xml
index 5915e6301..d4d9cc8e8 100644
--- a/pigx-common/pigx-common-gateway/pom.xml
+++ b/pigx-common/pigx-common-gateway/pom.xml
@@ -36,11 +36,14 @@
com.pig4cloud
pigx-common-core
- 2.2.0
org.springframework.cloud
spring-cloud-gateway-core
+
+ org.springframework.boot
+ spring-boot-starter-data-redis-reactive
+
diff --git a/pigx-common/pigx-common-log/pom.xml b/pigx-common/pigx-common-log/pom.xml
index 8b93bdfe5..0c4c20ff3 100644
--- a/pigx-common/pigx-common-log/pom.xml
+++ b/pigx-common/pigx-common-log/pom.xml
@@ -38,13 +38,11 @@
com.pig4cloud
pigx-common-core
- 2.2.0
com.pig4cloud
pigx-upms-api
- 2.2.0
diff --git a/pigx-common/pigx-common-security/pom.xml b/pigx-common/pigx-common-security/pom.xml
index e7f81d087..3e19282b2 100644
--- a/pigx-common/pigx-common-security/pom.xml
+++ b/pigx-common/pigx-common-security/pom.xml
@@ -38,7 +38,6 @@
com.pig4cloud
pigx-common-core
- 2.2.0
@@ -53,7 +52,6 @@
com.pig4cloud
pigx-upms-api
- 2.2.0
diff --git a/pigx-common/pigx-common-transaction/pom.xml b/pigx-common/pigx-common-transaction/pom.xml
index ed0be0314..8a6b9df31 100644
--- a/pigx-common/pigx-common-transaction/pom.xml
+++ b/pigx-common/pigx-common-transaction/pom.xml
@@ -17,7 +17,6 @@
com.pig4cloud
pigx-common-core
- 2.2.0
diff --git a/pigx-common/pom.xml b/pigx-common/pom.xml
index cc6f1a4de..a123e556d 100644
--- a/pigx-common/pom.xml
+++ b/pigx-common/pom.xml
@@ -33,6 +33,7 @@
pigx 公共聚合模块
+ pigx-common-bom
pigx-common-core
pigx-common-data
pigx-common-gateway
diff --git a/pigx-gateway/pom.xml b/pigx-gateway/pom.xml
index 45117cbae..a73d733be 100644
--- a/pigx-gateway/pom.xml
+++ b/pigx-gateway/pom.xml
@@ -46,7 +46,6 @@
com.pig4cloud
pigx-common-gateway
- 2.2.0
@@ -63,7 +62,6 @@
com.pig4cloud
pigx-common-core
- 2.2.0
diff --git a/pigx-upms/pigx-upms-api/pom.xml b/pigx-upms/pigx-upms-api/pom.xml
index 81a4f5fb8..1ca9037ad 100644
--- a/pigx-upms/pigx-upms-api/pom.xml
+++ b/pigx-upms/pigx-upms-api/pom.xml
@@ -38,13 +38,11 @@
com.pig4cloud
pigx-common-core
- 2.2.0
com.baomidou
mybatis-plus-extension
- ${mybatis-plus.version}
diff --git a/pigx-upms/pigx-upms-biz/pom.xml b/pigx-upms/pigx-upms-biz/pom.xml
index fae2f0b09..563f55bda 100644
--- a/pigx-upms/pigx-upms-biz/pom.xml
+++ b/pigx-upms/pigx-upms-biz/pom.xml
@@ -37,36 +37,25 @@
com.pig4cloud
pigx-upms-api
- 2.2.0
com.pig4cloud
pigx-common-log
- 2.2.0
-
-
-
- mysql
- mysql-connector-java
- ${mysql.connector.version}
com.pig4cloud
pigx-common-data
- 2.2.0
com.pig4cloud
pigx-common-swagger
- 2.2.0
com.pig4cloud
pigx-common-minio
- 2.2.0
@@ -82,25 +71,21 @@
com.pig4cloud
pigx-common-security
- 2.2.0
com.pig4cloud
pigx-common-gateway
- 2.2.0
com.baomidou
mybatis-plus-boot-starter
- ${mybatis-plus.version}
mysql
mysql-connector-java
- ${mysql.connector.version}
diff --git a/pigx-visual/pigx-activiti/pom.xml b/pigx-visual/pigx-activiti/pom.xml
index 490e57204..463a28260 100644
--- a/pigx-visual/pigx-activiti/pom.xml
+++ b/pigx-visual/pigx-activiti/pom.xml
@@ -41,29 +41,20 @@
com.pig4cloud
pigx-common-core
- 2.2.0
com.pig4cloud
pigx-common-data
- 2.2.0
com.pig4cloud
pigx-upms-api
- 2.2.0
com.baomidou
mybatis-plus-boot-starter
- ${mybatis-plus.version}
-
-
- com.pig4cloud
- pigx-common-swagger
- 2.2.0
@@ -85,7 +76,6 @@
mysql
mysql-connector-java
- ${mysql.connector.version}
org.activiti
@@ -133,12 +123,10 @@
com.pig4cloud
pigx-common-swagger
- 2.2.0
com.pig4cloud
pigx-common-security
- 2.2.0
diff --git a/pigx-visual/pigx-codegen/pom.xml b/pigx-visual/pigx-codegen/pom.xml
index ad803feb4..0d382fe61 100755
--- a/pigx-visual/pigx-codegen/pom.xml
+++ b/pigx-visual/pigx-codegen/pom.xml
@@ -24,36 +24,30 @@
com.pig4cloud
pigx-common-data
- 2.2.0
com.baomidou
mybatis-plus-boot-starter
- ${mybatis-plus.version}
mysql
mysql-connector-java
- ${mysql.connector.version}
com.pig4cloud
pigx-common-core
- 2.2.0
com.pig4cloud
pigx-common-swagger
- 2.2.0
com.pig4cloud
pigx-common-security
- 2.2.0
diff --git a/pigx-visual/pigx-daemon/pom.xml b/pigx-visual/pigx-daemon/pom.xml
index 4d2e8a6b8..58e2c6df1 100644
--- a/pigx-visual/pigx-daemon/pom.xml
+++ b/pigx-visual/pigx-daemon/pom.xml
@@ -41,29 +41,24 @@
com.pig4cloud
pigx-common-job
- 2.2.0
com.pig4cloud
pigx-common-swagger
- 2.2.0
com.pig4cloud
pigx-common-data
- 2.2.0
com.baomidou
mybatis-plus-boot-starter
- ${mybatis-plus.version}
mysql
mysql-connector-java
- ${mysql.connector.version}
@@ -76,17 +71,10 @@
curator-recipes
${curator.version}
-
-
- com.pig4cloud
- pigx-common-swagger
- 2.2.0
-
com.pig4cloud
pigx-common-security
- 2.2.0
diff --git a/pigx-visual/pigx-tx-manager/pom.xml b/pigx-visual/pigx-tx-manager/pom.xml
index 3e1d84e58..0d974f1cc 100644
--- a/pigx-visual/pigx-tx-manager/pom.xml
+++ b/pigx-visual/pigx-tx-manager/pom.xml
@@ -63,7 +63,11 @@
com.pig4cloud
pigx-common-core
- 2.2.0
+
+
+
+ com.pig4cloud
+ pigx-common-data
diff --git a/pom.xml b/pom.xml
index 2e97bbc66..da4b9bb38 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,13 +44,12 @@
2.1.2.RELEASE
Greenwich.RELEASE
- Cairo-SR6
+ Cairo-SR7
UTF-8
1.8
1.8
2.1.2
4.3.2
- 3.0.6
0.0.9
2.9.2
2.10.0
@@ -60,9 +59,7 @@
2.10.1
3.0.12
2.1.5
- 8.0.13
2.3.4.RELEASE
- 2.9.6
5.22.0
http://192.168.0.13:4243
192.168.0.13:5000
@@ -149,14 +146,14 @@
pom
import
-
- com.fasterxml.jackson.module
- jackson-modules-java8
- ${jackson.modules}
+ org.springframework.cloud
+ pigx-common-bom
+ ${project.version}
pom
import
+
org.springframework.security.oauth
spring-security-oauth2