From 23ded627f87ca96ef793013dd3f44ab05e2d111b Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 08 Jul 2022 12:13:34 +0800
Subject: [PATCH] 修改article handler 增加 签
---
src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/CmsTemplateServiceImpl.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 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 897950c..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
@@ -79,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;
}
@@ -104,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);
}
@@ -126,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);
}
@@ -165,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());
@@ -174,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