From f04b8922283120e2bc4a476ddc302ebd3b0894e4 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 07 Jul 2022 20:42: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 |    6 +++---
 1 files changed, 3 insertions(+), 3 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..9ef6e93 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);
             }

--
Gitblit v1.9.1