内部测试

src/main/java/net/mingsoft/cms/action/BaseAction.java

+package net.mingsoft.cms.action;
+
+import java.util.MissingResourceException;
+
+/**
+ * @Author: 铭飞开源团队--huise
+ * @Date: 2019/8/9 20:47
+ */
+public class BaseAction extends net.mingsoft.mdiy.action.BaseAction{
+    @Override
+    protected String getResString(String key) {
+        // TODO Auto-generated method stub
+        String str = "";
+        try {
+            str = super.getResString(key);
+        } catch (MissingResourceException e) {
+            str = getLocaleString(key,net.mingsoft.cms.constant.Const.RESOURCES);
+        }
+
+        return str;
+    }
+}

src/main/java/net/mingsoft/cms/action/web/CategoryAction.java

+package net.mingsoft.cms.action.web;
+
+import java.util.List;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import com.alibaba.fastjson.JSON;
+import net.mingsoft.base.entity.ResultData;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.validation.BindingResult;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.ui.ModelMap;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import net.mingsoft.cms.biz.ICategoryBiz;
+import net.mingsoft.cms.entity.CategoryEntity;
+import net.mingsoft.base.util.JSONObject;
+import net.mingsoft.base.entity.BaseEntity;
+import net.mingsoft.basic.util.BasicUtil;
+import net.mingsoft.basic.util.StringUtil;
+import net.mingsoft.base.filter.DateValueFilter;
+import net.mingsoft.base.filter.DoubleValueFilter;
+import net.mingsoft.basic.bean.EUListBean;
+import net.mingsoft.basic.annotation.LogAnn;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import springfox.documentation.annotations.ApiIgnore;
+/**
+ * 分类管理控制层
+ * @author 铭飞开发团队
+ * 创建日期：2019-11-28 15:12:32<br/>
+ * 历史修订：<br/>
+ */
+@Api(value = "分类接口")
+@Controller("WebcmsCategoryAction")
+@RequestMapping("/cms/category")
+public class CategoryAction extends net.mingsoft.cms.action.BaseAction{
+	
+	
+	/**
+	 * 注入分类业务层
+	 */	
+	@Autowired
+	private ICategoryBiz categoryBiz;
+
+	/**
+	 * 查询分类列表
+	 * @param category 分类实体
+	 */
+	@ApiOperation(value = "查询分类列表接口")
+	@ApiImplicitParams({
+    	@ApiImplicitParam(name = "categoryTitle", value = "栏目管理名称", required =false,paramType="query"),
+    	@ApiImplicitParam(name = "categoryId", value = "所属栏目", required =false,paramType="query"),
+    	@ApiImplicitParam(name = "categoryType", value = "栏目管理属性", required =false,paramType="query"),
+    	@ApiImplicitParam(name = "categorySort", value = "自定义顺序", required =false,paramType="query"),
+    	@ApiImplicitParam(name = "categoryListUrl", value = "列表模板", required =false,paramType="query"),
+    	@ApiImplicitParam(name = "categoryUrl", value = "内容模板", required =false,paramType="query"),
+    	@ApiImplicitParam(name = "categoryKeyword", value = "栏目管理关键字", required =false,paramType="query"),
+    	@ApiImplicitParam(name = "categoryDescrip", value = "栏目管理描述", required =false,paramType="query"),
+    	@ApiImplicitParam(name = "categoryImg", value = "缩略图", required =false,paramType="query"),
+    	@ApiImplicitParam(name = "categoryDiyUrl", value = "自定义链接", required =false,paramType="query"),
+    	@ApiImplicitParam(name = "mdiyModelId", value = "栏目管理的内容模型id", required =false,paramType="query"),
+    	@ApiImplicitParam(name = "categoryDatetime", value = "类别发布时间", required =false,paramType="query"),
+    	@ApiImplicitParam(name = "dictId", value = "字典对应编号", required =false,paramType="query"),
+    	@ApiImplicitParam(name = "categoryFlag", value = "栏目属性", required =false,paramType="query"),
+    	@ApiImplicitParam(name = "categoryPath", value = "栏目路径", required =false,paramType="query"),
+    	@ApiImplicitParam(name = "categoryParentId", value = "父类型编号", required =false,paramType="query"),
+    	@ApiImplicitParam(name = "createBy", value = "创建人", required =false,paramType="query"),
+    	@ApiImplicitParam(name = "createDate", value = "创建时间", required =false,paramType="query"),
+    	@ApiImplicitParam(name = "updateBy", value = "修改人", required =false,paramType="query"),
+    	@ApiImplicitParam(name = "updateDate", value = "修改时间", required =false,paramType="query"),
+    	@ApiImplicitParam(name = "del", value = "删除标记", required =false,paramType="query"),
+    	@ApiImplicitParam(name = "id", value = "编号", required =false,paramType="query"),
+    })
+	@RequestMapping("/list")
+	@ResponseBody
+	public ResultData list(@ModelAttribute @ApiIgnore CategoryEntity category,HttpServletResponse response, HttpServletRequest request,@ApiIgnore ModelMap model,BindingResult result) {
+		BasicUtil.startPage();
+		List categoryList = categoryBiz.query(category);
+		return ResultData.build().success(new EUListBean(categoryList,(int)BasicUtil.endPage(categoryList).getTotal()));
+	}
+	
+
+	/**
+	 * 获取分类
+	 * @param category 分类实体
+	 */
+	@ApiOperation(value = "获取分类列表接口")
+    @ApiImplicitParam(name = "id", value = "编号", required =true,paramType="query")
+	@GetMapping("/get")
+	@ResponseBody
+	public ResultData get(@ModelAttribute @ApiIgnore CategoryEntity category,HttpServletResponse response, HttpServletRequest request,@ApiIgnore ModelMap model){
+		if(category.getId()==null) {
+			return ResultData.build().error();
+		}
+		CategoryEntity _category = (CategoryEntity)categoryBiz.getEntity(Integer.parseInt(category.getId()));
+		return ResultData.build().success(_category);
+	}
+
+}
\ No newline at end of file

src/main/java/net/mingsoft/cms/action/web/ContentAction.java

