From ffa51c87c8f0728a6fd4a998816a1dd495a679cd Mon Sep 17 00:00:00 2001
From: zhongyh <1599558112>
Date: Fri, 27 Dec 2019 08:57:30 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9beanName?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/net/mingsoft/cms/aop/CotentAop.java         | 3 +++
 .../java/net/mingsoft/cms/biz/impl/HistoryLogBizImpl.java | 8 +++-----
 .../dao/{IHistoryLogDao.java => ICmsHistoryLogDao.java}   | 4 +---
 .../cms/dao/{IHistoryLogDao.xml => ICmsHistoryLogDao.xml} | 2 +-
 4 files changed, 8 insertions(+), 9 deletions(-)
 rename src/main/java/net/mingsoft/cms/dao/{IHistoryLogDao.java => ICmsHistoryLogDao.java} (63%)
 rename src/main/java/net/mingsoft/cms/dao/{IHistoryLogDao.xml => ICmsHistoryLogDao.xml} (98%)

diff --git a/src/main/java/net/mingsoft/cms/aop/CotentAop.java b/src/main/java/net/mingsoft/cms/aop/CotentAop.java
index 99a7e870..2f9310ee 100644
--- a/src/main/java/net/mingsoft/cms/aop/CotentAop.java
+++ b/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();
diff --git a/src/main/java/net/mingsoft/cms/biz/impl/HistoryLogBizImpl.java b/src/main/java/net/mingsoft/cms/biz/impl/HistoryLogBizImpl.java
index 628557ee..18e4bd0c 100644
--- a/src/main/java/net/mingsoft/cms/biz/impl/HistoryLogBizImpl.java
+++ b/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
diff --git a/src/main/java/net/mingsoft/cms/dao/IHistoryLogDao.java b/src/main/java/net/mingsoft/cms/dao/ICmsHistoryLogDao.java
similarity index 63%
rename from src/main/java/net/mingsoft/cms/dao/IHistoryLogDao.java
rename to src/main/java/net/mingsoft/cms/dao/ICmsHistoryLogDao.java
index 2c1f72fd..d8acb78b 100644
--- a/src/main/java/net/mingsoft/cms/dao/IHistoryLogDao.java
+++ b/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 {
 }
\ No newline at end of file
diff --git a/src/main/java/net/mingsoft/cms/dao/IHistoryLogDao.xml b/src/main/java/net/mingsoft/cms/dao/ICmsHistoryLogDao.xml
similarity index 98%
rename from src/main/java/net/mingsoft/cms/dao/IHistoryLogDao.xml
rename to src/main/java/net/mingsoft/cms/dao/ICmsHistoryLogDao.xml
index f58961a6..01dd4ab8 100644
--- a/src/main/java/net/mingsoft/cms/dao/IHistoryLogDao.xml
+++ b/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" /><!--编号 -->

From f40087b84c1e02b4673423cf21428df137c5536b Mon Sep 17 00:00:00 2001
From: zhongyh <1599558112>
Date: Fri, 27 Dec 2019 10:52:09 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8F=92=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/static/plugins/vue-codemirror/vue-codemirror.js | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 src/main/webapp/static/plugins/vue-codemirror/vue-codemirror.js

