代码整理

blog-admin/src/main/resources/templates/role/list.ftl

@@ -97,7 +97,7 @@
             '<a class="btn btn-xs btn-primary btn-update" data-id="' + trId + '"><i class="fa fa-edit"></i>编辑</a>',
         ];
         operateBtn.push('<a class="btn btn-xs btn-danger btn-remove" data-id="' + trId + '"><i class="fa fa-trash-o"></i>删除</a>');
-        operateBtn.push('<a class="btn btn-xs btn-info btn-allot" data-id="' + trId + '"><i class="fa fa-circle-thin"></i>分配权限</a>')
+        operateBtn.push('<a class="btn btn-xs btn-info btn-allot" data-id="' + trId + '"><i class="fa fa-circle-thin"></i>分配资源</a>')
         return operateBtn.join('');
     }
 

blog-admin/src/main/resources/templates/user/list.ftl

@@ -120,7 +120,7 @@
         ];
         if (currentUserId != trUserId) {
             operateBtn.push('<a class="btn btn-xs btn-danger btn-remove" data-id="' + trUserId + '"><i class="fa fa-trash-o"></i>删除</a>');
-            operateBtn.push('<a class="btn btn-xs btn-info btn-allot" data-id="' + trUserId + '"><i class="fa fa-circle-thin"></i>分配权限</a>')
+            operateBtn.push('<a class="btn btn-xs btn-info btn-allot" data-id="' + trUserId + '"><i class="fa fa-circle-thin"></i>分配角色</a>')
         }
         return operateBtn.join('');
     }

blog-core/src/main/java/com/zyd/blog/business/service/impl/BizCommentServiceImpl.java

@@ -216,6 +216,7 @@ public class BizCommentServiceImpl implements BizCommentService {
             comment.setAddress(address);
         } catch (Exception e) {
             comment.setAddress("未知");
+            log.error("获取地址失败", e);
         }
         if (StringUtils.isEmpty(comment.getStatus())) {
             comment.setStatus(CommentStatusEnum.VERIFYING.toString());

blog-core/src/main/java/com/zyd/blog/framework/exception/ZhydException.java

 /**
- * Copyright [2016-2017] [yadong.zhang]
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * 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.framework.exception;
 

blog-core/src/main/java/com/zyd/blog/framework/tag/ArticleTagDirective.java

@@ -89,7 +89,8 @@ public class ArticleTagDirective implements TemplateDirectiveModel {
                     // 按文章分类查询
                     ArticleConditionVO vo = new ArticleConditionVO();
                     vo.setTypeId(typeId);
-                    vo.setStatus(ArticleStatusEnum.PUBLISHED.getCode());// 已发布状态
+                    // 已发布状态
+                    vo.setStatus(ArticleStatusEnum.PUBLISHED.getCode());
                     vo.setPageSize(pageSize);
                     PageInfo<Article> pageInfo = articleService.findPageBreakByCondition(vo);
                     environment.setVariable("typeList", builder.build().wrap(null == pageInfo ? null : pageInfo.getList()));

blog-web/src/main/resources/templates/index.ftl

 <#include "include/macros.ftl">
-<@header title="${config.siteName} | 一个程序员的个人博客"
+<@header title="${config.siteName?if_exists} | 一个程序员的个人博客"
     keywords="${config.homeKeywords?if_exists}"
     description="${config.homeDesc?if_exists}"
     canonical="/${url?if_exists}">