整理基础bean

e7f79e19 · stylefeng · 3f1687fc · e7f79e19 · e7f79e19 · e7f79e19
Commit e7f79e19 authored Aug 17, 2017 by stylefeng
25 changed files
--- a/guns-admin/src/main/java/com/stylefeng/guns/core/intercept/SessionInterceptor.java
+++ b/guns-admin/src/main/java/com/stylefeng/guns/core/intercept/SessionInterceptor.java
 package com.stylefeng.guns.core.intercept;
-import com.stylefeng.guns.common.controller.BaseController;
+import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.core.util.HttpSessionHolder;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Pointcut;
-import com.stylefeng.guns.core.util.HttpSessionHolder;
 import org.springframework.stereotype.Component;
 /**

--- a/guns-admin/src/main/java/com/stylefeng/guns/core/intercept/SessionTimeoutInterceptor.java
+++ b/guns-admin/src/main/java/com/stylefeng/guns/core/intercept/SessionTimeoutInterceptor.java
 package com.stylefeng.guns.core.intercept;
-import com.stylefeng.guns.common.controller.BaseController;
+import com.stylefeng.guns.core.base.controller.BaseController;
 import com.stylefeng.guns.core.shiro.ShiroKit;
 import com.stylefeng.guns.core.support.HttpKit;
 import org.apache.shiro.session.InvalidSessionException;

--- a/guns-admin/src/main/java/com/stylefeng/guns/core/util/ApiMenuFilter.java
+++ b/guns-admin/src/main/java/com/stylefeng/guns/core/util/ApiMenuFilter.java
+package com.stylefeng.guns.core.util;
+import com.stylefeng.guns.common.constant.Const;
+import com.stylefeng.guns.config.properties.GunsProperties;
+import com.stylefeng.guns.core.node.MenuNode;
+import java.util.ArrayList;
+import java.util.List;
+/**
+ * api接口文档显示过滤
+ *
+ * @author fengshuonan
+ * @date 2017-08-17 16:55
+ */
+public class ApiMenuFilter extends MenuNode {
+    public static List<MenuNode> build(List<MenuNode> nodes) {
+        //如果关闭了接口文档,则不显示接口文档菜单
+        GunsProperties gunsProperties = SpringContextHolder.getBean(GunsProperties.class);
+        if (!gunsProperties.getSwaggerOpen()) {
+            List<MenuNode> menuNodesCopy = new ArrayList<>();
+            for (MenuNode menuNode : nodes) {
+                if (Const.API_MENU_NAME.equals(menuNode.getName())) {
+                    continue;
+                } else {
+                    menuNodesCopy.add(menuNode);
+                }
+            }
+            nodes = menuNodesCopy;
+        }
+        return nodes;
+    }
+}
--- a/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/BlackboardController.java
+++ b/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/BlackboardController.java
 package com.stylefeng.guns.modular.system.controller;
-import com.stylefeng.guns.common.controller.BaseController;
+import com.stylefeng.guns.core.base.controller.BaseController;
 import com.stylefeng.guns.modular.system.dao.NoticeDao;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;

--- a/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/CodeController.java
+++ b/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/CodeController.java
@@ -2,9 +2,9 @@ package com.stylefeng.guns.modular.system.controller;
 import com.stylefeng.guns.common.annotion.Permission;
 import com.stylefeng.guns.common.constant.Const;
-import com.stylefeng.guns.common.controller.BaseController;
 import com.stylefeng.guns.common.exception.BizExceptionEnum;
 import com.stylefeng.guns.common.exception.BussinessException;
+import com.stylefeng.guns.core.base.controller.BaseController;
 import com.stylefeng.guns.core.template.config.ContextConfig;
 import com.stylefeng.guns.core.template.engine.SimpleTemplateEngine;
 import com.stylefeng.guns.core.template.engine.base.GunsTemplateEngine;

--- a/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/DeptController.java
+++ b/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/DeptController.java
@@ -4,13 +4,13 @@ import com.stylefeng.guns.common.annotion.Permission;
 import com.stylefeng.guns.common.annotion.log.BussinessLog;
 import com.stylefeng.guns.common.constant.Dict;
 import com.stylefeng.guns.common.constant.factory.ConstantFactory;
