From a56380c00de70b79f7fd4f986139e1c342821bac Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 11 Jul 2022 22:21:23 +0800
Subject: [PATCH] fix
---
src/main/java/com/xcong/farmer/cms/modules/core/service/impl/CmsCoreServiceImpl.java | 9 +++++++++
src/main/java/com/xcong/farmer/cms/core/node/Template.java | 18 +++++++++++++++---
src/main/java/com/xcong/farmer/cms/modules/core/controller/CmsCoreController.java | 2 +-
src/main/java/com/xcong/farmer/cms/modules/system/service/IReleaseService.java | 3 ++-
src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ReleaseServiceImpl.java | 28 +++++++++++++++++++++-------
5 files changed, 48 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/xcong/farmer/cms/core/node/Template.java b/src/main/java/com/xcong/farmer/cms/core/node/Template.java
index 6a7a49c..ab9b54e 100644
--- a/src/main/java/com/xcong/farmer/cms/core/node/Template.java
+++ b/src/main/java/com/xcong/farmer/cms/core/node/Template.java
@@ -70,8 +70,20 @@
if (!new Integer(1).equals(page)) {
this.name = name + "_" + page;
}
- } else {
-
+ } else if ("search".equals(templateType)){
+ Object templateName = system.get("templateName");
+ if (templateName != null) {
+ this.name = String.valueOf(templateName);
+ } else {
+ this.name = "search";
+ }
+ } else if ("message".equals(templateType)) {
+ Object templateName = system.get("templateName");
+ if (templateName != null) {
+ this.name = String.valueOf(templateName);
+ } else {
+ this.name = "message";
+ }
}
}
@@ -107,7 +119,7 @@
file.mkdirs();
}
- FileOutputStream outputStream = new FileOutputStream(path +this.name + suffix);
+ FileOutputStream outputStream = new FileOutputStream(path + this.name + suffix);
outputStream.write(html.getBytes());
outputStream.close();
} catch (IOException e) {
diff --git a/src/main/java/com/xcong/farmer/cms/modules/core/controller/CmsCoreController.java b/src/main/java/com/xcong/farmer/cms/modules/core/controller/CmsCoreController.java
index 4aadc03..f65150f 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/core/controller/CmsCoreController.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/core/controller/CmsCoreController.java
@@ -45,7 +45,7 @@
@PostMapping(value = "/releaseIndex")
public Result releaseIndex() {
Long companyId = LoginUserUtil.getCompanyId();
- releaseService.releaseIndex(companyId);
+ releaseService.releaseIndex(companyId, true);
return Result.ok("success");
}
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 7a2eb81..daf39db 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
@@ -112,6 +112,15 @@
public void process(Map<String, Object> data, String templateType, String templateName) {
data.put("templateType", templateType);
globalData(data);
+
+ if ("search".equals(templateType)) {
+ templateName = "search.html";
+ }
+
+ if ("message".equals(templateType)) {
+ templateName = "message.html";
+ }
+
try {
cfg.process(data, templateName);
} catch (Exception e) {
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/service/IReleaseService.java b/src/main/java/com/xcong/farmer/cms/modules/system/service/IReleaseService.java
index 31d3ed1..2af8ed0 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/service/IReleaseService.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/service/IReleaseService.java
@@ -9,7 +9,8 @@
void releaseColumns(int type, Long companyId);
- void releaseIndex(Long companyId);
+ void releaseIndex(Long companyId, boolean hasSearch);
void releaseAll(Long companyId);
+
}
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ReleaseServiceImpl.java b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ReleaseServiceImpl.java
index ff8221c..b647660 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ReleaseServiceImpl.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ReleaseServiceImpl.java
@@ -4,8 +4,11 @@
import com.xcong.farmer.cms.modules.core.service.ICmsCoreService;
import com.xcong.farmer.cms.modules.system.entity.ArticleEntity;
import com.xcong.farmer.cms.modules.system.entity.ColumnEntity;
+import com.xcong.farmer.cms.modules.system.entity.WebSettingEntity;
import com.xcong.farmer.cms.modules.system.mapper.ArticleMapper;
import com.xcong.farmer.cms.modules.system.mapper.ColumnMapper;
+import com.xcong.farmer.cms.modules.system.mapper.CompanyMapper;
+import com.xcong.farmer.cms.modules.system.mapper.WebSetMapper;
import com.xcong.farmer.cms.modules.system.service.IReleaseService;
import com.xcong.farmer.cms.modules.system.util.LoginUserUtil;
import lombok.extern.slf4j.Slf4j;
@@ -22,8 +25,8 @@
import java.util.concurrent.TimeUnit;
/**
- * @TODO 发布时，index存在重复发布的情况，可优化。用线程notify唤醒。
* @author wzy
+ * @TODO 发布时，index存在重复发布的情况，可优化。用线程notify唤醒。
* @date 2022-07-05
**/
@Slf4j
@@ -38,6 +41,9 @@
@Autowired
private ICmsCoreService cmsCoreService;
+
+ @Autowired
+ private WebSetMapper webSetMapper;
private final Executor executor = new ThreadPoolExecutor(5, 20, 600, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>());
@@ -54,7 +60,7 @@
data.put("id", article.getId());
data.put("companyId", companyId);
- executor.execute(()->{
+ executor.execute(() -> {
log.info("执行文章发布");
cmsCoreService.articleProcess(data, column.getArticleTemplate(), column.getPath());
this.releaseColumn(column.getId(), 1, companyId);
@@ -70,7 +76,7 @@
}
}
- this.releaseIndex(companyId);
+ this.releaseIndex(companyId, false);
});
}
@@ -104,7 +110,7 @@
cmsCoreService.columnProcess(parentMap, parentColumn.getListTemplate());
}
- releaseIndex(companyId);
+ releaseIndex(companyId, false);
});
if (type != 1) {
@@ -134,7 +140,7 @@
}
}
- releaseIndex(companyId);
+ releaseIndex(companyId, false);
});
}
@@ -170,11 +176,19 @@
}
@Override
- public void releaseIndex(Long companyId) {
+ public void releaseIndex(Long companyId, boolean hasSearch) {
Map<String, Object> map = new HashMap<>();
map.put("companyId", companyId);
- cmsCoreService.indexProcess(map, null);
+ WebSettingEntity webSetting = webSetMapper.selectByCompanyId(companyId);
+
+ cmsCoreService.indexProcess(map, webSetting.getIndexTemplate());
+ if (hasSearch) {
+ executor.execute(() -> {
+ cmsCoreService.process(map, "search", webSetting.getSearchTemplate());
+ cmsCoreService.process(map, "message", webSetting.getMsgTemplate());
+ });
+ }
}
@Override
--
Gitblit v1.9.1