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 |   42 ++++++++++++++++++++++++++++++++++++------
 1 files changed, 36 insertions(+), 6 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 2d41c7d..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
@@ -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;
@@ -38,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("."));
@@ -71,6 +78,7 @@
 
                 for (File templateFile : files) {
                     if (!templateFile.isFile()) {
+                        FileUtil.move(templateFile, new File(FileUtils.path(staticPath, templateFile.getName())), true);
                         continue;
                     }
 
@@ -79,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;
                     }
 
@@ -95,7 +103,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 +125,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 +158,26 @@
         List<CmsTemplateEntity> cmsTemplateEntities = this.baseMapper.selectList(objectQueryWrapper);
         return Result.ok(cmsTemplateEntities);
     }
+
+    @Autowired
+    private CmsProperties cmsProperties;
+
+    @Override
+    public Result viewTemplateInfo(Long id) {
+        CmsTemplateEntity cmsTemplateEntity = this.baseMapper.selectById(id);
+        String templatePath = cmsProperties.getTemplatePath();
+        String pathName = FileUtils.path(templatePath, 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 );
+    }
+
 }

--
Gitblit v1.9.1