-import com.stylefeng.guns.common.controller.BaseController;
 import com.stylefeng.guns.common.exception.BizExceptionEnum;
 import com.stylefeng.guns.common.exception.BussinessException;
-import com.stylefeng.guns.common.node.ZTreeNode;
 import com.stylefeng.guns.common.persistence.dao.DeptMapper;
 import com.stylefeng.guns.common.persistence.model.Dept;
+import com.stylefeng.guns.core.base.controller.BaseController;
 import com.stylefeng.guns.core.log.LogObjectHolder;
+import com.stylefeng.guns.core.node.ZTreeNode;
 import com.stylefeng.guns.core.util.ToolUtil;
 import com.stylefeng.guns.modular.system.dao.DeptDao;
 import com.stylefeng.guns.modular.system.service.IDeptService;

--- a/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/DictController.java
+++ b/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/DictController.java
@@ -5,16 +5,16 @@ import com.stylefeng.guns.common.annotion.Permission;
 import com.stylefeng.guns.common.annotion.log.BussinessLog;
 import com.stylefeng.guns.common.constant.Const;
 import com.stylefeng.guns.common.constant.factory.ConstantFactory;
-import com.stylefeng.guns.common.controller.BaseController;
 import com.stylefeng.guns.common.exception.BizExceptionEnum;
 import com.stylefeng.guns.common.exception.BussinessException;
+import com.stylefeng.guns.common.persistence.dao.DictMapper;
+import com.stylefeng.guns.common.persistence.model.Dict;
+import com.stylefeng.guns.core.base.controller.BaseController;
 import com.stylefeng.guns.core.log.LogObjectHolder;
 import com.stylefeng.guns.core.util.ToolUtil;
 import com.stylefeng.guns.modular.system.dao.DictDao;
 import com.stylefeng.guns.modular.system.service.IDictService;
 import com.stylefeng.guns.modular.system.warpper.DictWarpper;
-import com.stylefeng.guns.common.persistence.dao.DictMapper;
-import com.stylefeng.guns.common.persistence.model.Dict;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.PathVariable;

--- a/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/LogController.java
+++ b/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/LogController.java
@@ -7,12 +7,12 @@ import com.stylefeng.guns.common.annotion.log.BussinessLog;
 import com.stylefeng.guns.common.constant.Const;
 import com.stylefeng.guns.common.constant.factory.PageFactory;
 import com.stylefeng.guns.common.constant.state.BizLogType;
-import com.stylefeng.guns.common.controller.BaseController;
+import com.stylefeng.guns.common.persistence.dao.OperationLogMapper;
+import com.stylefeng.guns.common.persistence.model.OperationLog;
+import com.stylefeng.guns.core.base.controller.BaseController;
 import com.stylefeng.guns.core.support.BeanKit;
 import com.stylefeng.guns.modular.system.dao.LogDao;
 import com.stylefeng.guns.modular.system.warpper.LogWarpper;
-import com.stylefeng.guns.common.persistence.dao.OperationLogMapper;
-import com.stylefeng.guns.common.persistence.model.OperationLog;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;

--- a/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/LoginController.java
+++ b/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/LoginController.java
 package com.stylefeng.guns.modular.system.controller;
 import com.google.code.kaptcha.Constants;
-import com.stylefeng.guns.common.controller.BaseController;
 import com.stylefeng.guns.common.exception.InvalidKaptchaException;
-import com.stylefeng.guns.common.node.MenuNode;
 import com.stylefeng.guns.common.persistence.dao.UserMapper;
 import com.stylefeng.guns.common.persistence.model.User;
+import com.stylefeng.guns.core.base.controller.BaseController;
 import com.stylefeng.guns.core.log.LogManager;
 import com.stylefeng.guns.core.log.factory.LogTaskFactory;
+import com.stylefeng.guns.core.node.MenuNode;
 import com.stylefeng.guns.core.shiro.ShiroKit;
 import com.stylefeng.guns.core.shiro.ShiroUser;
