Browse Source

Pull request #31: 无JIRA任务 插件发布,release合persist

Merge in PG/plugin-report-doc-demo from release/10.0 to persist/10.0

* commit 'ef6abc7d72ba752886304992d970260230f17c05':
  无jira任务,解决冲突
  无jira任务,解决冲突
  无jira任务,模块启动加上ModuleHealActivator避免NPE
  REPORT-35537 调用导出api,控制台报错NPE:fine module health clinic is null
persist/10.0
Bruce.Deng 4 years ago
parent
commit
d1776fa526
  1. 2
      src/main/java/com/fr/demo/SaveReportToDatabase.java
  2. 2
      src/main/java/com/fr/function/ReportCheck.java
  3. 2
      src/main/java/com/fr/io/CreateGenericTemplate.java
  4. 2
      src/main/java/com/fr/io/ExcelToCpt.java
  5. 2
      src/main/java/com/fr/io/ExcuteDemo.java
  6. 2
      src/main/java/com/fr/io/ExportApi_frm.java
  7. 2
      src/main/java/com/fr/io/ExportBatch.java
  8. 2
      src/main/java/com/fr/io/ExportExcel.java
  9. 2
      src/main/java/com/fr/io/ExportReports.java
  10. 2
      src/main/java/com/fr/io/JavaPrint.java
  11. 2
      src/main/java/com/fr/io/SaveReportToDatabase.java
  12. 2
      src/main/java/com/fr/io/SetParameterWindow.java
  13. 2
      src/main/java/com/fr/io/SimpleDemo.java
  14. 1
      src/test/main/java/com/fr/demo/ExportApiTest.java
  15. 1
      src/test/main/java/com/fr/demo/ModuleStartTest.java

2
src/main/java/com/fr/demo/SaveReportToDatabase.java

