Merge branch 'master' of http://120.27.238.55:7000/r/farmer-cms

Helius

2022-07-07 f04b8922283120e2bc4a476ddc302ebd3b0894e4

 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);
            }