From e7f9932f6d5bb67dac0de33e9d52d439d9a1a6bf Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 08 Jul 2022 09:57:05 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/farmer-cms
---
src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/CmsTemplateServiceImpl.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 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 85c2902..12f3b24 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
@@ -53,6 +53,7 @@
public void updateTemplate(MultipartFile upload) {
String templatePath = properties.getTemplatePath();
String staticPath = properties.getStaticPath();
+ Long companyId = LoginUserUtil.getCompanyId();
String filename = upload.getOriginalFilename();
String suffix = filename.substring(filename.lastIndexOf("."));
@@ -78,7 +79,7 @@
for (File templateFile : files) {
if (!templateFile.isFile()) {
- FileUtil.move(templateFile, new File(FileUtils.path(staticPath, templateFile.getName())), true);
+ FileUtil.move(templateFile, new File(staticPath), true);
continue;
}
@@ -94,7 +95,7 @@
Document parse = Jsoup.parse(templateFile, null);
String attr = parse.head().attr("name");
CmsTemplateEntity cmsTemplate = new CmsTemplateEntity();
- cmsTemplate.setCompanyId(10L);
+ cmsTemplate.setCompanyId(companyId);
if (name.endsWith(".list.html")) {
cmsTemplate.setType(2);
} else if (name.endsWith(".article.html")) {
@@ -103,7 +104,7 @@
cmsTemplate.setType(1);
}
cmsTemplate.setName(StrUtil.isNotBlank(attr) ? attr : templateFile.getName());
- cmsTemplate.setPath(IdUtil.simpleUUID()+templateFile.getName());
+ cmsTemplate.setPath(templateFile.getName());
this.baseMapper.insert(cmsTemplate);
}
@@ -116,7 +117,7 @@
Document parse = Jsoup.parse(file, null);
String attr = parse.head().attr("name");
CmsTemplateEntity cmsTemplate = new CmsTemplateEntity();
- cmsTemplate.setCompanyId(LoginUserUtil.getCompanyId());
+ cmsTemplate.setCompanyId(companyId);
if (file.getName().endsWith(".list.html")) {
cmsTemplate.setType(2);
} else if (file.getName().endsWith(".article.html")) {
@@ -125,7 +126,7 @@
cmsTemplate.setType(1);
}
cmsTemplate.setName(StrUtil.isNotBlank(attr) ? attr : file.getName());
- cmsTemplate.setPath(IdUtil.simpleUUID()+file.getName());
+ cmsTemplate.setPath(file.getName());
this.baseMapper.insert(cmsTemplate);
}
@@ -164,6 +165,7 @@
@Override
public Result viewTemplateInfo(Long id) {
+ Result result = new Result();
CmsTemplateEntity cmsTemplateEntity = this.baseMapper.selectById(id);
String templatePath = cmsProperties.getTemplatePath();
String pathName = FileUtils.path(templatePath, cmsTemplateEntity.getPath());
@@ -173,11 +175,12 @@
bytes = Files.readAllBytes(Paths.get(pathName));
} catch (IOException e) {
e.printStackTrace();
- return Result.ok("未找到模板");
+ return result.fail("未找到模板");
}
String content = new String(bytes, StandardCharsets.UTF_8);
- return Result.ok(content );
+ result.setData(content);
+ return result;
}
}
--
Gitblit v1.9.1