From 2275bcfbf840cda65c04a61e3e23e9512e28621a Mon Sep 17 00:00:00 2001 From: "Destiny.Lin" Date: Thu, 12 Dec 2024 10:47:32 +0800 Subject: [PATCH 1/5] =?UTF-8?q?REPORT-143610=20fr=E6=97=A0=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C=E6=8F=90=E7=A4=BA?= =?UTF-8?q?npe?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/fr/design/env/HttpWorkspaceConnector.java | 3 ++- .../java/com/fanruan/boot/init/DesignWorkContextComponent.java | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/env/HttpWorkspaceConnector.java b/designer-base/src/main/java/com/fr/design/env/HttpWorkspaceConnector.java index 47b67e6463..f8a4cc6739 100644 --- a/designer-base/src/main/java/com/fr/design/env/HttpWorkspaceConnector.java +++ b/designer-base/src/main/java/com/fr/design/env/HttpWorkspaceConnector.java @@ -3,6 +3,7 @@ package com.fr.design.env; import com.fanruan.workplace.http.HttpConstants; import com.fanruan.workplace.http.HttpServiceMap; import com.fanruan.workplace.http.RepositoryManager; +import com.fanruan.workplace.http.exception.RemoteServiceErrorException; import com.fanruan.workplace.http.info.Stub; import com.fanruan.workplace.network.RemoteNetworkRepository; import com.fr.decision.webservice.bean.authentication.LoginRequestInfoBean; @@ -86,7 +87,7 @@ public class HttpWorkspaceConnector implements WorkspaceConnector { client.setTimeout(timeout); try { return RemoteNetworkRepository.getInstance().testConnect(); - } catch (RemoteDesignNoAuthException e) { + } catch (RemoteDesignNoAuthException | RemoteServiceErrorException e) { throw e; } catch (Exception e) { throw new RemoteDesignConnectionException(e, StringUtils.EMPTY); diff --git a/designer-realize/src/main/java/com/fanruan/boot/init/DesignWorkContextComponent.java b/designer-realize/src/main/java/com/fanruan/boot/init/DesignWorkContextComponent.java index dfba3b1279..74de42cc43 100644 --- a/designer-realize/src/main/java/com/fanruan/boot/init/DesignWorkContextComponent.java +++ b/designer-realize/src/main/java/com/fanruan/boot/init/DesignWorkContextComponent.java @@ -15,6 +15,7 @@ import com.fanruan.workplace.http.RepositoryManager; import com.fanruan.workplace.http.WorkspaceHeartBeatShell; import com.fanruan.workplace.http.exception.DefaultRemoteExceptionHandler; import com.fanruan.workplace.http.exception.RemoteExceptionConvert; +import com.fanruan.workplace.http.exception.RemoteServiceErrorExceptionHandler; import com.fanruan.workplace.network.RemoteNetworkRepository; import com.fanruan.workplace.standard.ServerInfo; import com.fanruan.workplace.standard.ServerInfoOperator; @@ -160,6 +161,7 @@ public class DesignWorkContextComponent { RemoteExceptionConvert.registerException(HttpConstants.LOGIN_LOCK, new RemoteDesignLoginLockHandler()); RemoteExceptionConvert.registerException(HttpConstants.TPL_HAS_BEAN_UNLOCK, new UnLockedHandler()); RemoteExceptionConvert.registerException(HttpConstants.DRIVER_NOT_EXIST, new RemoteDriverUnExistHandler()); + RemoteExceptionConvert.registerException(HttpConstants.SERVICE_ERROR, new RemoteServiceErrorExceptionHandler()); DefaultRemoteExceptionHandler.getInstance().registerMatchMsg(ERROR_CODE, new RemoteProcedureErrorHandler()); } From 2eb2b4c73eacbf5a78a50aa98e51c78bf8530e08 Mon Sep 17 00:00:00 2001 From: "Destiny.Lin" Date: Fri, 13 Dec 2024 16:16:48 +0800 Subject: [PATCH 2/5] =?UTF-8?q?REPORT-143716=20=E8=BF=9C=E7=A8=8B=E8=AE=BE?= =?UTF-8?q?=E8=AE=A1=E5=90=AF=E5=8A=A8=E5=8D=A1=E4=BD=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../boot/env/function/DesignComponent.java | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/designer-realize/src/main/java/com/fanruan/boot/env/function/DesignComponent.java b/designer-realize/src/main/java/com/fanruan/boot/env/function/DesignComponent.java index 06fe5526a2..a0601752d7 100644 --- a/designer-realize/src/main/java/com/fanruan/boot/env/function/DesignComponent.java +++ b/designer-realize/src/main/java/com/fanruan/boot/env/function/DesignComponent.java @@ -17,15 +17,12 @@ import com.fr.base.process.ProcessOperator; import com.fr.base.theme.migrator.FormThemeConfigMigrator; import com.fr.base.theme.migrator.ReportThemeConfigMigrator; import com.fr.chart.chartattr.ChartCollection; -import com.fr.config.ServerPreferenceConfig; -import com.fr.data.core.db.dml.Update; import com.fr.decision.update.backup.RecoverManager; import com.fr.decision.webservice.v10.plugin.helper.category.impl.PluginResourceLoader; import com.fr.decision.webservice.v10.plugin.helper.category.impl.UpmResourceLoader; import com.fr.design.DesignerEnvManager; import com.fr.design.ExtraDesignClassManager; import com.fr.design.RPCConnectHandlerCenter; -import com.fr.design.actions.NewFormAction; import com.fr.design.actions.UpdateAction; import com.fr.design.actions.core.ActionFactory; import com.fr.design.actions.insert.cell.BiasCellAction; @@ -122,26 +119,22 @@ import com.fr.plugin.manage.PluginFilter; import com.fr.plugin.observer.PluginEvent; import com.fr.plugin.observer.PluginEventListener; import com.fr.quickeditor.cellquick.CellBiasTextPainterEditor; -import com.fr.quickeditor.cellquick.CellDSColumnEditor; import com.fr.quickeditor.cellquick.CellFormulaQuickEditor; import com.fr.quickeditor.cellquick.CellImageQuickEditor; import com.fr.quickeditor.cellquick.CellRichTextEditor; import com.fr.quickeditor.cellquick.CellStringQuickEditor; import com.fr.quickeditor.cellquick.CellSubReportEditor; -import com.fr.quickeditor.chartquick.BasicChartQuickEditor; import com.fr.quickeditor.chartquick.FloatChartQuickEditor; import com.fr.quickeditor.floatquick.FloatImageQuickEditor; import com.fr.quickeditor.floatquick.FloatStringQuickEditor; import com.fr.report.cell.CellElementValueConverter; import com.fr.report.cell.cellattr.core.RichText; import com.fr.report.cell.cellattr.core.SubReport; -import com.fr.report.cell.cellattr.core.group.DSColumn; import com.fr.report.cell.painter.BiasTextPainter; import com.fr.report.cell.painter.CellImagePainter; import com.fr.stable.ArrayUtils; import com.fr.stable.ParameterProvider; import com.fr.stable.bridge.StableFactory; -import com.fr.stable.os.support.OSBasedAction; import com.fr.stable.os.support.OSSupportCenter; import com.fr.stable.plugin.ExtraDesignClassManagerProvider; import com.fr.stable.script.CalculatorProviderContext; @@ -149,7 +142,6 @@ import com.fr.stable.script.ValueConverter; import com.fr.stable.xml.ObjectTokenizer; import com.fr.stable.xml.ObjectXMLWriterFinder; import com.fr.start.BBSGuestPaneProvider; -import com.fr.start.common.DesignerStartupExecutor; import com.fr.start.common.DesignerStartupPool; import com.fr.task.Once; import com.fr.workspace.WorkContext; @@ -198,8 +190,10 @@ public class DesignComponent { } } CompletableFuture themeConfigPrepare = CompletableFuture.runAsync(() -> { - FormThemeConfigMigrator.getInstance().upgrade(); - ReportThemeConfigMigrator.getInstance().upgrade(); + if (WorkContext.getCurrent().isLocal()) { + FormThemeConfigMigrator.getInstance().upgrade(); + ReportThemeConfigMigrator.getInstance().upgrade(); + } }, DesignerStartupPool.common()); CompletableFuture mainDesignerPrepare = CompletableFuture.runAsync(this::designerModuleStart, DesignerStartupPool.common()); CompletableFuture extendDesignerPrepare = CompletableFuture.runAsync(this::designerExtendStart, DesignerStartupPool.common()); @@ -426,7 +420,7 @@ public class DesignComponent { ActionFactory.registerAsyncInitCellEditorClass(BaseFormula.class, CellFormulaQuickEditor.class); ActionFactory.registerAsyncInitCellEditorClass(SubReport.class, CellSubReportEditor.class); ActionFactory.registerAsyncInitCellEditorClass(RichText.class, CellRichTextEditor.class); - ActionFactory.registerAsyncInitCellEditorClass(DSColumn.class, CellDSColumnEditor.class); +// ActionFactory.registerAsyncInitCellEditorClass(DSColumn.class, CellDSColumnEditor.class); ActionFactory.registerAsyncInitCellEditorClass(Image.class, CellImageQuickEditor.class); ActionFactory.registerAsyncInitCellEditorClass(BiasTextPainter.class, CellBiasTextPainterEditor.class); ActionFactory.registerAsyncInitCellEditorClass(BufferedImage.class, CellImageQuickEditor.class); From 84bf19fec31a72e70fa232e419fc35b510ca8980 Mon Sep 17 00:00:00 2001 From: "Destiny.Lin" Date: Fri, 13 Dec 2024 16:23:04 +0800 Subject: [PATCH 3/5] =?UTF-8?q?REPORT-143716=20=E8=BF=9C=E7=A8=8B=E8=AE=BE?= =?UTF-8?q?=E8=AE=A1=E5=90=AF=E5=8A=A8=E5=8D=A1=E4=BD=8F=20=E5=9B=9E?= =?UTF-8?q?=E9=80=80=E5=A4=9A=E6=8F=90=E4=BA=A4=E7=9A=84=E9=83=A8=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fanruan/boot/env/function/DesignComponent.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/designer-realize/src/main/java/com/fanruan/boot/env/function/DesignComponent.java b/designer-realize/src/main/java/com/fanruan/boot/env/function/DesignComponent.java index a0601752d7..ba5072c8c4 100644 --- a/designer-realize/src/main/java/com/fanruan/boot/env/function/DesignComponent.java +++ b/designer-realize/src/main/java/com/fanruan/boot/env/function/DesignComponent.java @@ -119,6 +119,7 @@ import com.fr.plugin.manage.PluginFilter; import com.fr.plugin.observer.PluginEvent; import com.fr.plugin.observer.PluginEventListener; import com.fr.quickeditor.cellquick.CellBiasTextPainterEditor; +import com.fr.quickeditor.cellquick.CellDSColumnEditor; import com.fr.quickeditor.cellquick.CellFormulaQuickEditor; import com.fr.quickeditor.cellquick.CellImageQuickEditor; import com.fr.quickeditor.cellquick.CellRichTextEditor; @@ -130,6 +131,7 @@ import com.fr.quickeditor.floatquick.FloatStringQuickEditor; import com.fr.report.cell.CellElementValueConverter; import com.fr.report.cell.cellattr.core.RichText; import com.fr.report.cell.cellattr.core.SubReport; +import com.fr.report.cell.cellattr.core.group.DSColumn; import com.fr.report.cell.painter.BiasTextPainter; import com.fr.report.cell.painter.CellImagePainter; import com.fr.stable.ArrayUtils; @@ -147,7 +149,7 @@ import com.fr.task.Once; import com.fr.workspace.WorkContext; import com.fr.xml.ReportXMLUtils; -import javax.swing.SwingWorker; +import javax.swing.*; import java.awt.*; import java.awt.image.BufferedImage; import java.util.ArrayList; @@ -420,7 +422,7 @@ public class DesignComponent { ActionFactory.registerAsyncInitCellEditorClass(BaseFormula.class, CellFormulaQuickEditor.class); ActionFactory.registerAsyncInitCellEditorClass(SubReport.class, CellSubReportEditor.class); ActionFactory.registerAsyncInitCellEditorClass(RichText.class, CellRichTextEditor.class); -// ActionFactory.registerAsyncInitCellEditorClass(DSColumn.class, CellDSColumnEditor.class); + ActionFactory.registerAsyncInitCellEditorClass(DSColumn.class, CellDSColumnEditor.class); ActionFactory.registerAsyncInitCellEditorClass(Image.class, CellImageQuickEditor.class); ActionFactory.registerAsyncInitCellEditorClass(BiasTextPainter.class, CellBiasTextPainterEditor.class); ActionFactory.registerAsyncInitCellEditorClass(BufferedImage.class, CellImageQuickEditor.class); From 4601905d17ce3131772b20aeb4a0dec42b8cf65f Mon Sep 17 00:00:00 2001 From: "Destiny.Lin" Date: Fri, 13 Dec 2024 16:23:56 +0800 Subject: [PATCH 4/5] =?UTF-8?q?REPORT-143716=20=E8=BF=9C=E7=A8=8B=E8=AE=BE?= =?UTF-8?q?=E8=AE=A1=E5=90=AF=E5=8A=A8=E5=8D=A1=E4=BD=8F=20=E5=9B=9E?= =?UTF-8?q?=E9=80=80=E5=A4=9A=E6=8F=90=E4=BA=A4=E7=9A=84=E9=83=A8=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fanruan/boot/env/function/DesignComponent.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-realize/src/main/java/com/fanruan/boot/env/function/DesignComponent.java b/designer-realize/src/main/java/com/fanruan/boot/env/function/DesignComponent.java index ba5072c8c4..297d3950f0 100644 --- a/designer-realize/src/main/java/com/fanruan/boot/env/function/DesignComponent.java +++ b/designer-realize/src/main/java/com/fanruan/boot/env/function/DesignComponent.java @@ -149,7 +149,7 @@ import com.fr.task.Once; import com.fr.workspace.WorkContext; import com.fr.xml.ReportXMLUtils; -import javax.swing.*; +import javax.swing.SwingWorker; import java.awt.*; import java.awt.image.BufferedImage; import java.util.ArrayList; From ef18ddf8c855beb8c5e4be31f59001c2e8693a3c Mon Sep 17 00:00:00 2001 From: Anner Date: Tue, 17 Dec 2024 11:36:58 +0800 Subject: [PATCH 5/5] =?UTF-8?q?REPORT-144358=20fix:=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E5=99=A8=E5=90=AF=E5=8A=A8=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E6=B3=A8=E5=86=8C=E6=A8=A1=E5=9D=97=E5=A4=B1=E8=B4=A5=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../boot/adaptation/DesignServerSupportModule.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/designer-realize/src/main/java/com/fanruan/boot/adaptation/DesignServerSupportModule.java b/designer-realize/src/main/java/com/fanruan/boot/adaptation/DesignServerSupportModule.java index 985bcc8e22..ebf1bf57e6 100644 --- a/designer-realize/src/main/java/com/fanruan/boot/adaptation/DesignServerSupportModule.java +++ b/designer-realize/src/main/java/com/fanruan/boot/adaptation/DesignServerSupportModule.java @@ -1,10 +1,13 @@ package com.fanruan.boot.adaptation; -import com.fanruan.carina.Carina; -import com.fanruan.carina.context.ContextListener; +import com.fanruan.carina.event.CarinaLifecycleEvent; import com.fanruan.portal.authority.PortalAuthorityItems; import com.fanruan.portal.module.PortalModule; import com.fanruan.portal.module.PortalModuleManager; +import com.fr.event.Event; +import com.fr.event.EventDispatcher; +import com.fr.event.Listener; +import com.fr.log.FineLoggerFactory; import com.fr.stable.StringUtils; import com.fr.third.guava.collect.Sets; @@ -94,14 +97,17 @@ public class DesignServerSupportModule { * 启动入口，重建一下展示的module */ public static void rebuild() { - Carina.getApplicationContext().addListener(new ContextListener() { + + EventDispatcher.listen(CarinaLifecycleEvent.AFTER_START, new Listener() { @Override - public void onStart() { + public void on(Event event, Object o) { + FineLoggerFactory.getLogger().info("start unregister module for embed design server"); PortalModuleManager.allModules().values().stream() .filter(m -> !StringUtils.equals(m.getParentID(), PortalAuthorityItems.PORTAL_ROOT_ID)) .map(PortalModule::getId) .filter(m -> !SUPPORT_MODULE.contains(m)) .forEach(PortalModuleManager::unregister); + FineLoggerFactory.getLogger().info("unregister module for embed design server done"); } }); }