From 1facfdc9361d888d72c959bac4d8fb05dcad02d7 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 07 Jul 2022 18:27:06 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/farmer-cms
---
src/main/java/com/xcong/farmer/cms/modules/core/service/impl/CmsCoreServiceImpl.java | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/xcong/farmer/cms/modules/core/service/impl/CmsCoreServiceImpl.java b/src/main/java/com/xcong/farmer/cms/modules/core/service/impl/CmsCoreServiceImpl.java
index 475c74d..433f90a 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/core/service/impl/CmsCoreServiceImpl.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/core/service/impl/CmsCoreServiceImpl.java
@@ -10,6 +10,10 @@
import javax.validation.constraints.NotNull;
import java.util.HashMap;
import java.util.Map;
+import java.util.concurrent.Executor;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
/**
* @author wzy
@@ -21,30 +25,32 @@
@Autowired
private TemplateConfiguration cfg;
+ private final Executor executor = new ThreadPoolExecutor(5, 10, 600, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>());
+
@Override
- public void articleProcess(Long id, String templateName, String templatePath) {
- Map<String, Object> data = new HashMap<>();
- data.put("id", id);
- data.put("companyId", 23L);
+ public void articleProcess(Map<String, Object> data, String templateName, String templatePath) {
data.put("templateType", "article");
data.put("templatePath", templatePath);
- data.put("templateName", id);
+ data.put("templateName", data.get("id"));
if (StrUtil.isEmpty(templateName)) {
templateName = "defualt.artile.html";
}
- cfg.process(data, templateName);
+
+ String finalTemplateName = templateName;
+ executor.execute(() -> cfg.process(data, finalTemplateName));
}
@Override
- public void columnProcess(Map<String, Object> data, String templateName, boolean article) {
- data.put("companyId", 23L);
+ public void columnProcess(Map<String, Object> data, String templateName) {
data.put("templateType", "column");
data.put("page", 1);
if (StrUtil.isEmpty(templateName)) {
templateName = "defualt.list.html";
}
- cfg.process(data, templateName);
+
+ String finalTemplateName = templateName;
+ executor.execute(() -> cfg.process(data, finalTemplateName));
}
@Override
@@ -53,7 +59,7 @@
templateName = "index.html";
}
- data.put("companyId", 23L);
- cfg.process(data, templateName);
+ String finalTemplateName = templateName;
+ executor.execute(() -> cfg.process(data, finalTemplateName));
}
}
--
Gitblit v1.9.1