From e703d415ff36584518a76d4d26363bfd1556b43b Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 05 Jul 2022 12:01:35 +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 | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 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 1110bfb..807d28e 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.StrUtil;
import cn.hutool.core.util.ZipUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -82,7 +83,6 @@
Document parse = Jsoup.parse(templateFile, null);
String attr = parse.head().attr("name");
- System.out.println(attr);
CmsTemplateEntity cmsTemplate = new CmsTemplateEntity();
cmsTemplate.setCompanyId(10L);
if (name.endsWith(".list.html")) {
@@ -92,14 +92,32 @@
} else {
cmsTemplate.setType(1);
}
- cmsTemplate.setName(templateFile.getName());
+ cmsTemplate.setName(StrUtil.isNotBlank(attr) ? attr : templateFile.getName());
cmsTemplate.setPath(templateFile.getName());
+
+ this.baseMapper.insert(cmsTemplate);
}
}
if (".html".equals(suffix)) {
FileUtil.touch(file);
+
+ Document parse = Jsoup.parse(file, null);
+ String attr = parse.head().attr("name");
+ CmsTemplateEntity cmsTemplate = new CmsTemplateEntity();
+ cmsTemplate.setCompanyId(LoginUserUtil.getCompanyId());
+ if (file.getName().endsWith(".list.html")) {
+ cmsTemplate.setType(2);
+ } else if (file.getName().endsWith(".article.html")) {
+ cmsTemplate.setType(3);
+ } else {
+ cmsTemplate.setType(1);
+ }
+ cmsTemplate.setName(StrUtil.isNotBlank(attr) ? attr : file.getName());
+ cmsTemplate.setPath(file.getName());
+
+ this.baseMapper.insert(cmsTemplate);
}
} catch (IOException e) {
e.printStackTrace();
--
Gitblit v1.9.1