Skip to content

Commit 961d158

Browse files
committed
fix template copy error
1 parent 04d9946 commit 961d158

File tree

7 files changed

+7
-34
lines changed

7 files changed

+7
-34
lines changed

chat2db-server/chat2db-server-start/src/main/java/ai/chat2db/server/start/listener/TemplateListener.java

Lines changed: 0 additions & 26 deletions
This file was deleted.

chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/rdb/RdbDocController.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,6 @@ public class RdbDocController {
5050
@Autowired
5151
private RdbWebConverter rdbWebConverter;
5252

53-
@Autowired
54-
private ApplicationContext applicationContext;
5553

5654
/**
5755
* export data
@@ -61,7 +59,6 @@ public class RdbDocController {
6159
@PostMapping("/export")
6260
public void export(@Valid @RequestBody DataExportRequest request, HttpServletResponse response) throws Exception {
6361
//复制模板
64-
applicationContext.publishEvent(new TemplateEvent("copy"));
6562
ExportTypeEnum exportType = EasyEnumUtils.getEnum(ExportTypeEnum.class, request.getExportType());
6663
response.setCharacterEncoding("utf-8");
6764
String fileName = URLEncoder.encode(

chat2db-server/chat2db-server-start/src/main/java/ai/chat2db/server/start/config/util/CopyTemplate.java renamed to chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/rdb/factory/CopyTemplate.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
package ai.chat2db.server.start.config.util;
1+
package ai.chat2db.server.web.api.controller.rdb.factory;
22

33
import ai.chat2db.server.tools.common.util.ConfigUtils;
44
import lombok.extern.slf4j.Slf4j;
5-
import org.springframework.stereotype.Component;
65

76
import java.io.File;
87
import java.io.FileOutputStream;
@@ -15,15 +14,14 @@
1514
*
1615
* @author lzy
1716
**/
18-
@Component
1917
@Slf4j
2018
public class CopyTemplate {
2119
/**
2220
* 模板文件
2321
**/
2422
private static final List<String> TEMPLATE_FILE = Arrays.asList("template.html", "template_diy.docx", "sub_template_diy.docx");
2523

26-
public void copyTemplateFile() {
24+
public static void copyTemplateFile() {
2725
String templateDir = ConfigUtils.CONFIG_BASE_PATH + File.separator + "template";
2826
File file = new File(templateDir);
2927
if (!file.exists()) {
@@ -34,7 +32,7 @@ public void copyTemplateFile() {
3432
}
3533
}
3634

37-
public void saveFile(String dir, String path, boolean isOverride) {
35+
private static void saveFile(String dir, String path, boolean isOverride) {
3836
if (!isOverride) {
3937
File file = new File(dir + File.separator + path);
4038
if (file.exists()) {

chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/rdb/factory/ExportServiceFactory.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,16 @@ public class ExportServiceFactory {
1919
*/
2020
private static final Map<String, Class<?>> REPORT_POOL = new ConcurrentHashMap<>(8);
2121

22+
23+
24+
2225
static {
2326
REPORT_POOL.put(ExportTypeEnum.EXCEL.name(), ExportExcelService.class);
2427
REPORT_POOL.put(ExportTypeEnum.WORD.name(), ExportWordSuperService.class);
2528
REPORT_POOL.put(ExportTypeEnum.MARKDOWN.name(), ExportMarkdownService.class);
2629
REPORT_POOL.put(ExportTypeEnum.HTML.name(), ExportHtmlService.class);
2730
REPORT_POOL.put(ExportTypeEnum.PDF.name(), ExportPdfService.class);
31+
CopyTemplate.copyTemplateFile();
2832
}
2933

3034
/**

chat2db-server/chat2db-server-start/src/main/resources/template/sub_template_diy.docx renamed to chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/resources/template/sub_template_diy.docx

File renamed without changes.

chat2db-server/chat2db-server-start/src/main/resources/template/template.html renamed to chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/resources/template/template.html

File renamed without changes.

chat2db-server/chat2db-server-start/src/main/resources/template/template_diy.docx renamed to chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/resources/template/template_diy.docx

File renamed without changes.

0 commit comments

Comments
 (0)