@ -7,6 +7,7 @@ import com.fr.config.activator.BaseDBActivator;
import com.fr.config.activator.ConfigurationActivator; import com.fr.config.activator.ConfigurationActivator;
import com.fr.env.operator.CommonOperatorImpl; import com.fr.env.operator.CommonOperatorImpl;
import com.fr.general.I18nResource; import com.fr.general.I18nResource;
import com.fr.health.activator.ModuleHealActivator;
import com.fr.module.Module; import com.fr.module.Module;
import com.fr.module.tool.ActivatorToolBox; import com.fr.module.tool.ActivatorToolBox;
import com.fr.report.ReportActivator; import com.fr.report.ReportActivator;
@ -35,6 +36,7 @@ public class SaveReportToDatabase {
Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(), Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(),
new ConfigurationActivator(), new ConfigurationActivator(),
new StandaloneModeActivator(), new StandaloneModeActivator(),
new ModuleHealActivator(),
new StateServiceActivator(), new StateServiceActivator(),
new ChartBaseActivator(), new ChartBaseActivator(),
new SchedulerActivator(), new SchedulerActivator(),

2
src/main/java/com/fr/function/ReportCheck.java

@ -9,6 +9,7 @@ import com.fr.config.activator.BaseDBActivator;
import com.fr.config.activator.ConfigurationActivator; import com.fr.config.activator.ConfigurationActivator;
import com.fr.env.operator.CommonOperatorImpl; import com.fr.env.operator.CommonOperatorImpl;
import com.fr.general.I18nResource; import com.fr.general.I18nResource;
import com.fr.health.activator.ModuleHealActivator;
import com.fr.io.TemplateWorkBookIO; import com.fr.io.TemplateWorkBookIO;
import com.fr.json.JSONArray; import com.fr.json.JSONArray;
import com.fr.json.JSONObject; import com.fr.json.JSONObject;
@ -45,6 +46,7 @@ public class ReportCheck extends AbstractFunction {
Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(), Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(),
new ConfigurationActivator(), new ConfigurationActivator(),
new StandaloneModeActivator(), new StandaloneModeActivator(),
new ModuleHealActivator(),
new StateServiceActivator(), new StateServiceActivator(),
new ChartBaseActivator(), new ChartBaseActivator(),
new SchedulerActivator(), new SchedulerActivator(),

2
src/main/java/com/fr/io/CreateGenericTemplate.java

@ -11,6 +11,7 @@ import com.fr.data.impl.NameDatabaseConnection;
import com.fr.env.operator.CommonOperatorImpl; import com.fr.env.operator.CommonOperatorImpl;
import com.fr.general.I18nResource; import com.fr.general.I18nResource;
import com.fr.general.data.TableDataColumn; import com.fr.general.data.TableDataColumn;
import com.fr.health.activator.ModuleHealActivator;
import com.fr.main.impl.WorkBook; import com.fr.main.impl.WorkBook;
import com.fr.module.Module; import com.fr.module.Module;
import com.fr.module.tool.ActivatorToolBox; import com.fr.module.tool.ActivatorToolBox;
@ -37,6 +38,7 @@ public class CreateGenericTemplate {
Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(), Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(),
new ConfigurationActivator(), new ConfigurationActivator(),
new StandaloneModeActivator(), new StandaloneModeActivator(),
new ModuleHealActivator(),
new StateServiceActivator(), new StateServiceActivator(),
new ChartBaseActivator(), new ChartBaseActivator(),
new SchedulerActivator(), new SchedulerActivator(),

2
src/main/java/com/fr/io/ExcelToCpt.java

@ -7,6 +7,7 @@ import com.fr.config.activator.BaseDBActivator;
import com.fr.config.activator.ConfigurationActivator; import com.fr.config.activator.ConfigurationActivator;
import com.fr.env.operator.CommonOperatorImpl; import com.fr.env.operator.CommonOperatorImpl;
import com.fr.general.I18nResource; import com.fr.general.I18nResource;
import com.fr.health.activator.ModuleHealActivator;
import com.fr.io.importer.Excel2007ReportImporter; import com.fr.io.importer.Excel2007ReportImporter;
import com.fr.main.TemplateWorkBook; import com.fr.main.TemplateWorkBook;
import com.fr.main.impl.WorkBook; import com.fr.main.impl.WorkBook;
@ -32,6 +33,7 @@ public class ExcelToCpt {
Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(), Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(),
new ConfigurationActivator(), new ConfigurationActivator(),
new StandaloneModeActivator(), new StandaloneModeActivator(),
new ModuleHealActivator(),
new StateServiceActivator(), new StateServiceActivator(),
new ChartBaseActivator(), new ChartBaseActivator(),
new SchedulerActivator(), new SchedulerActivator(),

2
src/main/java/com/fr/io/ExcuteDemo.java

@ -7,6 +7,7 @@ import com.fr.config.activator.BaseDBActivator;
import com.fr.config.activator.ConfigurationActivator; import com.fr.config.activator.ConfigurationActivator;
import com.fr.env.operator.CommonOperatorImpl; import com.fr.env.operator.CommonOperatorImpl;
import com.fr.general.I18nResource; import com.fr.general.I18nResource;
import com.fr.health.activator.ModuleHealActivator;
import com.fr.io.exporter.ExcelExporter; import com.fr.io.exporter.ExcelExporter;
import com.fr.main.TemplateWorkBook; import com.fr.main.TemplateWorkBook;
import com.fr.main.workbook.ResultWorkBook; import com.fr.main.workbook.ResultWorkBook;
@ -33,6 +34,7 @@ public class ExcuteDemo {
Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(), Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(),
new ConfigurationActivator(), new ConfigurationActivator(),
new StandaloneModeActivator(), new StandaloneModeActivator(),
new ModuleHealActivator(),
new StateServiceActivator(), new StateServiceActivator(),
new ChartBaseActivator(), new ChartBaseActivator(),
new SchedulerActivator(), new SchedulerActivator(),

2
src/main/java/com/fr/io/ExportApi_frm.java

@ -8,6 +8,7 @@ import com.fr.config.activator.ConfigurationActivator;
import com.fr.env.operator.CommonOperatorImpl; import com.fr.env.operator.CommonOperatorImpl;
import com.fr.form.export.FormToWBExecutor; import com.fr.form.export.FormToWBExecutor;
import com.fr.general.I18nResource; import com.fr.general.I18nResource;
import com.fr.health.activator.ModuleHealActivator;
import com.fr.io.exporter.ImageExporter; import com.fr.io.exporter.ImageExporter;
import com.fr.io.exporter.PDFExporter; import com.fr.io.exporter.PDFExporter;
import com.fr.io.exporter.excel.stream.StreamExcel2007Exporter; import com.fr.io.exporter.excel.stream.StreamExcel2007Exporter;
@ -31,6 +32,7 @@ public class ExportApi_frm {
Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(), Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(),
new ConfigurationActivator(), new ConfigurationActivator(),
new StandaloneModeActivator(), new StandaloneModeActivator(),
new ModuleHealActivator(),
new StateServiceActivator(), new StateServiceActivator(),
new SchedulerActivator(), new SchedulerActivator(),
new ReportBaseActivator(), new ReportBaseActivator(),

2
src/main/java/com/fr/io/ExportBatch.java

@ -7,6 +7,7 @@ import com.fr.config.activator.BaseDBActivator;
import com.fr.config.activator.ConfigurationActivator; import com.fr.config.activator.ConfigurationActivator;
import com.fr.env.operator.CommonOperatorImpl; import com.fr.env.operator.CommonOperatorImpl;
import com.fr.general.I18nResource; import com.fr.general.I18nResource;
import com.fr.health.activator.ModuleHealActivator;
import com.fr.io.exporter.ExcelExporter; import com.fr.io.exporter.ExcelExporter;
import com.fr.main.TemplateWorkBook; import com.fr.main.TemplateWorkBook;
import com.fr.main.workbook.ResultWorkBook; import com.fr.main.workbook.ResultWorkBook;
@ -38,6 +39,7 @@ public class ExportBatch {
Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(), Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(),
new ConfigurationActivator(), new ConfigurationActivator(),
new StandaloneModeActivator(), new StandaloneModeActivator(),
new ModuleHealActivator(),
new StateServiceActivator(), new StateServiceActivator(),
new ChartBaseActivator(), new ChartBaseActivator(),
new SchedulerActivator(), new SchedulerActivator(),

2
src/main/java/com/fr/io/ExportExcel.java

@ -8,6 +8,7 @@ import com.fr.config.activator.BaseDBActivator;
import com.fr.config.activator.ConfigurationActivator; import com.fr.config.activator.ConfigurationActivator;
import com.fr.env.operator.CommonOperatorImpl; import com.fr.env.operator.CommonOperatorImpl;
import com.fr.general.I18nResource; import com.fr.general.I18nResource;
import com.fr.health.activator.ModuleHealActivator;
import com.fr.io.exporter.ExcelExporter; import com.fr.io.exporter.ExcelExporter;
import com.fr.io.exporter.LargeDataPageExcelExporter; import com.fr.io.exporter.LargeDataPageExcelExporter;
import com.fr.io.exporter.PageExcel2007Exporter; import com.fr.io.exporter.PageExcel2007Exporter;
@ -40,6 +41,7 @@ public class ExportExcel {
Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(), Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(),
new ConfigurationActivator(), new ConfigurationActivator(),
new StandaloneModeActivator(), new StandaloneModeActivator(),
new ModuleHealActivator(),
new StateServiceActivator(), new StateServiceActivator(),
new ChartBaseActivator(), new ChartBaseActivator(),
new SchedulerActivator(), new SchedulerActivator(),

2
src/main/java/com/fr/io/ExportReports.java

@ -8,6 +8,7 @@ import com.fr.config.activator.BaseDBActivator;
import com.fr.config.activator.ConfigurationActivator; import com.fr.config.activator.ConfigurationActivator;
import com.fr.env.operator.CommonOperatorImpl; import com.fr.env.operator.CommonOperatorImpl;
import com.fr.general.I18nResource; import com.fr.general.I18nResource;
import com.fr.health.activator.ModuleHealActivator;
import com.fr.io.exporter.PageExcelExporter; import com.fr.io.exporter.PageExcelExporter;
import com.fr.main.TemplateWorkBook; import com.fr.main.TemplateWorkBook;
import com.fr.main.workbook.PageWorkBook; import com.fr.main.workbook.PageWorkBook;
@ -35,6 +36,7 @@ public class ExportReports {
Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(), Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(),
new ConfigurationActivator(), new ConfigurationActivator(),
new StandaloneModeActivator(), new StandaloneModeActivator(),
new ModuleHealActivator(),
new StateServiceActivator(), new StateServiceActivator(),
new ChartBaseActivator(), new ChartBaseActivator(),
new SchedulerActivator(), new SchedulerActivator(),

2
src/main/java/com/fr/io/JavaPrint.java

@ -8,6 +8,7 @@ import com.fr.config.activator.BaseDBActivator;
import com.fr.config.activator.ConfigurationActivator; import com.fr.config.activator.ConfigurationActivator;
import com.fr.env.operator.CommonOperatorImpl; import com.fr.env.operator.CommonOperatorImpl;
import com.fr.general.I18nResource; import com.fr.general.I18nResource;
import com.fr.health.activator.ModuleHealActivator;
import com.fr.main.TemplateWorkBook; import com.fr.main.TemplateWorkBook;
import com.fr.module.Module; import com.fr.module.Module;
import com.fr.module.tool.ActivatorToolBox; import com.fr.module.tool.ActivatorToolBox;
@ -29,6 +30,7 @@ public class JavaPrint {
Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(), Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(),
new ConfigurationActivator(), new ConfigurationActivator(),
new StandaloneModeActivator(), new StandaloneModeActivator(),
new ModuleHealActivator(),
new StateServiceActivator(), new StateServiceActivator(),
new ChartBaseActivator(), new ChartBaseActivator(),
new SchedulerActivator(), new SchedulerActivator(),

2
src/main/java/com/fr/io/SaveReportToDatabase.java

@ -7,6 +7,7 @@ import com.fr.config.activator.BaseDBActivator;
import com.fr.config.activator.ConfigurationActivator; import com.fr.config.activator.ConfigurationActivator;
import com.fr.env.operator.CommonOperatorImpl; import com.fr.env.operator.CommonOperatorImpl;
import com.fr.general.I18nResource; import com.fr.general.I18nResource;
import com.fr.health.activator.ModuleHealActivator;
import com.fr.module.Module; import com.fr.module.Module;
import com.fr.module.tool.ActivatorToolBox; import com.fr.module.tool.ActivatorToolBox;
import com.fr.report.ReportActivator; import com.fr.report.ReportActivator;
@ -45,6 +46,7 @@ public class SaveReportToDatabase {
Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(), Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(),
new ConfigurationActivator(), new ConfigurationActivator(),
new StandaloneModeActivator(), new StandaloneModeActivator(),
new ModuleHealActivator(),
new StateServiceActivator(), new StateServiceActivator(),
new ChartBaseActivator(), new ChartBaseActivator(),
new SchedulerActivator(), new SchedulerActivator(),

2
src/main/java/com/fr/io/SetParameterWindow.java

@ -9,6 +9,7 @@ import com.fr.config.activator.ConfigurationActivator;
import com.fr.env.operator.CommonOperatorImpl; import com.fr.env.operator.CommonOperatorImpl;
import com.fr.general.Background; import com.fr.general.Background;
import com.fr.general.I18nResource; import com.fr.general.I18nResource;
import com.fr.health.activator.ModuleHealActivator;
import com.fr.io.exporter.EmbeddedTableDataExporter; import com.fr.io.exporter.EmbeddedTableDataExporter;
import com.fr.main.impl.WorkBook; import com.fr.main.impl.WorkBook;
import com.fr.main.parameter.ReportParameterAttr; import com.fr.main.parameter.ReportParameterAttr;
@ -33,6 +34,7 @@ public class SetParameterWindow {
Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(), Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(),
new ConfigurationActivator(), new ConfigurationActivator(),
new StandaloneModeActivator(), new StandaloneModeActivator(),
new ModuleHealActivator(),
new StateServiceActivator(), new StateServiceActivator(),
new ChartBaseActivator(), new ChartBaseActivator(),
new SchedulerActivator(), new SchedulerActivator(),

2
src/main/java/com/fr/io/SimpleDemo.java

@ -9,6 +9,7 @@ import com.fr.config.activator.ConfigurationActivator;
import com.fr.env.operator.CommonOperatorImpl; import com.fr.env.operator.CommonOperatorImpl;
import com.fr.general.FRFont; import com.fr.general.FRFont;
import com.fr.general.I18nResource; import com.fr.general.I18nResource;
import com.fr.health.activator.ModuleHealActivator;
import com.fr.main.impl.WorkBook; import com.fr.main.impl.WorkBook;
import com.fr.module.Module; import com.fr.module.Module;
import com.fr.module.tool.ActivatorToolBox; import com.fr.module.tool.ActivatorToolBox;
@ -33,6 +34,7 @@ public class SimpleDemo {
Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(), Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(),
new ConfigurationActivator(), new ConfigurationActivator(),
new StandaloneModeActivator(), new StandaloneModeActivator(),
new ModuleHealActivator(),
new StateServiceActivator(), new StateServiceActivator(),
new ChartBaseActivator(), new ChartBaseActivator(),
new SchedulerActivator(), new SchedulerActivator(),

1
src/test/main/java/com/fr/demo/ExportApiTest.java

@ -43,6 +43,7 @@ public class ExportApiTest extends TestCase {
Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(), Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(),
new ConfigurationActivator(), new ConfigurationActivator(),
new StandaloneModeActivator(), new StandaloneModeActivator(),
new ModuleHealActivator(),
new StateServiceActivator(), new StateServiceActivator(),
new ChartBaseActivator(), new ChartBaseActivator(),
new SchedulerActivator(), new SchedulerActivator(),

1
src/test/main/java/com/fr/demo/ModuleStartTest.java

@ -65,6 +65,7 @@ public class ModuleStartTest extends TestCase {
Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(), Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(),
new ConfigurationActivator(), new ConfigurationActivator(),
new StandaloneModeActivator(), new StandaloneModeActivator(),
new ModuleHealActivator(),
new StateServiceActivator(), new StateServiceActivator(),
new ChartBaseActivator(), new ChartBaseActivator(),
new SchedulerActivator(), new SchedulerActivator(),

Loading…
Cancel
Save