From e31d82b426c6caafd49f5c7529200bd4da63572b Mon Sep 17 00:00:00 2001 From: zack Date: Fri, 24 May 2019 17:02:32 +0800 Subject: [PATCH 1/4] =?UTF-8?q?REPORT-15183=20=E8=AE=BE=E8=AE=A1=E5=99=A8s?= =?UTF-8?q?dk=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer-form/build.form.gradle | 1 + .../com/fr/sdk/designer/FineDesignUtils.java | 79 +++++++++++++++++++ .../java/com/fr/sdk/FineDesignUtilsTest.java | 7 ++ pom.xml | 1 + 4 files changed, 88 insertions(+) create mode 100644 designer-sdk/src/main/java/com/fr/sdk/designer/FineDesignUtils.java create mode 100644 designer-sdk/src/test/java/com/fr/sdk/FineDesignUtilsTest.java diff --git a/designer-form/build.form.gradle b/designer-form/build.form.gradle index c489d5ca2..42b16b020 100644 --- a/designer-form/build.form.gradle +++ b/designer-form/build.form.gradle @@ -41,6 +41,7 @@ ant{ mkdir(dir:"src/main/java") move(todir:"src/main/java"){ fileset(dir:"../designer-realize/src",includes:"com/**") + fileset(dir:"../designer-sdk/src",includes:"com/**") fileset(dir:"src",includes:"com/**") } } diff --git a/designer-sdk/src/main/java/com/fr/sdk/designer/FineDesignUtils.java b/designer-sdk/src/main/java/com/fr/sdk/designer/FineDesignUtils.java new file mode 100644 index 000000000..f04cb33a0 --- /dev/null +++ b/designer-sdk/src/main/java/com/fr/sdk/designer/FineDesignUtils.java @@ -0,0 +1,79 @@ +package com.fr.sdk.designer; + +import com.fr.config.activator.ConfigurationActivator; +import com.fr.design.env.DesignerWorkspaceGenerator; +import com.fr.design.env.RemoteDesignerWorkspaceInfo; +import com.fr.module.Activator; +import com.fr.module.Module; +import com.fr.module.tool.ActivatorToolBox; +import com.fr.report.ReportActivator; +import com.fr.report.RestrictionActivator; +import com.fr.report.module.ReportBaseActivator; +import com.fr.scheduler.SchedulerActivator; +import com.fr.sdk.server.ModuleShell; +import com.fr.serialization.SerializationActivator; +import com.fr.stable.StringUtils; +import com.fr.startup.WorkspaceRegister; +import com.fr.store.StateServerActivator; +import com.fr.workspace.WorkContext; +import com.fr.workspace.connect.WorkspaceConnectionInfo; +import com.fr.workspace.engine.WorkspaceActivator; +import com.fr.workspace.server.ServerWorkspaceRegister; + +/** + * 设计器SDK模块工具类，用来放一些设计器相关插件开发过程中常用的工具函数 + */ +public class FineDesignUtils { + + /** + * 创建一个连接远程服务器的模块 + * @param remoteUrl 远程服务器地址 + * @param username 用户名 + * @param password 密码 + * @return 模块代理对象 使用ModuleShell的start和stop控制模块启停 + */ + public static ModuleShell createRemoteServerModule(String remoteUrl, String username, String password) { + return createRemoteServerModule(remoteUrl, username, password, StringUtils.EMPTY, StringUtils.EMPTY); + } + + /** + * 创建一个连接远程服务器的模块 + * @param remoteUrl 远程服务器地址 + * @param username 用户名 + * @param password 密码 + * @param certPath https证书路径 + * @param certSecretKey 证书秘钥 + * @return 模块代理对象 使用ModuleShell的start和stop控制模块启停 + */ + public static ModuleShell createRemoteServerModule(final String remoteUrl, final String username, final String password, final String certPath, final String certSecretKey) { + Module module = ActivatorToolBox.simpleLink( + new WorkspaceActivator(), + new SerializationActivator(), + new Activator() { + @Override + public void start() { + WorkspaceConnectionInfo connectionInfo = new WorkspaceConnectionInfo(remoteUrl, username, password, certPath, certSecretKey); + try { + WorkContext.switchTo(DesignerWorkspaceGenerator.generate(RemoteDesignerWorkspaceInfo.create(connectionInfo))); + } catch (Exception e) { + e.printStackTrace(); + } + } + + @Override + public void stop() { + + } + }, + new ConfigurationActivator(), + new StateServerActivator(), + new SchedulerActivator(), + new ReportBaseActivator(), + new RestrictionActivator(), + new ReportActivator(), + new WorkspaceRegister(), + new ServerWorkspaceRegister() + ); + return new ModuleShell(module); + } +} \ No newline at end of file diff --git a/designer-sdk/src/test/java/com/fr/sdk/FineDesignUtilsTest.java b/designer-sdk/src/test/java/com/fr/sdk/FineDesignUtilsTest.java new file mode 100644 index 000000000..ec210321b --- /dev/null +++ b/designer-sdk/src/test/java/com/fr/sdk/FineDesignUtilsTest.java @@ -0,0 +1,7 @@ +package com.fr.sdk; + +import junit.framework.TestCase; + +public class FineDesignUtilsTest extends TestCase { + +} \ No newline at end of file diff --git a/pom.xml b/pom.xml index 408bc7be8..407f1fd17 100644 --- a/pom.xml +++ b/pom.xml @@ -16,6 +16,7 @@ designer-chart designer-form designer-realize + designer-sdk com.fr.report design From 0cd35bb8a281cd9acf6bf733d3737a83a288e888 Mon Sep 17 00:00:00 2001 From: zack Date: Fri, 24 May 2019 17:04:00 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=A7=BB=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer-sdk/.gitignore | 5 +++++ designer-sdk/pom.xml | 21 +++++++++++++++++++ .../com/fr/sdk/designer/FineDesignUtils.java | 2 +- 3 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 designer-sdk/.gitignore create mode 100644 designer-sdk/pom.xml diff --git a/designer-sdk/.gitignore b/designer-sdk/.gitignore new file mode 100644 index 000000000..85184fbc3 --- /dev/null +++ b/designer-sdk/.gitignore @@ -0,0 +1,5 @@ +*.iml +.idea/ +.DS_Store +.classpath +.project \ No newline at end of file diff --git a/designer-sdk/pom.xml b/designer-sdk/pom.xml new file mode 100644 index 000000000..2fb53e1dc --- /dev/null +++ b/designer-sdk/pom.xml @@ -0,0 +1,21 @@ + + + 4.0.0 + + com.fr.report + design + 10.0 + + com.fr.report + designer-sdk + 10.0 + + + com.fr.report + designer-realize + 10.0 + + + \ No newline at end of file diff --git a/designer-sdk/src/main/java/com/fr/sdk/designer/FineDesignUtils.java b/designer-sdk/src/main/java/com/fr/sdk/designer/FineDesignUtils.java index f04cb33a0..a99cf36c5 100644 --- a/designer-sdk/src/main/java/com/fr/sdk/designer/FineDesignUtils.java +++ b/designer-sdk/src/main/java/com/fr/sdk/designer/FineDesignUtils.java @@ -10,7 +10,7 @@ import com.fr.report.ReportActivator; import com.fr.report.RestrictionActivator; import com.fr.report.module.ReportBaseActivator; import com.fr.scheduler.SchedulerActivator; -import com.fr.sdk.server.ModuleShell; +import com.fr.sdk.server.shell.ModuleShell; import com.fr.serialization.SerializationActivator; import com.fr.stable.StringUtils; import com.fr.startup.WorkspaceRegister; From 3320161278e97f7dc7c3fd3f69aa5f7c73313ce7 Mon Sep 17 00:00:00 2001 From: zack Date: Fri, 24 May 2019 17:15:54 +0800 Subject: [PATCH 3/4] =?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 --- .../src/main/java/com/fr/sdk/designer/FineDesignUtils.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/designer-sdk/src/main/java/com/fr/sdk/designer/FineDesignUtils.java b/designer-sdk/src/main/java/com/fr/sdk/designer/FineDesignUtils.java index a99cf36c5..ea60edf74 100644 --- a/designer-sdk/src/main/java/com/fr/sdk/designer/FineDesignUtils.java +++ b/designer-sdk/src/main/java/com/fr/sdk/designer/FineDesignUtils.java @@ -3,6 +3,7 @@ package com.fr.sdk.designer; import com.fr.config.activator.ConfigurationActivator; import com.fr.design.env.DesignerWorkspaceGenerator; import com.fr.design.env.RemoteDesignerWorkspaceInfo; +import com.fr.log.FineLoggerFactory; import com.fr.module.Activator; import com.fr.module.Module; import com.fr.module.tool.ActivatorToolBox; @@ -56,7 +57,7 @@ public class FineDesignUtils { try { WorkContext.switchTo(DesignerWorkspaceGenerator.generate(RemoteDesignerWorkspaceInfo.create(connectionInfo))); } catch (Exception e) { - e.printStackTrace(); + FineLoggerFactory.getLogger().error(e.getMessage(),e); } } From 2a74a9103b20a4561c06757f666762a00b8dfa1d Mon Sep 17 00:00:00 2001 From: zack Date: Thu, 30 May 2019 15:18:57 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer-sdk/pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/designer-sdk/pom.xml b/designer-sdk/pom.xml index 2fb53e1dc..9702536e2 100644 --- a/designer-sdk/pom.xml +++ b/designer-sdk/pom.xml @@ -17,5 +17,10 @@ designer-realize 10.0 + + com.fr.report + sdk-base + 10.0 + \ No newline at end of file