+package net.mingsoft.cms.action.web;
+
+import cn.hutool.core.util.ObjectUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import net.mingsoft.base.entity.ResultData;
+import net.mingsoft.basic.bean.EUListBean;
+import net.mingsoft.basic.util.BasicUtil;
+import net.mingsoft.cms.biz.IContentBiz;
+import net.mingsoft.cms.biz.IHistoryLogBiz;
+import net.mingsoft.cms.entity.ContentEntity;
+import net.mingsoft.cms.entity.HistoryLogEntity;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import springfox.documentation.annotations.ApiIgnore;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Date;
+import java.util.List;
+/**
+ * 文章管理控制层
+ * @author 铭飞开发团队
+ * 创建日期：2019-11-28 15:12:32<br/>
+ * 历史修订：<br/>
+ */
+@Api(value = "文章接口")
+@Controller("WebcmsContentAction")
+@RequestMapping("/cms/content")
+public class ContentAction extends net.mingsoft.cms.action.BaseAction{
+
+
+	/**
+	 * 注入文章业务层
+	 */
+	@Autowired
+	private IContentBiz contentBiz;
+
+	@Autowired
+	private IHistoryLogBiz historyLogBiz;
+
+	/**
+	 * 查询文章列表
+	 * @param content 文章实体
+	 */
+	@ApiOperation(value = "查询文章列表接口")
+	@ApiImplicitParams({
+    	@ApiImplicitParam(name = "contentTitle", value = "文章标题", required =false,paramType="query"),
+    	@ApiImplicitParam(name = "categoryId", value = "所属栏目", required =false,paramType="query"),
+    	@ApiImplicitParam(name = "contentType", value = "文章类型", required =false,paramType="query"),
+    	@ApiImplicitParam(name = "contentDisplay", value = "是否显示", required =false,paramType="query"),
+    	@ApiImplicitParam(name = "contentAuthor", value = "文章作者", required =false,paramType="query"),
+    	@ApiImplicitParam(name = "contentSource", value = "文章来源", required =false,paramType="query"),
+    	@ApiImplicitParam(name = "contentDatetime", value = "发布时间", required =false,paramType="query"),
+    	@ApiImplicitParam(name = "contentSort", value = "自定义顺序", required =false,paramType="query"),
+    	@ApiImplicitParam(name = "contentImg", value = "文章缩略图", required =false,paramType="query"),
+    	@ApiImplicitParam(name = "contentDescription", value = "描述", required =false,paramType="query"),
+    	@ApiImplicitParam(name = "contentKeyword", value = "关键字", required =false,paramType="query"),
+    	@ApiImplicitParam(name = "contentDetails", value = "文章内容", required =false,paramType="query"),
+    	@ApiImplicitParam(name = "contentUrl", value = "文章跳转链接地址", required =false,paramType="query"),
+    	@ApiImplicitParam(name = "appid", value = "文章管理的应用id", required =false,paramType="query"),
+    	@ApiImplicitParam(name = "createBy", value = "创建人", required =false,paramType="query"),
+    	@ApiImplicitParam(name = "createDate", value = "创建时间", required =false,paramType="query"),
+    	@ApiImplicitParam(name = "updateBy", value = "修改人", required =false,paramType="query"),
+    	@ApiImplicitParam(name = "updateDate", value = "修改时间", required =false,paramType="query"),
+    	@ApiImplicitParam(name = "del", value = "删除标记", required =false,paramType="query"),
+    	@ApiImplicitParam(name = "id", value = "编号", required =false,paramType="query"),
+    })
+	@RequestMapping("/list")
+	@ResponseBody
+	public ResultData list(@ModelAttribute @ApiIgnore ContentEntity content,HttpServletResponse response, HttpServletRequest request,@ApiIgnore ModelMap model,BindingResult result) {
+		BasicUtil.startPage();
+		List contentList = contentBiz.query(content);
+		return ResultData.build().success(new EUListBean(contentList,(int)BasicUtil.endPage(contentList).getTotal()));
+	}
+
+
+	/**
+	 * 获取文章
+	 * @param content 文章实体
+	 */
+	@ApiOperation(value = "获取文章列表接口")
+    @ApiImplicitParam(name = "id", value = "编号", required =true,paramType="query")
+	@GetMapping("/get")
+	@ResponseBody
+	public ResultData get(@ModelAttribute @ApiIgnore ContentEntity content,HttpServletResponse response, HttpServletRequest request,@ApiIgnore ModelMap model){
+		if(content.getId()==null) {
+			return ResultData.build().error();
+		}
+		ContentEntity _content = (ContentEntity)contentBiz.getEntity(Integer.parseInt(content.getId()));
+		return ResultData.build().success(_content);
+	}
+
+	@ApiOperation(value = "查看文章点击数")
+	@ApiImplicitParam(name = "contentId", value = "文章编号", required = true,paramType="path")
+	@GetMapping(value = "/{contentId}/hit")
+	@ResponseBody
+	public String hit(@PathVariable @ApiIgnore String contentId, HttpServletRequest request, HttpServletResponse response){
+		if(StringUtils.isEmpty(contentId)){
+			return "document.write(0)";
+		}
+	 	//获取ip
+		String ip = BasicUtil.getIp();
+		//获取端口（移动/web..）
+		boolean isMobileDevice = BasicUtil.isMobileDevice();
+
+		ContentEntity content = contentBiz.getById(contentId);
+		if(content == null){
+			return "document.write(0)";
+		}
+	 	//浏览数+1
+		if(ObjectUtil.isNotEmpty(content.getContentHit())){
+			content.setContentHit(content.getContentHit()+1);
+		}else {
+			content.setContentHit(1);
+		}
+		contentBiz.updateEntity(content);
+
+		// cms_history 增加相应记录
+		HistoryLogEntity entity = new HistoryLogEntity();
+		entity.setHlIsMobile(isMobileDevice);
+		entity.setHlIp(ip);
+		entity.setContentId(content.getId());
+		entity.setCreateDate(new Date());
+		historyLogBiz.saveEntity(entity);
+
+		return "document.write(" + content.getContentHit() + ")";
+	}
+
+}

src/main/java/net/mingsoft/cms/aop/ContentAop.java

+package net.mingsoft.cms.aop;
+
+import net.mingsoft.basic.aop.BaseAop;
+import net.mingsoft.basic.util.BasicUtil;
+import net.mingsoft.cms.biz.IContentBiz;
+import net.mingsoft.cms.biz.IHistoryLogBiz;
+import net.mingsoft.cms.entity.ContentEntity;
+import net.mingsoft.cms.entity.HistoryLogEntity;
+import org.apache.commons.lang3.StringUtils;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+/**
+ * @author 铭飞开源团队
+ * @date 2019/12/23
+ */
+@Component
+@Aspect
+public class ContentAop extends BaseAop {
+
+    /**
+     * 注入文章业务
+     */
+    @Autowired
+    private IContentBiz contentBiz;
+
+    /**
+     * 注入浏览记录业务
+     */
+    @Autowired
+    private IHistoryLogBiz historyLogBiz;
+
+    /**
+     * 文章浏览记录，
+     * 如果该文章该ip已经记录过，则不在重复记录
+     * @param pjp
+     * @return
+     * @throws Throwable
+     */
+    @Around("execution(* net.mingsoft.cms.action.web.ContentAction.get(..))")
+    public Object get(ProceedingJoinPoint pjp) throws Throwable{
+
+//        获取方法参数
+        ContentEntity content = getType(pjp, ContentEntity.class);
+//        如果id为空则直接发行
+        if(content.getId()==null) {
+            return pjp.proceed();
+        }
+        content = (ContentEntity)contentBiz.getEntity(Integer.parseInt(content.getId()));
+        //如果文章不存在则直接发行
+        if(content == null){
+            return pjp.proceed();
+        }
+
+        //查询判断该ip是否已经有浏览记录了
+        HistoryLogEntity historyLog = new HistoryLogEntity();
+        historyLog.setContentId(content.getId());
+        historyLog.setHlIp(BasicUtil.getIp());
+        historyLog.setHlIsMobile(BasicUtil.isMobileDevice());
+        HistoryLogEntity _historyLog = (HistoryLogEntity)historyLogBiz.getEntity(historyLog);
+        //如果该ip该文章没有浏览记录则保存浏览记录
+        //并且更新点击数
+        if(_historyLog == null || StringUtils.isBlank(_historyLog.getId())){
+            historyLog.setCreateDate(new Date());
+            historyLogBiz.saveEntity(historyLog);
+            //更新点击数
+            ContentEntity updateContent = new ContentEntity();
+            updateContent.setId(content.getId());
+            if(content.getContentHit() == null){
+                updateContent.setContentHit(1);
+            }else{
+                updateContent.setContentHit(content.getContentHit()+1);
+            }
+            contentBiz.updateEntity(updateContent);
+        }
+
+        return pjp.proceed();
+    }
+}

