整理warpper和tip

guns-admin/src/main/java/com/stylefeng/guns/common/constant/tips/ErrorTip.java

 package com.stylefeng.guns.common.constant.tips;
 package com.stylefeng.guns.common.constant.tips;
 
 
 import com.stylefeng.guns.common.exception.BizExceptionEnum;
 import com.stylefeng.guns.common.exception.BizExceptionEnum;
+import com.stylefeng.guns.core.base.tips.Tip;
 
 
 /**
 /**
  * 返回给前台的错误提示
  * 返回给前台的错误提示

guns-admin/src/main/java/com/stylefeng/guns/common/constant/tips/SuccessTip.java

 package com.stylefeng.guns.common.constant.tips;
 package com.stylefeng.guns.common.constant.tips;
 
 
+import com.stylefeng.guns.core.base.tips.Tip;
+
 /**
 /**
  * 返回给前台的成功提示
  * 返回给前台的成功提示
  *
  *
  * @author fengshuonan
  * @author fengshuonan
  * @date 2016年11月12日 下午5:05:22
  * @date 2016年11月12日 下午5:05:22
  */
  */
-public class SuccessTip extends Tip{
+public class SuccessTip extends Tip {
 	
 	
 	public SuccessTip(){
 	public SuccessTip(){
 		super.code = 200;
 		super.code = 200;

guns-admin/src/main/java/com/stylefeng/guns/common/controller/BaseController.java

@@ -3,7 +3,7 @@ package com.stylefeng.guns.common.controller;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.stylefeng.guns.common.constant.tips.SuccessTip;
 import com.stylefeng.guns.common.constant.tips.SuccessTip;
 import com.stylefeng.guns.common.page.PageInfoBT;
 import com.stylefeng.guns.common.page.PageInfoBT;
-import com.stylefeng.guns.common.warpper.BaseControllerWarpper;
+import com.stylefeng.guns.core.base.warpper.BaseControllerWarpper;
 import com.stylefeng.guns.core.support.HttpKit;
 import com.stylefeng.guns.core.support.HttpKit;
 import com.stylefeng.guns.core.util.FileUtil;
 import com.stylefeng.guns.core.util.FileUtil;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpHeaders;

guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/MenuController.java

@@ -6,13 +6,13 @@ import com.stylefeng.guns.common.constant.Const;
 import com.stylefeng.guns.common.constant.Dict;
 import com.stylefeng.guns.common.constant.Dict;
 import com.stylefeng.guns.common.constant.factory.ConstantFactory;
 import com.stylefeng.guns.common.constant.factory.ConstantFactory;
 import com.stylefeng.guns.common.constant.state.MenuStatus;
 import com.stylefeng.guns.common.constant.state.MenuStatus;
-import com.stylefeng.guns.common.constant.tips.Tip;
 import com.stylefeng.guns.common.controller.BaseController;
 import com.stylefeng.guns.common.controller.BaseController;
 import com.stylefeng.guns.common.exception.BizExceptionEnum;
 import com.stylefeng.guns.common.exception.BizExceptionEnum;
 import com.stylefeng.guns.common.exception.BussinessException;
 import com.stylefeng.guns.common.exception.BussinessException;
 import com.stylefeng.guns.common.node.ZTreeNode;
 import com.stylefeng.guns.common.node.ZTreeNode;
 import com.stylefeng.guns.common.persistence.dao.MenuMapper;
 import com.stylefeng.guns.common.persistence.dao.MenuMapper;
 import com.stylefeng.guns.common.persistence.model.Menu;
 import com.stylefeng.guns.common.persistence.model.Menu;
+import com.stylefeng.guns.core.base.tips.Tip;
 import com.stylefeng.guns.core.log.LogObjectHolder;
 import com.stylefeng.guns.core.log.LogObjectHolder;
 import com.stylefeng.guns.core.support.BeanKit;
 import com.stylefeng.guns.core.support.BeanKit;
 import com.stylefeng.guns.core.util.ToolUtil;
 import com.stylefeng.guns.core.util.ToolUtil;

guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/RoleController.java

@@ -6,11 +6,15 @@ import com.stylefeng.guns.common.constant.Const;
 import com.stylefeng.guns.common.constant.Dict;
 import com.stylefeng.guns.common.constant.Dict;
 import com.stylefeng.guns.common.constant.cache.Cache;
 import com.stylefeng.guns.common.constant.cache.Cache;
 import com.stylefeng.guns.common.constant.factory.ConstantFactory;
 import com.stylefeng.guns.common.constant.factory.ConstantFactory;
-import com.stylefeng.guns.common.constant.tips.Tip;
 import com.stylefeng.guns.common.controller.BaseController;
 import com.stylefeng.guns.common.controller.BaseController;
 import com.stylefeng.guns.common.exception.BizExceptionEnum;
 import com.stylefeng.guns.common.exception.BizExceptionEnum;
 import com.stylefeng.guns.common.exception.BussinessException;
 import com.stylefeng.guns.common.exception.BussinessException;
 import com.stylefeng.guns.common.node.ZTreeNode;
 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.tips.Tip;
 import com.stylefeng.guns.core.cache.CacheKit;
 import com.stylefeng.guns.core.cache.CacheKit;
 import com.stylefeng.guns.core.log.LogObjectHolder;
 import com.stylefeng.guns.core.log.LogObjectHolder;
 import com.stylefeng.guns.core.util.Convert;
 import com.stylefeng.guns.core.util.Convert;
@@ -18,10 +22,6 @@ import com.stylefeng.guns.core.util.ToolUtil;
 import com.stylefeng.guns.modular.system.dao.RoleDao;
 import com.stylefeng.guns.modular.system.dao.RoleDao;
 import com.stylefeng.guns.modular.system.service.IRoleService;
 import com.stylefeng.guns.modular.system.service.IRoleService;
 import com.stylefeng.guns.modular.system.warpper.RoleWarpper;
 import com.stylefeng.guns.modular.system.warpper.RoleWarpper;
-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 org.springframework.stereotype.Controller;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.BindingResult;

guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/UserMgrController.java

@@ -6,13 +6,13 @@ import com.stylefeng.guns.common.constant.Const;
 import com.stylefeng.guns.common.constant.Dict;
 import com.stylefeng.guns.common.constant.Dict;
 import com.stylefeng.guns.common.constant.factory.ConstantFactory;
 import com.stylefeng.guns.common.constant.factory.ConstantFactory;
 import com.stylefeng.guns.common.constant.state.ManagerStatus;
 import com.stylefeng.guns.common.constant.state.ManagerStatus;
-import com.stylefeng.guns.common.constant.tips.Tip;
 import com.stylefeng.guns.common.controller.BaseController;
 import com.stylefeng.guns.common.controller.BaseController;
 import com.stylefeng.guns.common.exception.BizExceptionEnum;
 import com.stylefeng.guns.common.exception.BizExceptionEnum;
 import com.stylefeng.guns.common.exception.BussinessException;
 import com.stylefeng.guns.common.exception.BussinessException;
 import com.stylefeng.guns.common.persistence.dao.UserMapper;
 import com.stylefeng.guns.common.persistence.dao.UserMapper;
 import com.stylefeng.guns.common.persistence.model.User;
 import com.stylefeng.guns.common.persistence.model.User;
 import com.stylefeng.guns.config.properties.GunsProperties;
 import com.stylefeng.guns.config.properties.GunsProperties;
+import com.stylefeng.guns.core.base.tips.Tip;
 import com.stylefeng.guns.core.datascope.DataScope;
 import com.stylefeng.guns.core.datascope.DataScope;
 import com.stylefeng.guns.core.db.Db;
 import com.stylefeng.guns.core.db.Db;
 import com.stylefeng.guns.core.log.LogObjectHolder;
 import com.stylefeng.guns.core.log.LogObjectHolder;

guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/DeptWarpper.java

 package com.stylefeng.guns.modular.system.warpper;
 package com.stylefeng.guns.modular.system.warpper;
 
 
 import com.stylefeng.guns.common.constant.factory.ConstantFactory;
 import com.stylefeng.guns.common.constant.factory.ConstantFactory;
-import com.stylefeng.guns.common.warpper.BaseControllerWarpper;
+import com.stylefeng.guns.core.base.warpper.BaseControllerWarpper;
 import com.stylefeng.guns.core.util.ToolUtil;
 import com.stylefeng.guns.core.util.ToolUtil;
 
 
 import java.util.Map;
 import java.util.Map;

guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/DictWarpper.java

 package com.stylefeng.guns.modular.system.warpper;
 package com.stylefeng.guns.modular.system.warpper;
 
 
 import com.stylefeng.guns.common.constant.factory.ConstantFactory;
 import com.stylefeng.guns.common.constant.factory.ConstantFactory;
-import com.stylefeng.guns.common.warpper.BaseControllerWarpper;
-import com.stylefeng.guns.core.util.ToolUtil;
 import com.stylefeng.guns.common.persistence.model.Dict;
 import com.stylefeng.guns.common.persistence.model.Dict;
+import com.stylefeng.guns.core.base.warpper.BaseControllerWarpper;
+import com.stylefeng.guns.core.util.ToolUtil;
 
 
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;

guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/LogWarpper.java

 package com.stylefeng.guns.modular.system.warpper;
 package com.stylefeng.guns.modular.system.warpper;
 
 
 import com.stylefeng.guns.common.constant.factory.ConstantFactory;
 import com.stylefeng.guns.common.constant.factory.ConstantFactory;
-import com.stylefeng.guns.common.warpper.BaseControllerWarpper;
+import com.stylefeng.guns.core.base.warpper.BaseControllerWarpper;
 import com.stylefeng.guns.core.util.Contrast;
 import com.stylefeng.guns.core.util.Contrast;
 import com.stylefeng.guns.core.util.ToolUtil;
 import com.stylefeng.guns.core.util.ToolUtil;
 
 

guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/MenuWarpper.java

@@ -2,7 +2,7 @@ package com.stylefeng.guns.modular.system.warpper;
 
 
 import com.stylefeng.guns.common.constant.factory.ConstantFactory;
 import com.stylefeng.guns.common.constant.factory.ConstantFactory;
 import com.stylefeng.guns.common.constant.state.IsMenu;
 import com.stylefeng.guns.common.constant.state.IsMenu;
-import com.stylefeng.guns.common.warpper.BaseControllerWarpper;
+import com.stylefeng.guns.core.base.warpper.BaseControllerWarpper;
 
 
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;

guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/NoticeWrapper.java

 package com.stylefeng.guns.modular.system.warpper;
 package com.stylefeng.guns.modular.system.warpper;
 
 
 import com.stylefeng.guns.common.constant.factory.ConstantFactory;
 import com.stylefeng.guns.common.constant.factory.ConstantFactory;
-import com.stylefeng.guns.common.warpper.BaseControllerWarpper;
+import com.stylefeng.guns.core.base.warpper.BaseControllerWarpper;
 
 
 import java.util.Map;
 import java.util.Map;
 
 

guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/RoleWarpper.java

 package com.stylefeng.guns.modular.system.warpper;
 package com.stylefeng.guns.modular.system.warpper;
 
 
 import com.stylefeng.guns.common.constant.factory.ConstantFactory;
 import com.stylefeng.guns.common.constant.factory.ConstantFactory;
-import com.stylefeng.guns.common.warpper.BaseControllerWarpper;
+import com.stylefeng.guns.core.base.warpper.BaseControllerWarpper;
 
 
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;

guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/UserWarpper.java

 package com.stylefeng.guns.modular.system.warpper;
 package com.stylefeng.guns.modular.system.warpper;
 
 
 import com.stylefeng.guns.common.constant.factory.ConstantFactory;
 import com.stylefeng.guns.common.constant.factory.ConstantFactory;
-import com.stylefeng.guns.common.warpper.BaseControllerWarpper;
+import com.stylefeng.guns.core.base.warpper.BaseControllerWarpper;
 
 
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;

guns-admin/src/main/java/com/stylefeng/guns/common/constant/tips/Tip.java → guns-core/src/main/java/com/stylefeng/guns/core/base/tips/Tip.java

-package com.stylefeng.guns.common.constant.tips;
+package com.stylefeng.guns.core.base.tips;
 
 
 /**
 /**
  * 返回给前台的提示（最终转化为json形式）
  * 返回给前台的提示（最终转化为json形式）

guns-admin/src/main/java/com/stylefeng/guns/common/warpper/BaseControllerWarpper.java → guns-core/src/main/java/com/stylefeng/guns/core/base/warpper/BaseControllerWarpper.java

-package com.stylefeng.guns.common.warpper;
+package com.stylefeng.guns.core.base.warpper;
 
 
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;