+import com.stylefeng.guns.core.util.ApiMenuFilter;
 import com.stylefeng.guns.core.util.KaptchaUtil;
 import com.stylefeng.guns.core.util.ToolUtil;
 import com.stylefeng.guns.modular.system.dao.MenuDao;
@@ -54,6 +55,8 @@ public class LoginController extends BaseController {
        }
        List<MenuNode> menus = menuDao.getMenusByRoleIds(roleList);
        List<MenuNode> titles = MenuNode.buildTitle(menus);
+        titles = ApiMenuFilter.build(titles);
        model.addAttribute("titles", titles);
        //获取用户头像

--- a/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/LoginLogController.java
+++ b/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/LoginLogController.java
@@ -6,10 +6,10 @@ import com.stylefeng.guns.common.annotion.Permission;
 import com.stylefeng.guns.common.annotion.log.BussinessLog;
 import com.stylefeng.guns.common.constant.Const;
 import com.stylefeng.guns.common.constant.factory.PageFactory;
-import com.stylefeng.guns.common.controller.BaseController;
+import com.stylefeng.guns.common.persistence.model.OperationLog;
+import com.stylefeng.guns.core.base.controller.BaseController;
 import com.stylefeng.guns.modular.system.dao.LogDao;
 import com.stylefeng.guns.modular.system.warpper.LogWarpper;
-import com.stylefeng.guns.common.persistence.model.OperationLog;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;

--- a/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/MenuController.java
+++ b/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/MenuController.java
@@ -6,14 +6,14 @@ import com.stylefeng.guns.common.constant.Const;
 import com.stylefeng.guns.common.constant.Dict;
 import com.stylefeng.guns.common.constant.factory.ConstantFactory;
 import com.stylefeng.guns.common.constant.state.MenuStatus;
-import com.stylefeng.guns.common.controller.BaseController;
 import com.stylefeng.guns.common.exception.BizExceptionEnum;
 import com.stylefeng.guns.common.exception.BussinessException;
-import com.stylefeng.guns.common.node.ZTreeNode;
 import com.stylefeng.guns.common.persistence.dao.MenuMapper;
 import com.stylefeng.guns.common.persistence.model.Menu;
+import com.stylefeng.guns.core.base.controller.BaseController;
 import com.stylefeng.guns.core.base.tips.Tip;
 import com.stylefeng.guns.core.log.LogObjectHolder;
+import com.stylefeng.guns.core.node.ZTreeNode;
 import com.stylefeng.guns.core.support.BeanKit;
 import com.stylefeng.guns.core.util.ToolUtil;
 import com.stylefeng.guns.modular.system.dao.MenuDao;

--- a/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/NoticeController.java
+++ b/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/NoticeController.java
@@ -3,16 +3,16 @@ package com.stylefeng.guns.modular.system.controller;
 import com.stylefeng.guns.common.annotion.log.BussinessLog;
 import com.stylefeng.guns.common.constant.Dict;
 import com.stylefeng.guns.common.constant.factory.ConstantFactory;
-import com.stylefeng.guns.common.controller.BaseController;
 import com.stylefeng.guns.common.exception.BizExceptionEnum;
 import com.stylefeng.guns.common.exception.BussinessException;
+import com.stylefeng.guns.common.persistence.dao.NoticeMapper;
+import com.stylefeng.guns.common.persistence.model.Notice;
+import com.stylefeng.guns.core.base.controller.BaseController;
 import com.stylefeng.guns.core.log.LogObjectHolder;
 import com.stylefeng.guns.core.shiro.ShiroKit;
 import com.stylefeng.guns.core.util.ToolUtil;
 import com.stylefeng.guns.modular.system.dao.NoticeDao;
 import com.stylefeng.guns.modular.system.warpper.NoticeWrapper;
-import com.stylefeng.guns.common.persistence.dao.NoticeMapper;
-import com.stylefeng.guns.common.persistence.model.Notice;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.PathVariable;

--- a/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/RoleController.java
+++ b/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/RoleController.java
@@ -6,17 +6,17 @@ import com.stylefeng.guns.common.constant.Const;
 import com.stylefeng.guns.common.constant.Dict;
 import com.stylefeng.guns.common.constant.cache.Cache;
 import com.stylefeng.guns.common.constant.factory.ConstantFactory;
