From c49dd989ed6afddefb546672a17ec6745698edc9 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 07 Jul 2022 11:07:52 +0800
Subject: [PATCH] 20220606
---
src/main/java/com/xcong/farmer/cms/modules/system/service/ICmsTemplateService.java | 2 +
src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/CmsTemplateServiceImpl.java | 40 +++++++++++++++++++-
src/main/java/com/xcong/farmer/cms/modules/system/controller/CmsTemplateController.java | 8 +++
src/test/java/com/xcong/farmer/cms/KssframeworkApplicationTests.java | 45 ++++++++++++++++++++++
4 files changed, 92 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/controller/CmsTemplateController.java b/src/main/java/com/xcong/farmer/cms/modules/system/controller/CmsTemplateController.java
index f31f248..54c396d 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/controller/CmsTemplateController.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/controller/CmsTemplateController.java
@@ -48,6 +48,12 @@
@ApiOperation(value = "模板下拉列表", notes = "模板下拉列表接口")
@GetMapping(value = "/dropdownList")
public Result dropdownList() {
- return Result.ok(cmsTemplateService.dropdownList());
+ return cmsTemplateService.dropdownList();
+ }
+
+ @ApiOperation(value = "查看模板", notes = "查看模板")
+ @GetMapping(value = "/viewTemplateInfo/{id}")
+ public Result viewTemplateInfo(@PathVariable(value = "id") Long id) {
+ return cmsTemplateService.viewTemplateInfo(id);
}
}
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/service/ICmsTemplateService.java b/src/main/java/com/xcong/farmer/cms/modules/system/service/ICmsTemplateService.java
index ebe9aaa..5c95b78 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/service/ICmsTemplateService.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/service/ICmsTemplateService.java
@@ -17,4 +17,6 @@
void delete(Long id);
Result dropdownList();
+
+ Result viewTemplateInfo(Long id);
}
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 2d41c7d..a4a194d 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
@@ -1,6 +1,7 @@
package com.xcong.farmer.cms.modules.system.service.Impl;
import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.util.ZipUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -11,6 +12,7 @@
import com.xcong.farmer.cms.common.response.Result;
import com.xcong.farmer.cms.common.utils.FileUtils;
import com.xcong.farmer.cms.configurations.GlobalExceptionHandler;
+import com.xcong.farmer.cms.configurations.properties.CmsProperties;
import com.xcong.farmer.cms.core.template.TemplateConfiguration;
import com.xcong.farmer.cms.modules.system.dto.TemplateListDto;
import com.xcong.farmer.cms.modules.system.entity.CmsTemplateEntity;
@@ -25,7 +27,12 @@
import org.springframework.web.multipart.MultipartFile;
import java.io.File;
+import java.io.FileInputStream;
import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -95,7 +102,7 @@
cmsTemplate.setType(1);
}
cmsTemplate.setName(StrUtil.isNotBlank(attr) ? attr : templateFile.getName());
- cmsTemplate.setPath(templateFile.getName());
+ cmsTemplate.setPath(IdUtil.simpleUUID()+templateFile.getName());
this.baseMapper.insert(cmsTemplate);
}
@@ -117,7 +124,7 @@
cmsTemplate.setType(1);
}
cmsTemplate.setName(StrUtil.isNotBlank(attr) ? attr : file.getName());
- cmsTemplate.setPath(file.getName());
+ cmsTemplate.setPath(IdUtil.simpleUUID()+file.getName());
this.baseMapper.insert(cmsTemplate);
}
@@ -150,4 +157,33 @@
List<CmsTemplateEntity> cmsTemplateEntities = this.baseMapper.selectList(objectQueryWrapper);
return Result.ok(cmsTemplateEntities);
}
+
+ @Autowired
+ private CmsProperties cmsProperties;
+
+ @Override
+ public Result viewTemplateInfo(Long id) {
+ Long companyId = LoginUserUtil.getCompanyId();
+ CmsTemplateEntity cmsTemplateEntity = this.baseMapper.selectById(id);
+ String baseUrl = cmsProperties.getBaseUrl();
+ String templatePath = cmsProperties.getTemplatePath();
+ File uploadDir = new File(templatePath);
+ if (!uploadDir.isDirectory()) {
+ uploadDir.mkdir();
+ }
+ String htmlUrl = baseUrl + templatePath;
+ String pathName = htmlUrl + "\\" + cmsTemplateEntity.getPath();
+
+ byte[] bytes = new byte[0];
+ try {
+ bytes = Files.readAllBytes(Paths.get(pathName));
+ } catch (IOException e) {
+ e.printStackTrace();
+ return Result.ok("未找到模板");
+ }
+
+ String content = new String(bytes, StandardCharsets.UTF_8);
+ return Result.ok(content );
+ }
+
}
diff --git a/src/test/java/com/xcong/farmer/cms/KssframeworkApplicationTests.java b/src/test/java/com/xcong/farmer/cms/KssframeworkApplicationTests.java
index f4bab75..87f25ee 100644
--- a/src/test/java/com/xcong/farmer/cms/KssframeworkApplicationTests.java
+++ b/src/test/java/com/xcong/farmer/cms/KssframeworkApplicationTests.java
@@ -1,11 +1,25 @@
package com.xcong.farmer.cms;
+import cn.hutool.core.util.ObjectUtil;
+import com.xcong.farmer.cms.common.response.Result;
+import com.xcong.farmer.cms.configurations.properties.CmsProperties;
+import com.xcong.farmer.cms.modules.system.entity.CmsTemplateEntity;
+import com.xcong.farmer.cms.modules.system.mapper.CmsTemplateMapper;
import com.xcong.farmer.cms.modules.test.dao.TestUserDao;
import com.xcong.farmer.cms.modules.test.entity.TestUserEntity;
+import org.jsoup.Jsoup;
import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import javax.annotation.Resource;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Paths;
import java.util.Date;
@SpringBootTest
@@ -13,6 +27,9 @@
@Resource
private TestUserDao testUserDao;
+
+ @Resource
+ private CmsTemplateMapper cmsTemplateMapper;
@Test
public void testUserInsert() {
@@ -35,4 +52,32 @@
System.out.println(1);
}
+
+ @Autowired
+ private CmsProperties cmsProperties;
+
+ @Test
+ public void viewTemplateInfo() {
+ Long id = 4L;
+ CmsTemplateEntity cmsTemplateEntity = cmsTemplateMapper.selectById(id);
+ String htmlUrl = cmsProperties.getBaseUrl() + cmsProperties.getTemplatePath();
+ File uploadDir = new File(htmlUrl);
+ if (!uploadDir.isDirectory()) {
+ uploadDir.mkdir();
+ }
+ htmlUrl = "D:\\cmshtml";
+ String pathName = htmlUrl+"\\"+cmsTemplateEntity.getPath();
+ System.out.println(pathName);
+ byte[] bytes = new byte[0];
+ try {
+ bytes = Files.readAllBytes(Paths.get(pathName));
+ } catch (IOException e) {
+ e.printStackTrace();
+ System.out.println("未找到模板");
+ }
+
+ String content = new String(bytes, StandardCharsets.UTF_8);
+ System.out.println(content);
+ }
+
}
--
Gitblit v1.9.1