Merge remote-tracking branch 'origin/master'

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

@@ -13,6 +13,8 @@ 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
@@ -64,6 +66,7 @@ public class CotentAop extends BaseAop {
         //如果该ip该文章没有浏览记录则保存浏览记录
         //并且更新点击数
         if(_historyLog == null || StringUtils.isBlank(_historyLog.getId())){
+            historyLog.setCreateDate(new Date());
             historyLogBiz.saveEntity(historyLog);
             //更新点击数
             ContentEntity updateContent = new ContentEntity();

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

@@ -21,14 +21,12 @@ The MIT License (MIT) * Copyright (c) 2019 铭飞科技
 
 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 java.util.*;
-import net.mingsoft.cms.entity.HistoryLogEntity;
-import net.mingsoft.cms.biz.IHistoryLogBiz;
-import net.mingsoft.cms.dao.IHistoryLogDao;
+import net.mingsoft.cms.dao.ICmsHistoryLogDao;
 
 /**
  * 文章浏览记录管理持久化层
@@ -41,7 +39,7 @@ public class HistoryLogBizImpl extends BaseBizImpl implements IHistoryLogBiz {
 
 	
 	@Autowired
-	private IHistoryLogDao historyLogDao;
+	private ICmsHistoryLogDao historyLogDao;
 	
 	
 	@Override

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

@@ -1,8 +1,6 @@
 package net.mingsoft.cms.dao;
 
 import net.mingsoft.base.dao.IBaseDao;
-import java.util.*;
-import net.mingsoft.cms.entity.HistoryLogEntity;
 
 /**
  * 文章浏览记录持久层
@@ -10,5 +8,5 @@ import net.mingsoft.cms.entity.HistoryLogEntity;
  * 创建日期：2019-12-23 9:24:03<br/>
  * 历史修订：<br/>
  */
-public interface IHistoryLogDao extends IBaseDao {
+public interface ICmsHistoryLogDao extends IBaseDao {
 }

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

@@ -1,6 +1,6 @@
 <?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.IHistoryLogDao">
+<mapper namespace="net.mingsoft.cms.dao.ICmsHistoryLogDao">
 
 	<resultMap id="resultMap" type="net.mingsoft.cms.entity.HistoryLogEntity">
 			<id column="id" property="id" /><!--编号 -->