From 7f65b6ff2b06a6131b8be903cb8bd02cc879e8c1 Mon Sep 17 00:00:00 2001
From: "yadong.zhang" <yadong.zhang0415@gamil.com>
Date: Fri, 25 May 2018 14:02:05 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E4=BF=AE=E5=A4=8D=E5=90=8E=E5=8F=B0?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE=E7=AD=89=E5=88=86=E9=A1=B5=E5=A4=B1=E8=B4=A5?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=202.=20=E4=BF=AE=E5=A4=8D=E5=89=8D?=
 =?UTF-8?q?=E5=8F=B0=E8=87=AA=E5=8A=A8=E7=94=B3=E8=AF=B7=E5=8F=8B=E9=93=BE?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE=E9=A2=98=203.=20=E5=85=B6?=
 =?UTF-8?q?=E4=BB=96=E4=B8=80=E4=BA=9B=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     |   9 +
 .../controller/RestArticleController.java     |   2 -
 .../controller/RestCommentController.java     |   2 -
 .../blog/controller/RestLinkController.java   |   2 -
 .../blog/controller/RestNoticeController.java |   2 -
 .../controller/RestResourcesController.java   |   2 -
 .../blog/controller/RestRoleController.java   |   2 -
 .../blog/controller/RestTagController.java    |   2 -
 .../controller/RestTemplateController.java    |   2 -
 .../blog/controller/RestTypeController.java   |   1 -
 .../blog/controller/RestUpdateController.java |   2 -
 .../blog/controller/RestUserController.java   |   2 -
 .../business/aspect/RedisCacheAspect.java     |  45 +-
 .../service/impl/BizCommentServiceImpl.java   |   1 -
 .../service/impl/BizTagsServiceImpl.java      |   1 -
 .../service/impl/SysLinkServiceImpl.java      |   6 -
 .../java/com/zyd/blog/util/CacheKeyUtil.java  |  43 ++
 .../com/zyd/blog/util/RestClientUtil.java     |   2 +-
 .../main/resources/mybatis/SysLinkMapper.xml  |   4 +-
 .../main/resources/static/js/zhyd.comment.js  | 712 +++++++++---------
 20 files changed, 429 insertions(+), 415 deletions(-)
 create mode 100644 blog-core/src/main/java/com/zyd/blog/util/CacheKeyUtil.java

diff --git a/README.md b/README.md
index 20c84b2..7fdfeee 100644
--- a/README.md
+++ b/README.md
@@ -90,6 +90,15 @@ _评论审核管理员_： 账号：comment-admin  密码：123456
 
 ### 更新日志
 
+2018-05-25
+
+**修改功能：**
+
+1. 修复后台标签等分页失败的问题
+2. 修复前台自动申请友链失败的问题
+3. 其他一些问题
+
+
 2018-05-22
 
 **修改功能：**
diff --git a/blog-admin/src/main/java/com/zyd/blog/controller/RestArticleController.java b/blog-admin/src/main/java/com/zyd/blog/controller/RestArticleController.java
index b6fc1ca..0909b0d 100644
--- a/blog-admin/src/main/java/com/zyd/blog/controller/RestArticleController.java
+++ b/blog-admin/src/main/java/com/zyd/blog/controller/RestArticleController.java
@@ -20,7 +20,6 @@
 package com.zyd.blog.controller;
 
 import com.alibaba.fastjson.JSONObject;
-import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.zyd.blog.business.entity.Article;
 import com.zyd.blog.business.entity.Config;
