From 472f283b4da53a68dddb2ade8a32f646cc475f9f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 07 Jul 2022 15:55:40 +0800
Subject: [PATCH] 20220606
---
src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/CmsTemplateServiceImpl.java | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/CmsTemplateServiceImpl.java b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/CmsTemplateServiceImpl.java
index e21b47d..85c2902 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/CmsTemplateServiceImpl.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/CmsTemplateServiceImpl.java
@@ -45,14 +45,14 @@
public class CmsTemplateServiceImpl extends ServiceImpl<CmsTemplateMapper, CmsTemplateEntity> implements ICmsTemplateService {
@Autowired
- private TemplateConfiguration cfg;
+ private CmsProperties properties;
private List<String> fileSuffix = Arrays.asList(".zip", ".html");
@Override
public void updateTemplate(MultipartFile upload) {
- String templatePath = cfg.templatePath;
- String staticPath = cfg.staticPath;
+ String templatePath = properties.getTemplatePath();
+ String staticPath = properties.getStaticPath();
String filename = upload.getOriginalFilename();
String suffix = filename.substring(filename.lastIndexOf("."));
@@ -78,6 +78,7 @@
for (File templateFile : files) {
if (!templateFile.isFile()) {
+ FileUtil.move(templateFile, new File(FileUtils.path(staticPath, templateFile.getName())), true);
continue;
}
@@ -86,7 +87,7 @@
}
String name = templateFile.getName();
- if (!name.endsWith(".list.html") && !name.endsWith(".article.html") && !name.endsWith(".index.html")) {
+ if (!name.endsWith(".list.html") && !name.endsWith(".article.html") && !name.endsWith("index.html")) {
continue;
}
@@ -163,12 +164,9 @@
@Override
public Result viewTemplateInfo(Long id) {
- Long companyId = LoginUserUtil.getCompanyId();
CmsTemplateEntity cmsTemplateEntity = this.baseMapper.selectById(id);
- String baseUrl = cmsProperties.getBaseUrl();
String templatePath = cmsProperties.getTemplatePath();
- String htmlUrl = baseUrl + templatePath;
- String pathName = htmlUrl + "\\" + cmsTemplateEntity.getPath();
+ String pathName = FileUtils.path(templatePath, cmsTemplateEntity.getPath());
byte[] bytes = new byte[0];
try {
--
Gitblit v1.9.1