diff --git a/pigx-common/pigx-common-transaction/src/main/java/com/pig4cloud/pigx/common/transaction/tx/init/ApplicationTxInitializer.java b/pigx-common/pigx-common-transaction/src/main/java/com/pig4cloud/pigx/common/transaction/tx/init/ApplicationTxInitializer.java new file mode 100644 index 000000000..670a7ddd8 --- /dev/null +++ b/pigx-common/pigx-common-transaction/src/main/java/com/pig4cloud/pigx/common/transaction/tx/init/ApplicationTxInitializer.java @@ -0,0 +1,26 @@ +package com.pig4cloud.pigx.common.transaction.tx.init; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.env.EnvironmentPostProcessor; +import org.springframework.core.Ordered; +import org.springframework.core.env.ConfigurableEnvironment; + +/** + * @author lengleng + * @date 22022-02-17 + *

+ * 通过环境变量的形式注入 允许循环依赖 + */ +public class ApplicationTxInitializer implements EnvironmentPostProcessor, Ordered { + + @Override + public void postProcessEnvironment(ConfigurableEnvironment environment, SpringApplication application) { + System.setProperty("spring.main.allow-circular-references", "true"); + } + + @Override + public int getOrder() { + return Ordered.LOWEST_PRECEDENCE; + } + +} diff --git a/pigx-common/pigx-common-transaction/src/main/resources/META-INF/spring.factories b/pigx-common/pigx-common-transaction/src/main/resources/META-INF/spring.factories index 7de3128b7..b4aa57cf6 100644 --- a/pigx-common/pigx-common-transaction/src/main/resources/META-INF/spring.factories +++ b/pigx-common/pigx-common-transaction/src/main/resources/META-INF/spring.factories @@ -1 +1,3 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=com.pig4cloud.pigx.common.transaction.TransactionConfiguration +org.springframework.boot.env.EnvironmentPostProcessor=\ + com.pig4cloud.pigx.common.transaction.tx.init.ApplicationTxInitializer diff --git a/pigx-upms/pigx-upms-biz/pom.xml b/pigx-upms/pigx-upms-biz/pom.xml index c6b330d54..2d6d5e3f5 100644 --- a/pigx-upms/pigx-upms-biz/pom.xml +++ b/pigx-upms/pigx-upms-biz/pom.xml @@ -33,6 +33,11 @@ pigx 通用用户权限管理系统业务处理模块 + + + com.pig4cloud + pigx-common-transaction + mysql diff --git a/pigx-upms/pigx-upms-biz/src/main/resources/logback-spring.xml b/pigx-upms/pigx-upms-biz/src/main/resources/logback-spring.xml index ad5c62247..db4c129de 100644 --- a/pigx-upms/pigx-upms-biz/src/main/resources/logback-spring.xml +++ b/pigx-upms/pigx-upms-biz/src/main/resources/logback-spring.xml @@ -60,7 +60,7 @@ - + diff --git a/pigx-visual/pigx-codegen/pom.xml b/pigx-visual/pigx-codegen/pom.xml index ecfc6eac6..0892a9cee 100755 --- a/pigx-visual/pigx-codegen/pom.xml +++ b/pigx-visual/pigx-codegen/pom.xml @@ -141,6 +141,11 @@ org.springframework.boot spring-boot-starter-undertow + + + com.pig4cloud + pigx-common-transaction + diff --git a/pigx-visual/pigx-tx-manager/src/main/resources/application.yml b/pigx-visual/pigx-tx-manager/src/main/resources/application.yml new file mode 100644 index 000000000..ac4fd1924 --- /dev/null +++ b/pigx-visual/pigx-tx-manager/src/main/resources/application.yml @@ -0,0 +1,3 @@ +spring: + main: + allow-circular-references: true