src/main/java/net/mingsoft/cms/bean/CategoryBean.java

+package net.mingsoft.cms.bean;
+
+import net.mingsoft.cms.entity.CategoryEntity;
+
+/**
+* 文章实体
+* @author 铭飞开发团队
+* 创建日期：2019-11-28 15:12:32<br/>
+* 历史修订：<br/>
+*/
+public class CategoryBean extends CategoryEntity {
+
+	/**
+	 * 文章编号
+	 */
+	private String articleId;
+
+
+
+
+	public String getArticleId() {
+		return articleId;
+	}
+
+	public void setArticleId(String articleId) {
+		this.articleId = articleId;
+	}
+}
\ No newline at end of file

src/main/java/net/mingsoft/cms/bean/ContentBean.java

+package net.mingsoft.cms.bean;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import net.mingsoft.cms.entity.ContentEntity;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * 文章实体bean
+ */
+public class ContentBean extends ContentEntity {
+
+//    /**
+//     * 静态化地址
+//     */
+//    private String staticUrl;
+
+    /**
+     * 开始时间
+     */
+    private String beginTime;
+
+    /**
+     * 结束时间
+     */
+    private String endTime;
+
+    /**
+     * 属性标记
+     */
+    private String flag;
+
+    /**
+     * 不包含属性标记
+     */
+    private String noflag;
+
+
+
+    public String getBeginTime() {
+        return beginTime;
+    }
+
+    public void setBeginTime(String beginTime) {
+        this.beginTime = beginTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
+    public String getFlag() {
+        return flag;
+    }
+
+    public void setFlag(String flag) {
+        this.flag = flag;
+    }
+
+    public String getNoflag() {
+        return noflag;
+    }
+
+    public void setNoflag(String noflag) {
+        this.noflag = noflag;
+    }
+}

src/main/java/net/mingsoft/cms/biz/ICategoryBiz.java

+package net.mingsoft.cms.biz;
+
+import net.mingsoft.base.biz.IBaseBiz;
+import net.mingsoft.cms.entity.CategoryEntity;
+
+import java.util.List;
+
+
+/**
+ * 分类业务
+ * @author 铭飞开发团队
+ * 创建日期：2019-11-28 15:12:32<br/>
+ * 历史修订：<br/>
+ */
+public interface ICategoryBiz extends IBaseBiz<CategoryEntity> {
+
+    /**
+     * 查询当前分类下的所有子分类
+     * @param category
+     * @return
+     */
+    List<CategoryEntity> queryChilds(CategoryEntity category);
+
+    void saveEntity(CategoryEntity entity);
+
+    /**更新父级及子集
+     * @param entity
+     */
+    void updateEntity(CategoryEntity entity);
+
+    /**只更新自身
+     * @param entity
+     */
+    void update(CategoryEntity entity);
+
+    void delete(String categoryId);
+
+    void copyCategory(CategoryEntity entity);
+}

src/main/java/net/mingsoft/cms/biz/IContentBiz.java

+package net.mingsoft.cms.biz;
+
+import net.mingsoft.base.biz.IBaseBiz;
+import net.mingsoft.cms.bean.CategoryBean;
+import net.mingsoft.cms.bean.ContentBean;
+import net.mingsoft.cms.entity.ContentEntity;
+import net.mingsoft.mdiy.entity.ModelEntity;
+
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 文章业务
+ * @author 铭飞开发团队
+ * 创建日期：2019-11-28 15:12:32<br/>
+ * 历史修订：<br/>
+ */
+public interface IContentBiz extends IBaseBiz<ContentEntity> {
+
+    /**
+     * 根据文章属性查询
+     * @param contentBean
+     * @return
+     */
+    List<CategoryBean> queryIdsByCategoryIdForParser(ContentBean contentBean);
+
+    int getSearchCount(ModelEntity contentModel, List diyList, Map whereMap, int appId, String categoryIds);
+}
\ No newline at end of file

src/main/java/net/mingsoft/cms/biz/IHistoryLogBiz.java

+package net.mingsoft.cms.biz;
+
+import net.mingsoft.base.biz.IBaseBiz;
+
+
+/**
+ * 文章浏览记录业务
+ * @author 铭飞开发团队
+ * 创建日期：2019-12-23 9:24:03<br/>
+ * 历史修订：<br/>
+ */
+public interface IHistoryLogBiz extends IBaseBiz {
+
+}
\ No newline at end of file

src/main/java/net/mingsoft/cms/biz/impl/ContentBizImpl.java

+/**
+The MIT License (MIT) * Copyright (c) 2019 铭飞科技
+
+ * 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
+ * the Software without restriction, including without limitation the rights to
+ * 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,
+ * subject to the following conditions:
+
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package net.mingsoft.cms.biz.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.bean.copier.CopyOptions;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.io.FileUtil;
+import net.mingsoft.basic.constant.Const;
+import net.mingsoft.basic.holder.DataHolder;
+import net.mingsoft.basic.util.BasicUtil;
+import net.mingsoft.cms.bean.CategoryBean;
+import net.mingsoft.cms.bean.ContentBean;
+import net.mingsoft.cms.constant.e.CategoryTypeEnum;
+import net.mingsoft.cms.dao.ICategoryDao;
+import net.mingsoft.cms.entity.CategoryEntity;
+import net.mingsoft.cms.entity.ContentEntity;
+import net.mingsoft.cms.util.CmsParserUtil;
+import net.mingsoft.mdiy.bean.PageBean;
+import net.mingsoft.mdiy.entity.ModelEntity;
+import net.mingsoft.mdiy.util.ParserUtil;
+import org.apache.commons.lang3.StringUtils;
+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.stereotype.Service;
+import net.mingsoft.base.biz.impl.BaseBizImpl;
+import net.mingsoft.base.dao.IBaseDao;
+
+import java.io.IOException;
+import java.util.*;
+
+import net.mingsoft.cms.biz.IContentBiz;
+import net.mingsoft.cms.dao.IContentDao;
+
+/**
+ * 文章管理持久化层
+ * @author 铭飞开发团队
+ * 创建日期：2019-11-28 15:12:32<br/>
+ * 历史修订：<br/>
+ */
+ @Service("cmscontentBizImpl")
+public class ContentBizImpl  extends BaseBizImpl<IContentDao, ContentEntity> implements IContentBiz {
+
+	/*
+	 * log4j日志记录
+	 */
+	protected final Logger LOG = LoggerFactory.getLogger(this.getClass());
+
+	@Autowired
+	private IContentDao contentDao;
+	/**
+	 * 栏目管理业务层
+	 */
+	@Autowired
+	private ICategoryDao categoryDao;
+
+	@Value("${ms.diy.html-dir:html}")
+	private String htmlDir;
+
+
+	@Override
+	protected IBaseDao getDao() {
+		// TODO Auto-generated method stub
+		return contentDao;
+	}
+
+	@Override
+	public List<CategoryBean> queryIdsByCategoryIdForParser(ContentBean contentBean) {
+		return this.contentDao.queryIdsByCategoryIdForParser(contentBean);
+	}
+
+	@Override
+	public int getSearchCount(ModelEntity contentModel, List diyList, Map whereMap, int appId, String categoryIds) {
+		if (contentModel!=null) {
+			return contentDao.getSearchCount(contentModel.getModelTableName(),diyList,whereMap, appId,categoryIds);
+		}
+		return contentDao.getSearchCount(null,null,whereMap, appId,categoryIds);
+	}
+
+
+}
\ No newline at end of file

src/main/java/net/mingsoft/cms/biz/impl/HistoryLogBizImpl.java

+/**
+The MIT License (MIT) * Copyright (c) 2019 铭飞科技
+
+ * 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
+ * the Software without restriction, including without limitation the rights to
+ * 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,
+ * subject to the following conditions:
+
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package net.mingsoft.cms.biz.impl;
+
+import net.mingsoft.cms.biz.IHistoryLogBiz;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import net.mingsoft.base.biz.impl.BaseBizImpl;
+import net.mingsoft.base.dao.IBaseDao;
+import net.mingsoft.cms.dao.ICmsHistoryLogDao;
+
+/**
+ * 文章浏览记录管理持久化层
+ * @author 铭飞开发团队
+ * 创建日期：2019-12-23 9:24:03<br/>
+ * 历史修订：<br/>
+ */
+ @Service("cmshistoryLogBizImpl")
+public class HistoryLogBizImpl extends BaseBizImpl implements IHistoryLogBiz {
+
+	
+	@Autowired
+	private ICmsHistoryLogDao historyLogDao;
+	
+	
+	@Override
+	protected IBaseDao getDao() {
+		// TODO Auto-generated method stub
+		return historyLogDao;
+	} 
+}
\ No newline at end of file

src/main/java/net/mingsoft/cms/constant/Const.java

+package net.mingsoft.cms.constant;
+
+/**
+ * @Author: 铭飞开源团队--huise
+ * @Date: 2019/8/9 20:51
+ */
+public class Const {
+    /**
+     * 资源文件
+     */
+    public final static String RESOURCES = "net.mingsoft.cms.resources.resources";
+}

src/main/java/net/mingsoft/cms/constant/e/CategoryTypeEnum.java

+/**
+ * The MIT License (MIT) * Copyright (c) 2020 铭软科技(mingsoft.net)
+
+ * 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
+ * the Software without restriction, including without limitation the rights to
+ * 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,
+ * subject to the following conditions:
+
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package net.mingsoft.cms.constant.e;
+
+import net.mingsoft.base.constant.e.BaseEnum;
+
+/**
+ * @Author: 铭飞团队
+ * @Description:
+ * @Date: Create in 2020/06/23 14:18
+ */
+public enum CategoryTypeEnum implements BaseEnum {
+
+    /**
+     * 列表
+     */
+    LIST("1"),
+    /**
+     * 封面
+     */
+    COVER("2"),
+    /**
+     * 链接
+     */
+    LINK("3");
+
+
+    CategoryTypeEnum(String type) {
+        this.type = type;
+    }
+
+    private String type;
+
+    public static CategoryTypeEnum get(String type) {
+        for (CategoryTypeEnum e : CategoryTypeEnum.values()) {
+            if (e.type.equals(type)) {
+                return e;
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public int toInt() {
+        return Integer.parseInt(type);
+    }
+
+    @Override
+    public String toString() {
+        return type;
+    }
+}

src/main/java/net/mingsoft/cms/dao/ICategoryDao.java

+package net.mingsoft.cms.dao;
+
+import net.mingsoft.base.dao.IBaseDao;
+import net.mingsoft.cms.entity.CategoryEntity;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * 分类持久层
+ * @author 铭飞开发团队
+ * 创建日期：2019-11-28 15:12:32<br/>
+ * 历史修订：<br/>
+ */
+@Component("cmsCategoryDao")
+public interface ICategoryDao extends IBaseDao<CategoryEntity> {
+
+    /**
+     * 查询当前分类下面的所有子分类
+     * @param category 必须存在categoryId categoryParentId
+     * @return
+     */
+    public List<CategoryEntity> queryChildren(CategoryEntity category);
+
+}
\ No newline at end of file

src/main/java/net/mingsoft/cms/dao/ICmsHistoryLogDao.java

+package net.mingsoft.cms.dao;
+
+import net.mingsoft.base.dao.IBaseDao;
+
+/**
+ * 文章浏览记录持久层
+ * @author 铭飞开发团队
+ * 创建日期：2019-12-23 9:24:03<br/>
+ * 历史修订：<br/>
+ */
+public interface ICmsHistoryLogDao extends IBaseDao {
+}
\ No newline at end of file

src/main/java/net/mingsoft/cms/dao/ICmsHistoryLogDao.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="net.mingsoft.cms.dao.ICmsHistoryLogDao">
+
+	<resultMap id="resultMap" type="net.mingsoft.cms.entity.HistoryLogEntity">
+			<id column="id" property="id" /><!--编号 -->
+				<result column="content_id" property="contentId" /><!--文章编号 -->
+				<result column="hl_ip" property="hlIp" /><!--浏览ip -->
+				<result column="people_id" property="peopleId" /><!--用户id -->
+				<result column="hl_is_mobile" property="hlIsMobile" /><!--是否为移动端 -->
+				<result column="create_by" property="createBy" /><!--创建人 -->
+				<result column="create_date" property="createDate" /><!--创建时间 -->
+				<result column="update_by" property="updateBy" /><!--修改人 -->
+				<result column="update_date" property="updateDate" /><!--修改时间 -->
+				<result column="del" property="del" /><!--删除标记 -->
+	</resultMap>
+
+	<!--保存-->
+	<insert id="saveEntity" useGeneratedKeys="true" keyProperty="id"
+			parameterType="net.mingsoft.cms.entity.HistoryLogEntity" >
+		insert into cms_history_log
+		<trim prefix="(" suffix=")" suffixOverrides=",">
+				<if test="contentId != null and contentId != ''">content_id,</if>
+				<if test="hlIp != null and hlIp != ''">hl_ip,</if>
+				<if test="peopleId != null and peopleId != ''">people_id,</if>
+				<if test="hlIsMobile != null">hl_is_mobile,</if>
+				<if test="createBy &gt; 0">create_by,</if>
+				<if test="createDate != null">create_date,</if>
+				<if test="updateBy &gt; 0">update_by,</if>
+				<if test="updateDate != null">update_date,</if>
+				<if test="del != null">del,</if>
+		</trim>
+		<trim prefix="values (" suffix=")" suffixOverrides=",">
+				<if test="contentId != null and contentId != ''">#{contentId},</if>
+				<if test="hlIp != null and hlIp != ''">#{hlIp},</if>
+				<if test="peopleId != null and peopleId != ''">#{peopleId},</if>
+				<if test="hlIsMobile != null">#{hlIsMobile},</if>
+				<if test="createBy &gt; 0">#{createBy},</if>
+				<if test="createDate != null">#{createDate},</if>
+				<if test="updateBy &gt; 0">#{updateBy},</if>
+				<if test="updateDate != null">#{updateDate},</if>
+				<if test="del != null">#{del},</if>
+		</trim>
+	</insert>
+
+		<!--更新-->
+		<update id="updateEntity" parameterType="net.mingsoft.cms.entity.HistoryLogEntity">
+			update cms_history_log
+			<set>
+				<if test="contentId != null and contentId != ''">content_id=#{contentId},</if>
+				<if test="hlIp != null and hlIp != ''">hl_ip=#{hlIp},</if>
+				<if test="peopleId != null and peopleId != ''">people_id=#{peopleId},</if>
+				<if test="hlIsMobile != null">hl_is_mobile=#{hlIsMobile},</if>
+				<if test="createBy &gt; 0">create_by=#{createBy},</if>
+				<if test="createDate != null">create_date=#{createDate},</if>
+				<if test="updateBy &gt; 0">update_by=#{updateBy},</if>
+				<if test="updateDate != null">update_date=#{updateDate},</if>
+				<if test="del != null">del=#{del},</if>
+			</set>
+			where id = #{id}
+		</update>
+
+		<!--根据id获取-->
+		<select id="getEntity" resultMap="resultMap" parameterType="int">
+			select * from cms_history_log where id=#{id}
+		</select>
+
+		<!--根据实体获取-->
+		<select id="getByEntity" resultMap="resultMap" parameterType="net.mingsoft.cms.entity.HistoryLogEntity">
+			select * from cms_history_log
+			<where>
+				<if test="contentId != null and contentId != ''">and content_id=#{contentId}</if>
+				<if test="hlIp != null and hlIp != ''">and hl_ip=#{hlIp}</if>
+				<if test="peopleId != null and peopleId != ''">and people_id=#{peopleId}</if>
+				<if test="hlIsMobile != null"> and hl_is_mobile=#{hlIsMobile} </if>
+				<if test="createBy &gt; 0"> and create_by=#{createBy} </if>
+				<if test="createDate != null"> and create_date=#{createDate} </if>
+				<if test="updateBy &gt; 0"> and update_by=#{updateBy} </if>
+				<if test="updateDate != null"> and update_date=#{updateDate} </if>
+				<if test="del != null"> and del=#{del} </if>
+			</where>
+			limit 0,1
+		</select>
+
+
+		<!--删除-->
+		<delete id="deleteEntity" parameterType="int">
+			delete from cms_history_log  where id=#{id}
+		</delete>
+
+		<!--批量删除-->
+		<delete id="delete" >
+			delete from cms_history_log
+			<where>
+				id  in <foreach collection="ids" item="item" index="index"
+										 open="(" separator="," close=")">#{item}</foreach>
+			</where>
+		</delete>
+		<!--查询全部-->
+		<select id="queryAll" resultMap="resultMap">
+			select * from cms_history_log order by id desc
+		</select>
+	<!--条件查询-->
+	<select id="query" resultMap="resultMap">
+		select * from cms_history_log
+		<where>
+			<if test="contentId != null and contentId != ''"> and content_id=#{contentId}</if>
+			<if test="hlIp != null and hlIp != ''"> and hl_ip=#{hlIp}</if>
+			<if test="peopleId != null and peopleId != ''"> and people_id=#{peopleId}</if>
+			<if test="hlIsMobile != null"> and hl_is_mobile=#{hlIsMobile} </if>
+			<if test="createBy &gt; 0"> and create_by=#{createBy} </if>
+			<if test="createDate != null"> and create_date=#{createDate} </if>
+			<if test="updateBy &gt; 0"> and update_by=#{updateBy} </if>
+			<if test="updateDate != null"> and update_date=#{updateDate} </if>
+			<if test="del != null"> and del=#{del} </if>
+			<include refid="net.mingsoft.base.dao.IBaseDao.sqlWhere"></include>
+		</where>
+		order by id desc
+	</select>
+
+</mapper>
\ No newline at end of file

src/main/java/net/mingsoft/cms/dao/IContentDao.java

+package net.mingsoft.cms.dao;
+
+import net.mingsoft.base.dao.IBaseDao;
+import net.mingsoft.cms.bean.CategoryBean;
+import net.mingsoft.cms.bean.ContentBean;
+import net.mingsoft.cms.entity.ContentEntity;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 文章持久层
+ * @author 铭飞开发团队
+ * 创建日期：2019-11-28 15:12:32<br/>
+ * 历史修订：<br/>
+ */
+public interface IContentDao extends IBaseDao<ContentEntity> {
+
+    /**
+     * 查询文章编号集合
+     * @contentBean
+     * @return
+     */
+    public List<CategoryBean> queryIdsByCategoryIdForParser(ContentBean contentBean);
+
+    /**
+     * 根据查询文章实体总数
+     *
+     * @param tableName
+     *            :自定义生成的表名
+     * @param map
+     *            key:字段名 value:List 字段的各种判断值 list[0]:是否为自定义字段 list[1]:是否为整形
+     *            list[2]:是否是等值查询 list[3]:字段的值
+     * @return 文章实体总数
+     */
+    int getSearchCount(@Param("tableName") String tableName, @Param("diyList") List diyList, @Param("map") Map<String, Object> map,
+                       @Param("websiteId") int websiteId, @Param("ids") String ids);
+
+    /**
+     * 分类编号删除文章
+     * @param ids
+     */
+    void deleteEntityByCategoryIds(@Param("ids") String[] ids);
+}
\ No newline at end of file

src/main/java/net/mingsoft/cms/entity/CategoryEntity.java

+package net.mingsoft.cms.entity;
+
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import net.mingsoft.base.entity.BaseEntity;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * 分类实体
+ *
+ * @author 铭飞开发团队
+ * 创建日期：2019-11-28 15:12:32<br/>
+ * 历史修订：<br/>
+ */
+@TableName("cms_category")
+public class CategoryEntity extends BaseEntity {
+
+    private static final long serialVersionUID = 1574925152750L;
+
+    /**
+     * 栏目管理名称
+     */
+    private String categoryTitle;
+    /**
+     * 栏目别名
+     */
+    private String categoryPinyin;
+    /**
+     * 所属栏目
+     */
+    @TableField(insertStrategy = FieldStrategy.NOT_EMPTY, updateStrategy = FieldStrategy.NOT_EMPTY, whereStrategy = FieldStrategy.NOT_EMPTY)
+    private String categoryId;
+    /**
+     * 栏目管理属性
+     */
+    private String categoryType;
+    /**
+     * 自定义顺序
+     */
+    private Integer categorySort;
+    /**
+     * 列表模板
+     */
+    private String categoryListUrl;
+    /**
+     * 内容模板
+     */
+    private String categoryUrl;
+    /**
+     * 栏目管理关键字
+     */
+    private String categoryKeyword;
+    /**
+     * 栏目管理描述
+     */
+    private String categoryDescrip;
+    /**
+     * 缩略图
+     */
+    private String categoryImg;
+    /**
+     * 自定义链接
+     */
+    private String categoryDiyUrl;
+    /**
+     * 栏目管理的内容模型id
+     */
+    private Integer mdiyModelId;
+    /**
+     * 类别发布时间
+     */
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date categoryDatetime;
+
+    /**
+     * 字典对应编号
+     */
+    private Integer dictId;
+    /**
+     * 栏目属性
+     */
+    private String categoryFlag;
+    /**
+     * 栏目路径
+     */
+    private String categoryPath;
+    /**
+     * 父类型编号
+     */
+    private String categoryParentIds;
+
+    /**
+     * 叶子节点
+     */
+    private Boolean leaf;
+
+    /**
+     * 顶级id
+     */
+    private String topId;
+
+    public Boolean getLeaf() {
+        return leaf;
+    }
+
+    public void setLeaf(Boolean leaf) {
+        this.leaf = leaf;
+    }
+
+    public String getTopId() {
+        return topId;
+    }
+
+    public void setTopId(String topId) {
+        this.topId = topId;
+    }
+
+    /**
+     * 设置栏目管理名称
+     */
+    public void setCategoryTitle(String categoryTitle) {
+        this.categoryTitle = categoryTitle;
+    }
+
+    /**
+     * 获取栏目管理名称
+     */
+    public String getCategoryTitle() {
+        return this.categoryTitle;
+    }
+
+    /**
+     * 设置所属栏目
+     */
+    public void setCategoryId(String categoryId) {
+        this.categoryId = categoryId;
+    }
+
+    public String getCategoryPinyin() {
+        return categoryPinyin;
+    }
+
+    public void setCategoryPinyin(String categoryPinyin) {
+        this.categoryPinyin = categoryPinyin;
+    }
+
+    /**
+     * 获取所属栏目
+     */
+    public String getCategoryId() {
+        return this.categoryId;
+    }
+
+    /**
+     * 设置栏目管理属性
+     */
+    public void setCategoryType(String categoryType) {
+        this.categoryType = categoryType;
+    }
+
+    /**
+     * 获取栏目管理属性
+     */
+    public String getCategoryType() {
+        return this.categoryType;
+    }
+
+    /**
+     * 设置自定义顺序
+     */
+    public void setCategorySort(Integer categorySort) {
+        this.categorySort = categorySort;
+    }
+
+    /**
+     * 获取自定义顺序
+     */
+    public Integer getCategorySort() {
+        return this.categorySort;
+    }
+
+    /**
+     * 设置列表模板
+     */
+    public void setCategoryListUrl(String categoryListUrl) {
+        this.categoryListUrl = categoryListUrl;
+    }
+
+    /**
+     * 获取列表模板
+     */
+    public String getCategoryListUrl() {
+        return this.categoryListUrl;
+    }
+
+    /**
+     * 设置内容模板
+     */
+    public void setCategoryUrl(String categoryUrl) {
+        this.categoryUrl = categoryUrl;
+    }
+
+    /**
+     * 获取内容模板
+     */
+    public String getCategoryUrl() {
+        return this.categoryUrl;
+    }
+
+    /**
+     * 设置栏目管理关键字
+     */
+    public void setCategoryKeyword(String categoryKeyword) {
+        this.categoryKeyword = categoryKeyword;
+    }
+
+    /**
+     * 获取栏目管理关键字
+     */
+    public String getCategoryKeyword() {
+        return this.categoryKeyword;
+    }
+
+    /**
+     * 设置栏目管理描述
+     */
+    public void setCategoryDescrip(String categoryDescrip) {
+        this.categoryDescrip = categoryDescrip;
+    }
+
+    /**
+     * 获取栏目管理描述
+     */
+    public String getCategoryDescrip() {
+        return this.categoryDescrip;
+    }
+
+    /**
+     * 设置缩略图
+     */
+    public void setCategoryImg(String categoryImg) {
+        this.categoryImg = categoryImg;
+    }
+
+    /**
+     * 获取缩略图
+     */
+    public String getCategoryImg() {
+        return this.categoryImg;
+    }
+
+    /**
+     * 设置自定义链接
+     */
+    public void setCategoryDiyUrl(String categoryDiyUrl) {
+        this.categoryDiyUrl = categoryDiyUrl;
+    }
+
+    /**
+     * 获取自定义链接
+     */
+    public String getCategoryDiyUrl() {
+        return this.categoryDiyUrl;
+    }
+
+    public Integer getMdiyModelId() {
+        return mdiyModelId;
+    }
+
+    public void setMdiyModelId(Integer mdiyModelId) {
+        this.mdiyModelId = mdiyModelId;
+    }
+
+    /**
+     * 设置类别发布时间
+     */
+    public void setCategoryDatetime(Date categoryDatetime) {
+        this.categoryDatetime = categoryDatetime;
+    }
+
+    /**
+     * 获取类别发布时间
+     */
+    public Date getCategoryDatetime() {
+        return this.categoryDatetime;
+    }
+
+    /**
+     * 设置字典对应编号
+     */
+    public void setDictId(Integer dictId) {
+        this.dictId = dictId;
+    }
+
+    /**
+     * 获取字典对应编号
+     */
+    public Integer getDictId() {
+        return this.dictId;
+    }
+
+    /**
+     * 设置栏目属性
+     */
+    public void setCategoryFlag(String categoryFlag) {
+        this.categoryFlag = categoryFlag;
+    }
+
+    /**
+     * 获取栏目属性
+     */
+    public String getCategoryFlag() {
+        return this.categoryFlag;
+    }
+
+    /**
+     * 设置栏目路径
+     */
+    public void setCategoryPath(String categoryPath) {
+        this.categoryPath = categoryPath;
+    }
+
+    /**
+     * 获取栏目路径
+     */
+    public String getCategoryPath() {
+        return this.categoryPath;
+    }
+
+    /**
+     * 设置父类型编号
+     */
+    public void setCategoryParentIds(String categoryParentIds) {
+        this.categoryParentIds = categoryParentIds;
+    }
+
+    /**
+     * 获取父类型编号
+     */
+    public String getCategoryParentIds() {
+        return this.categoryParentIds;
+    }
+
+    /**
+     * 获取栏目标题 （标签使用）
+     */
+    public String getTypetitle() {
+        return this.categoryTitle;
+    }
+
+    /**
+     * 获取栏目链接 （标签使用，动态链接不考虑）
+     */
+    public String getTypelink() {
+        return "3".equals(this.categoryType) ? this.categoryDiyUrl : this.categoryPath + "/index.html";
+    }
+
+    /**
+     * 获取栏目关键字 （标签使用）
+     */
+    public String getTypekeyword() {
+        return this.categoryKeyword;
+    }
+
+    /**
+     * 获取栏目url （标签使用）
+     */
+    public String getTypeurl() {
+        return this.categoryDiyUrl;
+    }
+
+    /**
+     * 获取栏目属性 （标签使用）
+     */
+    public String getFlag() {
+        return this.categoryFlag;
+    }
+
+    /**
+     * 获取栏目父级Id （标签使用）
+     */
+    public String getParentids() {
+        return this.categoryParentIds;
+    }
+
+    /**
+     * 获取栏目描述（标签使用）
+     */
+    public String getTypedescrip() {
+        return this.categoryDescrip;
+    }
+
+    /**
+     * 获取栏目Id（标签使用）
+     */
+    public String getTypeid() {
+        return this.id;
+    }
+
+    /**
+     * 获取栏目图片 (标签使用）
+     */
+    public String getTypelitpic() {
+        return categoryImg;
+    }
+}

src/main/java/net/mingsoft/cms/entity/ContentEntity.java

+package net.mingsoft.cms.entity;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import net.mingsoft.base.entity.BaseEntity;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+* 文章实体
+* @author 铭飞开发团队
+* 创建日期：2019-11-28 15:12:32<br/>
+* 历史修订：<br/>
+*/
+@TableName("cms_content")
+public class ContentEntity extends BaseEntity {
+
+private static final long serialVersionUID = 1574925152617L;
+
+	/**
+	* 文章标题
+	*/
+	private String contentTitle;
+	/**
+	* 所属栏目
+	*/
+	private String categoryId;
+	/**
+	* 文章类型
+	*/
+	private String contentType;
+	/**
+	* 是否显示
+	*/
+	private String contentDisplay;
+	/**
+	* 文章作者
+	*/
+	private String contentAuthor;
+	/**
+	* 文章来源
+	*/
+	private String contentSource;
+	/**
+	* 发布时间
+	*/
+	@JSONField(format = "yyyy-MM-dd HH:mm:ss")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date contentDatetime;
+	/**
+	* 自定义顺序
+	*/
+	private Integer contentSort;
+	/**
+	* 文章缩略图
+	*/
+	private String contentImg;
+	/**
+	* 描述
+	*/
+	private String contentDescription;
+	/**
+	* 关键字
+	*/
+	private String contentKeyword;
+	/**
+	* 文章内容
+	*/
+	private String contentDetails;
+	/**
+	* 文章跳转链接地址
+	*/
+	private String contentUrl;
+	/**
+	* 文章管理的应用id
+	*/
+
+	/**
+	* 点击次数
+	*/
+	private Integer contentHit;
+
+	public Integer getContentHit() {
+		return contentHit;
+	}
+
+	public void setContentHit(Integer contentHit) {
+		this.contentHit = contentHit;
+	}
+
+	/**
+	* 设置文章标题
+	*/
+	public void setContentTitle(String contentTitle) {
+	this.contentTitle = contentTitle;
+	}
+
+	/**
+	* 获取文章标题
+	*/
+	public String getContentTitle() {
+	return this.contentTitle;
+	}
+
+	public String getCategoryId() {
+		return categoryId;
+	}
+
+	public void setCategoryId(String categoryId) {
+		this.categoryId = categoryId;
+	}
+
+	/**
+	* 设置文章类型
+	*/
+	public void setContentType(String contentType) {
+	this.contentType = contentType;
+	}
+
+	/**
+	* 获取文章类型
+	*/
+	public String getContentType() {
+	return this.contentType;
+	}
+	/**
+	* 设置是否显示
+	*/
+	public void setContentDisplay(String contentDisplay) {
+	this.contentDisplay = contentDisplay;
+	}
+
+	/**
+	* 获取是否显示
+	*/
+	public String getContentDisplay() {
+	return this.contentDisplay;
+	}
+	/**
+	* 设置文章作者
+	*/
+	public void setContentAuthor(String contentAuthor) {
+	this.contentAuthor = contentAuthor;
+	}
+
+	/**
+	* 获取文章作者
+	*/
+	public String getContentAuthor() {
+	return this.contentAuthor;
+	}
+	/**
+	* 设置文章来源
+	*/
+	public void setContentSource(String contentSource) {
+	this.contentSource = contentSource;
+	}
+
+	/**
+	* 获取文章来源
+	*/
+	public String getContentSource() {
+	return this.contentSource;
+	}
+	/**
+	* 设置发布时间
+	*/
+	public void setContentDatetime(Date contentDatetime) {
+	this.contentDatetime = contentDatetime;
+	}
+
+	/**
+	* 获取发布时间
+	*/
+	public Date getContentDatetime() {
+	return this.contentDatetime;
+	}
+	/**
+	* 设置自定义顺序
+	*/
+	public void setContentSort(Integer contentSort) {
+	this.contentSort = contentSort;
+	}
+
+	/**
+	* 获取自定义顺序
+	*/
+	public Integer getContentSort() {
+	return this.contentSort;
+	}
+	/**
+	* 设置文章缩略图
+	*/
+	public void setContentImg(String contentImg) {
+	this.contentImg = contentImg;
+	}
+
+	/**
+	* 获取文章缩略图
+	*/
+	public String getContentImg() {
+	return this.contentImg;
+	}
+	/**
+	* 设置描述
+	*/
+	public void setContentDescription(String contentDescription) {
+	this.contentDescription = contentDescription;
+	}
+
+	/**
+	* 获取描述
+	*/
+	public String getContentDescription() {
+	return this.contentDescription;
+	}
+	/**
+	* 设置关键字
+	*/
+	public void setContentKeyword(String contentKeyword) {
+	this.contentKeyword = contentKeyword;
+	}
+
+	/**
+	* 获取关键字
+	*/
+	public String getContentKeyword() {
+	return this.contentKeyword;
+	}
+	/**
+	* 设置文章内容
+	*/
+	public void setContentDetails(String contentDetails) {
+	this.contentDetails = contentDetails;
+	}
+
+	/**
+	* 获取文章内容
+	*/
+	public String getContentDetails() {
+	return this.contentDetails;
+	}
+	/**
+	* 设置文章跳转链接地址
+	*/
+	public void setContentUrl(String contentUrl) {
+	this.contentUrl = contentUrl;
+	}
+
+	/**
+	* 获取文章跳转链接地址
+	*/
+	public String getContentUrl() {
+	return this.contentUrl;
+	}
+
+}
\ No newline at end of file

src/main/java/net/mingsoft/cms/entity/HistoryLogEntity.java

+package net.mingsoft.cms.entity;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import org.springframework.format.annotation.DateTimeFormat;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import net.mingsoft.base.entity.BaseEntity;
+import java.util.Date;
+/**
+* 文章浏览记录实体
+* @author 铭飞开发团队
+* 创建日期：2019-12-23 9:24:03<br/>
+* 历史修订：<br/>
+*/
+public class HistoryLogEntity extends BaseEntity {
+
+private static final long serialVersionUID = 1577064243576L;
+
+	/**
+	* 文章编号
+	*/
+	private String contentId;
+	/**
+	* 浏览ip
+	*/
+	private String hlIp;
+	/**
+	* 用户idp
+	*/
+	private String peopleId;
+	/**
+	* 是否为移动端
+	*/
+	private Boolean hlIsMobile;
+
+
+	/**
+	* 设置文章编号
+	*/
+	public void setContentId(String contentId) {
+	this.contentId = contentId;
+	}
+
+	/**
+	* 获取文章编号
+	*/
+	public String getContentId() {
+	return this.contentId;
+	}
+	/**
+	* 设置浏览ip
+	*/
+	public void setHlIp(String hlIp) {
+	this.hlIp = hlIp;
+	}
+
+	/**
+	* 获取浏览ip
+	*/
+	public String getHlIp() {
+	return this.hlIp;
+	}
+
+	public String getPeopleId() {
+		return peopleId;
+	}
+
+	public void setPeopleId(String peopleId) {
+		this.peopleId = peopleId;
+	}
+
+	/**
+	* 设置是否为移动端
+	*/
+	public void setHlIsMobile(Boolean hlIsMobile) {
+	this.hlIsMobile = hlIsMobile;
+	}
+
+	/**
+	* 获取是否为移动端
+	*/
+	public Boolean getHlIsMobile() {
+	return this.hlIsMobile;
+	}
+}
\ No newline at end of file

src/main/java/net/mingsoft/cms/resources/resources_en_US.properties

+#
+#Thu Nov 28 15:12:32 CST 2019
+category.img=Thumbnail
+appid=The application id of article management
+content.datetime=Publishing time
+category.manager.id=Posting user id
+category.title=Column management name
+category.keyword=Column management keyword
+content.img=Article thumbnail
+category.path=Column path
+content.type=Article type
+category.url=Content template
+dict.id=Dictionary corresponding number
+content.author=Article author
+category.parent.id=Parent type number
+category.datetime=Category publication time
+category.flag =Column attribute
+content.description=Description
+content.url=Article jump link address
+category.sort=Custom order
+content.title=Article title
+content.category.id=belongingcolumn
+id=number
+app.id=application number
+category.list.url=List template
+mdiy.model.id=Content model id for column management
+content.source=The source of the article
+content.display=Whether to display
+category.type=Column management attribute
+category.descrip=Column management description
+content.details=Article content
+category.id=belonging to the column
+content.sort=custom order
+category.diy.url=custom link
+content.keyword=keyword
+templet.file=template file not found
+category.pinyin=pinyin

src/main/java/net/mingsoft/cms/resources/resources_zh_CN.properties

+#
+#Thu Nov 28 15:12:32 CST 2019
+category.img=\u7F29\u7565\u56FE
+appid=\u6587\u7AE0\u7BA1\u7406\u7684\u5E94\u7528id
+content.datetime=\u53D1\u5E03\u65F6\u95F4
+category.manager.id=\u53D1\u5E03\u7528\u6237id
+category.title=\u680F\u76EE\u7BA1\u7406\u540D\u79F0
+category.keyword=\u680F\u76EE\u7BA1\u7406\u5173\u952E\u5B57
+content.img=\u6587\u7AE0\u7F29\u7565\u56FE
+category.path=\u680F\u76EE\u8DEF\u5F84
+content.type=\u6587\u7AE0\u7C7B\u578B
+category.url=\u5185\u5BB9\u6A21\u677F
+dict.id=\u5B57\u5178\u5BF9\u5E94\u7F16\u53F7
+content.author=\u6587\u7AE0\u4F5C\u8005
+category.parent.id=\u7236\u7C7B\u578B\u7F16\u53F7
+category.datetime=\u7C7B\u522B\u53D1\u5E03\u65F6\u95F4
+category.flag=\u680F\u76EE\u5C5E\u6027
+content.description=\u63CF\u8FF0
+content.url=\u6587\u7AE0\u8DF3\u8F6C\u94FE\u63A5\u5730\u5740
+category.sort=\u81EA\u5B9A\u4E49\u987A\u5E8F
+content.title=\u6587\u7AE0\u6807\u9898
+content.category.id=\u6240\u5C5E\u680F\u76EE
+id=\u7F16\u53F7
+app.id=\u5E94\u7528\u7F16\u53F7
+category.list.url=\u5217\u8868\u6A21\u677F
+mdiy.model.id=\u680F\u76EE\u7BA1\u7406\u7684\u5185\u5BB9\u6A21\u578Bid
+content.source=\u6587\u7AE0\u6765\u6E90
+content.display=\u662F\u5426\u663E\u793A
+category.type=\u680F\u76EE\u7BA1\u7406\u5C5E\u6027
+category.descrip=\u680F\u76EE\u7BA1\u7406\u63CF\u8FF0
+content.details=\u6587\u7AE0\u5185\u5BB9
+category.id=\u6240\u5C5E\u680F\u76EE
+content.sort=\u81EA\u5B9A\u4E49\u987A\u5E8F
+category.diy.url=\u81EA\u5B9A\u4E49\u94FE\u63A5
+content.keyword=\u5173\u952E\u5B57
+templet.file=\u672A\u627E\u5230\u6A21\u677F\u6587\u4EF6
+category.pinyin=\u62FC\u97F3