修复菜单问题

src/main/java/cn/stylefeng/guns/core/interceptor/AttributeSetInteceptor.java

@@ -52,7 +52,6 @@ public class AttributeSetInteceptor extends HandlerInterceptorAdapter {
         if (user == null) {
         if (user == null) {
             throw new AuthenticationException("当前没有登录账号！");
             throw new AuthenticationException("当前没有登录账号！");
         } else {
         } else {
-            modelAndView.addObject("menus", user.getMenus());
             modelAndView.addObject("name", user.getName());
             modelAndView.addObject("name", user.getName());
             modelAndView.addObject("avatar", DefaultImages.defaultAvatarUrl());
             modelAndView.addObject("avatar", DefaultImages.defaultAvatarUrl());
             modelAndView.addObject("email", user.getEmail());
             modelAndView.addObject("email", user.getEmail());

src/main/java/cn/stylefeng/guns/core/shiro/ShiroUser.java

@@ -15,7 +15,6 @@
  */
  */
 package cn.stylefeng.guns.core.shiro;
 package cn.stylefeng.guns.core.shiro;
 
 
-import cn.stylefeng.guns.core.common.node.MenuNode;
 import lombok.Data;
 import lombok.Data;
 
 
 import java.io.Serializable;
 import java.io.Serializable;
@@ -77,10 +76,4 @@ public class ShiroUser implements Serializable {
      */
      */
     private List<String> roleNames;
     private List<String> roleNames;
 
 
-    /**
-     * 用户所能看到的菜单列表
-     */
-    private List<MenuNode> menus;
-
-
 }
 }

src/main/java/cn/stylefeng/guns/core/shiro/service/impl/UserAuthServiceServiceImpl.java

@@ -91,9 +91,6 @@ public class UserAuthServiceServiceImpl implements UserAuthService {
         shiroUser.setRoleList(roleList);
         shiroUser.setRoleList(roleList);
         shiroUser.setRoleNames(roleNameList);
         shiroUser.setRoleNames(roleNameList);
 
 
-        //获取用户拥有的菜单
-        shiroUser.setMenus(userService.getUserMenuNodes(roleList));
-
         return shiroUser;
         return shiroUser;
     }
     }
 
 

src/main/java/cn/stylefeng/guns/modular/system/controller/LoginController.java

@@ -15,13 +15,16 @@
  */
  */
 package cn.stylefeng.guns.modular.system.controller;
 package cn.stylefeng.guns.modular.system.controller;
 
 
+import cn.stylefeng.guns.core.common.node.MenuNode;
 import cn.stylefeng.guns.core.log.LogManager;
 import cn.stylefeng.guns.core.log.LogManager;
 import cn.stylefeng.guns.core.log.factory.LogTaskFactory;
 import cn.stylefeng.guns.core.log.factory.LogTaskFactory;
 import cn.stylefeng.guns.core.shiro.ShiroKit;
 import cn.stylefeng.guns.core.shiro.ShiroKit;
 import cn.stylefeng.guns.core.shiro.ShiroUser;
 import cn.stylefeng.guns.core.shiro.ShiroUser;
+import cn.stylefeng.guns.modular.system.service.UserService;
 import cn.stylefeng.roses.core.base.controller.BaseController;
 import cn.stylefeng.roses.core.base.controller.BaseController;
 import org.apache.shiro.authc.UsernamePasswordToken;
 import org.apache.shiro.authc.UsernamePasswordToken;
 import org.apache.shiro.subject.Subject;
 import org.apache.shiro.subject.Subject;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -40,6 +43,9 @@ import static cn.stylefeng.roses.core.util.HttpContext.getIp;
 @Controller
 @Controller
 public class LoginController extends BaseController {
 public class LoginController extends BaseController {
 
 
+    @Autowired
+    private UserService userService;
+
     /**
     /**
      * 跳转到主页
      * 跳转到主页
      *
      *
@@ -59,7 +65,8 @@ public class LoginController extends BaseController {
             return "/login.html";
             return "/login.html";
         }
         }
 
 
-        model.addAttribute("menus", user.getMenus());
+        List<MenuNode> menus = userService.getUserMenuNodes(roleList);
+        model.addAttribute("menus", menus);
 
 
         return "/index.html";
         return "/index.html";
     }
     }

src/main/java/cn/stylefeng/guns/modular/system/service/MenuService.java

@@ -7,6 +7,7 @@ import cn.stylefeng.guns.core.common.exception.BizExceptionEnum;
 import cn.stylefeng.guns.core.common.node.MenuNode;
 import cn.stylefeng.guns.core.common.node.MenuNode;
 import cn.stylefeng.guns.core.common.node.ZTreeNode;
 import cn.stylefeng.guns.core.common.node.ZTreeNode;
 import cn.stylefeng.guns.core.common.page.LayuiPageFactory;
 import cn.stylefeng.guns.core.common.page.LayuiPageFactory;
+import cn.stylefeng.guns.core.listener.ConfigListener;
 import cn.stylefeng.guns.modular.system.entity.Menu;
 import cn.stylefeng.guns.modular.system.entity.Menu;
 import cn.stylefeng.guns.modular.system.mapper.MenuMapper;
 import cn.stylefeng.guns.modular.system.mapper.MenuMapper;
 import cn.stylefeng.guns.modular.system.model.MenuDto;
 import cn.stylefeng.guns.modular.system.model.MenuDto;
@@ -183,7 +184,14 @@ public class MenuService extends ServiceImpl<MenuMapper, Menu> {
      * @date 2017年2月19日 下午10:35:40
      * @date 2017年2月19日 下午10:35:40
      */
      */
     public List<MenuNode> getMenusByRoleIds(List<Long> roleIds) {
     public List<MenuNode> getMenusByRoleIds(List<Long> roleIds) {
-        return this.baseMapper.getMenusByRoleIds(roleIds);
+        List<MenuNode> menus = this.baseMapper.getMenusByRoleIds(roleIds);
+
+        //给所有的菜单url加上ctxPath
+        for (MenuNode menuItem : menus) {
+            menuItem.setUrl(ConfigListener.getConf().get("contextPath") + menuItem.getUrl());
+        }
+
+        return menus;
     }
     }
 
 
     /**
     /**

src/main/webapp/pages/common/_container.html

@@ -31,7 +31,7 @@
     @if(isNotEmpty(css)){
     @if(isNotEmpty(css)){
         @for(item in css){
         @for(item in css){
             @if(strutil.startWith(item,"/")){
             @if(strutil.startWith(item,"/")){
-                @item = item + ctxPath;
+                @item = ctxPath + item;
             @}
             @}
             <link href="${item}" rel="stylesheet" type="text/css" />
             <link href="${item}" rel="stylesheet" type="text/css" />
         @}
         @}