From 97ed79b7f6016c47027f047b1f1ffa31245f0887 Mon Sep 17 00:00:00 2001
From: qraddx <eoyacm81453@unionstone.com.cn>
Date: Thu, 17 Feb 2022 15:20:45 +0800
Subject: [PATCH] =?UTF-8?q?:bug:=20Fixing=20a=20bug.=20=20=E5=88=86?=
 =?UTF-8?q?=E5=B8=83=E5=BC=8F=E4=BA=8B=E5=8A=A1=E5=85=BC=E5=AE=B9=20Spring?=
 =?UTF-8?q?Boot=202.6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tx/init/ApplicationTxInitializer.java     | 26 +++++++++++++++++++
 .../main/resources/META-INF/spring.factories  |  2 ++
 pigx-upms/pigx-upms-biz/pom.xml               |  5 ++++
 .../src/main/resources/logback-spring.xml     |  2 +-
 pigx-visual/pigx-codegen/pom.xml              |  5 ++++
 .../src/main/resources/application.yml        |  3 +++
 6 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 pigx-common/pigx-common-transaction/src/main/java/com/pig4cloud/pigx/common/transaction/tx/init/ApplicationTxInitializer.java
 create mode 100644 pigx-visual/pigx-tx-manager/src/main/resources/application.yml

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
+ * <p>
+ * 通过环境变量的形式注入 允许循环依赖
+ */
+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 @@
 	<description>pigx 通用用户权限管理系统业务处理模块</description>
 
 	<dependencies>
+		<!--工具类核心包-->
+		<dependency>
+			<groupId>com.pig4cloud</groupId>
+			<artifactId>pigx-common-transaction</artifactId>
+		</dependency>
 		<!-- mysql -->
 		<dependency>
 			<groupId>mysql</groupId>
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 @@
 	</logger>
 
 	<!-- Level: FATAL 0  ERROR 3  WARN 4  INFO 6  DEBUG 7 -->
-	<root level="debug">
+	<root level="INFO">
 		<appender-ref ref="console"/>
 		<appender-ref ref="debug"/>
 	</root>
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 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-undertow</artifactId>
 		</dependency>
+		<!--工具类核心包-->
+		<dependency>
+			<groupId>com.pig4cloud</groupId>
+			<artifactId>pigx-common-transaction</artifactId>
+		</dependency>
 	</dependencies>
 
 	<build>
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