diff --git a/chat2db-server/chat2db-server-start/src/main/java/ai/chat2db/server/start/listener/TemplateListener.java b/chat2db-server/chat2db-server-start/src/main/java/ai/chat2db/server/start/listener/TemplateListener.java deleted file mode 100644 index 2f0783c7..00000000 --- a/chat2db-server/chat2db-server-start/src/main/java/ai/chat2db/server/start/listener/TemplateListener.java +++ /dev/null @@ -1,26 +0,0 @@ -package ai.chat2db.server.start.listener; - -import ai.chat2db.server.start.config.util.CopyTemplate; -import ai.chat2db.server.web.api.controller.rdb.doc.event.TemplateEvent; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.event.EventListener; -import org.springframework.stereotype.Component; - -/** - * TemplateListener - * - * @author lzy - **/ -@Component -public class TemplateListener { - - @Autowired - private CopyTemplate copyTemplate; - - @EventListener(classes = TemplateEvent.class) - public void copyTemplate() { - //复制模板 - copyTemplate.copyTemplateFile(); - } - -} diff --git a/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/rdb/RdbDocController.java b/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/rdb/RdbDocController.java index 4dd39690..0ea76219 100644 --- a/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/rdb/RdbDocController.java +++ b/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/rdb/RdbDocController.java @@ -50,8 +50,6 @@ public class RdbDocController { @Autowired private RdbWebConverter rdbWebConverter; - @Autowired - private ApplicationContext applicationContext; /** * export data @@ -61,7 +59,6 @@ public class RdbDocController { @PostMapping("/export") public void export(@Valid @RequestBody DataExportRequest request, HttpServletResponse response) throws Exception { //复制模板 - applicationContext.publishEvent(new TemplateEvent("copy")); ExportTypeEnum exportType = EasyEnumUtils.getEnum(ExportTypeEnum.class, request.getExportType()); response.setCharacterEncoding("utf-8"); String fileName = URLEncoder.encode( diff --git a/chat2db-server/chat2db-server-start/src/main/java/ai/chat2db/server/start/config/util/CopyTemplate.java b/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/rdb/factory/CopyTemplate.java similarity index 88% rename from chat2db-server/chat2db-server-start/src/main/java/ai/chat2db/server/start/config/util/CopyTemplate.java rename to chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/rdb/factory/CopyTemplate.java index d723e590..9798e4ba 100644 --- a/chat2db-server/chat2db-server-start/src/main/java/ai/chat2db/server/start/config/util/CopyTemplate.java +++ b/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/rdb/factory/CopyTemplate.java @@ -1,8 +1,7 @@ -package ai.chat2db.server.start.config.util; +package ai.chat2db.server.web.api.controller.rdb.factory; import ai.chat2db.server.tools.common.util.ConfigUtils; import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; import java.io.File; import java.io.FileOutputStream; @@ -15,7 +14,6 @@ import java.util.List; * * @author lzy **/ -@Component @Slf4j public class CopyTemplate { /** @@ -23,7 +21,7 @@ public class CopyTemplate { **/ private static final List TEMPLATE_FILE = Arrays.asList("template.html", "template_diy.docx", "sub_template_diy.docx"); - public void copyTemplateFile() { + public static void copyTemplateFile() { String templateDir = ConfigUtils.CONFIG_BASE_PATH + File.separator + "template"; File file = new File(templateDir); if (!file.exists()) { @@ -34,7 +32,7 @@ public class CopyTemplate { } } - public void saveFile(String dir, String path, boolean isOverride) { + private static void saveFile(String dir, String path, boolean isOverride) { if (!isOverride) { File file = new File(dir + File.separator + path); if (file.exists()) { diff --git a/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/rdb/factory/ExportServiceFactory.java b/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/rdb/factory/ExportServiceFactory.java index 579ee10f..c4e5146e 100644 --- a/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/rdb/factory/ExportServiceFactory.java +++ b/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/rdb/factory/ExportServiceFactory.java @@ -19,12 +19,16 @@ public class ExportServiceFactory { */ private static final Map> REPORT_POOL = new ConcurrentHashMap<>(8); + + + static { REPORT_POOL.put(ExportTypeEnum.EXCEL.name(), ExportExcelService.class); REPORT_POOL.put(ExportTypeEnum.WORD.name(), ExportWordSuperService.class); REPORT_POOL.put(ExportTypeEnum.MARKDOWN.name(), ExportMarkdownService.class); REPORT_POOL.put(ExportTypeEnum.HTML.name(), ExportHtmlService.class); REPORT_POOL.put(ExportTypeEnum.PDF.name(), ExportPdfService.class); + CopyTemplate.copyTemplateFile(); } /** diff --git a/chat2db-server/chat2db-server-start/src/main/resources/template/sub_template_diy.docx b/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/resources/template/sub_template_diy.docx similarity index 100% rename from chat2db-server/chat2db-server-start/src/main/resources/template/sub_template_diy.docx rename to chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/resources/template/sub_template_diy.docx diff --git a/chat2db-server/chat2db-server-start/src/main/resources/template/template.html b/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/resources/template/template.html similarity index 100% rename from chat2db-server/chat2db-server-start/src/main/resources/template/template.html rename to chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/resources/template/template.html diff --git a/chat2db-server/chat2db-server-start/src/main/resources/template/template_diy.docx b/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/resources/template/template_diy.docx similarity index 100% rename from chat2db-server/chat2db-server-start/src/main/resources/template/template_diy.docx rename to chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/resources/template/template_diy.docx