[改]修复删除文章时清空了文章浏览表的BUG

[改]修复resources方法的shiro注解配置成users权限的BUG
[改]无推荐文章时不显示轮播图
[改]Shiro更改权限后可能会造成的403问题

blog-admin/src/main/java/com/zyd/blog/controller/RenderController.java

@@ -72,7 +72,7 @@ public class RenderController {
         return ResultUtil.view("user/list");
     }
 
-    @RequiresPermissions("users")
+    @RequiresPermissions("resources")
     @BussinessLog("进入资源列表页")
     @GetMapping("/resources")
     public ModelAndView resources() {

blog-admin/src/main/java/com/zyd/blog/core/shiro/realm/ShiroRealm.java

@@ -27,7 +27,6 @@ import com.zyd.blog.business.enums.UserTypeEnum;
 import com.zyd.blog.business.service.SysResourcesService;
 import com.zyd.blog.business.service.SysRoleService;
 import com.zyd.blog.business.service.SysUserService;
-import com.zyd.blog.util.SessionUtil;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authc.*;
 import org.apache.shiro.authz.AuthorizationInfo;
@@ -104,12 +103,12 @@ public class ShiroRealm extends AuthorizingRealm {
 
         // 赋予权限
         List<Resources> resourcesList = null;
-        User user = SessionUtil.getUser();
-        if(null == user){
+        User user = userService.getByPrimaryKey(userId);
+        if (null == user) {
             return info;
         }
         // ROOT用户默认拥有所有权限
-        if(UserTypeEnum.ROOT.toString().equalsIgnoreCase(user.getUserType())) {
+        if (UserTypeEnum.ROOT.toString().equalsIgnoreCase(user.getUserType())) {
             resourcesList = resourcesService.listAll();
         } else {
             resourcesList = resourcesService.listByUserId(userId);

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

@@ -31,10 +31,7 @@ import com.zyd.blog.business.service.BizArticleTagsService;
 import com.zyd.blog.business.vo.ArticleConditionVO;
 import com.zyd.blog.framework.exception.ZhydArticleException;
 import com.zyd.blog.framework.holder.RequestHolder;
-import com.zyd.blog.persistence.beans.BizArticle;
-import com.zyd.blog.persistence.beans.BizArticleLove;
-import com.zyd.blog.persistence.beans.BizArticleTags;
-import com.zyd.blog.persistence.beans.BizTags;
+import com.zyd.blog.persistence.beans.*;
 import com.zyd.blog.persistence.mapper.BizArticleLookMapper;
 import com.zyd.blog.persistence.mapper.BizArticleLoveMapper;
 import com.zyd.blog.persistence.mapper.BizArticleMapper;
@@ -391,7 +388,7 @@ public class BizArticleServiceImpl implements BizArticleService {
         loveCriteria.andEqualTo("articleId", primaryKey);
         bizArticleTagsMapper.deleteByExample(loveExample);
         // 删除查看记录
-        Example lookExample = new Example(BizArticleLove.class);
+        Example lookExample = new Example(BizArticleLook.class);
         Example.Criteria lookCriteria = loveExample.createCriteria();
         lookCriteria.andEqualTo("articleId", primaryKey);
         bizArticleLookMapper.deleteByExample(lookExample);

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

@@ -27,44 +27,40 @@
     </nav>
     <div class="row">
         <div class="col-sm-8 blog-main">
-            <div class="blog-body expansion" style="padding: 0;">
-                <div id="myCarousel" class="carousel slide" style="height:300px;">
-                    <!-- 轮播（Carousel）指标 -->
-                    <ol class="carousel-indicators">
-                        <@articleTag method="recommendedList" pageSize="8">
-                            <#if recommendedList?exists && (recommendedList?size > 0)>
-                                <#list recommendedList as item>
-                                <li data-target="#myCarousel" data-slide-to="${item_index}" class="${(item_index == 0)?string('active','')}"></li>
-                                </#list>
-                            </#if>
-                        </@articleTag>
-                    </ol>
-                    <!-- 轮播（Carousel）项目 -->
-                    <div class="carousel-inner">
-                        <@articleTag method="recommendedList" pageSize="8">
-                            <#if recommendedList?exists && (recommendedList?size > 0)>
-                                <#list recommendedList as item>
-                                <div class="item ${(item_index == 0)?string('active','')}">
-                                    <a href="${config.siteUrl}/article/${item.id?c}">
-                                        <img src="${config.qiuniuBasePath}${item.coverImage}" alt="${item.title}" title="${item.title}">
-                                    </a>
-                                    <div class="zyd-carousel-caption">${item.title}</div>
-                                </div>
-                                </#list>
-                            </#if>
-                        </@articleTag>
+            <@articleTag method="recommendedList" pageSize="8">
+                <#if recommendedList?exists && (recommendedList?size > 0)>
+                <div class="blog-body expansion" style="padding: 0;">
+                    <div id="myCarousel" class="carousel slide" style="height:300px;">
+                        <!-- 轮播（Carousel）指标 -->
+                        <ol class="carousel-indicators">
+                            <#list recommendedList as item>
+                            <li data-target="#myCarousel" data-slide-to="${item_index}" class="${(item_index == 0)?string('active','')}"></li>
+                            </#list>
+                        </ol>
+                        <!-- 轮播（Carousel）项目 -->
+                        <div class="carousel-inner">
+                            <#list recommendedList as item>
+                            <div class="item ${(item_index == 0)?string('active','')}">
+                                <a href="${config.siteUrl}/article/${item.id?c}">
+                                    <img src="${config.qiuniuBasePath}${item.coverImage}" alt="${item.title}" title="${item.title}">
+                                </a>
+                                <div class="zyd-carousel-caption">${item.title}</div>
+                            </div>
+                            </#list>
+                        </div>
+                        <!-- 轮播（Carousel）导航 -->
+                        <a class="left carousel-control hide" href="#myCarousel" role="button" data-slide="prev">
+                            <span class="fa fa-angle-left fa-fw fa-3x" aria-hidden="true"></span>
+                            <span class="sr-only">Previous</span>
+                        </a>
+                        <a class="right carousel-control hide" href="#myCarousel" role="button" data-slide="next">
+                            <span class="fa fa-angle-right fa-fw fa-3x" aria-hidden="true"></span>
+                            <span class="sr-only">Next</span>
+                        </a>
                     </div>
-                    <!-- 轮播（Carousel）导航 -->
-                    <a class="left carousel-control hide" href="#myCarousel" role="button" data-slide="prev">
-                        <span class="fa fa-angle-left fa-fw fa-3x" aria-hidden="true"></span>
-                        <span class="sr-only">Previous</span>
-                    </a>
-                    <a class="right carousel-control hide" href="#myCarousel" role="button" data-slide="next">
-                        <span class="fa fa-angle-right fa-fw fa-3x" aria-hidden="true"></span>
-                        <span class="sr-only">Next</span>
-                    </a>
                 </div>
-            </div>
+                </#if>
+            </@articleTag>
             <#if page.list?exists && (page.list?size > 0)>
                 <#list page.list as item>
                     <article class="fade-in">