From 5cfcf94647adf9f4ab1fcd39622ecd72f7aa342d Mon Sep 17 00:00:00 2001 From: "Destiny.Lin" Date: Tue, 13 Aug 2024 14:47:09 +0800 Subject: [PATCH 1/2] =?UTF-8?q?REPORT-130348=20=20=E6=8E=A7=E4=BB=B6?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E8=AF=BB=E5=8F=96=E7=9A=84=E5=86=85=E5=AE=B9?= =?UTF-8?q?=EF=BC=8C=E6=9C=AC=E5=9C=B0=E5=92=8C=E8=BF=9C=E7=A8=8B=E6=84=9F?= =?UTF-8?q?=E8=A7=89=E8=AF=BB=E7=9A=84=E6=98=AF=E5=90=8C=E4=B8=80=E5=A5=97?= 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, 2 insertions(+) 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 3ac33e309a..7c9350430a 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 @@ -31,6 +31,7 @@ import com.fr.cbb.dialect.security.InsecurityElementFactory; import com.fr.cluster.ClusterBridge; import com.fr.cluster.lock.ClusterLock; import com.fr.config.BaseDBEnv; +import com.fr.config.ConfigContext; import com.fr.config.ConfigEvent; import com.fr.config.Configuration; import com.fr.config.FinalPreferenceConfig; @@ -361,6 +362,7 @@ public class DesignEnvComponent { DaoContext.setEntityDao(null); DaoContext.setXmlEntityDao(null); Configurations.setHelper(null); + ConfigContext.destroyAllConfig(); } /** From c80d70652d4d3af72b37768ef5dd377db27238ca Mon Sep 17 00:00:00 2001 From: "Destiny.Lin" Date: Tue, 13 Aug 2024 15:25:20 +0800 Subject: [PATCH 2/2] =?UTF-8?q?REPORT-114392=20FR-FBP=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E8=AE=BE=E8=AE=A1=E9=80=82=E9=85=8D=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8F=82=E6=95=B0=E9=9D=A2=E6=9D=BF=E7=BB=86?= =?UTF-8?q?=E8=8A=82=E9=97=AE=E9=A2=98=EF=BC=8C=E5=8E=BB=E9=99=A4decode?= =?UTF-8?q?=EF=BC=8C=E5=90=8E=E7=BB=AD=E5=86=8D=E8=80=83=E8=99=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/tabledata/tabledatapane/ProcedureDataPane.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ProcedureDataPane.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ProcedureDataPane.java index 3829fc2a3c..8a4fb92073 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ProcedureDataPane.java +++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ProcedureDataPane.java @@ -35,6 +35,8 @@ import com.fr.design.utils.gui.GUICoreUtils; import com.fr.log.FineLoggerFactory; import com.fr.stable.ArrayUtils; import com.fr.stable.StringUtils; +import com.fr.workspace.server.entity.connection.ConnectionBean; +import com.fr.workspace.server.repository.connection.ConnectionRepository; import javax.swing.BorderFactory; import javax.swing.Box; @@ -176,8 +178,9 @@ public class ProcedureDataPane extends AbstractTableDataPane imp } private boolean isAutoParameterDatabase() { - Connection connection = ConnectionConfigProviderFactory.getConfigProvider().getConnection(connectionTableProcedurePane.getSelectedDatabaseConnnectonName()); - return connection == null ? false : ArrayUtils.contains(DRIVERS, connection.getDriver()); + ConnectionBean bean = ConnectionRepository.getInstance().getByName(connectionTableProcedurePane.getSelectedDatabaseConnnectonName()); + Connection connection = bean == null ? null : bean.getConnection(); + return connection != null && ArrayUtils.contains(DRIVERS, connection.getDriver()); } @Override