From 429b1af7ad00312b90b0c2be6112903f06f2ed5f Mon Sep 17 00:00:00 2001
From: "Destiny.Lin" <destiny.lin@fanruan.com>
Date: Mon, 26 Aug 2024 15:13:15 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=97=A0jira=E4=BB=BB=E5=8A=A1=EF=BC=8C?=
=?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=89=93=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../fanruan/boot/env/DesignEnvComponent.java | 30 +++++++++----------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/designer-realize/src/main/java/com/fanruan/boot/env/DesignEnvComponent.java b/designer-realize/src/main/java/com/fanruan/boot/env/DesignEnvComponent.java
index 7c9350430a..551455aeab 100644
--- a/designer-realize/src/main/java/com/fanruan/boot/env/DesignEnvComponent.java
+++ b/designer-realize/src/main/java/com/fanruan/boot/env/DesignEnvComponent.java
@@ -239,27 +239,27 @@ public class DesignEnvComponent {
* ----------- logger --------
*/
private void startLogger() {
- String realPath = Carina.properties(LoggerProperties.class).getXml();
- URI uri = Log4jUtils.buildUserConfigURI(realPath);
+ URI uri = Log4jUtils.buildUserConfigURI(StringUtils.EMPTY);
FRLogger.getLogger().config(uri);
// 日志配置更新的监听在FRLogger里面，fbp去掉了但是设计器本地还是需要这个监听的，初始化的时候监听一下
listenConfig();
}
private void listenConfig() {
- ValidateConfigManger.getInstance().registerListener(new ConfigChangeListener() {
-
- @Override
- public boolean accept(Class<? extends Configuration> configClass) {
- return configClass.equals(Log4jConfig.class);
- }
-
- @Override
- public void change() {
- // The root logger is the topmost logger with a name of "" (the empty string).
- Configurator.setAllLevels("", Log4jConfig.getInstance().getRootLevel());
- }
- });
+// 等fbp改完，现在先配合打包注释掉
+// ValidateConfigManger.getInstance().registerListener(new ConfigChangeListener() {
+//
+// @Override
+// public boolean accept(Class<? extends Configuration> configClass) {
+// return configClass.equals(Log4jConfig.class);
+// }
+//
+// @Override
+// public void change() {
+// // The root logger is the topmost logger with a name of "" (the empty string).
+// Configurator.setAllLevels("", Log4jConfig.getInstance().getRootLevel());
+// }
+// });
}
From 874b67c1151583445ca8f63548b5bb8665c47ea1 Mon Sep 17 00:00:00 2001
From: "Destiny.Lin" <destiny.lin@fanruan.com>
Date: Mon, 26 Aug 2024 15:14:32 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=97=A0jira=E4=BB=BB=E5=8A=A1=EF=BC=8C?=
=?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=89=93=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/main/java/com/fanruan/boot/env/DesignEnvComponent.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/designer-realize/src/main/java/com/fanruan/boot/env/DesignEnvComponent.java b/designer-realize/src/main/java/com/fanruan/boot/env/DesignEnvComponent.java
index 551455aeab..95bcc301aa 100644
--- a/designer-realize/src/main/java/com/fanruan/boot/env/DesignEnvComponent.java
+++ b/designer-realize/src/main/java/com/fanruan/boot/env/DesignEnvComponent.java
@@ -246,7 +246,7 @@ public class DesignEnvComponent {
}
private void listenConfig() {
-// 等fbp改完，现在先配合打包注释掉
+/// 等fbp改完，现在先配合打包注释掉
// ValidateConfigManger.getInstance().registerListener(new ConfigChangeListener() {
//
// @Override