-import com.stylefeng.guns.common.controller.BaseController;
 import com.stylefeng.guns.common.exception.BizExceptionEnum;
 import com.stylefeng.guns.common.exception.BussinessException;
-import com.stylefeng.guns.common.node.ZTreeNode;
 import com.stylefeng.guns.common.persistence.dao.RoleMapper;
 import com.stylefeng.guns.common.persistence.dao.UserMapper;
 import com.stylefeng.guns.common.persistence.model.Role;
 import com.stylefeng.guns.common.persistence.model.User;
+import com.stylefeng.guns.core.base.controller.BaseController;
 import com.stylefeng.guns.core.base.tips.Tip;
 import com.stylefeng.guns.core.cache.CacheKit;
 import com.stylefeng.guns.core.log.LogObjectHolder;
+import com.stylefeng.guns.core.node.ZTreeNode;
 import com.stylefeng.guns.core.util.Convert;
 import com.stylefeng.guns.core.util.ToolUtil;
 import com.stylefeng.guns.modular.system.dao.RoleDao;

--- a/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/UserMgrController.java
+++ b/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/UserMgrController.java
@@ -6,12 +6,12 @@ import com.stylefeng.guns.common.constant.Const;
 import com.stylefeng.guns.common.constant.Dict;
 import com.stylefeng.guns.common.constant.factory.ConstantFactory;
 import com.stylefeng.guns.common.constant.state.ManagerStatus;
-import com.stylefeng.guns.common.controller.BaseController;
 import com.stylefeng.guns.common.exception.BizExceptionEnum;
 import com.stylefeng.guns.common.exception.BussinessException;
 import com.stylefeng.guns.common.persistence.dao.UserMapper;
 import com.stylefeng.guns.common.persistence.model.User;
 import com.stylefeng.guns.config.properties.GunsProperties;
+import com.stylefeng.guns.core.base.controller.BaseController;
 import com.stylefeng.guns.core.base.tips.Tip;
 import com.stylefeng.guns.core.datascope.DataScope;
 import com.stylefeng.guns.core.db.Db;

--- a/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DeptDao.java
+++ b/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DeptDao.java
 package com.stylefeng.guns.modular.system.dao;
-import com.stylefeng.guns.common.node.ZTreeNode;
+import com.stylefeng.guns.core.node.ZTreeNode;
 import org.apache.ibatis.annotations.Param;
 import java.util.List;

--- a/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/MenuDao.java
+++ b/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/MenuDao.java
 package com.stylefeng.guns.modular.system.dao;
-import com.stylefeng.guns.common.node.MenuNode;
+import com.stylefeng.guns.core.node.MenuNode;
-import com.stylefeng.guns.common.node.ZTreeNode;
+import com.stylefeng.guns.core.node.ZTreeNode;
 import org.apache.ibatis.annotations.Param;
 import java.util.List;

--- a/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/RoleDao.java
+++ b/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/RoleDao.java
 package com.stylefeng.guns.modular.system.dao;
-import com.stylefeng.guns.common.node.ZTreeNode;
+import com.stylefeng.guns.core.node.ZTreeNode;
 import org.apache.ibatis.annotations.Param;
 import java.util.List;

--- a/guns-admin/src/main/java/com/stylefeng/guns/common/controller/BaseController.java
+++ b/guns-admin/src/main/java/com/stylefeng/guns/common/controller/BaseController.java
-package com.stylefeng.guns.common.controller;
+package com.stylefeng.guns.core.base.controller;
 import com.baomidou.mybatisplus.plugins.Page;
-import com.stylefeng.guns.common.constant.tips.SuccessTip;
+import com.stylefeng.guns.core.base.tips.SuccessTip;
-import com.stylefeng.guns.common.page.PageInfoBT;
 import com.stylefeng.guns.core.base.warpper.BaseControllerWarpper;
+import com.stylefeng.guns.core.page.PageInfoBT;
 import com.stylefeng.guns.core.support.HttpKit;
 import com.stylefeng.guns.core.util.FileUtil;
 import org.springframework.http.HttpHeaders;

