diff --git a/src/main/java/net/mingsoft/cms/action/GeneraterAction.java b/src/main/java/net/mingsoft/cms/action/GeneraterAction.java index c592370a..cd152c1c 100644 --- a/src/main/java/net/mingsoft/cms/action/GeneraterAction.java +++ b/src/main/java/net/mingsoft/cms/action/GeneraterAction.java @@ -34,6 +34,8 @@ import net.mingsoft.cms.entity.CategoryEntity; import net.mingsoft.cms.util.CmsParserUtil; import net.mingsoft.mdiy.util.ParserUtil; import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Scope; @@ -64,6 +66,11 @@ import java.util.List; @Scope("request") public class GeneraterAction extends BaseAction { + /* + * log4j日志记录 + */ + protected final Logger LOG = LoggerFactory.getLogger(this.getClass()); + /** * 文章管理业务层 */ @@ -163,6 +170,7 @@ public class GeneraterAction extends BaseAction { for (CategoryEntity column : columns) { // 判断模板文件是否存在 if (!FileUtil.exist(ParserUtil.buildTempletPath(column.getCategoryUrl()))) { + LOG.error("模板不存在：{}",column.getCategoryUrl()); continue; } articleIdList = contentBiz.queryIdsByCategoryIdForParser(column.getId(), null, null); diff --git a/src/main/java/net/mingsoft/cms/action/web/MCmsAction.java b/src/main/java/net/mingsoft/cms/action/web/MCmsAction.java index 5f579778..1dde180b 100644 --- a/src/main/java/net/mingsoft/cms/action/web/MCmsAction.java +++ b/src/main/java/net/mingsoft/cms/action/web/MCmsAction.java @@ -49,6 +49,7 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.io.File; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.util.ArrayList; @@ -284,7 +285,7 @@ public class MCmsAction extends net.mingsoft.cms.action.BaseAction { */ @RequestMapping(value = "search") @ResponseBody - public void search(HttpServletRequest request, HttpServletResponse response) { + public void search(HttpServletRequest request, HttpServletResponse response) throws IOException { Map map = new HashMap<>(); // 读取请求字段 @@ -358,19 +359,6 @@ public class MCmsAction extends net.mingsoft.cms.action.BaseAction { //设置分页类 PageBean page = new PageBean(); - //读取模板的分页数量 - int size = BasicUtil.getInt(ParserUtil.SIZE,10); - try { - size = TagParser.getPageSize(ParserUtil.read(SEARCH+ParserUtil.HTM_SUFFIX,false )); - } catch (TemplateNotFoundException e1) { - e1.printStackTrace(); - } catch (MalformedTemplateNameException e1) { - e1.printStackTrace(); - } catch (ParseException e1) { - e1.printStackTrace(); - } catch (IOException e1) { - e1.printStackTrace(); - } Map searchMap = field; searchMap.forEach((k,v)->{ //sql注入过滤 @@ -381,24 +369,31 @@ public class MCmsAction extends net.mingsoft.cms.action.BaseAction { //查询数量 int count= contentBiz.getSearchCount(contentModel,fieldValueList,searchMap,BasicUtil.getAppId(),categoryIds); - int total = PageUtil.totalPage(count, size); - + map.put(ParserUtil.URL, BasicUtil.getUrl()); + map.put(SEARCH, searchMap); + map.put(ParserUtil.APP_ID, BasicUtil.getAppId()); + map.put(ParserUtil.PAGE, page); + map.put(ParserUtil.HTML, ParserUtil.HTML); + //动态解析 + map.put(ParserUtil.IS_DO,false); + //设置动态请求的模块路径 + map.put(ParserUtil.MODEL_NAME, "mcms"); + searchMap.put(ParserUtil.PAGE_NO, 0); + ParserUtil.read(SEARCH+ParserUtil.HTM_SUFFIX,map, page); + int total = PageUtil.totalPage(count, page.getSize()); int pageNo = BasicUtil.getInt(ParserUtil.PAGE_NO, 1); if(pageNo >= total && total!=0) { pageNo = total; } //获取总数 page.setTotal(total); - //设置页面显示数量 - page.setSize(size); - //设置列表当前页 page.setPageNo(pageNo); String str = ParserUtil.PAGE_NO+","+ParserUtil.SIZE; //设置分页的统一链接 String url = BasicUtil.getUrl()+request.getServletPath() +"?" + BasicUtil.assemblyRequestUrlParams(str.split(",")); - String pageNoStr = "&"+ParserUtil.SIZE+"="+size+"&"+ParserUtil.PAGE_NO+"="; + String pageNoStr = "&"+ParserUtil.SIZE+"="+page.getSize()+"&"+ParserUtil.PAGE_NO+"="; //下一页 String nextUrl = url + pageNoStr+((pageNo+1 > total)?total:pageNo+1); //首页 @@ -412,14 +407,8 @@ public class MCmsAction extends net.mingsoft.cms.action.BaseAction { page.setNextUrl(nextUrl); page.setPreUrl(preUrl); page.setLastUrl(lastUrl); - map.put(ParserUtil.URL, BasicUtil.getUrl()); + searchMap.put(ParserUtil.PAGE_NO, pageNo); - map.put(SEARCH, searchMap); - map.put(ParserUtil.PAGE, page); - //动态解析 - map.put(ParserUtil.IS_DO,false); - //设置动态请求的模块路径 - map.put(ParserUtil.MODEL_NAME, "mcms"); //解析后的内容 String content = ""; diff --git a/src/main/java/net/mingsoft/cms/util/CmsParserUtil.java b/src/main/java/net/mingsoft/cms/util/CmsParserUtil.java index 33e09e7a..701ca3c1 100644 --- a/src/main/java/net/mingsoft/cms/util/CmsParserUtil.java +++ b/src/main/java/net/mingsoft/cms/util/CmsParserUtil.java @@ -1,15 +1,12 @@ package net.mingsoft.cms.util; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.date.TimeInterval; import cn.hutool.core.io.FileUtil; import cn.hutool.core.util.PageUtil; import freemarker.cache.FileTemplateLoader; import freemarker.core.ParseException; import freemarker.template.MalformedTemplateNameException; import freemarker.template.Template; -import freemarker.template.TemplateException; import freemarker.template.TemplateNotFoundException; import net.mingsoft.base.constant.Const; import net.mingsoft.basic.util.BasicUtil; @@ -20,17 +17,12 @@ import net.mingsoft.mdiy.bean.PageBean; import net.mingsoft.mdiy.biz.IModelBiz; import net.mingsoft.mdiy.biz.impl.ModelBizImpl; import net.mingsoft.mdiy.entity.ModelEntity; -import net.mingsoft.mdiy.parser.TagParser; import net.mingsoft.mdiy.util.ParserUtil; import org.apache.commons.lang3.StringUtils; -import org.springframework.web.context.request.RequestContextHolder; -import org.springframework.web.context.request.ServletRequestAttributes; -import org.springframework.web.util.WebAppRootListener; import javax.servlet.http.HttpServletRequest; import java.io.File; import java.io.IOException; -import java.io.StringWriter; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -61,14 +53,6 @@ public class CmsParserUtil extends ParserUtil { map.put(COLUMN, column); String content = CmsParserUtil.generate(templatePath, map, false); FileUtil.writeString(content, ParserUtil.buildHtmlPath(targetPath), Const.UTF8); - - // 生成移动页面 - if (ParserUtil.hasMobileFile(templatePath)) { - // 手机端m - map.put(ParserUtil.MOBILE, BasicUtil.getApp().getAppMobileStyle()); - content = CmsParserUtil.generate(templatePath, map, true); - FileUtil.writeString(content, ParserUtil.buildMobileHtmlPath(targetPath), Const.UTF8); - } } /** @@ -95,13 +79,12 @@ public class CmsParserUtil extends ParserUtil { // 文章的栏目模型编号 String columnContentModelId = column.getMdiyModelId(); - - //ParserUtil.read(File.separator + column.getCategoryListUrl(), false, acrList); + PageBean page = new PageBean(); + page.setSize(10); + //获取分页数量 //获取列表页显示的文章数量 - int pageSize = 10; //获取总数 - int totalPageSize = PageUtil.totalPage(articleIdTotal, pageSize); String columnListPath; String mobilePath; @@ -112,12 +95,10 @@ public class CmsParserUtil extends ParserUtil { contentModel = (ModelEntity) SpringUtil.getBean(ModelBizImpl.class).getEntity(Integer.parseInt(columnContentModelId)); } int pageNo = 1; - PageBean page = new PageBean(); - page.setSize(pageSize); + //全局参数设置 Map parserParams = new HashMap(); parserParams.put(COLUMN, column); - page.setTotal(totalPageSize); parserParams.put(IS_DO, false); parserParams.put(HTML, HTML); parserParams.put(APP_ID, BasicUtil.getAppId()); @@ -129,24 +110,18 @@ public class CmsParserUtil extends ParserUtil { if(ParserUtil.IS_SINGLE) { parserParams.put(ParserUtil.URL, BasicUtil.getUrl()); } - + int totalPageSize = PageUtil.totalPage(articleIdTotal, page.getSize()); + page.setTotal(totalPageSize); + parserParams.put(ParserUtil.PAGE, page); + ParserUtil.read(File.separator + column.getCategoryListUrl(),parserParams, page); //文章列表页没有写文章列表标签，总数为0 if (totalPageSize <= 0) { // 数据库中第一页是从开始0*size - // 首页路径index.html - mobilePath = ParserUtil.buildMobileHtmlPath(column.getCategoryPath() + File.separator + ParserUtil.INDEX); columnListPath = ParserUtil.buildHtmlPath(column.getCategoryPath() + File.separator + ParserUtil.INDEX); // 设置分页的起始位置 page.setPageNo(pageNo); - parserParams.put(ParserUtil.PAGE, page); - String read = ParserUtil.read(File.separator + column.getCategoryListUrl(), false, parserParams); + String read = ParserUtil.read(File.separator + column.getCategoryListUrl(), parserParams); FileUtil.writeString(read, columnListPath, Const.UTF8); - // 判断是手机端生成还是pc端,防止重复生成 - if (ParserUtil.hasMobileFile(column.getCategoryListUrl())) { - parserParams.put(ParserUtil.MOBILE, BasicUtil.getApp().getAppMobileStyle()); - String read1 = ParserUtil.read(File.separator + column.getCategoryListUrl(), true, parserParams); - FileUtil.writeString(read1, mobilePath, Const.UTF8); - } } else { // 遍历分页 @@ -154,29 +129,17 @@ public class CmsParserUtil extends ParserUtil { if (i == 0) { // 数据库中第一页是从开始0*size // 首页路径index.html - mobilePath = ParserUtil - .buildMobileHtmlPath(column.getCategoryPath() + File.separator + ParserUtil.INDEX); columnListPath = ParserUtil .buildHtmlPath(column.getCategoryPath() + File.separator + ParserUtil.INDEX); } else { // 其他路径list-2.html - mobilePath = ParserUtil.buildMobileHtmlPath( - column.getCategoryPath() + File.separator + ParserUtil.PAGE_LIST + pageNo); columnListPath = ParserUtil .buildHtmlPath(column.getCategoryPath() + File.separator + ParserUtil.PAGE_LIST + pageNo); } // 设置分页的起始位置 page.setPageNo(pageNo); - parserParams.put(ParserUtil.PAGE, page); - String read = ParserUtil.read(File.separator + column.getCategoryListUrl(), false, parserParams); + String read = ParserUtil.read(File.separator + column.getCategoryListUrl(), parserParams); FileUtil.writeString(read, columnListPath, Const.UTF8); - // 判断是手机端生成还是pc端,防止重复生成 - if (ParserUtil.hasMobileFile(column.getCategoryListUrl())) { - parserParams.put(ParserUtil.MOBILE, BasicUtil.getApp().getAppMobileStyle()); - String read1 = ParserUtil.read(File.separator + column.getCategoryListUrl(), true, parserParams); - // 将tag.getContent()写入路径 - FileUtil.writeString(read1, mobilePath, Const.UTF8); - } pageNo++; } } @@ -290,33 +253,6 @@ public class CmsParserUtil extends ParserUtil { e.printStackTrace(); } }); - // 手机端 - - if (ParserUtil.hasMobileFile(columnUrl)) { - //如果是封面就生成index.html - if(Integer.parseInt(articleIdList.get(artId).getCategoryType()) == COLUMN_TYPE_COVER) { - writePath = ParserUtil.buildMobileHtmlPath(articleColumnPath + File.separator + ParserUtil.INDEX); - }else { - writePath = ParserUtil.buildMobileHtmlPath(articleColumnPath + File.separator + articleId); - } - // 判断文件是否存在，若不存在弹出返回信息 - if (!FileUtil.exist(ParserUtil.buildTempletPath(MOBILE + File.separator + columnUrl))) { - artId++; - continue; - } - String finalWritePath1 = writePath; - pool.execute(() -> { - SpringUtil.setRequest(request); - parserParams.put(MOBILE, BasicUtil.getApp().getAppMobileStyle()); - String content = null; - try { - content = CmsParserUtil.generate(columnUrl, parserParams, true); - FileUtil.writeString(content, finalWritePath1, Const.UTF8); - } catch (IOException e) { - e.printStackTrace(); - } - }); - } artId++; } } diff --git a/src/main/webapp/templets/1/default/about.htm b/src/main/webapp/templets/1/default/about.htm index 94a1b2f7..7798f829 100644 --- a/src/main/webapp/templets/1/default/about.htm +++ b/src/main/webapp/templets/1/default/about.htm @@ -6,7 +6,7 @@ <#include "head.htm"/> -
+
@@ -15,13 +15,13 @@ <#include "menu-left.htm"/>
- 首页 + 首页 > - ${field.typetitle} + ${field.typetitle}
-
{ms:field.title/}
-
{ms:field.content/}
+
${field.title}
+
${field.content}
diff --git a/src/main/webapp/templets/1/default/case-list.htm b/src/main/webapp/templets/1/default/case-list.htm index 8dabd062..ddc9fd8d 100644 --- a/src/main/webapp/templets/1/default/case-list.htm +++ b/src/main/webapp/templets/1/default/case-list.htm @@ -6,7 +6,7 @@ <#include "head.htm"/> -
+
diff --git a/src/main/webapp/templets/1/default/head.htm b/src/main/webapp/templets/1/default/head.htm index 9437a473..32a1cb5c 100644 --- a/src/main/webapp/templets/1/default/head.htm +++ b/src/main/webapp/templets/1/default/head.htm @@ -1,7 +1,7 @@
- +
    @@ -54,7 +54,7 @@
-
+ @@ -63,12 +63,12 @@
- 登录 - |注册 + 登录 + |注册