From 79b18ff09e31ca48fdb5f64a8c801637303bf7fb Mon Sep 17 00:00:00 2001 From: zack Date: Fri, 28 Feb 2020 17:15:21 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20=20?= =?UTF-8?q?=E9=80=82=E9=85=8D=E6=96=B010.0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/fr/demo/SaveReportToDatabase.java | 4 ++-- src/main/java/com/fr/function/ReportCheck.java | 4 ++-- src/main/java/com/fr/io/CreateGenericTemplate.java | 4 ++-- src/main/java/com/fr/io/ExcelToCpt.java | 4 ++-- src/main/java/com/fr/io/ExcuteDemo.java | 4 ++-- src/main/java/com/fr/io/ExportApi.java | 4 ++-- src/main/java/com/fr/io/ExportApi_frm.java | 7 ++----- src/main/java/com/fr/io/ExportBatch.java | 4 ++-- src/main/java/com/fr/io/ExportExcel.java | 4 ++-- src/main/java/com/fr/io/ExportReports.java | 4 ++-- src/main/java/com/fr/io/JavaPrint.java | 4 ++-- src/main/java/com/fr/io/SaveReportToDatabase.java | 4 ++-- src/main/java/com/fr/io/SetParameterWindow.java | 4 ++-- src/main/java/com/fr/io/SimpleDemo.java | 4 ++-- src/main/java/com/fr/learn/Leaner.java | 4 ++-- src/test/main/java/com/fr/demo/ExportApiTest.java | 4 ++-- src/test/main/java/com/fr/demo/ModuleStartTest.java | 4 ++-- 17 files changed, 34 insertions(+), 37 deletions(-) diff --git a/src/main/java/com/fr/demo/SaveReportToDatabase.java b/src/main/java/com/fr/demo/SaveReportToDatabase.java index 9a5e891..6ec5ce7 100644 --- a/src/main/java/com/fr/demo/SaveReportToDatabase.java +++ b/src/main/java/com/fr/demo/SaveReportToDatabase.java @@ -14,7 +14,7 @@ import com.fr.report.RestrictionActivator; import com.fr.report.module.ReportBaseActivator; import com.fr.report.write.WriteActivator; import com.fr.scheduler.SchedulerActivator; -import com.fr.store.StateServerActivator; +import com.fr.store.StateServiceActivator; import com.fr.workspace.simple.SimpleWork; import java.io.File; @@ -35,7 +35,7 @@ public class SaveReportToDatabase { Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(), new ConfigurationActivator(), new StandaloneModeActivator(), - new StateServerActivator(), + new StateServiceActivator(), new ChartBaseActivator(), new SchedulerActivator(), new ReportBaseActivator(), diff --git a/src/main/java/com/fr/function/ReportCheck.java b/src/main/java/com/fr/function/ReportCheck.java index 095ff3f..b10465b 100644 --- a/src/main/java/com/fr/function/ReportCheck.java +++ b/src/main/java/com/fr/function/ReportCheck.java @@ -25,7 +25,7 @@ import com.fr.report.write.WriteActivator; import com.fr.scheduler.SchedulerActivator; import com.fr.script.AbstractFunction; import com.fr.stable.WriteActor; -import com.fr.store.StateServerActivator; +import com.fr.store.StateServiceActivator; import com.fr.workspace.simple.SimpleWork; import com.fr.write.cal.WB; @@ -45,7 +45,7 @@ public class ReportCheck extends AbstractFunction { Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(), new ConfigurationActivator(), new StandaloneModeActivator(), - new StateServerActivator(), + new StateServiceActivator(), new ChartBaseActivator(), new SchedulerActivator(), new ReportBaseActivator(), diff --git a/src/main/java/com/fr/io/CreateGenericTemplate.java b/src/main/java/com/fr/io/CreateGenericTemplate.java index c52f22c..cb4c296 100644 --- a/src/main/java/com/fr/io/CreateGenericTemplate.java +++ b/src/main/java/com/fr/io/CreateGenericTemplate.java @@ -23,7 +23,7 @@ import com.fr.report.module.ReportBaseActivator; import com.fr.report.worksheet.WorkSheet; import com.fr.report.write.WriteActivator; import com.fr.scheduler.SchedulerActivator; -import com.fr.store.StateServerActivator; +import com.fr.store.StateServiceActivator; import com.fr.workspace.simple.SimpleWork; import java.io.File; @@ -37,7 +37,7 @@ public class CreateGenericTemplate { Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(), new ConfigurationActivator(), new StandaloneModeActivator(), - new StateServerActivator(), + new StateServiceActivator(), new ChartBaseActivator(), new SchedulerActivator(), new ReportBaseActivator(), diff --git a/src/main/java/com/fr/io/ExcelToCpt.java b/src/main/java/com/fr/io/ExcelToCpt.java index d661b81..f829510 100644 --- a/src/main/java/com/fr/io/ExcelToCpt.java +++ b/src/main/java/com/fr/io/ExcelToCpt.java @@ -17,7 +17,7 @@ import com.fr.report.RestrictionActivator; import com.fr.report.module.ReportBaseActivator; import com.fr.report.write.WriteActivator; import com.fr.scheduler.SchedulerActivator; -import com.fr.store.StateServerActivator; +import com.fr.store.StateServiceActivator; import com.fr.workspace.simple.SimpleWork; import java.io.File; @@ -32,7 +32,7 @@ public class ExcelToCpt { Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(), new ConfigurationActivator(), new StandaloneModeActivator(), - new StateServerActivator(), + new StateServiceActivator(), new ChartBaseActivator(), new SchedulerActivator(), new ReportBaseActivator(), diff --git a/src/main/java/com/fr/io/ExcuteDemo.java b/src/main/java/com/fr/io/ExcuteDemo.java index 944f977..0b2c45f 100644 --- a/src/main/java/com/fr/io/ExcuteDemo.java +++ b/src/main/java/com/fr/io/ExcuteDemo.java @@ -18,7 +18,7 @@ import com.fr.report.module.ReportBaseActivator; import com.fr.report.write.WriteActivator; import com.fr.scheduler.SchedulerActivator; import com.fr.stable.WriteActor; -import com.fr.store.StateServerActivator; +import com.fr.store.StateServiceActivator; import com.fr.workspace.simple.SimpleWork; import java.io.File; @@ -33,7 +33,7 @@ public class ExcuteDemo { Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(), new ConfigurationActivator(), new StandaloneModeActivator(), - new StateServerActivator(), + new StateServiceActivator(), new ChartBaseActivator(), new SchedulerActivator(), new ReportBaseActivator(), diff --git a/src/main/java/com/fr/io/ExportApi.java b/src/main/java/com/fr/io/ExportApi.java index 6588771..084a50b 100644 --- a/src/main/java/com/fr/io/ExportApi.java +++ b/src/main/java/com/fr/io/ExportApi.java @@ -18,7 +18,7 @@ import com.fr.report.module.ReportBaseActivator; import com.fr.report.write.WriteActivator; import com.fr.scheduler.SchedulerActivator; import com.fr.stable.WriteActor; -import com.fr.store.StateServerActivator; +import com.fr.store.StateServiceActivator; import com.fr.workspace.simple.SimpleWork; import java.io.File; @@ -31,7 +31,7 @@ public class ExportApi { Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(), new ConfigurationActivator(), new StandaloneModeActivator(), - new StateServerActivator(), + new StateServiceActivator(), new SchedulerActivator(), new ReportBaseActivator(), new RestrictionActivator(), diff --git a/src/main/java/com/fr/io/ExportApi_frm.java b/src/main/java/com/fr/io/ExportApi_frm.java index 4b13c53..16734eb 100644 --- a/src/main/java/com/fr/io/ExportApi_frm.java +++ b/src/main/java/com/fr/io/ExportApi_frm.java @@ -8,11 +8,9 @@ import com.fr.config.activator.ConfigurationActivator; import com.fr.env.operator.CommonOperatorImpl; import com.fr.form.export.FormToWBExecutor; import com.fr.general.I18nResource; -import com.fr.io.TemplateWorkBookIO; import com.fr.io.exporter.ImageExporter; import com.fr.io.exporter.PDFExporter; import com.fr.io.exporter.excel.stream.StreamExcel2007Exporter; -import com.fr.main.impl.WorkBook; import com.fr.main.workbook.ResultWorkBook; import com.fr.module.Module; import com.fr.module.tool.ActivatorToolBox; @@ -21,8 +19,7 @@ import com.fr.report.RestrictionActivator; import com.fr.report.module.ReportBaseActivator; import com.fr.report.write.WriteActivator; import com.fr.scheduler.SchedulerActivator; -import com.fr.stable.WriteActor; -import com.fr.store.StateServerActivator; +import com.fr.store.StateServiceActivator; import com.fr.workspace.simple.SimpleWork; import java.io.File; @@ -34,7 +31,7 @@ public class ExportApi_frm { Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(), new ConfigurationActivator(), new StandaloneModeActivator(), - new StateServerActivator(), + new StateServiceActivator(), new SchedulerActivator(), new ReportBaseActivator(), new RestrictionActivator(), diff --git a/src/main/java/com/fr/io/ExportBatch.java b/src/main/java/com/fr/io/ExportBatch.java index 8ad3494..0f78eb2 100644 --- a/src/main/java/com/fr/io/ExportBatch.java +++ b/src/main/java/com/fr/io/ExportBatch.java @@ -19,7 +19,7 @@ import com.fr.report.write.WriteActivator; import com.fr.scheduler.SchedulerActivator; import com.fr.stable.StableUtils; import com.fr.stable.WriteActor; -import com.fr.store.StateServerActivator; +import com.fr.store.StateServiceActivator; import com.fr.workspace.simple.SimpleWork; import java.io.BufferedReader; @@ -38,7 +38,7 @@ public class ExportBatch { Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(), new ConfigurationActivator(), new StandaloneModeActivator(), - new StateServerActivator(), + new StateServiceActivator(), new ChartBaseActivator(), new SchedulerActivator(), new ReportBaseActivator(), diff --git a/src/main/java/com/fr/io/ExportExcel.java b/src/main/java/com/fr/io/ExportExcel.java index cba3a1b..a48200c 100644 --- a/src/main/java/com/fr/io/ExportExcel.java +++ b/src/main/java/com/fr/io/ExportExcel.java @@ -26,7 +26,7 @@ import com.fr.report.module.ReportBaseActivator; import com.fr.report.write.WriteActivator; import com.fr.scheduler.SchedulerActivator; import com.fr.stable.WriteActor; -import com.fr.store.StateServerActivator; +import com.fr.store.StateServiceActivator; import com.fr.workspace.simple.SimpleWork; import java.io.File; @@ -40,7 +40,7 @@ public class ExportExcel { Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(), new ConfigurationActivator(), new StandaloneModeActivator(), - new StateServerActivator(), + new StateServiceActivator(), new ChartBaseActivator(), new SchedulerActivator(), new ReportBaseActivator(), diff --git a/src/main/java/com/fr/io/ExportReports.java b/src/main/java/com/fr/io/ExportReports.java index ca75b62..e70f58d 100644 --- a/src/main/java/com/fr/io/ExportReports.java +++ b/src/main/java/com/fr/io/ExportReports.java @@ -21,7 +21,7 @@ import com.fr.report.report.PageReport; import com.fr.report.write.WriteActivator; import com.fr.scheduler.SchedulerActivator; import com.fr.stable.PageActor; -import com.fr.store.StateServerActivator; +import com.fr.store.StateServiceActivator; import com.fr.workspace.simple.SimpleWork; import java.io.File; @@ -35,7 +35,7 @@ public class ExportReports { Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(), new ConfigurationActivator(), new StandaloneModeActivator(), - new StateServerActivator(), + new StateServiceActivator(), new ChartBaseActivator(), new SchedulerActivator(), new ReportBaseActivator(), diff --git a/src/main/java/com/fr/io/JavaPrint.java b/src/main/java/com/fr/io/JavaPrint.java index 06b263a..5468214 100644 --- a/src/main/java/com/fr/io/JavaPrint.java +++ b/src/main/java/com/fr/io/JavaPrint.java @@ -17,7 +17,7 @@ import com.fr.report.RestrictionActivator; import com.fr.report.module.ReportBaseActivator; import com.fr.report.write.WriteActivator; import com.fr.scheduler.SchedulerActivator; -import com.fr.store.StateServerActivator; +import com.fr.store.StateServiceActivator; import com.fr.workspace.simple.SimpleWork; import java.util.HashMap; @@ -29,7 +29,7 @@ public class JavaPrint { Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(), new ConfigurationActivator(), new StandaloneModeActivator(), - new StateServerActivator(), + new StateServiceActivator(), new ChartBaseActivator(), new SchedulerActivator(), new ReportBaseActivator(), diff --git a/src/main/java/com/fr/io/SaveReportToDatabase.java b/src/main/java/com/fr/io/SaveReportToDatabase.java index 2bc2500..eb20c5f 100644 --- a/src/main/java/com/fr/io/SaveReportToDatabase.java +++ b/src/main/java/com/fr/io/SaveReportToDatabase.java @@ -14,7 +14,7 @@ import com.fr.report.RestrictionActivator; import com.fr.report.module.ReportBaseActivator; import com.fr.report.write.WriteActivator; import com.fr.scheduler.SchedulerActivator; -import com.fr.store.StateServerActivator; +import com.fr.store.StateServiceActivator; import com.fr.workspace.simple.SimpleWork; import java.io.File; @@ -45,7 +45,7 @@ public class SaveReportToDatabase { Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(), new ConfigurationActivator(), new StandaloneModeActivator(), - new StateServerActivator(), + new StateServiceActivator(), new ChartBaseActivator(), new SchedulerActivator(), new ReportBaseActivator(), diff --git a/src/main/java/com/fr/io/SetParameterWindow.java b/src/main/java/com/fr/io/SetParameterWindow.java index fa2638e..3da477a 100644 --- a/src/main/java/com/fr/io/SetParameterWindow.java +++ b/src/main/java/com/fr/io/SetParameterWindow.java @@ -19,7 +19,7 @@ import com.fr.report.RestrictionActivator; import com.fr.report.module.ReportBaseActivator; import com.fr.report.write.WriteActivator; import com.fr.scheduler.SchedulerActivator; -import com.fr.store.StateServerActivator; +import com.fr.store.StateServiceActivator; import com.fr.workspace.simple.SimpleWork; import java.awt.Color; @@ -33,7 +33,7 @@ public class SetParameterWindow { Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(), new ConfigurationActivator(), new StandaloneModeActivator(), - new StateServerActivator(), + new StateServiceActivator(), new ChartBaseActivator(), new SchedulerActivator(), new ReportBaseActivator(), diff --git a/src/main/java/com/fr/io/SimpleDemo.java b/src/main/java/com/fr/io/SimpleDemo.java index bed0132..308a1c1 100644 --- a/src/main/java/com/fr/io/SimpleDemo.java +++ b/src/main/java/com/fr/io/SimpleDemo.java @@ -19,7 +19,7 @@ import com.fr.report.elementcase.TemplateElementCase; import com.fr.report.module.ReportBaseActivator; import com.fr.report.write.WriteActivator; import com.fr.scheduler.SchedulerActivator; -import com.fr.store.StateServerActivator; +import com.fr.store.StateServiceActivator; import com.fr.workspace.simple.SimpleWork; import java.awt.Color; @@ -33,7 +33,7 @@ public class SimpleDemo { Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(), new ConfigurationActivator(), new StandaloneModeActivator(), - new StateServerActivator(), + new StateServiceActivator(), new ChartBaseActivator(), new SchedulerActivator(), new ReportBaseActivator(), diff --git a/src/main/java/com/fr/learn/Leaner.java b/src/main/java/com/fr/learn/Leaner.java index c35f2ab..11ac8de 100644 --- a/src/main/java/com/fr/learn/Leaner.java +++ b/src/main/java/com/fr/learn/Leaner.java @@ -1,8 +1,8 @@ package com.fr.learn; -import com.fr.start.Designer; +import com.fr.start.MainDesigner; -public class Leaner extends Designer { +public class Leaner extends MainDesigner { static { // 这段代码让插件能支持远程设计的时候的调试 diff --git a/src/test/main/java/com/fr/demo/ExportApiTest.java b/src/test/main/java/com/fr/demo/ExportApiTest.java index ef070bb..19029e2 100644 --- a/src/test/main/java/com/fr/demo/ExportApiTest.java +++ b/src/test/main/java/com/fr/demo/ExportApiTest.java @@ -22,7 +22,7 @@ import com.fr.report.worksheet.WorkSheet; import com.fr.report.write.WriteActivator; import com.fr.scheduler.SchedulerActivator; import com.fr.stable.WriteActor; -import com.fr.store.StateServerActivator; +import com.fr.store.StateServiceActivator; import com.fr.workspace.simple.SimpleWork; import com.fr.write.web.excel.ExcelImportPlusProcessor; import junit.framework.TestCase; @@ -43,7 +43,7 @@ public class ExportApiTest extends TestCase { Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(), new ConfigurationActivator(), new StandaloneModeActivator(), - new StateServerActivator(), + new StateServiceActivator(), new ChartBaseActivator(), new SchedulerActivator(), new ReportBaseActivator(), diff --git a/src/test/main/java/com/fr/demo/ModuleStartTest.java b/src/test/main/java/com/fr/demo/ModuleStartTest.java index de2cb8a..034184f 100644 --- a/src/test/main/java/com/fr/demo/ModuleStartTest.java +++ b/src/test/main/java/com/fr/demo/ModuleStartTest.java @@ -19,7 +19,7 @@ import com.fr.report.RestrictionActivator; import com.fr.report.module.ReportBaseActivator; import com.fr.report.write.WriteActivator; import com.fr.scheduler.SchedulerActivator; -import com.fr.store.StateServerActivator; +import com.fr.store.StateServiceActivator; import com.fr.workspace.simple.SimpleWork; import junit.framework.TestCase; import org.junit.Assert; @@ -65,7 +65,7 @@ public class ModuleStartTest extends TestCase { Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(), new ConfigurationActivator(), new StandaloneModeActivator(), - new StateServerActivator(), + new StateServiceActivator(), new ChartBaseActivator(), new SchedulerActivator(), new ReportBaseActivator(), From 72102210215a3db0395978fc6fd3a860c71b9982 Mon Sep 17 00:00:00 2001 From: Harrison Date: Thu, 12 Mar 2020 16:26:14 +0800 Subject: [PATCH 2/2] =?UTF-8?q?DEMO-3230=20Release10=20module=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E5=BC=95=E7=94=A8=20=E5=88=A0=E6=8E=89=E4=B8=8D?= =?UTF-8?q?=E5=8F=AF=E7=94=A8=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pom.xml b/pom.xml index 7f069cd..61099db 100644 --- a/pom.xml +++ b/pom.xml @@ -9,10 +9,6 @@ 10.0-RELEASE-SNAPSHOT ${project.basedir}/webroot/WEB-INF - - demo-file-submit-oss - crm-file-manager -