diff --git a/src/main/webapp/static/plugins/vue-codemirror/vue-codemirror.js b/src/main/webapp/static/plugins/vue-codemirror/vue-codemirror.js
new file mode 100644
index 00000000..7097cb23
--- /dev/null
+++ b/src/main/webapp/static/plugins/vue-codemirror/vue-codemirror.js
@@ -0,0 +1 @@
+!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t(require("codemirror")):"function"==typeof define&&define.amd?define(["codemirror"],t):"object"==typeof exports?exports.VueCodemirror=t(require("codemirror")):e.VueCodemirror=t(e.codemirror)}(this,function(e){return function(e){function t(r){if(n[r])return n[r].exports;var o=n[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,t),o.l=!0,o.exports}var n={};return t.m=e,t.c=n,t.i=function(e){return e},t.d=function(e,n,r){t.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},t.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(n,"a",n),n},t.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},t.p="/",t(t.s=3)}([function(t,n){t.exports=e},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=n(0),o=function(e){return e&&e.__esModule?e:{default:e}}(r),i=window.CodeMirror||o.default;"function"!=typeof Object.assign&&Object.defineProperty(Object,"assign",{value:function(e,t){if(null==e)throw new TypeError("Cannot convert undefined or null to object");for(var n=Object(e),r=1;r<arguments.length;r++){var o=arguments[r];if(null!=o)for(var i in o)Object.prototype.hasOwnProperty.call(o,i)&&(n[i]=o[i])}return n},writable:!0,configurable:!0}),t.default={name:"codemirror",data:function(){return{content:"",codemirror:null,cminstance:null}},props:{code:String,value:String,marker:Function,unseenLines:Array,name:{type:String,default:"codemirror"},placeholder:{type:String,default:""},merge:{type:Boolean,default:!1},options:{type:Object,default:function(){return{}}},events:{type:Array,default:function(){return[]}},globalOptions:{type:Object,default:function(){return{}}},globalEvents:{type:Array,default:function(){return[]}}},watch:{options:{deep:!0,handler:function(e){for(var t in e)this.cminstance.setOption(t,e[t])}},merge:function(){this.$nextTick(this.switchMerge)},code:function(e){this.handerCodeChange(e)},value:function(e){this.handerCodeChange(e)}},methods:{initialize:function(){var e=this,t=Object.assign({},this.globalOptions,this.options);this.merge?(this.codemirror=i.MergeView(this.$refs.mergeview,t),this.cminstance=this.codemirror.edit):(this.codemirror=i.fromTextArea(this.$refs.textarea,t),this.cminstance=this.codemirror,this.cminstance.setValue(this.code||this.value||this.content)),this.cminstance.on("change",function(t){e.content=t.getValue(),e.$emit&&e.$emit("input",e.content)});var n={};["scroll","changes","beforeChange","cursorActivity","keyHandled","inputRead","electricInput","beforeSelectionChange","viewportChange","swapDoc","gutterClick","gutterContextMenu","focus","blur","refresh","optionChange","scrollCursorIntoView","update"].concat(this.events).concat(this.globalEvents).filter(function(e){return!n[e]&&(n[e]=!0)}).forEach(function(t){e.cminstance.on(t,function(){for(var n=arguments.length,r=Array(n),o=0;o<n;o++)r[o]=arguments[o];e.$emit.apply(e,[t].concat(r));var i=t.replace(/([A-Z])/g,"-$1").toLowerCase();i!==t&&e.$emit.apply(e,[i].concat(r))})});this.$emit("ready",this.codemirror),this.unseenLineMarkers(),this.refresh()},refresh:function(){var e=this;this.$nextTick(function(){e.cminstance.refresh()})},destroy:function(){var e=this.cminstance.doc.cm.getWrapperElement();e&&e.remove&&e.remove()},handerCodeChange:function(e){if(e!==this.cminstance.getValue()){var t=this.cminstance.getScrollInfo();this.cminstance.setValue(e),this.content=e,this.cminstance.scrollTo(t.left,t.top)}this.unseenLineMarkers()},unseenLineMarkers:function(){var e=this;void 0!==this.unseenLines&&void 0!==this.marker&&this.unseenLines.forEach(function(t){var n=e.cminstance.lineInfo(t);e.cminstance.setGutterMarker(t,"breakpoints",n.gutterMarkers?null:e.marker())})},switchMerge:function(){var e=this.cminstance.doc.history,t=this.cminstance.doc.cleanGeneration;this.options.value=this.cminstance.getValue(),this.destroy(),this.initialize(),this.cminstance.doc.history=e,this.cminstance.doc.cleanGeneration=t}},mounted:function(){this.initialize()},beforeDestroy:function(){this.destroy()}}},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=n(1),o=n.n(r);for(var i in r)["default","default"].indexOf(i)<0&&function(e){n.d(t,e,function(){return r[e]})}(i);var s=n(5),c=n(4),a=c(o.a,s.a,!1,null,null,null);t.default=a.exports},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0}),t.install=t.codemirror=t.CodeMirror=void 0;var o=n(0),i=r(o),s=n(2),c=r(s),a=window.CodeMirror||i.default,u=function(e,t){t&&(t.options&&(c.default.props.globalOptions.default=function(){return t.options}),t.events&&(c.default.props.globalEvents.default=function(){return t.events})),e.component(c.default.name,c.default)},l={CodeMirror:a,codemirror:c.default,install:u};t.default=l,t.CodeMirror=a,t.codemirror=c.default,t.install=u},function(e,t){e.exports=function(e,t,n,r,o,i){var s,c=e=e||{},a=typeof e.default;"object"!==a&&"function"!==a||(s=e,c=e.default);var u="function"==typeof c?c.options:c;t&&(u.render=t.render,u.staticRenderFns=t.staticRenderFns,u._compiled=!0),n&&(u.functional=!0),o&&(u._scopeId=o);var l;if(i?(l=function(e){e=e||this.$vnode&&this.$vnode.ssrContext||this.parent&&this.parent.$vnode&&this.parent.$vnode.ssrContext,e||"undefined"==typeof __VUE_SSR_CONTEXT__||(e=__VUE_SSR_CONTEXT__),r&&r.call(this,e),e&&e._registeredComponents&&e._registeredComponents.add(i)},u._ssrRegister=l):r&&(l=r),l){var f=u.functional,d=f?u.render:u.beforeCreate;f?(u._injectStyles=l,u.render=function(e,t){return l.call(t),d(e,t)}):u.beforeCreate=d?[].concat(d,l):[l]}return{esModule:s,exports:c,options:u}}},function(e,t,n){"use strict";var r=function(){var e=this,t=e.$createElement,n=e._self._c||t;return n("div",{staticClass:"vue-codemirror",class:{merge:e.merge}},[e.merge?n("div",{ref:"mergeview"}):n("textarea",{ref:"textarea",attrs:{name:e.name,placeholder:e.placeholder}})])},o=[],i={render:r,staticRenderFns:o};t.a=i}])});
\ No newline at end of file