--- a/guns-admin/src/main/java/com/stylefeng/guns/common/controller/GlobalController.java
+++ b/guns-admin/src/main/java/com/stylefeng/guns/common/controller/GlobalController.java
-package com.stylefeng.guns.common.controller;
+package com.stylefeng.guns.core.base.controller;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;

--- a/guns-admin/src/main/java/com/stylefeng/guns/common/constant/tips/SuccessTip.java
+++ b/guns-admin/src/main/java/com/stylefeng/guns/common/constant/tips/SuccessTip.java
-package com.stylefeng.guns.common.constant.tips;
+package com.stylefeng.guns.core.base.tips;
-import com.stylefeng.guns.core.base.tips.Tip;
 /**
 * 返回给前台的成功提示

--- a/guns-core/src/main/java/com/stylefeng/guns/core/constant/IsMenu.java
+++ b/guns-core/src/main/java/com/stylefeng/guns/core/constant/IsMenu.java
+package com.stylefeng.guns.core.constant;
+/**
+ * 是否是菜单的枚举
+ *
+ * @author fengshuonan
+ * @date 2017年6月1日22:50:11
+ */
+public enum IsMenu {
+    YES(1, "是"),
+    NO(0, "不是");//不是菜单的是按钮
+    int code;
+    String message;
+    IsMenu(int code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+    public int getCode() {
+        return code;
+    }
+    public void setCode(int code) {
+        this.code = code;
+    }
+    public String getMessage() {
+        return message;
+    }
+    public void setMessage(String message) {
+        this.message = message;
+    }
+    public static String valueOf(Integer status) {
+        if (status == null) {
+            return "";
+        } else {
+            for (IsMenu s : IsMenu.values()) {
+                if (s.getCode() == status) {
+                    return s.getMessage();
+                }
+            }
+            return "";
+        }
+    }
+}
--- a/guns-admin/src/main/java/com/stylefeng/guns/common/node/MenuNode.java
+++ b/guns-admin/src/main/java/com/stylefeng/guns/common/node/MenuNode.java
-package com.stylefeng.guns.common.node;
+package com.stylefeng.guns.core.node;
-import com.stylefeng.guns.common.constant.Const;
+import com.stylefeng.guns.core.constant.IsMenu;
-import com.stylefeng.guns.common.constant.state.IsMenu;
-import com.stylefeng.guns.config.properties.GunsProperties;
-import com.stylefeng.guns.core.util.SpringContextHolder;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -304,20 +301,6 @@ public class MenuNode implements Comparable {
            }
        }
-        //如果关闭了接口文档,则不显示接口文档菜单
-        GunsProperties gunsProperties = SpringContextHolder.getBean(GunsProperties.class);
-        if (!gunsProperties.getSwaggerOpen()) {
-            List<MenuNode> menuNodesCopy = new ArrayList<>();
-            for (MenuNode menuNode : menuNodes) {
-                if (Const.API_MENU_NAME.equals(menuNode.getName())) {
-                    continue;
-                } else {
-                    menuNodesCopy.add(menuNode);
-                }
-            }
-            menuNodes = menuNodesCopy;
-        }
        return menuNodes;
    }
 }
--- a/guns-admin/src/main/java/com/stylefeng/guns/common/node/ZTreeNode.java
+++ b/guns-admin/src/main/java/com/stylefeng/guns/common/node/ZTreeNode.java
-package com.stylefeng.guns.common.node;
+package com.stylefeng.guns.core.node;
 /**
 * 

--- a/guns-admin/src/main/java/com/stylefeng/guns/common/page/PageBT.java
+++ b/guns-admin/src/main/java/com/stylefeng/guns/common/page/PageBT.java
-package com.stylefeng.guns.common.page;
+package com.stylefeng.guns.core.page;
 /**
 * 分页参数类（for BootStrap Table）

--- a/guns-admin/src/main/java/com/stylefeng/guns/common/page/PageInfoBT.java
+++ b/guns-admin/src/main/java/com/stylefeng/guns/common/page/PageInfoBT.java
-package com.stylefeng.guns.common.page;
+package com.stylefeng.guns.core.page;
 import com.baomidou.mybatisplus.plugins.Page;