ak
/
msopen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
wujj 2020-11-28 12:12:09 +08:00
parent 527f2b2711 fd764fdb4e
commit 50b1dd9291
11 changed files with 685 additions and 677 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/net/mingsoft/cms/action/ContentAction.java
View File

@ -123,9 +123,9 @@ public class ContentAction extends BaseAction {
*/ */
@ApiOperation(value = "根据封面获取文章列表接口") @ApiOperation(value = "根据封面获取文章列表接口")
@ApiImplicitParam(name = "categoryId", value = "分类编号", required =true,paramType="query") @ApiImplicitParam(name = "categoryId", value = "分类编号", required =true,paramType="query")
@GetMapping("/getByFengMian") @GetMapping("/getFromFengMian")
@ResponseBody @ResponseBody
public ResultData getByFengMian(@ModelAttribute @ApiIgnore ContentEntity content){ public ResultData getFromFengMian(@ModelAttribute @ApiIgnore ContentEntity content){
if(content.getCategoryId() == null) { if(content.getCategoryId() == null) {
return ResultData.build().error(); return ResultData.build().error();
} }

98
src/main/java/net/mingsoft/cms/action/GeneraterAction.java
View File

@ -1,16 +1,16 @@
/** /**
The MIT License (MIT) * Copyright (c) 2016 铭飞科技(mingsoft.net) * The MIT License (MIT) * Copyright (c) 2016 铭飞科技(mingsoft.net)
* <p>
* Permission is hereby granted, free of charge, to any person obtaining a copy of * Permission is hereby granted, free of charge, to any person obtaining a copy of
* this software and associated documentation files (the "Software"), to deal in * this software and associated documentation files (the "Software"), to deal in
* the Software without restriction, including without limitation the rights to * the Software without restriction, including without limitation the rights to
* use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
* the Software, and to permit persons to whom the Software is furnished to do so, * the Software, and to permit persons to whom the Software is furnished to do so,
* subject to the following conditions: * subject to the following conditions:
* <p>
* The above copyright notice and this permission notice shall be included in all * The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software. * copies or substantial portions of the Software.
* <p>
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
* FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@ -36,7 +36,6 @@ import net.mingsoft.cms.biz.ICategoryBiz;
import net.mingsoft.cms.biz.IContentBiz; import net.mingsoft.cms.biz.IContentBiz;
import net.mingsoft.cms.entity.CategoryEntity; import net.mingsoft.cms.entity.CategoryEntity;
import net.mingsoft.cms.util.CmsParserUtil; import net.mingsoft.cms.util.CmsParserUtil;
import net.mingsoft.mdiy.bean.AttributeBean;
import net.mingsoft.mdiy.bean.PageBean; import net.mingsoft.mdiy.bean.PageBean;
import net.mingsoft.mdiy.util.ParserUtil; import net.mingsoft.mdiy.util.ParserUtil;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
@ -141,7 +140,6 @@ public class GeneraterAction extends BaseAction {
} }
/** /**
* 生成列表的静态页面 * 生成列表的静态页面
* *
@ -156,60 +154,48 @@ public class GeneraterAction extends BaseAction {
public ResultData genernateColumn(HttpServletRequest request, HttpServletResponse response, @PathVariable String categoryId) throws IOException { public ResultData genernateColumn(HttpServletRequest request, HttpServletResponse response, @PathVariable String categoryId) throws IOException {
// 获取站点id // 获取站点id
AppEntity app = BasicUtil.getApp(); AppEntity app = BasicUtil.getApp();
//栏目列表
List<CategoryEntity> columns = new ArrayList<CategoryEntity>(); List<CategoryEntity> columns = new ArrayList<CategoryEntity>();
// 如果栏目id小于0则更新所有的栏目，否则只更新选中的栏目
if (!"0".equals(categoryId)) { if ("0".equals(categoryId)) {// 0更新所有栏目
CategoryEntity categoryEntity = new CategoryEntity();
columns = categoryBiz.query(categoryEntity);
} else { //选择栏目更新
CategoryEntity categoryEntity = new CategoryEntity(); CategoryEntity categoryEntity = new CategoryEntity();
categoryEntity.setId(categoryId); categoryEntity.setId(categoryId);
columns = categoryBiz.queryChilds(categoryEntity); columns = categoryBiz.queryChilds(categoryEntity);
} else {
// 获取所有的内容管理栏目
CategoryEntity categoryEntity=new CategoryEntity();
columns = categoryBiz.query(categoryEntity);
} }
//文章列表
List<CategoryBean> articleIdList = null; List<CategoryBean> articleIdList = null;
// 1、设置模板文件夹路径
// 获取栏目列表模版 // 获取栏目列表模版
for (CategoryEntity column : columns) { for (CategoryEntity column : columns) {
ContentBean contentBean = new ContentBean(); ContentBean contentBean = new ContentBean();
contentBean.setCategoryId(column.getId()); contentBean.setCategoryId(column.getId());
// 分类是列表
if(column.getCategoryType().equals("1")) {
// 判断模板文件是否存在
if (!FileUtil.exist(ParserUtil.buildTempletPath(column.getCategoryListUrl()))) {
LOG.error("模板不存在：{}", column.getCategoryUrl());
continue;
}
//获取模板中列表标签中的条件
Map<String, Object> map = new HashMap<>();
if(BasicUtil.getWebsiteApp() != null){
map.put(ParserUtil.APP_ID, BasicUtil.getWebsiteApp().getAppId());
}
PageBean page = new PageBean();
map.put(ParserUtil.HTML, ParserUtil.HTML);
map.put(ParserUtil.URL, BasicUtil.getUrl());
map.put(ParserUtil.PAGE, page);
AttributeBean attributeBean = new AttributeBean();
// 获取文章列表模板标签属性
ParserUtil.read(column.getCategoryListUrl(), map, page, attributeBean);
contentBean.setFlag(attributeBean.getFlag());
contentBean.setNoflag(attributeBean.getNoflag());
contentBean.setOrder(attributeBean.getOrder());
contentBean.setOrderBy(attributeBean.getOrderby());
}
articleIdList = contentBiz.queryIdsByCategoryIdForParser(contentBean); articleIdList = contentBiz.queryIdsByCategoryIdForParser(contentBean);
// 判断列表类型 // 判断列表类型
switch (column.getCategoryType()) { switch (column.getCategoryType()) {
//TODO 暂时先用字符串代替 //TODO 暂时先用字符串代替
case "1": // 列表 case "1": // 列表
// 判断模板文件是否存在
if (!FileUtil.exist(ParserUtil.buildTempletPath(column.getCategoryListUrl()))) {
LOG.error("模板不存在：{}", column.getCategoryUrl());
continue;
}
CmsParserUtil.generateList(column, articleIdList.size()); CmsParserUtil.generateList(column, articleIdList.size());
break; break;
case "2":// 单页 case "2":// 单页
if(articleIdList.size()==0){ if (articleIdList.size() == 0) {
CategoryBean columnArticleIdBean=new CategoryBean(); CategoryBean columnArticleIdBean = new CategoryBean();
CopyOptions copyOptions=CopyOptions.create(); CopyOptions copyOptions = CopyOptions.create();
copyOptions.setIgnoreError(true); copyOptions.setIgnoreError(true);
BeanUtil.copyProperties(column,columnArticleIdBean,copyOptions); BeanUtil.copyProperties(column, columnArticleIdBean, copyOptions);
articleIdList.add(columnArticleIdBean); articleIdList.add(columnArticleIdBean);
} }
CmsParserUtil.generateBasic(articleIdList); CmsParserUtil.generateBasic(articleIdList);
@ -236,11 +222,10 @@ public class GeneraterAction extends BaseAction {
// 网站风格物理路径 // 网站风格物理路径
List<CategoryBean> articleIdList = null; List<CategoryBean> articleIdList = null;
List<CategoryEntity> categoryList = null; List<CategoryEntity> categoryList = null;
AttributeBean attributeBean = new AttributeBean();
ContentBean contentBean = new ContentBean(); ContentBean contentBean = new ContentBean();
contentBean.setBeginTime(dateTime); contentBean.setBeginTime(dateTime);
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
if(BasicUtil.getWebsiteApp() != null){ if (BasicUtil.getWebsiteApp() != null) {
map.put(ParserUtil.APP_ID, BasicUtil.getWebsiteApp().getAppId()); map.put(ParserUtil.APP_ID, BasicUtil.getWebsiteApp().getAppId());
} }
PageBean page = new PageBean(); PageBean page = new PageBean();
@ -248,24 +233,19 @@ public class GeneraterAction extends BaseAction {
map.put(ParserUtil.URL, BasicUtil.getUrl()); map.put(ParserUtil.URL, BasicUtil.getUrl());
map.put(ParserUtil.PAGE, page); map.put(ParserUtil.PAGE, page);
// 生成所有栏目的文章 // 生成所有栏目的文章
if("0".equals(columnId)){ if ("0".equals(columnId)) {
CategoryEntity categoryEntity = new CategoryEntity(); CategoryEntity categoryEntity = new CategoryEntity();
categoryList = categoryBiz.query(categoryEntity); categoryList = categoryBiz.query(categoryEntity);
for(CategoryEntity category : categoryList){ for (CategoryEntity category : categoryList) {
contentBean.setCategoryId(category.getId()); contentBean.setCategoryId(category.getId());
// 分类是列表 // 分类是列表
if(category.getCategoryType().equals("1")){ if (category.getCategoryType().equals("1")) {
// 判断模板文件是否存在 // 判断模板文件是否存在
if (!FileUtil.exist(ParserUtil.buildTempletPath(category.getCategoryListUrl())) || StringUtils.isEmpty(category.getCategoryListUrl())) { if (!FileUtil.exist(ParserUtil.buildTempletPath(category.getCategoryListUrl())) || StringUtils.isEmpty(category.getCategoryListUrl())) {
LOG.error("模板不存在：{}",category.getCategoryUrl()); LOG.error("模板不存在：{}", category.getCategoryUrl());
continue; continue;
} }
// 获取文章列表表属性
ParserUtil.read(category.getCategoryListUrl(),map, page,attributeBean);
contentBean.setFlag(attributeBean.getFlag());
contentBean.setNoflag(attributeBean.getNoflag());
contentBean.setOrder(attributeBean.getOrder());
contentBean.setOrderBy(attributeBean.getOrderby());
} }
//将文章列表标签中的中的参数 //将文章列表标签中的中的参数
articleIdList = contentBiz.queryIdsByCategoryIdForParser(contentBean); articleIdList = contentBiz.queryIdsByCategoryIdForParser(contentBean);
@ -274,22 +254,17 @@ public class GeneraterAction extends BaseAction {
CmsParserUtil.generateBasic(articleIdList); CmsParserUtil.generateBasic(articleIdList);
} }
} }
}else { } else {
CategoryEntity category = (CategoryEntity) categoryBiz.getById(columnId); CategoryEntity category = (CategoryEntity) categoryBiz.getById(columnId);
contentBean.setCategoryId(columnId); contentBean.setCategoryId(columnId);
// 分类是列表 // 分类是列表
if(category.getCategoryType().equals("1")){ if (category.getCategoryType().equals("1")) {
// 获取文章列表表属性 // 获取文章列表表属性
// 判断模板文件是否存在 // 判断模板文件是否存在
if (!FileUtil.exist(ParserUtil.buildTempletPath(category.getCategoryUrl()))) { if (!FileUtil.exist(ParserUtil.buildTempletPath(category.getCategoryUrl()))) {
LOG.error("模板不存在：{}",category.getCategoryUrl()); LOG.error("模板不存在：{}", category.getCategoryUrl());
return ResultData.build().error(getResString("templet.file")); return ResultData.build().error(getResString("templet.file"));
} }
ParserUtil.read(category.getCategoryListUrl(),map, page,attributeBean);
contentBean.setFlag(attributeBean.getFlag());
contentBean.setNoflag(attributeBean.getNoflag());
contentBean.setOrder(attributeBean.getOrder());
contentBean.setOrderBy(attributeBean.getOrderby());
} }
articleIdList = contentBiz.queryIdsByCategoryIdForParser(contentBean); articleIdList = contentBiz.queryIdsByCategoryIdForParser(contentBean);
// 有符合条件的就更新 // 有符合条件的就更新
@ -301,7 +276,6 @@ public class GeneraterAction extends BaseAction {
} }
/** /**
* 用户预览主页 * 用户预览主页
* *

233
src/main/java/net/mingsoft/cms/action/web/MCmsAction.java
View File

@ -1,16 +1,16 @@
/** /**
The MIT License (MIT) * Copyright (c) 2016 铭飞科技(mingsoft.net) * The MIT License (MIT) * Copyright (c) 2016 铭飞科技(mingsoft.net)
* <p>
* Permission is hereby granted, free of charge, to any person obtaining a copy of * Permission is hereby granted, free of charge, to any person obtaining a copy of
* this software and associated documentation files (the "Software"), to deal in * this software and associated documentation files (the "Software"), to deal in
* the Software without restriction, including without limitation the rights to * the Software without restriction, including without limitation the rights to
* use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
* the Software, and to permit persons to whom the Software is furnished to do so, * the Software, and to permit persons to whom the Software is furnished to do so,
* subject to the following conditions: * subject to the following conditions:
* <p>
* The above copyright notice and this permission notice shall be included in all * The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software. * copies or substantial portions of the Software.
* <p>
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
* FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
@ -25,6 +25,7 @@ import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.PageUtil; import cn.hutool.core.util.PageUtil;
import freemarker.core.ParseException; import freemarker.core.ParseException;
import freemarker.template.MalformedTemplateNameException; import freemarker.template.MalformedTemplateNameException;
import freemarker.template.TemplateException;
import freemarker.template.TemplateNotFoundException; import freemarker.template.TemplateNotFoundException;
import net.bytebuddy.implementation.bytecode.Throw; import net.bytebuddy.implementation.bytecode.Throw;
import net.mingsoft.base.constant.Const; import net.mingsoft.base.constant.Const;
@ -38,7 +39,6 @@ import net.mingsoft.cms.biz.IContentBiz;
import net.mingsoft.cms.entity.CategoryEntity; import net.mingsoft.cms.entity.CategoryEntity;
import net.mingsoft.cms.entity.ContentEntity; import net.mingsoft.cms.entity.ContentEntity;
import net.mingsoft.cms.util.CmsParserUtil; import net.mingsoft.cms.util.CmsParserUtil;
import net.mingsoft.mdiy.bean.AttributeBean;
import net.mingsoft.mdiy.bean.PageBean; import net.mingsoft.mdiy.bean.PageBean;
import net.mingsoft.mdiy.biz.IModelBiz; import net.mingsoft.mdiy.biz.IModelBiz;
import net.mingsoft.mdiy.biz.IPageBiz; import net.mingsoft.mdiy.biz.IPageBiz;
@ -90,7 +90,6 @@ public class MCmsAction extends net.mingsoft.cms.action.BaseAction {
private ICategoryBiz categoryBiz; private ICategoryBiz categoryBiz;
/** /**
* 搜索标签; * 搜索标签;
*/ */
@ -110,19 +109,19 @@ public class MCmsAction extends net.mingsoft.cms.action.BaseAction {
@ResponseBody @ResponseBody
public String index(HttpServletRequest req, HttpServletResponse resp) { public String index(HttpServletRequest req, HttpServletResponse resp) {
Map map = BasicUtil.assemblyRequestMap(); Map map = BasicUtil.assemblyRequestMap();
map.forEach((k,v)->{ map.forEach((k, v) -> {
map.put(k,v.toString().replaceAll("('|\"|\\\\)","\\\\$1")); map.put(k, v.toString().replaceAll("('|\"|\\\\)", "\\\\$1"));
}); });
map.put(ParserUtil.URL, BasicUtil.getUrl()); map.put(ParserUtil.URL, BasicUtil.getUrl());
//动态解析 //动态解析
map.put(ParserUtil.IS_DO,true); map.put(ParserUtil.IS_DO, true);
//设置动态请求的模块路径 //设置动态请求的模块路径
map.put(ParserUtil.MODEL_NAME, "mcms"); map.put(ParserUtil.MODEL_NAME, "mcms");
//解析后的内容 //解析后的内容
String content = ""; String content = "";
try { try {
//根据模板路径，参数生成 //根据模板路径，参数生成
content = CmsParserUtil.generate(ParserUtil.INDEX+ParserUtil.HTM_SUFFIX, map); content = CmsParserUtil.generate(ParserUtil.INDEX + ParserUtil.HTM_SUFFIX, map);
} catch (TemplateNotFoundException e) { } catch (TemplateNotFoundException e) {
e.printStackTrace(); e.printStackTrace();
} catch (MalformedTemplateNameException e) { } catch (MalformedTemplateNameException e) {
@ -137,6 +136,7 @@ public class MCmsAction extends net.mingsoft.cms.action.BaseAction {
/** /**
* 动态列表页 * 动态列表页
*
* @param req * @param req
* @param resp * @param resp
*/ */
@ -144,42 +144,42 @@ public class MCmsAction extends net.mingsoft.cms.action.BaseAction {
@GetMapping("/list.do") @GetMapping("/list.do")
public String list(HttpServletRequest req, HttpServletResponse resp) { public String list(HttpServletRequest req, HttpServletResponse resp) {
Map map = BasicUtil.assemblyRequestMap(); Map map = BasicUtil.assemblyRequestMap();
map.forEach((k,v)->{ map.forEach((k, v) -> {
map.put(k,v.toString().replaceAll("('|\"|\\\\)","\\\\$1")); map.put(k, v.toString().replaceAll("('|\"|\\\\)", "\\\\$1"));
}); });
//获取栏目编号 //获取栏目编号
int typeId = BasicUtil.getInt(ParserUtil.TYPE_ID,0); int typeId = BasicUtil.getInt(ParserUtil.TYPE_ID, 0);
int size = BasicUtil.getInt(ParserUtil.SIZE,10); int size = BasicUtil.getInt("size", 10);
ContentBean contentBean = new ContentBean(); ContentBean contentBean = new ContentBean();
contentBean.setCategoryId(String.valueOf(typeId)); contentBean.setCategoryId(String.valueOf(typeId));
//获取文章总数 //获取文章总数
List<CategoryBean> columnArticles = contentBiz.queryIdsByCategoryIdForParser(contentBean); List<CategoryBean> columnArticles = contentBiz.queryIdsByCategoryIdForParser(contentBean);
//判断栏目下是否有文章 //判断栏目下是否有文章
if(columnArticles.size()==0){ if (columnArticles.size() == 0) {
return ""; return "";
} }
//设置分页类 //设置分页类
PageBean page = new PageBean(); PageBean page = new PageBean();
page.setPageNo(BasicUtil.getPageNo());
int total = PageUtil.totalPage(columnArticles.size(), size); int total = PageUtil.totalPage(columnArticles.size(), size);
map.put(ParserUtil.COLUMN, columnArticles.get(0)); map.put(ParserUtil.COLUMN, columnArticles.get(0));
//获取总数 //获取总数
page.setTotal(total); page.setTotal(total);
//设置栏目编号 //设置栏目编号
map.put(ParserUtil.TYPE_ID, typeId); map.put(ParserUtil.TYPE_ID, typeId);
//设置列表当前页
map.put(ParserUtil.PAGE_NO, BasicUtil.getInt(ParserUtil.PAGE_NO,1));
map.put(ParserUtil.URL, BasicUtil.getUrl()); map.put(ParserUtil.URL, BasicUtil.getUrl());
map.put(ParserUtil.PAGE, page); map.put(ParserUtil.PAGE, page);
//动态解析 //动态解析
map.put(ParserUtil.IS_DO,true); map.put(ParserUtil.IS_DO, true);
//设置动态请求的模块路径 //设置动态请求的模块路径
map.put(ParserUtil.MODEL_NAME, "mcms"); map.put(ParserUtil.MODEL_NAME, "mcms");
//解析后的内容 //解析后的内容
String content = ""; String content = "";
try { try {
//根据模板路径，参数生成 //根据模板路径，参数生成
content = CmsParserUtil.generate(columnArticles.get(0).getCategoryListUrl(),map); content = CmsParserUtil.generate(columnArticles.get(0).getCategoryListUrl(), map);
} catch (TemplateNotFoundException e) { } catch (TemplateNotFoundException e) {
e.printStackTrace(); e.printStackTrace();
} catch (MalformedTemplateNameException e) { } catch (MalformedTemplateNameException e) {
@ -194,38 +194,37 @@ public class MCmsAction extends net.mingsoft.cms.action.BaseAction {
/** /**
* 动态详情页 * 动态详情页
* @param id 文章编号
*/ */
@GetMapping("/view.do") @GetMapping("/view.do")
@ResponseBody @ResponseBody
public String view(String orderby,String order,HttpServletRequest req, HttpServletResponse resp) { public String view(String orderby, String order, HttpServletRequest req, HttpServletResponse resp) {
//参数文章编号 //参数文章编号
ContentEntity article = (ContentEntity) contentBiz.getEntity(BasicUtil.getInt(ParserUtil.ID)); ContentEntity article = (ContentEntity) contentBiz.getEntity(BasicUtil.getInt(ParserUtil.ID));
if(ObjectUtil.isNull(article)){ if (ObjectUtil.isNull(article)) {
throw new BusinessException(this.getResString("err.empty", this.getResString("id"))) ; throw new BusinessException(this.getResString("err.empty", this.getResString("id")));
} }
if(StringUtils.isNotBlank(order)){ if (StringUtils.isNotBlank(order)) {
//防注入 //防注入
if(!order.toLowerCase().equals("asc")&&!order.toLowerCase().equals("desc")){ if (!order.toLowerCase().equals("asc") && !order.toLowerCase().equals("desc")) {
throw new BusinessException(this.getResString("err.error", this.getResString("order"))); throw new BusinessException(this.getResString("err.error", this.getResString("order")));
} }
} }
orderby= orderby.replaceAll("('|\"|\\\\)","\\\\$1"); orderby = orderby.replaceAll("('|\"|\\\\)", "\\\\$1");
PageBean page = new PageBean(); PageBean page = new PageBean();
//用于详情上下页获取当前文章列表对应的分类，根据文章查询只能获取自身分类 //用于详情上下页获取当前文章列表对应的分类，根据文章查询只能获取自身分类
String typeId = BasicUtil.getString(ParserUtil.TYPE_ID,article.getCategoryId()); String typeId = BasicUtil.getString(ParserUtil.TYPE_ID, article.getCategoryId());
//根据文章编号查询栏目详情模版 //根据文章编号查询栏目详情模版
CategoryEntity column = (CategoryEntity) categoryBiz.getEntity(Integer.parseInt(typeId)); CategoryEntity column = (CategoryEntity) categoryBiz.getEntity(Integer.parseInt(typeId));
//解析后的内容 //解析后的内容
String content = ""; String content = "";
Map map = BasicUtil.assemblyRequestMap(); Map map = BasicUtil.assemblyRequestMap();
map.forEach((k,v)->{ map.forEach((k, v) -> {
//sql注入过滤 //sql注入过滤
map.put(k,v.toString().replaceAll("('|\"|\\\\)","\\\\$1")); map.put(k, v.toString().replaceAll("('|\"|\\\\)", "\\\\$1"));
}); });
//动态解析 //动态解析
map.put(ParserUtil.IS_DO,true); map.put(ParserUtil.IS_DO, true);
//设置栏目编号 //设置栏目编号
map.put(ParserUtil.TYPE_ID, typeId); map.put(ParserUtil.TYPE_ID, typeId);
//设置动态请求的模块路径 //设置动态请求的模块路径
@ -240,29 +239,29 @@ public class MCmsAction extends net.mingsoft.cms.action.BaseAction {
List<CategoryBean> articleIdList = contentBiz.queryIdsByCategoryIdForParser(contentBean); List<CategoryBean> articleIdList = contentBiz.queryIdsByCategoryIdForParser(contentBean);
Map<Object, Object> contentModelMap = new HashMap<Object, Object>(); Map<Object, Object> contentModelMap = new HashMap<Object, Object>();
ModelEntity contentModel = null; ModelEntity contentModel = null;
for (int artId = 0; artId < articleIdList.size();) { for (int artId = 0; artId < articleIdList.size(); ) {
//如果不是当前文章则跳过 //如果不是当前文章则跳过
if(articleIdList.get(artId).getArticleId().equals(article.getId())){ if (articleIdList.get(artId).getArticleId().equals(article.getId())) {
artId++; artId++;
continue; continue;
} }
// 文章的栏目路径 // 文章的栏目路径
String categoryParentId = articleIdList.get(artId).getId() ; String categoryParentId = articleIdList.get(artId).getId();
if(StringUtils.isNotBlank(articleIdList.get(artId).getCategoryParentId())){ if (StringUtils.isNotBlank(articleIdList.get(artId).getCategoryParentId())) {
categoryParentId += ','+articleIdList.get(artId).getCategoryParentId(); categoryParentId += ',' + articleIdList.get(artId).getCategoryParentId();
} }
// 文章的栏目模型编号 // 文章的栏目模型编号
Integer columnContentModelId = articleIdList.get(artId).getMdiyModelId(); Integer columnContentModelId = articleIdList.get(artId).getMdiyModelId();
Map<String, Object> parserParams = new HashMap<String, Object>(); Map<String, Object> parserParams = new HashMap<String, Object>();
parserParams.put(ParserUtil.COLUMN, articleIdList.get(artId)); parserParams.put(ParserUtil.COLUMN, articleIdList.get(artId));
// 判断当前栏目是否有自定义模型 // 判断当前栏目是否有自定义模型
if ( columnContentModelId != null && columnContentModelId > 0) { if (columnContentModelId != null && columnContentModelId > 0) {
// 通过当前栏目的模型编号获取，自定义模型表名 // 通过当前栏目的模型编号获取，自定义模型表名
if (contentModelMap.containsKey(columnContentModelId)) { if (contentModelMap.containsKey(columnContentModelId)) {
parserParams.put(ParserUtil.TABLE_NAME, contentModel.getModelTableName()); parserParams.put(ParserUtil.TABLE_NAME, contentModel.getModelTableName());
} else { } else {
// 通过栏目模型编号获取自定义模型实体 // 通过栏目模型编号获取自定义模型实体
contentModel=(ModelEntity)modelBiz.getEntity(columnContentModelId); contentModel = (ModelEntity) modelBiz.getEntity(columnContentModelId);
// 将自定义模型编号设置为key值 // 将自定义模型编号设置为key值
contentModelMap.put(columnContentModelId, contentModel.getModelTableName()); contentModelMap.put(columnContentModelId, contentModel.getModelTableName());
parserParams.put(ParserUtil.TABLE_NAME, contentModel.getModelTableName()); parserParams.put(ParserUtil.TABLE_NAME, contentModel.getModelTableName());
@ -296,73 +295,100 @@ public class MCmsAction extends net.mingsoft.cms.action.BaseAction {
} }
/** /**
* 实现前端页面的文章搜索 * 实现前端页面的文章搜索
* *
* @param request * @param request 搜索id
* 搜索id
* @param response * @param response
*/ */
@RequestMapping(value = "search") @RequestMapping(value = "search")
@ResponseBody @ResponseBody
public String search(HttpServletRequest request, HttpServletResponse response) throws IOException { public String search(HttpServletRequest request, HttpServletResponse response) {
//设置分页类
PageBean page = new PageBean();
page.setSize(ParserUtil.getPageSize(SEARCH + ParserUtil.HTM_SUFFIX,20));
//参数集合，提供给解析使用
Map<String, Object> params = new HashMap<>();
Map<String, Object> map = new HashMap<>();
// 读取请求字段 // 读取请求字段
Map<String, Object> field = BasicUtil.assemblyRequestMap(); Map<String, Object> field = BasicUtil.assemblyRequestMap();
// 自定义字段集合 // 自定义字段集合
Map<String, String> diyFieldName = new HashMap<String, String>(); Map<String, String> diyFieldName = new HashMap<String, String>();
CategoryEntity column = null; // 当前栏目
ModelEntity contentModel = null; // 栏目对应模型 //记录自定义模型字段名
List<DiyModelMap> fieldValueList = new ArrayList<DiyModelMap>(); // 栏目对应字段的值 List filedStr = new ArrayList<>();
// 栏目对应字段的值
List<DiyModelMap> fieldValueList = new ArrayList<DiyModelMap>();
// 当前栏目
CategoryEntity column = null;
// 栏目对应模型
ModelEntity contentModel = null;
//获取栏目信息
int typeId = 0; int typeId = 0;
String categoryIds = BasicUtil.getString("categoryId"); String categoryIds = BasicUtil.getString("categoryId");
//当传递了栏目编号，但不是栏目集合 //当传递了栏目编号，但不是栏目集合
if(!StringUtil.isBlank(categoryIds) && !categoryIds.contains(",")){ if (!StringUtil.isBlank(categoryIds) && !categoryIds.contains(",")) {
typeId = Integer.parseInt(categoryIds); typeId = Integer.parseInt(categoryIds);
} }
//当前访问的项目地址
String url = BasicUtil.getUrl(); String url = BasicUtil.getUrl();
//记录自定义模型字段名
List filedStr = new ArrayList<>();
//根据栏目确定自定义模型 //根据栏目确定自定义模型
if(typeId>0){ if (typeId > 0) {
column = (CategoryEntity) categoryBiz.getEntity(Integer.parseInt(typeId+"")); column = (CategoryEntity) categoryBiz.getEntity(typeId);
// 获取表单类型的id // 获取表单类型的id
if (column != null&&ObjectUtil.isNotNull(column.getMdiyModelId())) { if (column != null && ObjectUtil.isNotNull(column.getMdiyModelId())) {
contentModel = (ModelEntity) modelBiz.getEntity(column.getMdiyModelId()); contentModel = (ModelEntity) modelBiz.getEntity(column.getMdiyModelId());
if (contentModel != null) { if (contentModel != null) {
Map<String,String> fieldMap = contentModel.getFieldMap(); // 保存自定义模型的数据
Map<String, String> fieldMap = contentModel.getFieldMap();
for (String s : fieldMap.keySet()) { for (String s : fieldMap.keySet()) {
filedStr.add(fieldMap.get(s)); filedStr.add(fieldMap.get(s));
} }
map.put(ParserUtil.TABLE_NAME, contentModel.getModelTableName()); // 设置自定义模型表名，方便解析的时候关联表查询
params.put(ParserUtil.TABLE_NAME, contentModel.getModelTableName());
} }
} }
map.put(ParserUtil.COLUMN, column);
}
// 遍历取字段集合 // 设置栏目，方便解析的时候关联表查询
params.put(ParserUtil.COLUMN, column);
}
// 处理读取请求字段
if (field != null) { if (field != null) {
for (Map.Entry<String, Object> entry : field.entrySet()) { for (Map.Entry<String, Object> entry : field.entrySet()) {
if (entry != null) { if (entry != null) {
//空值不处理
if (ObjectUtil.isNull(entry.getValue())) { if (ObjectUtil.isNull(entry.getValue())) {
continue; continue;
} }
String value = entry.getValue().toString().replaceAll("('|\"|\\\\)","\\\\$1"); // 处理由get方法请求中文乱码问题
value=clearXss(value); // 对值进行安全处理
if (request.getMethod().equals(RequestMethod.GET)) { // 如果是get方法需要将请求地址参数转码 // 处理由get方法请求中文乱码问题
String value = entry.getValue().toString().replaceAll("('|\"|\\\\)", "\\\\$1");
//Xss过滤
value = clearXss(value);
// 如果是get方法需要将请求地址参数转码
if (request.getMethod().equals(RequestMethod.GET)) {
try { try {
value = new String(value.getBytes("ISO-8859-1"), Const.UTF8); value = new String(value.getBytes("ISO-8859-1"), Const.UTF8);
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
e.printStackTrace(); e.printStackTrace();
} }
} }
// 保存至自定义字段集合 // 保存至自定义字段集合
if (!StringUtil.isBlank(value)) { if (!StringUtil.isBlank(value)) {
diyFieldName.put(entry.getKey(), value); diyFieldName.put(entry.getKey(), value);
//判断请求中的是否是自定义模型中的字段 //判断请求中的是否是自定义模型中的字段
if(filedStr.contains(entry.getKey())){ if (filedStr.contains(entry.getKey())) {
//设置自定义模型字段和值 //设置自定义模型字段和值
DiyModelMap diyMap = new DiyModelMap(); DiyModelMap diyMap = new DiyModelMap();
diyMap.setKey(entry.getKey()); diyMap.setKey(entry.getKey());
@ -376,44 +402,47 @@ public class MCmsAction extends net.mingsoft.cms.action.BaseAction {
} }
//添加自定义模型的字段和值 //添加自定义模型的字段和值
if(fieldValueList.size()>0){ if (fieldValueList.size() > 0) {
map.put("diyModel", fieldValueList); params.put("diyModel", fieldValueList);
} }
//设置分页类
PageBean page = new PageBean();
Map<String, Object> searchMap = field; Map<String, Object> searchMap = field;
StringBuilder urlParams=new StringBuilder(); StringBuilder urlParams = new StringBuilder();
searchMap.forEach((k,v)->{
searchMap.forEach((k, v) -> {
//sql注入过滤 //sql注入过滤
if(v!=null){ if (v != null) {
searchMap.put(k,v.toString().replaceAll("('|\"|\\\\)","\\\\$1")); searchMap.put(k, v.toString().replaceAll("('|\"|\\\\)", "\\\\$1"));
searchMap.put(k,clearXss(searchMap.get(k).toString())); searchMap.put(k, clearXss(searchMap.get(k).toString()));
if(!ParserUtil.SIZE.equals(k)&&!ParserUtil.PAGE_NO.equals(k)){ if (!"size".equals(k) && !"pageNo".equals(k)) {
urlParams.append(k).append("=").append(searchMap.get(k)).append("&"); urlParams.append(k).append("=").append(searchMap.get(k)).append("&");
} }
} }
}); });
//查询数量 //查询数量
int count= contentBiz.getSearchCount(contentModel,fieldValueList,searchMap,BasicUtil.getApp().getAppId(),categoryIds); int count = contentBiz.getSearchCount(contentModel, fieldValueList, searchMap, BasicUtil.getApp().getAppId(), categoryIds);
map.put(ParserUtil.URL, url); page.setRcount(count);
map.put(SEARCH, searchMap); params.put(ParserUtil.URL, url);
if(BasicUtil.getWebsiteApp() != null){ params.put(SEARCH, searchMap);
map.put(ParserUtil.APP_ID, BasicUtil.getWebsiteApp().getAppId()); if (BasicUtil.getWebsiteApp() != null) {
params.put(ParserUtil.APP_ID, BasicUtil.getWebsiteApp().getAppId());
} }
map.put(ParserUtil.PAGE, page); params.put(ParserUtil.PAGE, page);
map.put(ParserUtil.HTML, ParserUtil.HTML); params.put(ParserUtil.HTML, ParserUtil.HTML);
//动态解析 //动态解析
map.put(ParserUtil.IS_DO,false); params.put(ParserUtil.IS_DO, false);
//设置动态请求的模块路径 //设置动态请求的模块路径
map.put(ParserUtil.MODEL_NAME, "mcms"); params.put(ParserUtil.MODEL_NAME, "mcms");
searchMap.put(ParserUtil.PAGE_NO, 0);
AttributeBean attributeBean = new AttributeBean(); searchMap.put("pageNo", 0);
ParserUtil.read(SEARCH+ParserUtil.HTM_SUFFIX,map, page,attributeBean); // ParserUtil.read(SEARCH + ParserUtil.HTM_SUFFIX, map, page);
int total = PageUtil.totalPage(count, page.getSize()); int total = PageUtil.totalPage(count, page.getSize());
int pageNo = BasicUtil.getInt(ParserUtil.PAGE_NO, 1);
if(pageNo >= total && total!=0) {
int pageNo = BasicUtil.getInt("pageNo", 1);
if (pageNo >= total && total != 0) {
pageNo = total; pageNo = total;
} }
//获取总数 //获取总数
@ -422,27 +451,39 @@ public class MCmsAction extends net.mingsoft.cms.action.BaseAction {
page.setPageNo(pageNo); page.setPageNo(pageNo);
//设置分页的统一链接 //设置分页的统一链接
url = url +request.getServletPath() +"?" + urlParams; url = url + request.getServletPath() + "?" + urlParams;
String pageNoStr = ParserUtil.SIZE+"="+page.getSize()+"&"+ParserUtil.PAGE_NO+"="; String pageNoStr = "size=" + page.getSize() + "&pageNo=";
//下一页 //下一页
String nextUrl = url + pageNoStr+((pageNo+1 > total)?total:pageNo+1); String nextUrl = url + pageNoStr + ((pageNo + 1 > total) ? total : pageNo + 1);
//首页 //首页
String indexUrl = url + pageNoStr + 1; String indexUrl = url + pageNoStr + 1;
//尾页 //尾页
String lastUrl = url + pageNoStr + total; String lastUrl = url + pageNoStr + total;
//上一页 当前页为1时，上一页就是1 //上一页 当前页为1时，上一页就是1
String preUrl = url + pageNoStr + ((pageNo==1) ? 1:pageNo-1); String preUrl = url + pageNoStr + ((pageNo == 1) ? 1 : pageNo - 1);
page.setIndexUrl(indexUrl); page.setIndexUrl(indexUrl);
page.setNextUrl(nextUrl); page.setNextUrl(nextUrl);
page.setPreUrl(preUrl); page.setPreUrl(preUrl);
page.setLastUrl(lastUrl); page.setLastUrl(lastUrl);
params.put(ParserUtil.URL, url);
params.put(SEARCH, searchMap);
if (BasicUtil.getWebsiteApp() != null) {
params.put(ParserUtil.APP_ID, BasicUtil.getWebsiteApp().getAppId());
}
params.put(ParserUtil.PAGE, page);
params.put(ParserUtil.HTML, ParserUtil.HTML);
//动态解析
params.put(ParserUtil.IS_DO, false);
//设置动态请求的模块路径
params.put(ParserUtil.MODEL_NAME, "mcms");
//解析后的内容 //解析后的内容
String content = ""; String content = "";
try { try {
//根据模板路径，参数生成 //根据模板路径，参数生成
content = CmsParserUtil.generate(SEARCH+ParserUtil.HTM_SUFFIX,map); content = CmsParserUtil.generate(SEARCH + ParserUtil.HTM_SUFFIX, params);
} catch (TemplateNotFoundException e) { } catch (TemplateNotFoundException e) {
e.printStackTrace(); e.printStackTrace();
} catch (MalformedTemplateNameException e) { } catch (MalformedTemplateNameException e) {
@ -475,27 +516,39 @@ public class MCmsAction extends net.mingsoft.cms.action.BaseAction {
/** /**
* 存储自定义模型字段和接口参数 * 存储自定义模型字段和接口参数
*
* @author 铭飞开源团队 * @author 铭飞开源团队
* @date 2019年3月5日 * @date 2019年3月5日
*/ */
public class DiyModelMap { class DiyModelMap {
String key; String key;
Object value; Object value;
public String getKey() { public String getKey() {
return key; return key;
} }
public void setKey(String key) { public void setKey(String key) {
this.key = key; this.key = key;
} }
public Object getValue() { public Object getValue() {
return value; return value;
} }
public void setValue(Object value) { public void setValue(Object value) {
this.value = value; this.value = value;
} }
} }
public static void main(String[] args) {
int [] a= PageUtil.rainbow(20,30,5);
for(int _a:a) {
System.out.println(_a);
}
}
} }

8
src/main/java/net/mingsoft/cms/bean/ContentBean.java
View File

@ -37,13 +37,7 @@ public class ContentBean extends ContentEntity {
*/ */
private String noflag; private String noflag;
// public String getStaticUrl() {
// return staticUrl;
// }
//
// public void setStaticUrl(String staticUrl) {
// this.staticUrl = staticUrl;
// }
public String getBeginTime() { public String getBeginTime() {
return beginTime; return beginTime;

19
src/main/java/net/mingsoft/cms/biz/impl/ContentBizImpl.java
View File

@ -34,7 +34,6 @@ import net.mingsoft.cms.dao.ICategoryDao;
import net.mingsoft.cms.entity.CategoryEntity; import net.mingsoft.cms.entity.CategoryEntity;
import net.mingsoft.cms.entity.ContentEntity; import net.mingsoft.cms.entity.ContentEntity;
import net.mingsoft.cms.util.CmsParserUtil; import net.mingsoft.cms.util.CmsParserUtil;
import net.mingsoft.mdiy.bean.AttributeBean;
import net.mingsoft.mdiy.bean.PageBean; import net.mingsoft.mdiy.bean.PageBean;
import net.mingsoft.mdiy.entity.ModelEntity; import net.mingsoft.mdiy.entity.ModelEntity;
import net.mingsoft.mdiy.util.ParserUtil; import net.mingsoft.mdiy.util.ParserUtil;
@ -122,7 +121,6 @@ public class ContentBizImpl extends BaseBizImpl<IContentDao, ContentEntity> imp
// 网站风格物理路径 // 网站风格物理路径
List<CategoryBean> articleIdList = null; List<CategoryBean> articleIdList = null;
List<CategoryEntity> categoryList = null; List<CategoryEntity> categoryList = null;
AttributeBean attributeBean = new AttributeBean();
ContentBean contentBean = new ContentBean(); ContentBean contentBean = new ContentBean();
contentBean.setBeginTime(dateTime); contentBean.setBeginTime(dateTime);
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
@ -145,12 +143,7 @@ public class ContentBizImpl extends BaseBizImpl<IContentDao, ContentEntity> imp
LOG.error("模板不存在：{}",category.getCategoryUrl()); LOG.error("模板不存在：{}",category.getCategoryUrl());
continue; continue;
} }
// 获取文章列表表属性
ParserUtil.read(category.getCategoryListUrl(),map, page,attributeBean);
contentBean.setFlag(attributeBean.getFlag());
contentBean.setNoflag(attributeBean.getNoflag());
contentBean.setOrder(attributeBean.getOrder());
contentBean.setOrderBy(attributeBean.getOrderby());
} }
articleIdList = queryIdsByCategoryIdForParser(contentBean); articleIdList = queryIdsByCategoryIdForParser(contentBean);
// 有符合条件的就更新 // 有符合条件的就更新
@ -190,13 +183,7 @@ public class ContentBizImpl extends BaseBizImpl<IContentDao, ContentEntity> imp
map.put(ParserUtil.HTML, ParserUtil.HTML); map.put(ParserUtil.HTML, ParserUtil.HTML);
map.put(ParserUtil.URL, BasicUtil.getUrl()); map.put(ParserUtil.URL, BasicUtil.getUrl());
map.put(ParserUtil.PAGE, page); map.put(ParserUtil.PAGE, page);
AttributeBean attributeBean = new AttributeBean();
// 获取文章列表模板标签属性
ParserUtil.read(column.getCategoryListUrl(), map, page, attributeBean);
contentBean.setFlag(attributeBean.getFlag());
contentBean.setNoflag(attributeBean.getNoflag());
contentBean.setOrder(attributeBean.getOrder());
contentBean.setOrderBy(attributeBean.getOrderby());
} }
articleIdList = contentDao.queryIdsByCategoryIdForParser(contentBean); articleIdList = contentDao.queryIdsByCategoryIdForParser(contentBean);
// 判断列表类型 // 判断列表类型
@ -242,7 +229,7 @@ public class ContentBizImpl extends BaseBizImpl<IContentDao, ContentEntity> imp
if(BasicUtil.getWebsiteApp() !=null){ if(BasicUtil.getWebsiteApp() !=null){
map.put(ParserUtil.APP_ID, BasicUtil.getWebsiteApp().getAppId()); map.put(ParserUtil.APP_ID, BasicUtil.getWebsiteApp().getAppId());
} }
String read = ParserUtil.read(templatePath, map); String read = ParserUtil.rendering(templatePath, map);
FileUtil.writeString(read, ParserUtil.buildHtmlPath(targetPath), net.mingsoft.base.constant.Const.UTF8); FileUtil.writeString(read, ParserUtil.buildHtmlPath(targetPath), net.mingsoft.base.constant.Const.UTF8);
} }

10
src/main/java/net/mingsoft/cms/entity/CategoryEntity.java
View File

@ -391,14 +391,6 @@ private static final long serialVersionUID = 1574925152750L;
* 获取栏目图片 (标签使用） * 获取栏目图片 (标签使用）
*/ */
public String getTypelitpic() { public String getTypelitpic() {
if(StrUtil.isNotBlank(categoryImg)){ return categoryImg;
try{
JSONArray objects = JSON.parseArray(categoryImg);
return objects.getJSONObject(0).getString("path");
}catch (Exception e){
}
}
return "";
} }
} }

39
src/main/java/net/mingsoft/cms/util/CmsParserUtil.java
View File

@ -11,7 +11,6 @@ import net.mingsoft.basic.util.BasicUtil;
import net.mingsoft.basic.util.SpringUtil; import net.mingsoft.basic.util.SpringUtil;
import net.mingsoft.cms.bean.CategoryBean; import net.mingsoft.cms.bean.CategoryBean;
import net.mingsoft.cms.entity.CategoryEntity; import net.mingsoft.cms.entity.CategoryEntity;
import net.mingsoft.mdiy.bean.AttributeBean;
import net.mingsoft.mdiy.bean.PageBean; import net.mingsoft.mdiy.bean.PageBean;
import net.mingsoft.mdiy.biz.IModelBiz; import net.mingsoft.mdiy.biz.IModelBiz;
import net.mingsoft.mdiy.biz.impl.ModelBizImpl; import net.mingsoft.mdiy.biz.impl.ModelBizImpl;
@ -72,25 +71,36 @@ public class CmsParserUtil extends ParserUtil {
throws TemplateNotFoundException, MalformedTemplateNameException, ParseException, IOException { throws TemplateNotFoundException, MalformedTemplateNameException, ParseException, IOException {
try{ try{
// 文章的栏目模型编号 // 文章的栏目模型编号
Integer columnContentModelId = column.getMdiyModelId();
PageBean page = new PageBean(); PageBean page = new PageBean();
page.setSize(10);
//获取分页数量
//获取列表页显示的文章数量 //获取列表中的size
//获取总数 page.setSize(ParserUtil.getPageSize(column.getCategoryListUrl(),20));
page.setRcount(articleIdTotal);
int totalPageSize = PageUtil.totalPage(articleIdTotal, page.getSize());
page.setTotal(totalPageSize);
//获取模板中列表标签中的条件
Map<String, Object> map = new HashMap<>();
if (BasicUtil.getWebsiteApp() != null) {
map.put(ParserUtil.APP_ID, BasicUtil.getWebsiteApp().getAppId());
}
map.put(ParserUtil.HTML, ParserUtil.HTML);
map.put(ParserUtil.URL, BasicUtil.getUrl());
map.put(ParserUtil.PAGE, page);
String columnListPath; String columnListPath;
ModelEntity contentModel = null; ModelEntity contentModel = null;
// 判断当前栏目是否有自定义模型 // 判断当前栏目是否有自定义模型
if (columnContentModelId != null) { if (column.getMdiyModelId() != null) {
// 通过栏目模型编号获取自定义模型实体 // 通过栏目模型编号获取自定义模型实体
contentModel = (ModelEntity) SpringUtil.getBean(ModelBizImpl.class).getEntity(columnContentModelId); contentModel = (ModelEntity) SpringUtil.getBean(ModelBizImpl.class).getEntity(column.getMdiyModelId());
} }
int pageNo = 1;
//全局参数设置 //全局参数设置
Map<String, Object> parserParams = new HashMap<String, Object>(); Map<String, Object> parserParams = new HashMap<String, Object>();
parserParams.put(ParserUtil.PAGE, page);
parserParams.put(COLUMN, column); parserParams.put(COLUMN, column);
//标签中使用field获取当前栏目 //标签中使用field获取当前栏目
parserParams.put(FIELD, column); parserParams.put(FIELD, column);
@ -107,18 +117,15 @@ public class CmsParserUtil extends ParserUtil {
if(ParserUtil.IS_SINGLE) { if(ParserUtil.IS_SINGLE) {
parserParams.put(ParserUtil.URL, BasicUtil.getUrl()); parserParams.put(ParserUtil.URL, BasicUtil.getUrl());
} }
parserParams.put(ParserUtil.PAGE, page);
AttributeBean attributeBean = new AttributeBean(); int pageNo = 1;
ParserUtil.read(File.separator + column.getCategoryListUrl(),parserParams, page,attributeBean);
int totalPageSize = PageUtil.totalPage(articleIdTotal, page.getSize());
page.setTotal(totalPageSize);
//文章列表页没有写文章列表标签，总数为0 //文章列表页没有写文章列表标签，总数为0
if (totalPageSize <= 0) { if (totalPageSize <= 0) {
// 数据库中第一页是从开始0*size // 数据库中第一页是从开始0*size
columnListPath = ParserUtil.buildHtmlPath(column.getCategoryPath() + File.separator + ParserUtil.INDEX); columnListPath = ParserUtil.buildHtmlPath(column.getCategoryPath() + File.separator + ParserUtil.INDEX);
// 设置分页的起始位置 // 设置分页的起始位置
page.setPageNo(pageNo); page.setPageNo(pageNo);
String read = ParserUtil.read(File.separator + column.getCategoryListUrl(), parserParams); String read = ParserUtil.rendering(File.separator + column.getCategoryListUrl(), parserParams);
FileUtil.writeString(read, columnListPath, Const.UTF8); FileUtil.writeString(read, columnListPath, Const.UTF8);
} else { } else {
@ -136,7 +143,7 @@ public class CmsParserUtil extends ParserUtil {
} }
// 设置分页的起始位置 // 设置分页的起始位置
page.setPageNo(pageNo); page.setPageNo(pageNo);
String read = ParserUtil.read(File.separator + column.getCategoryListUrl(), parserParams); String read = ParserUtil.rendering(File.separator + column.getCategoryListUrl(), parserParams);
FileUtil.writeString(read, columnListPath, Const.UTF8); FileUtil.writeString(read, columnListPath, Const.UTF8);
pageNo++; pageNo++;
} }

6
src/main/webapp/WEB-INF/manager/cms/content/form.ftl
View File

@ -525,9 +525,9 @@
}); });
}, },
//根据封面获取当前文章 //根据封面获取当前文章
getByFengMian: function (categoryId) { getFromFengMian: function (categoryId) {
var that = this; var that = this;
ms.http.get(ms.manager + "/cms/content/getByFengMian.do", { ms.http.get(ms.manager + "/cms/content/getFromFengMian.do", {
"categoryId": categoryId "categoryId": categoryId
}).then(function (res) { }).then(function (res) {
if (res.result) { if (res.result) {
@ -680,7 +680,7 @@
this.get(this.form.id); this.get(this.form.id);
} }
if (this.type) { if (this.type) {
this.getByFengMian(this.form.categoryId); this.getFromFengMian(this.form.categoryId);
this.returnIsShow = false; this.returnIsShow = false;
} }
} }

2
src/main/webapp/WEB-INF/manager/cms/content/index.ftl
View File

@ -122,7 +122,7 @@
#index .left-tree{ #index .left-tree{
min-height: 100vh; min-height: 100vh;
background: #fff; background: #fff;
width: 180px; width: 220px;
border-right: solid 1px #e6e6e6; border-right: solid 1px #e6e6e6;
} }

2
src/main/webapp/WEB-INF/manager/cms/content/main.ftl
View File

@ -68,7 +68,7 @@
</el-popover> </el-popover>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="栏目名" align="left" prop="categoryId" :formatter="contentCategoryIdFormat" width="100"> <el-table-column label="栏目名" align="left" prop="categoryId" :formatter="contentCategoryIdFormat" width="180">
</el-table-column> </el-table-column>
<el-table-column label="文章标题" align="left" prop="contentTitle" show-overflow-tooltip> <el-table-column label="文章标题" align="left" prop="contentTitle" show-overflow-tooltip>
</el-table-column> </el-table-column>

3
src/main/webapp/WEB-INF/manager/index.ftl
View File

@ -328,7 +328,8 @@
}) })
if (sub.syncStoreUrl) { if (sub.syncStoreUrl) {
sub.modelUrl = sub.syncStoreUrl //sub.modelUrl = "http://store.web.i.mingsoft.net/#/?client=localhost:8080//ms";
sub.modelUrl = sub.syncStoreUrl;
sub.modelTitle = 'mstore'; sub.modelTitle = 'mstore';
sub.isStore = true; sub.isStore = true;
!result ? this.editableTabs.push(sub) : "" !result ? this.editableTabs.push(sub) : ""