From 369ec239f653c5969492ac638373c55f45429eec Mon Sep 17 00:00:00 2001 From: "Destiny.Lin" Date: Tue, 9 Jul 2024 15:50:38 +0800 Subject: [PATCH 1/8] =?UTF-8?q?REPORT-126558=20fbp=E8=AE=BE=E8=AE=A1?= =?UTF-8?q?=E5=99=A8=E2=80=94=E2=80=94=E6=96=B0=E5=BB=BA=E5=AD=98=E5=82=A8?= =?UTF-8?q?=E8=BF=87=E7=A8=8B=EF=BC=8C=E6=95=B0=E6=8D=AE=E8=BF=9E=E6=8E=A5?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=B8=80=E7=9B=B4=E5=8A=A0=E8=BD=BD=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/tabledata/tabledatapane/ProcedureDataPane.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 f52315372d..8e446f5963 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 @@ -32,6 +32,7 @@ import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.menu.SeparatorDef; import com.fr.design.menu.ToolBarDef; import com.fr.design.utils.gui.GUICoreUtils; +import com.fr.log.FineLoggerFactory; import com.fr.stable.ArrayUtils; import com.fr.stable.StringUtils; @@ -217,7 +218,11 @@ public class ProcedureDataPane extends AbstractTableDataPane imp @Override public void done() { - editorPane.populate(storeprocedure.getParameters()); + if (editorPane != null) { + editorPane.populate(storeprocedure.getParameters()); + } else { + FineLoggerFactory.getLogger().warn("editorPane is null!"); + } } }; From 610c27fe84fc6a048ec85cf75eaa9c353aa17cfb Mon Sep 17 00:00:00 2001 From: "Destiny.Lin" Date: Tue, 9 Jul 2024 16:46:52 +0800 Subject: [PATCH 2/8] =?UTF-8?q?REPORT-126587=20FBP=E9=80=82=E9=85=8D?= =?UTF-8?q?=E6=B5=8B=E8=AF=95-=E8=AE=BE=E8=AE=A1=E5=99=A8-=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E4=B8=AD=E6=B2=A1=E6=9C=89=E5=86=85=E7=BD=AE=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E5=99=A8=E7=9B=B8=E5=85=B3=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/env/HttpWorkspaceConnector.java | 2 ++ .../src/main/java/com/fr/env/handler/impl/CancelHandler.java | 2 ++ 2 files changed, 4 insertions(+) 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 27d6258bd0..f45964508c 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 @@ -1,6 +1,7 @@ package com.fr.design.env; import com.fanruan.workplace.http.HttpConstants; +import com.fanruan.workplace.http.RepositoryManager; import com.fr.stable.StringUtils; import com.fr.workspace.server.repository.authority.RemoteAuthorityRepository; import com.fr.workspace.server.repository.compatible.register.CompatibleRegister; @@ -64,6 +65,7 @@ public class HttpWorkspaceConnector implements WorkspaceConnector { } client.startHeartBeat(); CompatibleRegister.registerCompatibleEnv(); + RepositoryManager.getInstance().clearLastPool(); return client; } diff --git a/designer-base/src/main/java/com/fr/env/handler/impl/CancelHandler.java b/designer-base/src/main/java/com/fr/env/handler/impl/CancelHandler.java index 140d0ec136..cd7f737eec 100644 --- a/designer-base/src/main/java/com/fr/env/handler/impl/CancelHandler.java +++ b/designer-base/src/main/java/com/fr/env/handler/impl/CancelHandler.java @@ -1,5 +1,6 @@ package com.fr.env.handler.impl; +import com.fanruan.workplace.http.RepositoryManager; import com.fr.env.handler.Handler; import com.fr.env.handler.RefWrapper; import com.fr.env.handler.ResultWrapper; @@ -17,6 +18,7 @@ public class CancelHandler implements Handler { @Override public ResultWrapper handle(RefWrapper wrapper) { Throwable e = wrapper.getThrowable(); + RepositoryManager.getInstance().rollBack(); return new ResultWrapper(!(e instanceof CancellationException), e); } } From 72a9fe75f423ca5176ccea0aeb02494c43447a84 Mon Sep 17 00:00:00 2001 From: "Destiny.Lin" Date: Tue, 9 Jul 2024 17:34:27 +0800 Subject: [PATCH 3/8] =?UTF-8?q?REPORT-126504=20=E6=9D=A1=E4=BB=B6=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=E6=93=8D=E4=BD=9C=E7=AC=A6=E6=96=87=E6=9C=AC=E4=B8=8D?= =?UTF-8?q?=E6=AD=A3=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fanruan/boot/init/DesignPreLoadComponent.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/designer-realize/src/main/java/com/fanruan/boot/init/DesignPreLoadComponent.java b/designer-realize/src/main/java/com/fanruan/boot/init/DesignPreLoadComponent.java index 8e2f939ffe..744ce4b65c 100644 --- a/designer-realize/src/main/java/com/fanruan/boot/init/DesignPreLoadComponent.java +++ b/designer-realize/src/main/java/com/fanruan/boot/init/DesignPreLoadComponent.java @@ -159,6 +159,14 @@ public class DesignPreLoadComponent { Carina.getApplicationContext().group(InterMutableKey.class).add(LocaleMarker.create("com/fr/decision/web/i18n/dec", LocaleScope.WEB)); Carina.getApplicationContext().group(InterMutableKey.class).add(LocaleMarker.create("com/fr/fineui/i18n/fineui", LocaleScope.WEB)); Carina.getApplicationContext().group(InterMutableKey.class).add(LocaleMarker.create("com/fr/fineui/i18n/fineui", LocaleScope.SERVER)); + Carina.getApplicationContext().group(InterMutableKey.class).addAll( + LocaleMarker.create("com/fr/server/i18n/report", LocaleScope.SERVER), + LocaleMarker.create("com/fr/server/i18n/chart", LocaleScope.SERVER) + ); + Carina.getApplicationContext().group(InterMutableKey.class).addAll( + LocaleMarker.create("com/fr/web/i18n/report", LocaleScope.WEB), + LocaleMarker.create("com/fr/web/i18n/chart", LocaleScope.WEB) + ); // WebLocaleProvider插件接口适配 LocaleUtils.registerLocaleParser(localeStr -> { From a4d39035922cb86a29c50fb5361adf1b272ca39e Mon Sep 17 00:00:00 2001 From: "Destiny.Lin" Date: Tue, 9 Jul 2024 18:05:09 +0800 Subject: [PATCH 4/8] =?UTF-8?q?REPORT-126559=20=E6=8E=A7=E4=BB=B6=E4=BA=8B?= =?UTF-8?q?=E4=BB=B6=E7=BC=96=E8=BE=91=E9=9D=A2=E6=9D=BF=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 1 + .../boot/env/DesignFunctionComponent.java | 57 +++++++++++++++++++ 2 files changed, 58 insertions(+) diff --git a/build.gradle b/build.gradle index b9595e53e8..ac1e875184 100644 --- a/build.gradle +++ b/build.gradle @@ -90,6 +90,7 @@ allprojects { implementation 'com.fr.license:fine-license-api:' + apiVersion implementation 'com.fr.workplace:workplace:' + apiVersion implementation 'com.fr.cluster:fine-cluster-api:' + apiVersion + implementation 'com.fr.messenger:fine-messenger:' + carinaVersion implementation 'com.install4j:install4j-runtime:8.0.4' implementation 'com.fr.third:jxbrowser:6.23' implementation 'com.fr.third:jxbrowser-v7:7.22' diff --git a/designer-realize/src/main/java/com/fanruan/boot/env/DesignFunctionComponent.java b/designer-realize/src/main/java/com/fanruan/boot/env/DesignFunctionComponent.java index 43837f18e1..a7c33f5d83 100644 --- a/designer-realize/src/main/java/com/fanruan/boot/env/DesignFunctionComponent.java +++ b/designer-realize/src/main/java/com/fanruan/boot/env/DesignFunctionComponent.java @@ -3,6 +3,19 @@ package com.fanruan.boot.env; import com.fanruan.carina.annotions.ActivatorRefer; import com.fanruan.carina.annotions.DependsOn; import com.fanruan.carina.annotions.FineComponent; +import com.fanruan.carina.annotions.Start; +import com.fanruan.messenger.ums.config.email.FineEmailSecurityProviderImpl; +import com.fr.base.email.EmailCenter; +import com.fr.base.email.impl.EmailAccountManagerImpl; +import com.fr.base.email.impl.FREmailDispatcherImpl; +import com.fr.base.email.impl.FineEmailExtensionProviderImpl; +import com.fr.base.email.impl.FineEmailResourceProviderImpl; +import com.fr.base.email.provider.FineEmailExtensionProvider; +import com.fr.base.email.provider.FineEmailResourceProvider; +import com.fr.base.email.provider.config.FineEmailServerConfigProvider; +import com.fr.base.email.task.EmailTaskManagement; +import com.fr.config.EmailServerConfig; +import com.fr.decision.webservice.v10.sms.SMSService; /** * 设计器基础功能组件，环境切换的上层模块 @@ -27,4 +40,48 @@ import com.fanruan.carina.annotions.FineComponent; @FineComponent(name = "design_function") @DependsOn(dependencies = {"design_function_analyzer"}) public class DesignFunctionComponent { + + @Start + public void start() { + // 通知中心目前是不支持的，但是可以先开个邮件的接口出来 + initEmail(); + initSMS(); + } + + private void initEmail() { + FineEmailExtensionProvider fineEmailExtensionProvider = new FineEmailExtensionProviderImpl(); + FineEmailResourceProvider fineEmailResourceProvider = new FineEmailResourceProviderImpl(); + EmailCenter.init(new FineEmailServerConfigProvider() { + @Override + public int getSmtpConnectionTimeout() { + return EmailServerConfig.getInstance().getSmtpConnectionTimeout(); + } + + @Override + public int getSmtpTimeout() { + return EmailServerConfig.getInstance().getSmtpTimeout(); + } + + @Override + public int getSmtpWriteTimeout() { + return EmailServerConfig.getInstance().getSmtpWriteTimeout(); + } + + @Override + public boolean isDebugEnable() { + return true; + } + }, + fineEmailExtensionProvider, fineEmailResourceProvider, + new FineEmailSecurityProviderImpl()); + + EmailCenter.setDispatcher(new FREmailDispatcherImpl()); + EmailCenter.setAccountManager(new EmailAccountManagerImpl()); + EmailTaskManagement.getInstance().start(); + } + + private void initSMS() { + SMSService.getInstance().registerTemplateId(); + } + } From 806774e7b8273cf7b344843ad2a9c000436dec22 Mon Sep 17 00:00:00 2001 From: "Destiny.Lin" Date: Tue, 9 Jul 2024 22:34:47 +0800 Subject: [PATCH 5/8] =?UTF-8?q?REPORT-126590=20fbp=E8=AE=BE=E8=AE=A1?= =?UTF-8?q?=E5=99=A8=E2=80=94=E2=80=94=E8=8F=9C=E5=8D=95=E6=A0=8F-?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=99=A8-=E5=9C=B0=E5=9B=BE=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E8=B7=B3=E8=BD=AC=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/van/chart/map/server/ChartMapEditorAction.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/server/ChartMapEditorAction.java b/designer-chart/src/main/java/com/fr/van/chart/map/server/ChartMapEditorAction.java index e9b0373a83..bb854f8a81 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/map/server/ChartMapEditorAction.java +++ b/designer-chart/src/main/java/com/fr/van/chart/map/server/ChartMapEditorAction.java @@ -7,6 +7,7 @@ import com.fr.design.actions.UpdateAction; import com.fr.general.GeneralContext; import com.fr.start.ServerStarter; +import com.fr.start.server.DesignEmbedHelper; import com.fr.workspace.WorkContext; import java.awt.event.ActionEvent; @@ -23,7 +24,7 @@ public class ChartMapEditorAction extends UpdateAction { public void actionPerformed(ActionEvent evt) { int port = DesignerEnvManager.getEnvManager().getEmbedServerPort(); - String web = GeneralContext.getCurrentAppNameOfEnv(); + String web = DesignEmbedHelper.getAppFolderName(); String serverlet = ServerConfig.getInstance().getServletName(); ServerStarter.browserURLWithLocalEnv(WorkContext.getCurrent().isLocal() ? String.format("http://localhost:%d/%s/%s/map/edit", port, web, serverlet) : WorkContext.getCurrent().getPath() + "/map/edit"); } From 72c259ff04eac121afa6b9368ccac3ec292400cd Mon Sep 17 00:00:00 2001 From: "Destiny.Lin" Date: Tue, 9 Jul 2024 23:07:49 +0800 Subject: [PATCH 6/8] =?UTF-8?q?REPORT-126575=20=E6=9C=8D=E5=8A=A1=E5=99=A8?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E6=97=A0=E6=B3=95=E4=BD=BF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../boot/init/DesignWorkContextComponent.java | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) 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 44de9859d1..e80a294a19 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 @@ -12,14 +12,24 @@ import com.fanruan.workplace.http.RepositoryManager; import com.fanruan.workplace.http.WorkspaceHeartBeatShell; import com.fanruan.workplace.standard.ServerInfo; import com.fanruan.workplace.standard.ServerInfoOperator; +import com.fr.base.io.FileAssistUtils; +import com.fr.base.io.FileAssistUtilsOperator; import com.fr.base.operator.common.CommonOperator; import com.fr.data.operator.DataOperator; import com.fr.data.operator.DataOperatorProvider; import com.fr.decision.service.context.ServiceContext; import com.fr.design.env.HttpWorkspaceConnector; import com.fr.env.operator.CommonOperatorImpl; +import com.fr.esd.core.remote.ESDConfigEventOperator; +import com.fr.esd.core.remote.ESDConfigEventOperatorImpl; +import com.fr.file.ConnectionOperator; +import com.fr.file.ConnectionOperatorImpl; +import com.fr.file.TableDataOperator; +import com.fr.file.TableDataOperatorImpl; import com.fr.file.filetree.FileNodes; import com.fr.file.filetree.LocalFileNodes; +import com.fr.general.build.BuildInfoOperator; +import com.fr.general.build.impl.BuildInfoOperatorImpl; import com.fr.security.encryption.storage.StorageEncryptors; import com.fr.security.encryption.storage.StorageTransfer; import com.fr.stable.StringUtils; @@ -132,7 +142,14 @@ public class DesignWorkContextComponent { WorkRPCRegister.wrap(StorageTransfer.class, new StorageEncryptors()), WorkRPCRegister.wrap(WorkRPCType.Local, FileNodes.class, new LocalFileNodes()), WorkRPCRegister.wrap(CommonOperator.class, new CommonOperatorImpl()), - WorkRPCRegister.wrap(DataOperatorProvider.class, new DataOperator()) + WorkRPCRegister.wrap(DataOperatorProvider.class, new DataOperator()), + WorkRPCRegister.wrap(ESDConfigEventOperator.class, new ESDConfigEventOperatorImpl()), + WorkRPCRegister.wrap(WorkRPCType.Compatible, TableDataOperator.class, TableDataOperatorImpl.getInstance()), + WorkRPCRegister.wrap(WorkRPCType.Compatible, ConnectionOperator.class, ConnectionOperatorImpl.getInstance()), + WorkRPCRegister.wrap(FileAssistUtilsOperator.class, new FileAssistUtils()), + WorkRPCRegister.wrap(TableDataOperator.class, TableDataOperatorImpl.getInstance()), + WorkRPCRegister.wrap(ConnectionOperator.class, ConnectionOperatorImpl.getInstance()), + WorkRPCRegister.wrap(BuildInfoOperator.class, new BuildInfoOperatorImpl()) ); } From f13a1b300a89348af758580b9a7b63ab0d20ff43 Mon Sep 17 00:00:00 2001 From: "Destiny.Lin" Date: Tue, 9 Jul 2024 23:08:38 +0800 Subject: [PATCH 7/8] =?UTF-8?q?REPORT-126540=20=E5=A4=9Asheet=E5=90=91?= =?UTF-8?q?=E5=8F=B3=E7=BF=BB=E9=A1=B5=E6=8C=89=E9=92=AE=E4=B8=A2=E5=A4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/mainframe/SheetNameTabPane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/SheetNameTabPane.java b/designer-realize/src/main/java/com/fr/design/mainframe/SheetNameTabPane.java index c8c1b7172e..a938761ec6 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/SheetNameTabPane.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/SheetNameTabPane.java @@ -67,7 +67,7 @@ public class SheetNameTabPane extends JComponent implements MouseListener, Mouse private static final Icon WORK_SHEET_ICON = IconUtils.readIcon("/com/fr/design/standard/worksheet"); private static final Icon POLY_SHEET_ICON = IconUtils.readIcon("/com/fr/design/standard/polysheet"); private static final Icon LEFT_ICON = IconUtils.readIcon("/com/fr/design/standard/prepage/pre_page"); - private static final Icon RIGHT_ICON = IconUtils.readIcon("/com/fr/design/standard/nextpage"); + private static final Icon RIGHT_ICON = IconUtils.readIcon("/com/fr/design/standard/nextpage/next_page"); private static final Icon DISABLED_LEFT_ICON = IconUtils.readIcon("/com/fr/design/standard/prepage/pre_page_disabled.svg"); private static final Icon DISABLED_RIGHT_ICON = IconUtils.readIcon("/com/fr/design/standard/nextpage/next_page_disabled.svg"); private static final int NUM = 10; From 5c4de3ae4f105930f59c322805e18e6f2d0cb05c Mon Sep 17 00:00:00 2001 From: "Destiny.Lin" Date: Tue, 9 Jul 2024 23:18:39 +0800 Subject: [PATCH 8/8] =?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=BB=A3=E7=A0=81=E8=A7=84=E8=8C=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fanruan/boot/env/DesignFunctionComponent.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/designer-realize/src/main/java/com/fanruan/boot/env/DesignFunctionComponent.java b/designer-realize/src/main/java/com/fanruan/boot/env/DesignFunctionComponent.java index a7c33f5d83..6c584ca3a3 100644 --- a/designer-realize/src/main/java/com/fanruan/boot/env/DesignFunctionComponent.java +++ b/designer-realize/src/main/java/com/fanruan/boot/env/DesignFunctionComponent.java @@ -41,6 +41,9 @@ import com.fr.decision.webservice.v10.sms.SMSService; @DependsOn(dependencies = {"design_function_analyzer"}) public class DesignFunctionComponent { + /** + * start + */ @Start public void start() { // 通知中心目前是不支持的，但是可以先开个邮件的接口出来