@@ -64,7 +63,6 @@ public class RestArticleController {
     @RequiresPermissions("articles")
     @PostMapping("/list")
     public PageResult list(ArticleConditionVO vo) {
-        PageHelper.startPage(vo.getPageNumber() - 1, vo.getPageSize());
         PageInfo<Article> pageInfo = articleService.findPageBreakByCondition(vo);
         return ResultUtil.tablePage(pageInfo);
     }
diff --git a/blog-admin/src/main/java/com/zyd/blog/controller/RestCommentController.java b/blog-admin/src/main/java/com/zyd/blog/controller/RestCommentController.java
index 5ccf49a..fc44e75 100644
--- a/blog-admin/src/main/java/com/zyd/blog/controller/RestCommentController.java
+++ b/blog-admin/src/main/java/com/zyd/blog/controller/RestCommentController.java
@@ -19,7 +19,6 @@
  */
 package com.zyd.blog.controller;
 
-import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.zyd.blog.business.entity.Comment;
 import com.zyd.blog.business.entity.Config;
@@ -65,7 +64,6 @@ public class RestCommentController {
     @RequiresPermissions("comments")
     @PostMapping("/list")
     public PageResult list(CommentConditionVO vo) {
-        PageHelper.startPage(vo.getPageNumber() - 1, vo.getPageSize());
         PageInfo<Comment> pageInfo = commentService.findPageBreakByCondition(vo);
         return ResultUtil.tablePage(pageInfo);
     }
diff --git a/blog-admin/src/main/java/com/zyd/blog/controller/RestLinkController.java b/blog-admin/src/main/java/com/zyd/blog/controller/RestLinkController.java
index ec391d4..7d789dd 100644
--- a/blog-admin/src/main/java/com/zyd/blog/controller/RestLinkController.java
+++ b/blog-admin/src/main/java/com/zyd/blog/controller/RestLinkController.java
@@ -19,7 +19,6 @@
  */
 package com.zyd.blog.controller;
 
-import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.zyd.blog.business.entity.Link;
 import com.zyd.blog.business.enums.LinkSourceEnum;
@@ -56,7 +55,6 @@ public class RestLinkController {
 
     @PostMapping("/list")
     public PageResult list(LinkConditionVO vo) {
-        PageHelper.startPage(vo.getPageNumber() - 1, vo.getPageSize());
         PageInfo<Link> pageInfo = linkService.findPageBreakByCondition(vo);
         return ResultUtil.tablePage(pageInfo);
     }
diff --git a/blog-admin/src/main/java/com/zyd/blog/controller/RestNoticeController.java b/blog-admin/src/main/java/com/zyd/blog/controller/RestNoticeController.java
index b229cdb..4fd78ec 100644
--- a/blog-admin/src/main/java/com/zyd/blog/controller/RestNoticeController.java
+++ b/blog-admin/src/main/java/com/zyd/blog/controller/RestNoticeController.java
@@ -19,7 +19,6 @@
  */
 package com.zyd.blog.controller;
 
-import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.zyd.blog.business.entity.Notice;
 import com.zyd.blog.business.entity.User;
@@ -54,7 +53,6 @@ public class RestNoticeController {
 
     @PostMapping("/list")
     public PageResult list(NoticeConditionVO vo) {
-        PageHelper.startPage(vo.getPageNumber() - 1, vo.getPageSize());
         PageInfo<Notice> pageInfo = noticeService.findPageBreakByCondition(vo);
         return ResultUtil.tablePage(pageInfo);
     }
diff --git a/blog-admin/src/main/java/com/zyd/blog/controller/RestResourcesController.java b/blog-admin/src/main/java/com/zyd/blog/controller/RestResourcesController.java
index 32e6d9f..802de0b 100644
--- a/blog-admin/src/main/java/com/zyd/blog/controller/RestResourcesController.java
+++ b/blog-admin/src/main/java/com/zyd/blog/controller/RestResourcesController.java
@@ -19,7 +19,6 @@
  */
 package com.zyd.blog.controller;
 
-import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.zyd.blog.business.entity.Resources;
 import com.zyd.blog.business.enums.ResponseStatus;
@@ -57,7 +56,6 @@ public class RestResourcesController {
 
     @PostMapping("/list")
     public PageResult getAll(ResourceConditionVO vo) {
-        PageHelper.startPage(vo.getPageNumber() - 1, vo.getPageSize());
         PageInfo<Resources> pageInfo = resourcesService.findPageBreakByCondition(vo);
         return ResultUtil.tablePage(pageInfo);
     }
diff --git a/blog-admin/src/main/java/com/zyd/blog/controller/RestRoleController.java b/blog-admin/src/main/java/com/zyd/blog/controller/RestRoleController.java
index 76f2708..d0d19fc 100644
--- a/blog-admin/src/main/java/com/zyd/blog/controller/RestRoleController.java
+++ b/blog-admin/src/main/java/com/zyd/blog/controller/RestRoleController.java
@@ -19,7 +19,6 @@
  */
 package com.zyd.blog.controller;
 
-import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.zyd.blog.business.entity.Role;
 import com.zyd.blog.business.enums.ResponseStatus;
@@ -60,7 +59,6 @@ public class RestRoleController {
 
     @PostMapping("/list")
     public PageResult getAll(RoleConditionVO vo) {
-        PageHelper.startPage(vo.getPageNumber() - 1, vo.getPageSize());
         PageInfo<Role> pageInfo = roleService.findPageBreakByCondition(vo);
         return ResultUtil.tablePage(pageInfo);
     }
diff --git a/blog-admin/src/main/java/com/zyd/blog/controller/RestTagController.java b/blog-admin/src/main/java/com/zyd/blog/controller/RestTagController.java
index 0c04f20..7a715db 100644
--- a/blog-admin/src/main/java/com/zyd/blog/controller/RestTagController.java
+++ b/blog-admin/src/main/java/com/zyd/blog/controller/RestTagController.java
@@ -19,7 +19,6 @@
  */
 package com.zyd.blog.controller;
 
-import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.zyd.blog.business.entity.Tags;
 import com.zyd.blog.business.enums.ResponseStatus;
@@ -51,7 +50,6 @@ public class RestTagController {
 
     @PostMapping("/list")
     public PageResult list(TagsConditionVO vo) {
-        PageHelper.startPage(vo.getPageNumber() - 1, vo.getPageSize());
         PageInfo<Tags> pageInfo = tagsService.findPageBreakByCondition(vo);
         return ResultUtil.tablePage(pageInfo);
     }
diff --git a/blog-admin/src/main/java/com/zyd/blog/controller/RestTemplateController.java b/blog-admin/src/main/java/com/zyd/blog/controller/RestTemplateController.java
index db655f9..2d85be7 100644
--- a/blog-admin/src/main/java/com/zyd/blog/controller/RestTemplateController.java
+++ b/blog-admin/src/main/java/com/zyd/blog/controller/RestTemplateController.java
@@ -19,7 +19,6 @@
  */
 package com.zyd.blog.controller;
 
-import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.zyd.blog.business.entity.Template;
 import com.zyd.blog.business.enums.ResponseStatus;
@@ -51,7 +50,6 @@ public class RestTemplateController {
 
     @PostMapping("/list")
     public PageResult list(TemplateConditionVO vo) {
-        PageHelper.startPage(vo.getPageNumber() - 1, vo.getPageSize());
         PageInfo<Template> pageInfo = templateService.findPageBreakByCondition(vo);
         return ResultUtil.tablePage(pageInfo);
     }
diff --git a/blog-admin/src/main/java/com/zyd/blog/controller/RestTypeController.java b/blog-admin/src/main/java/com/zyd/blog/controller/RestTypeController.java
index cc4043a..c491752 100644
--- a/blog-admin/src/main/java/com/zyd/blog/controller/RestTypeController.java
+++ b/blog-admin/src/main/java/com/zyd/blog/controller/RestTypeController.java
@@ -51,7 +51,6 @@ public class RestTypeController {
 
     @PostMapping("/list")
     public PageResult list(TypeConditionVO vo) {
-        PageHelper.startPage(vo.getPageNumber() - 1, vo.getPageSize());
         PageInfo<Type> pageInfo = typeService.findPageBreakByCondition(vo);
         return ResultUtil.tablePage(pageInfo);
     }
diff --git a/blog-admin/src/main/java/com/zyd/blog/controller/RestUpdateController.java b/blog-admin/src/main/java/com/zyd/blog/controller/RestUpdateController.java
index 292a2e1..486e39d 100644
--- a/blog-admin/src/main/java/com/zyd/blog/controller/RestUpdateController.java
+++ b/blog-admin/src/main/java/com/zyd/blog/controller/RestUpdateController.java
@@ -19,7 +19,6 @@
  */
 package com.zyd.blog.controller;
 
-import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.zyd.blog.business.entity.UpdateRecorde;
 import com.zyd.blog.business.enums.ResponseStatus;
@@ -51,7 +50,6 @@ public class RestUpdateController {
 
     @PostMapping("/list")
     public PageResult list(UpdateRecordeConditionVO vo) {
-        PageHelper.startPage(vo.getPageNumber() - 1, vo.getPageSize());
         PageInfo<UpdateRecorde> pageInfo = updateRecordeService.findPageBreakByCondition(vo);
         return ResultUtil.tablePage(pageInfo);
     }
diff --git a/blog-admin/src/main/java/com/zyd/blog/controller/RestUserController.java b/blog-admin/src/main/java/com/zyd/blog/controller/RestUserController.java
index 05b9380..d60cb09 100644
--- a/blog-admin/src/main/java/com/zyd/blog/controller/RestUserController.java
+++ b/blog-admin/src/main/java/com/zyd/blog/controller/RestUserController.java
@@ -19,7 +19,6 @@
  */
 package com.zyd.blog.controller;
 
-import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.zyd.blog.business.entity.User;
 import com.zyd.blog.business.enums.ResponseStatus;
@@ -56,7 +55,6 @@ public class RestUserController {
 
     @PostMapping("/list")
     public PageResult list(UserConditionVO vo) {
-        PageHelper.startPage(vo.getPageNumber() - 1, vo.getPageSize());
         PageInfo<User> pageInfo = userService.findPageBreakByCondition(vo);
         return ResultUtil.tablePage(pageInfo);
     }
diff --git a/blog-core/src/main/java/com/zyd/blog/business/aspect/RedisCacheAspect.java b/blog-core/src/main/java/com/zyd/blog/business/aspect/RedisCacheAspect.java
index b49f5fc..bd418ed 100644
--- a/blog-core/src/main/java/com/zyd/blog/business/aspect/RedisCacheAspect.java
+++ b/blog-core/src/main/java/com/zyd/blog/business/aspect/RedisCacheAspect.java
@@ -21,6 +21,7 @@ package com.zyd.blog.business.aspect;
 
 import com.zyd.blog.business.annotation.RedisCache;
 import com.zyd.blog.framework.property.AppProperties;
+import com.zyd.blog.util.CacheKeyUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.Signature;
@@ -31,12 +32,9 @@ import org.aspectj.lang.reflect.MethodSignature;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Component;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.StringUtils;
 
 import java.lang.reflect.Method;
 import java.util.Set;
-import java.util.concurrent.TimeUnit;
 
 /**
  * Redis业务层数据缓存
@@ -75,41 +73,24 @@ public class RedisCacheAspect {
         if (!currentMethod.isAnnotationPresent(RedisCache.class)) {
             throw new RuntimeException("未指定RedisChache注解！");
         }
-        // 获取拦截方法的参数
-        String className = point.getTarget().getClass().getName();
-        String methodName = currentMethod.getName();
+        StringBuilder key = new StringBuilder(point.getTarget().getClass().getName());
         // 获取操作名称
         RedisCache cache = currentMethod.getAnnotation(RedisCache.class);
-        boolean flush = cache.flush();
-        StringBuilder key = new StringBuilder();
-        //类名 + 方法名
-        key.append(className).append(".").append(methodName);
-        if (flush) {
-            log.info("{}-清空缓存", key.toString());
-            Set<String> keys = redisTemplate.keys(className + "*");
-            if (!CollectionUtils.isEmpty(keys)) {
-                redisTemplate.delete(keys);
-            }
+        if (cache.flush()) {
+            log.info("{}*-清空缓存", key);
+            Set<String> keys = redisTemplate.keys(key.toString() + "*");
+            redisTemplate.delete(keys);
             log.info("Clear all the cached query result from redis");
             return point.proceed();
         }
-        long expire = cache.expire();
-        TimeUnit unit = cache.unit();
-        Object[] params = point.getArgs();
-        if (StringUtils.isEmpty(cache.key())) {
-            if (null != params && params.length > 0) {
-                for (Object obj : params) {
-                    key.append(obj.toString());
-                }
-            }
-        } else {
-            key.append(cache.key());
-        }
+        key.append(".").append(currentMethod.getName());
+        key.append(CacheKeyUtil.getMethodParamsKey(point.getArgs())).append(cache.key());
+        String realKey = key.toString();
         // 缓存存在
-        boolean hasKey = redisTemplate.hasKey(key.toString());
+        boolean hasKey = redisTemplate.hasKey(realKey);
         if (hasKey) {
             try {
-                log.info("{}从缓存中获取数据", key.toString());
+                log.info("{}从缓存中获取数据", realKey);
                 return redisTemplate.opsForValue().get(key);
             } catch (Exception e) {
                 log.error("从缓存中获取数据失败！", e);
@@ -118,9 +99,9 @@ public class RedisCacheAspect {
         // 先执行业务
         Object result = point.proceed();
         // 向Redis中添加数据，有效时间是30天
-        redisTemplate.opsForValue().set(key.toString(), result, expire, unit);
+        redisTemplate.opsForValue().set(realKey, result, cache.expire(), cache.unit());
         log.info("Put query result to redis");
-        log.info("{}从数据库中获取数据", key.toString());
+        log.info("{}从数据库中获取数据", realKey);
         return result;
     }
 }
diff --git a/blog-core/src/main/java/com/zyd/blog/business/service/impl/BizCommentServiceImpl.java b/blog-core/src/main/java/com/zyd/blog/business/service/impl/BizCommentServiceImpl.java
index 536db72..ae61f0d 100644
--- a/blog-core/src/main/java/com/zyd/blog/business/service/impl/BizCommentServiceImpl.java
+++ b/blog-core/src/main/java/com/zyd/blog/business/service/impl/BizCommentServiceImpl.java
@@ -87,7 +87,6 @@ public class BizCommentServiceImpl implements BizCommentService {
      * @return
      */
     @Override
-//    @RedisCache
     public PageInfo<Comment> findPageBreakByCondition(CommentConditionVO vo) {
         PageHelper.startPage(vo.getPageNumber(), vo.getPageSize());
         List<BizComment> list = bizCommentMapper.findPageBreakByCondition(vo);
diff --git a/blog-core/src/main/java/com/zyd/blog/business/service/impl/BizTagsServiceImpl.java b/blog-core/src/main/java/com/zyd/blog/business/service/impl/BizTagsServiceImpl.java
index 7345709..28ffa1c 100644
--- a/blog-core/src/main/java/com/zyd/blog/business/service/impl/BizTagsServiceImpl.java
+++ b/blog-core/src/main/java/com/zyd/blog/business/service/impl/BizTagsServiceImpl.java
@@ -59,7 +59,6 @@ public class BizTagsServiceImpl implements BizTagsService{
      * @return
      */
     @Override
-    @RedisCache
     public PageInfo<Tags>findPageBreakByCondition(TagsConditionVO vo){
         PageHelper.startPage(vo.getPageNumber(),vo.getPageSize());
         List<BizTags>list=bizTagsMapper.findPageBreakByCondition(vo);
diff --git a/blog-core/src/main/java/com/zyd/blog/business/service/impl/SysLinkServiceImpl.java b/blog-core/src/main/java/com/zyd/blog/business/service/impl/SysLinkServiceImpl.java
index 7549a10..438741f 100644
--- a/blog-core/src/main/java/com/zyd/blog/business/service/impl/SysLinkServiceImpl.java
+++ b/blog-core/src/main/java/com/zyd/blog/business/service/impl/SysLinkServiceImpl.java
@@ -72,7 +72,6 @@ public class SysLinkServiceImpl implements SysLinkService {
      * @return
      */
     @Override
-    @RedisCache
     public PageInfo<Link> findPageBreakByCondition(LinkConditionVO vo) {
         PageHelper.startPage(vo.getPageNumber(), vo.getPageSize());
         List<SysLink> list = sysLinkMapper.findPageBreakByCondition(vo);
@@ -172,11 +171,6 @@ public class SysLinkServiceImpl implements SysLinkService {
             throw new ZhydLinkException("贵站暂未添加本站友情链接！请先添加本站友链后重新提交申请！");
         }
 
-//        if (LinksUtil.checkFavicon(link.getFavicon())) {
-//            bo.setFavicon(link.getFavicon());
-//        } else {
-//            bo.setFavicon(link.getFavicon());
-//        }
         link.setSource(LinkSourceEnum.AUTOMATIC);
         link.setStatus(true);
         if(!StringUtils.isEmpty(link.getEmail())){
diff --git a/blog-core/src/main/java/com/zyd/blog/util/CacheKeyUtil.java b/blog-core/src/main/java/com/zyd/blog/util/CacheKeyUtil.java
new file mode 100644
index 0000000..21f3dab
--- /dev/null
+++ b/blog-core/src/main/java/com/zyd/blog/util/CacheKeyUtil.java
@@ -0,0 +1,43 @@
+/**
+ * MIT License
+ * Copyright (c) 2018 yadong.zhang
+ * 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 com.zyd.blog.util;
+
+import com.alibaba.fastjson.JSON;
+import org.springframework.util.StringUtils;
+
+/**
+ * 缓存key相关的工具类
+ *
+ * @author yadong.zhang (yadong.zhang0415(a)gmail.com)
+ * @version 1.0
+ * @website https://www.zhyd.me
+ * @date 2018/5/25 10:23
+ * @since 1.0
+ */
+public class CacheKeyUtil {
+
+    public static String getMethodParamsKey(Object... obj) {
+        if (StringUtils.isEmpty(obj)) {
+            return "";
+        }
+        return "(" + JSON.toJSONString(obj) + ")";
+    }
+
+}
diff --git a/blog-core/src/main/java/com/zyd/blog/util/RestClientUtil.java b/blog-core/src/main/java/com/zyd/blog/util/RestClientUtil.java
index 3367d61..a7fa61b 100644
--- a/blog-core/src/main/java/com/zyd/blog/util/RestClientUtil.java
+++ b/blog-core/src/main/java/com/zyd/blog/util/RestClientUtil.java
@@ -73,7 +73,7 @@ public class RestClientUtil {
      */
     public static String request(String method, String urlString, Map<String, Object> params, String encode, Map<String, String> requestHeader) {
         // 解决因jdk版本问题造成的SSL请求失败的问题
-        java.lang.System.setProperty("https.protocols", "TLSv1,TLSv1.1,TLSv1.2");
+        System.setProperty("https.protocols", "TLSv1,TLSv1.1,TLSv1.2");
         final HttpURLConnection connection;
         try {
             connection = openConnection(urlString);
diff --git a/blog-core/src/main/resources/mybatis/SysLinkMapper.xml b/blog-core/src/main/resources/mybatis/SysLinkMapper.xml
index 1b0126f..772b1dc 100644
--- a/blog-core/src/main/resources/mybatis/SysLinkMapper.xml
+++ b/blog-core/src/main/resources/mybatis/SysLinkMapper.xml
@@ -48,7 +48,9 @@
 			AND  t.home_page_display = #{homePageDisplay}
 		</if>
 		ORDER BY
-			(t. STATUS > 0) DESC, t. STATUS ASC
+			(t. STATUS > 0) DESC,
+			t. STATUS ASC,
+			t.create_time DESC
 	</select>
 </mapper>
 
diff --git a/blog-web/src/main/resources/static/js/zhyd.comment.js b/blog-web/src/main/resources/static/js/zhyd.comment.js
index 6c38caa..1ebafa1 100644
--- a/blog-web/src/main/resources/static/js/zhyd.comment.js
+++ b/blog-web/src/main/resources/static/js/zhyd.comment.js
@@ -49,399 +49,407 @@
  * 'redo' // 重复
  *
  */
-$(function(){
-    var _form = {
-        valid: function(form){
-            var valid = true;
-            $(form).find("small").each(function(){
-                if($(this).attr("data-bv-result") == "INVALID"){
-                    valid = false;
-                }
-            });
-            return valid;
-        }
-    };
-    $.extend({
-        comment: {
-            detailKey: 'comment-detail',
-            menus: ['code', 'bold', 'italic', 'underline', 'image', 'link', 'list', 'quote', 'emoticon'],
-            sid: 0,
-            _commentDetailModal: '',
-            _detailForm: '',
-            _detailFormBtn: '',
-            _closeBtn: '',
-            _commentPid: '',
-            _commentPlace: '',
-            _commentPost: '',
-            _cancelReply: '',
-            _commentReply: '',
-            initDom: function () {
-                $.comment._commentDetailModal = $('#comment-detail-modal');
-                $.comment._detailForm = $('#detail-form');
-                $.comment._detailFormBtn = $('#detail-form-btn');
-                $.comment._closeBtn = $('#comment-detail-modal .close');
-                $.comment._commentPid = $('#comment-pid');
-                $.comment._commentPlace = $('#comment-place');
-                $.comment._commentPost = $('#comment-post');
-                $.comment._cancelReply = $('#cancel-reply');
-                $.comment._commentReply = $('.comment-reply');
-            },
-            init: function (options) {
-                var $box = $('#comment-box');
-                if (!$box || !$box[0]) {
-                    return;
-                }
-                var op = $.extend({
-                    menus: $.comment.menus,
-                    customMenu: true
-                }, options);
-                var detailInfoJson = $.tool.parseFormSerialize(localStorage.getItem(this.detailKey));
-                var currentUser = '';
-                if(detailInfoJson){
-                    currentUser = '<small> - 欢迎回来，<a href="'+detailInfoJson.url+'" target="_blank" rel="external nofollow">' + filterXSS(detailInfoJson.nickname) + '<i class="fa fa-smile-o"></i></a></small>';
-                }
-                var commentBox = '<div id="comment-place">'
-                        + '<div class="comment-post" id="comment-post" style="position: relative">'
-                        + '<h4 class="bottom-line"><i class="fa fa-commenting-o fa-fw icon"></i><strong>发表评论</strong>' + currentUser + '</h4>'
-                        + '<div class="cancel-reply" id="cancel-reply" style="display: none;"><a href="javascript:void(0);" onclick="$.comment.cancelReply(this)" rel="external nofollow"><i class="fa fa-share"></i>取消回复</a></div>'
-                        + '<form class="form-horizontal" role="form" id="comment-form">'
-                        + '<input type="hidden" name="pid" id="comment-pid" value="0" size="22" tabindex="1">'
-                        + '<textarea id="comment_content" name="content" style="display: none"></textarea>'
-                        + '<div id="editor" style="width: 100%;height: 150px;"></div>'
-                        + '<div style="position: absolute;right: 10px;bottom: 65px;font-size: 14px;font-weight: 700;color: #ececec;">张亚东博客<br>https://www.zhyd.me<br>讲文明、要和谐</div>'
-                        + '<a id="comment-form-btn" type="button" data-loading-text="正在提交评论..." class="btn btn-default btn-block">提交评论</a>'
-                        + '</form></div></div>';
-                $box.html(commentBox);
-                // 初始化并缓存常用的dom元素
-                $.comment.initDom();
-                // 创建编辑框
-                $.comment.createEdit(op);
-                $.comment.loadCommentList($box);
-                $.comment.initValidatorPlugin();
-            },
-            createEdit: function (options) {
-                var $selector = '#editor';
-                var E = window.wangEditor;
-                var editor = new E($selector);
-                if(options.customMenu){
-                    editor.customConfig.menus = options.menus;
-                }
+/*!
+ * BootstrapValidator (http://bootstrapvalidator.com)
+ * The best jQuery plugin to validate form fields. Designed to use with Bootstrap 3
+ *
+ * @version     v0.5.1-dev, built on 2014-07-23 6:05:15 AM
+ * @author      https://twitter.com/nghuuphuoc
+ * @copyright   (c) 2013 - 2014 Nguyen Huu Phuoc
+ * @license     MIT
+ */
+var _form = {
+    valid: function(form){
+        var valid = true;
+        $(form).find("small").each(function(){
+            if($(this).attr("data-bv-result") == "INVALID"){
+                valid = false;
+            }
+        });
+        return valid;
+    }
+};
+$.extend({
+    comment: {
+        detailKey: 'comment-detail',
+        menus: ['code', 'bold', 'italic', 'underline', 'image', 'link', 'list', 'quote', 'emoticon'],
+        sid: 0,
+        _commentDetailModal: '',
+        _detailForm: '',
+        _detailFormBtn: '',
+        _closeBtn: '',
+        _commentPid: '',
+        _commentPlace: '',
+        _commentPost: '',
+        _cancelReply: '',
+        _commentReply: '',
+        initDom: function () {
+            $.comment._commentDetailModal = $('#comment-detail-modal');
+            $.comment._detailForm = $('#detail-form');
+            $.comment._detailFormBtn = $('#detail-form-btn');
+            $.comment._closeBtn = $('#comment-detail-modal .close');
+            $.comment._commentPid = $('#comment-pid');
+            $.comment._commentPlace = $('#comment-place');
+            $.comment._commentPost = $('#comment-post');
+            $.comment._cancelReply = $('#cancel-reply');
+            $.comment._commentReply = $('.comment-reply');
+        },
+        init: function (options) {
+            var $box = $('#comment-box');
+            if (!$box || !$box[0]) {
+                return;
+            }
+            var op = $.extend({
+                menus: $.comment.menus,
+                customMenu: true
+            }, options);
+            var detailInfoJson = $.tool.parseFormSerialize(localStorage.getItem(this.detailKey));
+            var currentUser = '';
+            if(detailInfoJson){
+                currentUser = '<small> - 欢迎回来，<a href="'+detailInfoJson.url+'" target="_blank" rel="external nofollow">' + filterXSS(detailInfoJson.nickname) + '<i class="fa fa-smile-o"></i></a></small>';
+            }
+            var commentBox = '<div id="comment-place">'
+                    + '<div class="comment-post" id="comment-post" style="position: relative">'
+                    + '<h4 class="bottom-line"><i class="fa fa-commenting-o fa-fw icon"></i><strong>发表评论</strong>' + currentUser + '</h4>'
+                    + '<div class="cancel-reply" id="cancel-reply" style="display: none;"><a href="javascript:void(0);" onclick="$.comment.cancelReply(this)" rel="external nofollow"><i class="fa fa-share"></i>取消回复</a></div>'
+                    + '<form class="form-horizontal" role="form" id="comment-form">'
+                    + '<input type="hidden" name="pid" id="comment-pid" value="0" size="22" tabindex="1">'
+                    + '<textarea id="comment_content" name="content" style="display: none"></textarea>'
+                    + '<div id="editor" style="width: 100%;height: 150px;"></div>'
+                    + '<div style="position: absolute;right: 10px;bottom: 65px;font-size: 14px;font-weight: 700;color: #ececec;">张亚东博客<br>https://www.zhyd.me<br>讲文明、要和谐</div>'
+                    + '<a id="comment-form-btn" type="button" data-loading-text="正在提交评论..." class="btn btn-default btn-block">提交评论</a>'
+                    + '</form></div></div>';
+            $box.html(commentBox);
+            // 初始化并缓存常用的dom元素
+            $.comment.initDom();
+            // 创建编辑框
+            $.comment.createEdit(op);
+            $.comment.loadCommentList($box);
+            $.comment.initValidatorPlugin();
+        },
+        createEdit: function (options) {
+            var $selector = '#editor';
+            var E = window.wangEditor;
+            var editor = new E($selector);
+            if(options.customMenu){
+                editor.customConfig.menus = options.menus;
+            }
 
-                // debug模式下，有 JS 错误会以throw Error方式提示出来
-                editor.customConfig.debug = false;
+            // debug模式下，有 JS 错误会以throw Error方式提示出来
+            editor.customConfig.debug = false;
 
-                // 关闭粘贴样式的过滤
-                editor.customConfig.pasteFilterStyle = false;
-                // 插入网络图片的回调
-                editor.customConfig.linkImgCallback = function (url) {
-                    // console.log(url) // url 即插入图片的地址
-                };
-                editor.customConfig.zIndex = 100;
-                var $content = $('#comment_content');
-                editor.customConfig.onchange = function (html) {
-                    // 让编辑器始终处于最底部
-                    // var $dom = document.getElementsByClassName("w-e-text")[0];
-                    // $dom.scrollTop = $dom.scrollHeight;
-                    // 监控变化，同步更新到 textarea
-                    $content.val(filterXSS(html));
-                };
-                editor.create();
-                $content.val(editor.txt.html());
-                E.fullscreen.init($selector);
-            },
-            loadCommentList: function (box, pageNumber) {
-                var sid = box.attr("data-id");
-                // 该属性为了静态页面中防止请求服务器特加的属性，实际可能不用。
-                var autoLoad = box.attr("data-auto-load");
-                if(autoLoad && autoLoad == "false"){
-                    return false;
-                }
-                if(!sid){
-                    throw "未指定sid！";
-                }
-                this.sid = sid;
-                $.ajax({
-                    type: "post",
-                    url: "/api/comments",
-                    data: {sid: sid, pageNumber: pageNumber || 1},
-                    success: function (json) {
-                        $.alert.ajaxSuccess(json);
-                        // 加载 评论列表 start
-                        var commentList = json.data.commentList;
-                        var commentListBox  = '';
-                        if(!commentList){
+            // 关闭粘贴样式的过滤
+            editor.customConfig.pasteFilterStyle = false;
+            // 插入网络图片的回调
+            editor.customConfig.linkImgCallback = function (url) {
+                // console.log(url) // url 即插入图片的地址
+            };
+            editor.customConfig.zIndex = 100;
+            var $content = $('#comment_content');
+            editor.customConfig.onchange = function (html) {
+                // 让编辑器始终处于最底部
+                // var $dom = document.getElementsByClassName("w-e-text")[0];
+                // $dom.scrollTop = $dom.scrollHeight;
+                // 监控变化，同步更新到 textarea
+                $content.val(filterXSS(html));
+            };
+            editor.create();
+            $content.val(editor.txt.html());
+            E.fullscreen.init($selector);
+        },
+        loadCommentList: function (box, pageNumber) {
+            var sid = box.attr("data-id");
+            // 该属性为了静态页面中防止请求服务器特加的属性，实际可能不用。
+            var autoLoad = box.attr("data-auto-load");
+            if(autoLoad && autoLoad == "false"){
+                return false;
+            }
+            if(!sid){
+                throw "未指定sid！";
+            }
+            this.sid = sid;
+            $.ajax({
+                type: "post",
+                url: "/api/comments",
+                data: {sid: sid, pageNumber: pageNumber || 1},
+                success: function (json) {
+                    $.alert.ajaxSuccess(json);
+                    // 加载 评论列表 start
+                    var commentList = json.data.commentList;
+                    var commentListBox  = '';
+                    if(!commentList){
+                        commentListBox = '<div class="commentList">'
+                                + '<h4 class="bottom-line"><i class="fa fa-comments-o fa-fw icon"></i><strong><em>0</em> 条评论</strong></h4>'
+                                + '<ul class="comment">';
+                        commentListBox += '<li><div class="list-comment-empty-w fade-in">'
+                                +'<div class="empty-prompt-w">'
+                                +'<span class="prompt-null-w">还没有评论，快来抢沙发吧！</span>'
+                                +'</div>'
+                                +'</div></li>';
+                        // 加载 评论列表 end
+                        commentListBox += '</ul></div>';
+                        $(commentListBox).appendTo(box);
+                    }else{
+                        // 首次加载-刷新页面后第一次加载，此时没有点击加载更多进行分页
+                        if(!pageNumber) {
                             commentListBox = '<div class="commentList">'
-                                    + '<h4 class="bottom-line"><i class="fa fa-comments-o fa-fw icon"></i><strong><em>0</em> 条评论</strong></h4>'
+                                    + '<h5 class="bottom-line"><i class="fa fa-comments-o fa-fw icon"></i><strong><em>' + json.data.total + '</em> 条评论</strong></h5>'
                                     + '<ul class="comment">';
+                        }
+                        for(var i = 0, len = commentList.length; i < len ; i ++){
+                            var comment = commentList[i];
+                            var userUrl = comment.url || "javascript:void(0)";
+                            var parent = comment.parent;
+                            var parentQuote = parent ? '<a href="#comment-' + parent.id + '" class="comment-quote">@' + parent.nickname + '</a><div style="background-color: #f5f5f5;padding: 5px;margin: 5px;border-radius: 4px;"><i class="fa fa-quote-left"></i><p></p><div style="padding-left: 10px;">' + filterXSS(parent.content) + '</div></div>' : '';
+                            commentListBox += '<li>' +
+                                    '    <div class="comment-body fade-in" id="comment-'+comment.id+'">' +
+                                    '        <div class="cheader">' +
+                                    '           <div class="user-img"><img class="userImage" src="' + comment.avatar + '" onerror="this.src=\'' + appConfig.staticPath + '/img/user.png\'"></div>' +
+                                    '           <div class="user-info">' +
+                                    '              <div class="nickname">' +
+                                    '                 <a target="_blank" href="' + userUrl + '" rel="external nofollow"><strong>' + comment.nickname + '</strong></a>' +
+                                    '              </div>            ' +
+                                    '             <div class="timer">' +
+                                    '                  <i class="fa fa-clock-o fa-fw"></i>' + comment.createTimeString +
+                                    '                  <i class="fa fa-map-marker fa-fw"></i>' + comment.address +
+                                    '              </div>' +
+                                    '          </div>' +
+                                    '        </div>' +
+                                    '        <div class="content">' + parentQuote + '<div>' + filterXSS(comment.content) + '</div></div>' +
+                                    '        <div class="sign">' +
+                                    '            <i class="icons os-' + comment.osShortName + '"></i>'+ comment.os +' <i class="sepa"></i>' +
+                                    '            <i class="icons browser-' + comment.browserShortName + '"></i>' + comment.browser + ' <i class="sepa"></i>' +
+                                    '            <a href="javascript:void(0);" class="comment-up" onclick="$.comment.praise(' + comment.id + ', this)"><i class="fa fa-thumbs-o-up"></i>赞(<span class="count">' + comment.support + '</span>)<i class="sepa"></i></a>' +
+                                    '            <a href="javascript:void(0);" class="comment-down" onclick="$.comment.step(' + comment.id + ', this)"><i class="fa fa-thumbs-o-down"></i>踩(<span class="count">' + comment.oppose + '</span>)<i class="sepa"></i></a>' +
+                                    '            <a href="javascript:void(0);" class="comment-reply" onclick="$.comment.reply(' + comment.id + ', this)"><i class="fa fa-reply"></i>回复</a>' +
+                                    '            <a href="javascript:void(0);" class="comment-flag hide" onclick="$.comment.report(' + comment.id + ', this)"><i class="fa fa-flag"></i>举报</a>' +
+                                    '        </div>' +
+                                    '    </div>' +
+                                    '</li>';
+                        }
+                        // 如果存在下一页，则显示加载按钮
+                        if(json.data.hasNextPage){
                             commentListBox += '<li><div class="list-comment-empty-w fade-in">'
                                     +'<div class="empty-prompt-w">'
-                                    +'<span class="prompt-null-w">还没有评论，快来抢沙发吧！</span>'
+                                    +'<span class="prompt-null-w pointer load-more">加载更多 <i class="fa fa-angle-double-down"></i></span>'
                                     +'</div>'
                                     +'</div></li>';
-                            // 加载 评论列表 end
+                        }
+                        // 加载 评论列表 end
+
+                        if(!pageNumber) {
+                            // 首次加载-刷新页面后第一次加载，此时没有点击加载更多进行分页
                             commentListBox += '</ul></div>';
                             $(commentListBox).appendTo(box);
                         }else{
-                            // 首次加载-刷新页面后第一次加载，此时没有点击加载更多进行分页
-                            if(!pageNumber) {
-                                commentListBox = '<div class="commentList">'
-                                        + '<h5 class="bottom-line"><i class="fa fa-comments-o fa-fw icon"></i><strong><em>' + json.data.total + '</em> 条评论</strong></h5>'
-                                        + '<ul class="comment">';
-                            }
-                            for(var i = 0, len = commentList.length; i < len ; i ++){
-                                var comment = commentList[i];
-                                var userUrl = comment.url || "javascript:void(0)";
-                                var parent = comment.parent;
-                                var parentQuote = parent ? '<a href="#comment-' + parent.id + '" class="comment-quote">@' + parent.nickname + '</a><div style="background-color: #f5f5f5;padding: 5px;margin: 5px;border-radius: 4px;"><i class="fa fa-quote-left"></i><p></p><div style="padding-left: 10px;">' + filterXSS(parent.content) + '</div></div>' : '';
-                                commentListBox += '<li>' +
-                                        '    <div class="comment-body fade-in" id="comment-'+comment.id+'">' +
-                                        '        <div class="cheader">' +
-                                        '           <div class="user-img"><img class="userImage" src="' + comment.avatar + '" onerror="this.src=\'' + appConfig.staticPath + '/img/user.png\'"></div>' +
-                                        '           <div class="user-info">' +
-                                        '              <div class="nickname">' +
-                                        '                 <a target="_blank" href="' + userUrl + '" rel="external nofollow"><strong>' + comment.nickname + '</strong></a>' +
-                                        '              </div>            ' +
-                                        '             <div class="timer">' +
-                                        '                  <i class="fa fa-clock-o fa-fw"></i>' + comment.createTimeString +
-                                        '                  <i class="fa fa-map-marker fa-fw"></i>' + comment.address +
-                                        '              </div>' +
-                                        '          </div>' +
-                                        '        </div>' +
-                                        '        <div class="content">' + parentQuote + '<div>' + filterXSS(comment.content) + '</div></div>' +
-                                        '        <div class="sign">' +
-                                        '            <i class="icons os-' + comment.osShortName + '"></i>'+ comment.os +' <i class="sepa"></i>' +
-                                        '            <i class="icons browser-' + comment.browserShortName + '"></i>' + comment.browser + ' <i class="sepa"></i>' +
-                                        '            <a href="javascript:void(0);" class="comment-up" onclick="$.comment.praise(' + comment.id + ', this)"><i class="fa fa-thumbs-o-up"></i>赞(<span class="count">' + comment.support + '</span>)<i class="sepa"></i></a>' +
-                                        '            <a href="javascript:void(0);" class="comment-down" onclick="$.comment.step(' + comment.id + ', this)"><i class="fa fa-thumbs-o-down"></i>踩(<span class="count">' + comment.oppose + '</span>)<i class="sepa"></i></a>' +
-                                        '            <a href="javascript:void(0);" class="comment-reply" onclick="$.comment.reply(' + comment.id + ', this)"><i class="fa fa-reply"></i>回复</a>' +
-                                        '            <a href="javascript:void(0);" class="comment-flag hide" onclick="$.comment.report(' + comment.id + ', this)"><i class="fa fa-flag"></i>举报</a>' +
-                                        '        </div>' +
-                                        '    </div>' +
-                                        '</li>';
-                            }
-                            // 如果存在下一页，则显示加载按钮
-                            if(json.data.hasNextPage){
-                                commentListBox += '<li><div class="list-comment-empty-w fade-in">'
-                                        +'<div class="empty-prompt-w">'
-                                        +'<span class="prompt-null-w pointer load-more">加载更多 <i class="fa fa-angle-double-down"></i></span>'
-                                        +'</div>'
-                                        +'</div></li>';
-                            }
-                            // 加载 评论列表 end
+                            // 点击加载更多时，列表追加到ul中
+                            $(commentListBox).appendTo($(".comment"));
+                        }
 
-                            if(!pageNumber) {
-                                // 首次加载-刷新页面后第一次加载，此时没有点击加载更多进行分页
-                                commentListBox += '</ul></div>';
-                                $(commentListBox).appendTo(box);
-                            }else{
-                                // 点击加载更多时，列表追加到ul中
-                                $(commentListBox).appendTo($(".comment"));
+                        // 加载更多按钮
+                        $(".load-more").click(function () {
+                            $(this).parents('li').hide();
+                            $.comment.loadCommentList(box, json.data.nextPage)
+                        });
+                    }
+                },
+                error: $.alert.ajaxError
+            });
+        },
+        initValidatorPlugin: function () {
+            $.comment._detailForm.bootstrapValidator({
+                message: "输入值无效",
+                feedbackIcons: {
+                    valid: "fa fa-check",
+                    invalid: "fa fa-remove",
+                    validating: "fa fa-refresh"
+                },
+                fields: {
+                    nickname: {
+                        validators: {
+                            notEmpty: {
+                                message: "昵称必填"
                             }
-
-                            // 加载更多按钮
-                            $(".load-more").click(function () {
-                                $(this).parents('li').hide();
-                                $.comment.loadCommentList(box, json.data.nextPage)
-                            });
                         }
                     },
-                    error: $.alert.ajaxError
-                });
-            },
-            initValidatorPlugin: function () {
-                $.comment._detailForm.bootstrapValidator({
-                    message: "输入值无效",
-                    feedbackIcons: {
-                        valid: "fa fa-check",
-                        invalid: "fa fa-remove",
-                        validating: "fa fa-refresh"
-                    },
-                    fields: {
-                        nickname: {
-                            validators: {
-                                notEmpty: {
-                                    message: "昵称必填"
-                                }
-                            }
-                        },
-                        url: {
-                            validators: {
-                                uri: {
-                                    message: "URL地址不正确"
-                                }
+                    url: {
+                        validators: {
+                            uri: {
+                                message: "URL地址不正确"
                             }
-                        },
-                        email: {
-                            validators: {
-                                emailAddress: {
-                                    message: "邮箱地址不正确"
-                                }
+                        }
+                    },
+                    email: {
+                        validators: {
+                            emailAddress: {
+                                message: "邮箱地址不正确"
                             }
                         }
                     }
-                });
-            },
-            submit: function (target) {
-                var $this = $(target);
-                $this.button('loading');
-                var detail = localStorage.getItem(this.detailKey);
-                var data = $("#comment-form").serialize();
-                if(!detail){
-                }else{
-                    var detailInfoJson = $.tool.parseFormSerialize(detail);
-                    $.comment._detailForm.find("input").each(function () {
-                        var $this = $(this);
-                        var inputName = $this.attr("name");
-                        if(detailInfoJson[inputName]){
-                            $this.val(detailInfoJson[inputName]);
-                        }
-                    });
-                    var $img = $.comment._detailForm.find('img');
-                    $img.attr('src', detailInfoJson.avatar);
-                    $img.removeClass('hide');
-
                 }
-                this._commentDetailModal.modal('show');
-                this._closeBtn.unbind('click');
-                this._closeBtn.click(function () {
-                    setTimeout(function () {
-                        $this.html("<i class='fa fa-close'></i>取消操作...");
-                        setTimeout(function () {
-                            $this.button('reset');
-                        }, 1000);
-                    }, 500);
-                });
-                // 模态框抖动
-                this._commentDetailModal.find('.modal-content').addClass("shake");
-                $.comment._detailForm.find("input[name=qq]").unbind('change');
-                $.comment._detailForm.find("input[name=qq]").change(function () {
+            });
+        },
+        submit: function (target) {
+            var $this = $(target);
+            $this.button('loading');
+            var detail = localStorage.getItem(this.detailKey);
+            var data = $("#comment-form").serialize();
+            if(!detail){
+            }else{
+                var detailInfoJson = $.tool.parseFormSerialize(detail);
+                $.comment._detailForm.find("input").each(function () {
                     var $this = $(this);
-                    var qq = $this.val();
-                    var $nextImg = $this.next('img');
-                    if(qq){
-                        $.ajax({
-                            type: "post",
-                            url: "/api/qq/" + qq,
-                            success: function (json) {
-                                $.alert.ajaxSuccess(json);
-                                var data = json.data;
-                                $.comment._detailForm.find("input").each(function () {
-                                    var $this = $(this);
-                                    var inputName = $this.attr("name");
-                                    if(data[inputName]){
-                                        $this.val(data[inputName]);
-                                    }
-                                });
-                                $nextImg.attr('src', data.avatar);
-                                $nextImg.removeClass('hide');
-                            },
-                            error: $.alert.ajaxError
-                        });
-                    }else{
-                        $nextImg.addClass('hide');
-                    }
-
-                });
-
-                // 提交评论
-                this._detailFormBtn.unbind('click');
-                this._detailFormBtn.click(function () {
-                    $.comment._detailForm.bootstrapValidator("validate");
-                    if (_form.valid($.comment._detailForm)) {
-                        data = data + "&" + $.comment._detailForm.serialize();
-                        localStorage.setItem($.comment.detailKey, $.comment._detailForm.serialize());
-                        submitForm(data);
+                    var inputName = $this.attr("name");
+                    if(detailInfoJson[inputName]){
+                        $this.val(detailInfoJson[inputName]);
                     }
                 });
+                var $img = $.comment._detailForm.find('img');
+                $img.attr('src', detailInfoJson.avatar);
+                $img.removeClass('hide');
 
-                function submitForm(data) {
-                    $.comment._detailFormBtn.button('loading');
+            }
+            this._commentDetailModal.modal('show');
+            this._closeBtn.unbind('click');
+            this._closeBtn.click(function () {
+                setTimeout(function () {
+                    $this.html("<i class='fa fa-close'></i>取消操作...");
+                    setTimeout(function () {
+                        $this.button('reset');
+                    }, 1000);
+                }, 500);
+            });
+            // 模态框抖动
+            this._commentDetailModal.find('.modal-content').addClass("shake");
+            $.comment._detailForm.find("input[name=qq]").unbind('change');
+            $.comment._detailForm.find("input[name=qq]").change(function () {
+                var $this = $(this);
+                var qq = $this.val();
+                var $nextImg = $this.next('img');
+                if(qq){
                     $.ajax({
                         type: "post",
-                        url: "/api/comment",
-                        data: data + '&sid=' + $.comment.sid,
+                        url: "/api/qq/" + qq,
                         success: function (json) {
-                            $.comment._detailFormBtn.button('reset');
                             $.alert.ajaxSuccess(json);
-                            $.comment._commentDetailModal.modal('hide');
-
-                            setTimeout(function () {
-                                $this.html("<i class='fa fa-check'></i>" + json.message);
-                                setTimeout(function () {
-                                    $this.button('reset');
-                                    window.location.reload();
-                                }, 3000);
-                            }, 1000);
+                            var data = json.data;
+                            $.comment._detailForm.find("input").each(function () {
+                                var $this = $(this);
+                                var inputName = $this.attr("name");
+                                if(data[inputName]){
+                                    $this.val(data[inputName]);
+                                }
+                            });
+                            $nextImg.attr('src', data.avatar);
+                            $nextImg.removeClass('hide');
                         },
-                        error: function (data) {
-                            $.alert.ajaxError();
-                            $this.button('reset');
-                        }
+                        error: $.alert.ajaxError
                     });
+                }else{
+                    $nextImg.addClass('hide');
                 }
-            },
-            reply: function (pid, target) {
-                this._commentPid.val(pid);
-                this._cancelReply.show();
-                this._commentPost.find('h5 i').addClass("shake");
-                $(target).hide();
-                $(target).parents('.comment-body').append(this._commentPost);
-            },
-            cancelReply: function (target) {
-                this._commentPid.val("");
-                this._cancelReply.hide();
-                $(target).parents(".comment-body").find('.comment-reply').show();
-                this._commentPost.find('h5 i').addClass("shake");
-                this._commentPlace.append(this._commentPost);
-            },
-            /* 赞 */
-            praise: function (pid, target) {
-                $.bubble.unbind();
-                $.ajax({
-                    type: "post",
-                    url: "/api/doSupport/" + pid,
-                    success: function (json) {
-                        $.alert.ajaxSuccess(json);
-                        if(json.status == 200){
-                            $(target).effectBubble({y:-80, className:'thumb-bubble', fontSize: 1, content: '<i class="fa fa-smile-o"></i>+1'});
-                            var oldCount = $(target).find('span.count').text();
-                            $(target).find('span.count').text(parseInt(oldCount) + 1);
-                        }
-                        $.bubble.init();
-                    },
-                    error: function () {
-                        $.alert.ajaxError();
-                        $.bubble.init();
-                    }
-                });
-            },
-            /* 踩 */
-            step: function (pid, target) {
-                $.bubble.unbind();
+
+            });
+
+            // 提交评论
+            this._detailFormBtn.unbind('click');
+            this._detailFormBtn.click(function () {
+                $.comment._detailForm.bootstrapValidator("validate");
+                if (_form.valid($.comment._detailForm)) {
+                    data = data + "&" + $.comment._detailForm.serialize();
+                    localStorage.setItem($.comment.detailKey, $.comment._detailForm.serialize());
+                    submitForm(data);
+                }
+            });
+
+            function submitForm(data) {
+                $.comment._detailFormBtn.button('loading');
                 $.ajax({
                     type: "post",
-                    url: "/api/doOppose/" + pid,
+                    url: "/api/comment",
+                    data: data + '&sid=' + $.comment.sid,
                     success: function (json) {
+                        $.comment._detailFormBtn.button('reset');
                         $.alert.ajaxSuccess(json);
-                        if(json.status == 200){
-                            $(target).effectBubble({y:-80, className:'thumb-bubble', fontSize: 1, content: '<i class="fa fa-meh-o"></i>+1'});
-                            var oldCount = $(target).find('span.count').text();
-                            $(target).find('span.count').text(parseInt(oldCount) + 1);
-                        }
-                        $.bubble.init();
+                        $.comment._commentDetailModal.modal('hide');
+
+                        setTimeout(function () {
+                            $this.html("<i class='fa fa-check'></i>" + json.message);
+                            setTimeout(function () {
+                                $this.button('reset');
+                                window.location.reload();
+                            }, 3000);
+                        }, 1000);
                     },
-                    error: function () {
+                    error: function (data) {
                         $.alert.ajaxError();
-                        $.bubble.init();
+                        $this.button('reset');
                     }
                 });
-            },
-            /* 举报 */
-            report: function (pid, target) {
             }
+        },
+        reply: function (pid, target) {
+            this._commentPid.val(pid);
+            this._cancelReply.show();
+            this._commentPost.find('h5 i').addClass("shake");
+            $(target).hide();
+            $(target).parents('.comment-body').append(this._commentPost);
+        },
+        cancelReply: function (target) {
+            this._commentPid.val("");
+            this._cancelReply.hide();
+            $(target).parents(".comment-body").find('.comment-reply').show();
+            this._commentPost.find('h5 i').addClass("shake");
+            this._commentPlace.append(this._commentPost);
+        },
+        /* 赞 */
+        praise: function (pid, target) {
+            $.bubble.unbind();
+            $.ajax({
+                type: "post",
+                url: "/api/doSupport/" + pid,
+                success: function (json) {
+                    $.alert.ajaxSuccess(json);
+                    if(json.status == 200){
+                        $(target).effectBubble({y:-80, className:'thumb-bubble', fontSize: 1, content: '<i class="fa fa-smile-o"></i>+1'});
+                        var oldCount = $(target).find('span.count').text();
+                        $(target).find('span.count').text(parseInt(oldCount) + 1);
+                    }
+                    $.bubble.init();
+                },
+                error: function () {
+                    $.alert.ajaxError();
+                    $.bubble.init();
+                }
+            });
+        },
+        /* 踩 */
+        step: function (pid, target) {
+            $.bubble.unbind();
+            $.ajax({
+                type: "post",
+                url: "/api/doOppose/" + pid,
+                success: function (json) {
+                    $.alert.ajaxSuccess(json);
+                    if(json.status == 200){
+                        $(target).effectBubble({y:-80, className:'thumb-bubble', fontSize: 1, content: '<i class="fa fa-meh-o"></i>+1'});
+                        var oldCount = $(target).find('span.count').text();
+                        $(target).find('span.count').text(parseInt(oldCount) + 1);
+                    }
+                    $.bubble.init();
+                },
+                error: function () {
+                    $.alert.ajaxError();
+                    $.bubble.init();
+                }
+            });
+        },
+        /* 举报 */
+        report: function (pid, target) {
         }
-    });
-
+    }
+});
+$(function(){
     $.comment.init({customMenu: true});
 
     $("#comment-form-btn").click(function () {
-- 
GitLab