diff --git a/src/main/java/com/bsd/cases/controller/CaseContentController.java b/src/main/java/com/bsd/cases/controller/CaseContentController.java
index 3f08cf0..2ad4772 100644
--- a/src/main/java/com/bsd/cases/controller/CaseContentController.java
+++ b/src/main/java/com/bsd/cases/controller/CaseContentController.java
@@ -72,7 +72,7 @@ public class CaseContentController {
     }
 
     /**
-     * 点赞文章
+     * 点赞/取消点赞文章
      * @param ajaxRequest
      * @param request
      * @return
diff --git a/src/main/java/com/bsd/cases/model/BaseEntity.java b/src/main/java/com/bsd/cases/model/BaseEntity.java
index 30b18ac..1ff70d7 100644
--- a/src/main/java/com/bsd/cases/model/BaseEntity.java
+++ b/src/main/java/com/bsd/cases/model/BaseEntity.java
@@ -25,6 +25,7 @@
 package com.bsd.cases.model;
 
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.persistence.Column;
 import javax.persistence.GeneratedValue;
@@ -42,7 +43,9 @@ public class BaseEntity {
     @Column(name = "id")
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date createDateTime;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date updateDateTime;
     private Long createBy;
     private Long updateBy;
diff --git a/src/main/java/com/bsd/cases/service/impl/CaseContentLikeServiceImpl.java b/src/main/java/com/bsd/cases/service/impl/CaseContentLikeServiceImpl.java
index 3f60c4f..a6d333c 100644
--- a/src/main/java/com/bsd/cases/service/impl/CaseContentLikeServiceImpl.java
+++ b/src/main/java/com/bsd/cases/service/impl/CaseContentLikeServiceImpl.java
@@ -11,6 +11,7 @@ import com.bsd.cases.model.CaseUsers;
 import com.bsd.cases.service.CaseContentLikeService;
 import com.bsd.cases.service.CaseUsersService;
 import com.bsd.cases.util.AjaxResult;
+import org.apache.ibatis.annotations.Case;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -47,14 +48,29 @@ public class CaseContentLikeServiceImpl extends BaseServiceImpl<CaseContentLikeM
             ajaxResult.setRetcode(AjaxResult.FAILED);
             ajaxResult.setRetmsg("未找到该文章");
         }else {
-            CaseContentLike caseContentLike = new CaseContentLike();
-            caseContentLike.setContentId(contentId);
-            caseContentLike.setCreateDateTime(new Date());
-            caseContentLike.setUpdateDateTime(new Date());
-            caseContentLike.setCreateBy(caseUsers.getId());
-            caseContentLike.setUpdateBy(caseUsers.getId());
-            caseContentLike.setState(Constants.STATE_VALID);
-            caseContentLikeMapper.insert(caseContentLike);
+            CaseContentLike findMeContentLike = new CaseContentLike();
+            findMeContentLike.setState(Constants.STATE_VALID);
+            findMeContentLike.setContentId(contentId);
+            findMeContentLike.setCreateBy(caseUsers.getId());
+            CaseContentLike meContentLike = caseContentLikeMapper.selectOne(findMeContentLike);
+            if (null == meContentLike){
+                //点赞
+                CaseContentLike caseContentLike = new CaseContentLike();
+                caseContentLike.setContentId(contentId);
+                caseContentLike.setCreateDateTime(new Date());
+                caseContentLike.setUpdateDateTime(new Date());
+                caseContentLike.setCreateBy(caseUsers.getId());
+                caseContentLike.setUpdateBy(caseUsers.getId());
+                caseContentLike.setState(Constants.STATE_VALID);
+                caseContentLikeMapper.insert(caseContentLike);
+                ajaxResult.setRetmsg("已成功点赞");
+            }else {
+                //取消点赞
+                findMeContentLike.setState(Constants.STATE_INVALID);
+                caseContentLikeMapper.updateByPrimaryKeySelective(findMeContentLike);
+                ajaxResult.setRetmsg("已成功取消点赞");
+            }
+            //更新点赞统计数据
             CaseContentLike findCaseContentLike = new CaseContentLike();
             findCaseContentLike.setContentId(contentId);
             findCaseContentLike.setState(Constants.STATE_VALID);
@@ -66,7 +82,6 @@ public class CaseContentLikeServiceImpl extends BaseServiceImpl<CaseContentLikeM
             caseContentStatical.setLikeNum(likeNum);
             caseContentStatical.setUpdateDateTime(new Date());
             caseContentStaticalMapper.updateByPrimaryKeySelective(caseContentStatical);
-            ajaxResult.setRetmsg("已成功点赞");
             ajaxResult.setRetcode(AjaxResult.SUCCESS);
         }
         return ajaxResult;