Pull request #34: REPORT-39385 导出API，日志报错，文件无法输出

Merge in PG/plugin-report-doc-demo from ~BRUCE.DENG/plugin-report-doc-demo:release/10.0 to release/10.0

* commit 'ff722491446fcb21259c5107afb0552566fa25c7':
  REPORT-39385 导出API，日志报错，文件无法输出

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

@@ -8,6 +8,7 @@ import com.fr.config.activator.ConfigurationActivator;
 import com.fr.env.operator.CommonOperatorImpl;
 import com.fr.general.I18nResource;
 import com.fr.health.activator.ModuleHealActivator;
+import com.fr.io.ResourceRepositoryActivator;
 import com.fr.module.Module;
 import com.fr.module.tool.ActivatorToolBox;
 import com.fr.report.ReportActivator;
@@ -35,6 +36,7 @@ public class SaveReportToDatabase {
             // 定义报表运行环境,用于执行报表
             Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(),
                     new ConfigurationActivator(),
+                    new ResourceRepositoryActivator(),
                     new StandaloneModeActivator(),
                     new ModuleHealActivator(),
                     new StateServiceActivator(),

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

@@ -10,6 +10,7 @@ import com.fr.config.activator.ConfigurationActivator;
 import com.fr.env.operator.CommonOperatorImpl;
 import com.fr.general.I18nResource;
 import com.fr.health.activator.ModuleHealActivator;
+import com.fr.io.ResourceRepositoryActivator;
 import com.fr.io.TemplateWorkBookIO;
 import com.fr.json.JSONArray;
 import com.fr.json.JSONObject;
@@ -45,6 +46,7 @@ public class ReportCheck extends AbstractFunction {
         // 定义报表运行环境,用于执行报表
         Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(),
                 new ConfigurationActivator(),
+                new ResourceRepositoryActivator(),
                 new StandaloneModeActivator(),
                 new ModuleHealActivator(),
                 new StateServiceActivator(),

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

@@ -37,6 +37,7 @@ public class CreateGenericTemplate {
         // 定义报表运行环境,用于执行报表
         Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(),
                 new ConfigurationActivator(),
+                new ResourceRepositoryActivator(),
                 new StandaloneModeActivator(),
                 new ModuleHealActivator(),
                 new StateServiceActivator(),

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

@@ -32,6 +32,7 @@ public class ExcelToCpt {
         // 定义报表运行环境,用于执行报表
         Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(),
                 new ConfigurationActivator(),
+                new ResourceRepositoryActivator(),
                 new StandaloneModeActivator(),
                 new ModuleHealActivator(),
                 new StateServiceActivator(),

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

@@ -33,6 +33,7 @@ public class ExcuteDemo {
             // 定义报表运行环境,用于执行报表
             Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(),
                     new ConfigurationActivator(),
+                    new ResourceRepositoryActivator(),
                     new StandaloneModeActivator(),
                     new ModuleHealActivator(),
                     new StateServiceActivator(),

src/main/java/com/fr/io/ExportApi.java

@@ -10,8 +10,14 @@ import com.fr.general.I18nResource;
 import com.fr.general.log.Log4jConfig;
 import com.fr.general.log.parser.ExtraPatternParserManager;
 import com.fr.health.activator.ModuleHealActivator;
-import com.fr.io.TemplateWorkBookIO;
-import com.fr.io.exporter.*;
+import com.fr.io.exporter.CSVExporter;
+import com.fr.io.exporter.EmbeddedTableDataExporter;
+import com.fr.io.exporter.ExcelExporter;
+import com.fr.io.exporter.ImageExporter;
+import com.fr.io.exporter.PDFExporter;
+import com.fr.io.exporter.SVGExporter;
+import com.fr.io.exporter.TextExporter;
+import com.fr.io.exporter.WordExporter;
 import com.fr.io.exporter.excel.stream.StreamExcel2007Exporter;
 import com.fr.main.impl.WorkBook;
 import com.fr.module.tool.ActivatorToolBox;
@@ -43,6 +49,7 @@ public class ExportApi {
         /**定义报表运行环境,用于执行报表*/
         com.fr.module.Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(),
                 new ConfigurationActivator(),
+                new ResourceRepositoryActivator(),
                 new StandaloneModeActivator(),
                 new ModuleHealActivator(),
                 //2020.4.26jar包之前的版本，替换成StateServerActivator()

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

@@ -31,6 +31,7 @@ public class ExportApi_frm {
         // 定义报表运行环境,用于执行报表
         Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(),
                 new ConfigurationActivator(),
+                new ResourceRepositoryActivator(),
                 new StandaloneModeActivator(),
                 new ModuleHealActivator(),
                 new StateServiceActivator(),

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

@@ -38,6 +38,7 @@ public class ExportBatch {
             // 定义报表运行环境,用于执行报表
             Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(),
                     new ConfigurationActivator(),
+                    new ResourceRepositoryActivator(),
                     new StandaloneModeActivator(),
                     new ModuleHealActivator(),
                     new StateServiceActivator(),

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

@@ -40,6 +40,7 @@ public class ExportExcel {
         // 定义报表运行环境,用于执行报表
         Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(),
                 new ConfigurationActivator(),
+                new ResourceRepositoryActivator(),
                 new StandaloneModeActivator(),
                 new ModuleHealActivator(),
                 new StateServiceActivator(),

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

@@ -35,6 +35,7 @@ public class ExportReports {
         // 定义报表运行环境,用于执行报表
         Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(),
                 new ConfigurationActivator(),
+                new ResourceRepositoryActivator(),
                 new StandaloneModeActivator(),
                 new ModuleHealActivator(),
                 new StateServiceActivator(),

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

@@ -29,6 +29,7 @@ public class JavaPrint {
         // 定义报表运行环境,用于执行报表
         Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(),
                 new ConfigurationActivator(),
+                new ResourceRepositoryActivator(),
                 new StandaloneModeActivator(),
                 new ModuleHealActivator(),
                 new StateServiceActivator(),

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

@@ -45,6 +45,7 @@ public class SaveReportToDatabase {
             // 定义报表运行环境,用于执行报表
             Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(),
                     new ConfigurationActivator(),
+                    new ResourceRepositoryActivator(),
                     new StandaloneModeActivator(),
                     new ModuleHealActivator(),
                     new StateServiceActivator(),

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

@@ -33,6 +33,7 @@ public class SetParameterWindow {
             // 定义报表运行环境,用于执行报表
             Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(),
                     new ConfigurationActivator(),
+                    new ResourceRepositoryActivator(),
                     new StandaloneModeActivator(),
                     new ModuleHealActivator(),
                     new StateServiceActivator(),

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

@@ -33,6 +33,7 @@ public class SimpleDemo {
         // 定义报表运行环境,用于执行报表
         Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(),
                 new ConfigurationActivator(),
+                new ResourceRepositoryActivator(),
                 new StandaloneModeActivator(),
                 new ModuleHealActivator(),
                 new StateServiceActivator(),

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

@@ -42,6 +42,7 @@ public class ExportApiTest extends TestCase {
     public void testExport() {
         Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(),
                 new ConfigurationActivator(),
+                new ResourceRepositoryActivator(),
                 new StandaloneModeActivator(),
                 new ModuleHealActivator(),
                 new StateServiceActivator(),

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

@@ -64,6 +64,7 @@ public class ModuleStartTest extends TestCase {
     private Module initModule() {
         Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(),
                 new ConfigurationActivator(),
+                new ResourceRepositoryActivator(),
                 new StandaloneModeActivator(),
                 new ModuleHealActivator(),
                 new StateServiceActivator(),