升级kernel到2.2.4

guns-base-support/guns-sys/src/main/java/cn/stylefeng/guns/sys/core/auth/entrypoint/JwtAuthenticationEntryPoint.java

 package cn.stylefeng.guns.sys.core.auth.entrypoint;
 
 import cn.stylefeng.guns.base.auth.exception.enums.AuthExceptionEnum;
-import cn.stylefeng.roses.core.reqres.response.ErrorResponseData;
+import cn.stylefeng.roses.kernel.model.response.ErrorResponseData;
 import com.alibaba.fastjson.JSON;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.web.AuthenticationEntryPoint;

guns-base-support/guns-sys/src/main/java/cn/stylefeng/guns/sys/core/exception/aop/GlobalExceptionHandler.java

@@ -23,8 +23,8 @@ import cn.stylefeng.guns.sys.core.exception.InvalidKaptchaException;
 import cn.stylefeng.guns.sys.core.exception.enums.BizExceptionEnum;
 import cn.stylefeng.guns.sys.core.log.LogManager;
 import cn.stylefeng.guns.sys.core.log.factory.LogTaskFactory;
-import cn.stylefeng.roses.core.reqres.response.ErrorResponseData;
 import cn.stylefeng.roses.kernel.model.exception.ServiceException;
+import cn.stylefeng.roses.kernel.model.response.ErrorResponseData;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.core.annotation.Order;

guns-base-support/guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/consts/controller/SysConfigController.java

@@ -5,8 +5,8 @@ import cn.stylefeng.guns.sys.modular.consts.entity.SysConfig;
 import cn.stylefeng.guns.sys.modular.consts.model.params.SysConfigParam;
 import cn.stylefeng.guns.sys.modular.consts.service.SysConfigService;
 import cn.stylefeng.roses.core.base.controller.BaseController;
-import cn.stylefeng.roses.core.reqres.response.ResponseData;
 import cn.stylefeng.roses.core.util.ToolUtil;
+import cn.stylefeng.roses.kernel.model.response.ResponseData;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;

guns-base-support/guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/db/controller/DatabaseInfoController.java

@@ -7,8 +7,8 @@ import cn.stylefeng.guns.base.pojo.page.LayuiPageInfo;
 import cn.stylefeng.guns.sys.modular.db.model.params.DatabaseInfoParam;
 import cn.stylefeng.guns.sys.modular.db.service.DatabaseInfoService;
 import cn.stylefeng.roses.core.base.controller.BaseController;
-import cn.stylefeng.roses.core.reqres.response.ResponseData;
 import cn.stylefeng.roses.core.util.ToolUtil;
+import cn.stylefeng.roses.kernel.model.response.ResponseData;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;

guns-base-support/guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/gen/controller/GeneratorController.java

@@ -12,10 +12,10 @@ import cn.stylefeng.guns.generator.util.ConcatUtil;
 import cn.stylefeng.guns.generator.util.MapperConditionMapHolder;
 import cn.stylefeng.guns.sys.modular.db.mapper.DatabaseInfoMapper;
 import cn.stylefeng.guns.sys.modular.gen.service.TableService;
-import cn.stylefeng.roses.core.reqres.response.ResponseData;
-import cn.stylefeng.roses.core.reqres.response.SuccessResponseData;
 import cn.stylefeng.roses.core.util.HttpContext;
 import cn.stylefeng.roses.core.util.ToolUtil;
+import cn.stylefeng.roses.kernel.model.response.ResponseData;
+import cn.stylefeng.roses.kernel.model.response.SuccessResponseData;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import org.springframework.beans.factory.annotation.Autowired;

guns-base-support/guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/rest/controller/RestDeptController.java

@@ -27,8 +27,8 @@ import cn.stylefeng.guns.sys.modular.rest.service.RestDeptService;
 import cn.stylefeng.guns.sys.modular.system.model.DeptDto;
 import cn.stylefeng.guns.sys.modular.system.warpper.DeptWrapper;
 import cn.stylefeng.roses.core.base.controller.BaseController;
-import cn.stylefeng.roses.core.reqres.response.ResponseData;
-import cn.stylefeng.roses.core.reqres.response.SuccessResponseData;
+import cn.stylefeng.roses.kernel.model.response.ResponseData;
+import cn.stylefeng.roses.kernel.model.response.SuccessResponseData;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

guns-base-support/guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/rest/controller/RestDictController.java

@@ -7,8 +7,8 @@ import cn.stylefeng.guns.sys.modular.rest.service.RestDictService;
 import cn.stylefeng.guns.sys.modular.system.model.params.DictParam;
 import cn.stylefeng.guns.sys.modular.system.model.result.DictResult;
 import cn.stylefeng.roses.core.base.controller.BaseController;
-import cn.stylefeng.roses.core.reqres.response.ResponseData;
-import cn.stylefeng.roses.core.reqres.response.SuccessResponseData;
+import cn.stylefeng.roses.kernel.model.response.ResponseData;
+import cn.stylefeng.roses.kernel.model.response.SuccessResponseData;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;

guns-base-support/guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/rest/controller/RestDictTypeController.java

@@ -5,8 +5,8 @@ import cn.stylefeng.guns.sys.modular.rest.entity.RestDictType;
 import cn.stylefeng.guns.sys.modular.rest.service.RestDictTypeService;
 import cn.stylefeng.guns.sys.modular.system.model.params.DictTypeParam;
 import cn.stylefeng.roses.core.base.controller.BaseController;
-import cn.stylefeng.roses.core.reqres.response.ResponseData;
-import cn.stylefeng.roses.core.reqres.response.SuccessResponseData;
+import cn.stylefeng.roses.kernel.model.response.ResponseData;
+import cn.stylefeng.roses.kernel.model.response.SuccessResponseData;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;

guns-base-support/guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/rest/controller/RestIndexController.java

@@ -19,9 +19,9 @@ import cn.stylefeng.guns.base.auth.context.LoginContextHolder;
 import cn.stylefeng.guns.base.auth.model.LoginUser;
 import cn.stylefeng.guns.sys.modular.rest.service.RestUserService;
 import cn.stylefeng.roses.core.base.controller.BaseController;
-import cn.stylefeng.roses.core.reqres.response.ErrorResponseData;
-import cn.stylefeng.roses.core.reqres.response.ResponseData;
-import cn.stylefeng.roses.core.reqres.response.SuccessResponseData;
+import cn.stylefeng.roses.kernel.model.response.ErrorResponseData;
+import cn.stylefeng.roses.kernel.model.response.ResponseData;
+import cn.stylefeng.roses.kernel.model.response.SuccessResponseData;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;

guns-base-support/guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/rest/controller/RestLogController.java

@@ -25,7 +25,7 @@ import cn.stylefeng.guns.sys.modular.rest.model.LogQueryParam;
 import cn.stylefeng.guns.sys.modular.rest.service.RestOperationLogService;
 import cn.stylefeng.guns.sys.modular.system.warpper.LogWrapper;
 import cn.stylefeng.roses.core.base.controller.BaseController;
-import cn.stylefeng.roses.core.reqres.response.ResponseData;
+import cn.stylefeng.roses.kernel.model.response.ResponseData;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.toolkit.SqlRunner;
 import org.springframework.beans.factory.annotation.Autowired;

guns-base-support/guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/rest/controller/RestLoginController.java

@@ -17,10 +17,10 @@ package cn.stylefeng.guns.sys.modular.rest.controller;
 
 import cn.stylefeng.guns.base.auth.service.AuthService;
 import cn.stylefeng.roses.core.base.controller.BaseController;
-import cn.stylefeng.roses.core.reqres.response.ResponseData;
-import cn.stylefeng.roses.core.reqres.response.SuccessResponseData;
 import cn.stylefeng.roses.core.util.ToolUtil;
 import cn.stylefeng.roses.kernel.model.exception.RequestEmptyException;
+import cn.stylefeng.roses.kernel.model.response.ResponseData;
+import cn.stylefeng.roses.kernel.model.response.SuccessResponseData;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;

guns-base-support/guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/rest/controller/RestLoginLogController.java

@@ -22,7 +22,7 @@ import cn.stylefeng.guns.sys.modular.rest.model.LogQueryParam;
 import cn.stylefeng.guns.sys.modular.rest.service.RestLoginLogService;
 import cn.stylefeng.guns.sys.modular.system.warpper.LogWrapper;
 import cn.stylefeng.roses.core.base.controller.BaseController;
-import cn.stylefeng.roses.core.reqres.response.ResponseData;
+import cn.stylefeng.roses.kernel.model.response.ResponseData;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.toolkit.SqlRunner;
 import org.springframework.beans.factory.annotation.Autowired;

guns-base-support/guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/rest/controller/RestMenuController.java

@@ -34,9 +34,9 @@ import cn.stylefeng.guns.sys.modular.rest.service.RestUserService;
 import cn.stylefeng.guns.sys.modular.system.model.MenuDto;
 import cn.stylefeng.guns.sys.modular.system.warpper.MenuWrapper;
 import cn.stylefeng.roses.core.base.controller.BaseController;
-import cn.stylefeng.roses.core.reqres.response.ResponseData;
 import cn.stylefeng.roses.core.util.ToolUtil;
 import cn.stylefeng.roses.kernel.model.exception.ServiceException;
+import cn.stylefeng.roses.kernel.model.response.ResponseData;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

guns-base-support/guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/rest/controller/RestNoticeController.java

@@ -26,10 +26,10 @@ import cn.stylefeng.guns.sys.modular.rest.service.RestNoticeService;
 import cn.stylefeng.guns.sys.modular.system.entity.Notice;
 import cn.stylefeng.guns.sys.modular.system.warpper.NoticeWrapper;
 import cn.stylefeng.roses.core.base.controller.BaseController;
-import cn.stylefeng.roses.core.reqres.response.ResponseData;
-import cn.stylefeng.roses.core.reqres.response.SuccessResponseData;
 import cn.stylefeng.roses.core.util.ToolUtil;
 import cn.stylefeng.roses.kernel.model.exception.ServiceException;
+import cn.stylefeng.roses.kernel.model.response.ResponseData;
+import cn.stylefeng.roses.kernel.model.response.SuccessResponseData;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

guns-base-support/guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/rest/controller/RestPositionController.java

@@ -6,10 +6,10 @@ import cn.stylefeng.guns.sys.modular.rest.entity.RestPosition;
 import cn.stylefeng.guns.sys.modular.rest.service.RestPositionService;
 import cn.stylefeng.guns.sys.modular.system.model.params.PositionParam;
 import cn.stylefeng.roses.core.base.controller.BaseController;
-import cn.stylefeng.roses.core.reqres.response.ResponseData;
-import cn.stylefeng.roses.core.reqres.response.SuccessResponseData;
 import cn.stylefeng.roses.core.util.ToolUtil;
 import cn.stylefeng.roses.kernel.model.exception.RequestEmptyException;
+import cn.stylefeng.roses.kernel.model.response.ResponseData;
+import cn.stylefeng.roses.kernel.model.response.SuccessResponseData;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;

guns-base-support/guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/rest/controller/RestRoleController.java

@@ -32,9 +32,9 @@ import cn.stylefeng.guns.sys.modular.rest.service.RestUserService;
 import cn.stylefeng.guns.sys.modular.system.model.RoleDto;
 import cn.stylefeng.guns.sys.modular.system.warpper.RoleWrapper;
 import cn.stylefeng.roses.core.base.controller.BaseController;
-import cn.stylefeng.roses.core.reqres.response.ResponseData;
 import cn.stylefeng.roses.core.util.ToolUtil;
 import cn.stylefeng.roses.kernel.model.exception.ServiceException;
+import cn.stylefeng.roses.kernel.model.response.ResponseData;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

guns-base-support/guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/rest/controller/RestSystemController.java

@@ -23,12 +23,12 @@ import cn.stylefeng.guns.sys.core.constant.DefaultAvatar;
 import cn.stylefeng.guns.sys.modular.rest.service.RestFileInfoService;
 import cn.stylefeng.guns.sys.modular.rest.service.RestUserService;
 import cn.stylefeng.roses.core.base.controller.BaseController;
-import cn.stylefeng.roses.core.reqres.response.ResponseData;
-import cn.stylefeng.roses.core.reqres.response.SuccessResponseData;
 import cn.stylefeng.roses.core.util.ToolUtil;
 import cn.stylefeng.roses.kernel.model.exception.RequestEmptyException;
 import cn.stylefeng.roses.kernel.model.exception.ServiceException;
 import cn.stylefeng.roses.kernel.model.exception.enums.CoreExceptionEnum;
+import cn.stylefeng.roses.kernel.model.response.ResponseData;
+import cn.stylefeng.roses.kernel.model.response.SuccessResponseData;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

guns-base-support/guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/rest/controller/RestUserMgrController.java

@@ -31,11 +31,11 @@ import cn.stylefeng.guns.sys.modular.system.model.UserDto;
 import cn.stylefeng.guns.sys.modular.system.warpper.UserWrapper;
 import cn.stylefeng.roses.core.base.controller.BaseController;
 import cn.stylefeng.roses.core.datascope.DataScope;
-import cn.stylefeng.roses.core.reqres.response.ResponseData;
-import cn.stylefeng.roses.core.reqres.response.SuccessResponseData;
 import cn.stylefeng.roses.core.util.ToolUtil;
 import cn.stylefeng.roses.kernel.model.exception.RequestEmptyException;
 import cn.stylefeng.roses.kernel.model.exception.ServiceException;
+import cn.stylefeng.roses.kernel.model.response.ResponseData;
+import cn.stylefeng.roses.kernel.model.response.SuccessResponseData;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

guns-base-support/guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/system/controller/DeptController.java

@@ -32,10 +32,10 @@ import cn.stylefeng.guns.sys.modular.system.service.DeptService;
 import cn.stylefeng.guns.sys.modular.system.warpper.DeptTreeWrapper;
 import cn.stylefeng.guns.sys.modular.system.warpper.DeptWrapper;
 import cn.stylefeng.roses.core.base.controller.BaseController;
-import cn.stylefeng.roses.core.reqres.response.ResponseData;
 import cn.stylefeng.roses.core.treebuild.DefaultTreeBuildFactory;
 import cn.stylefeng.roses.core.util.ToolUtil;
 import cn.stylefeng.roses.kernel.model.exception.RequestEmptyException;
+import cn.stylefeng.roses.kernel.model.response.ResponseData;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;

guns-base-support/guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/system/controller/DictController.java

@@ -9,9 +9,9 @@ import cn.stylefeng.guns.sys.modular.system.model.result.DictResult;
 import cn.stylefeng.guns.sys.modular.system.service.DictService;
 import cn.stylefeng.guns.sys.modular.system.service.DictTypeService;
 import cn.stylefeng.roses.core.base.controller.BaseController;
-import cn.stylefeng.roses.core.reqres.response.ResponseData;
-import cn.stylefeng.roses.core.reqres.response.SuccessResponseData;
 import cn.stylefeng.roses.kernel.model.exception.RequestEmptyException;
+import cn.stylefeng.roses.kernel.model.response.ResponseData;
+import cn.stylefeng.roses.kernel.model.response.SuccessResponseData;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;

guns-base-support/guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/system/controller/DictTypeController.java

@@ -5,8 +5,8 @@ import cn.stylefeng.guns.sys.modular.system.entity.DictType;
 import cn.stylefeng.guns.sys.modular.system.model.params.DictTypeParam;
 import cn.stylefeng.guns.sys.modular.system.service.DictTypeService;
 import cn.stylefeng.roses.core.base.controller.BaseController;
-import cn.stylefeng.roses.core.reqres.response.ResponseData;
-import cn.stylefeng.roses.core.reqres.response.SuccessResponseData;
+import cn.stylefeng.roses.kernel.model.response.ResponseData;
+import cn.stylefeng.roses.kernel.model.response.SuccessResponseData;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;

guns-base-support/guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/system/controller/LoginController.java

@@ -22,10 +22,10 @@ import cn.stylefeng.guns.sys.core.auth.cache.SessionManager;
 import cn.stylefeng.guns.sys.core.exception.InvalidKaptchaException;
 import cn.stylefeng.guns.sys.modular.system.service.UserService;
 import cn.stylefeng.roses.core.base.controller.BaseController;
-import cn.stylefeng.roses.core.reqres.response.ResponseData;
-import cn.stylefeng.roses.core.reqres.response.SuccessResponseData;
 import cn.stylefeng.roses.core.util.ToolUtil;
 import cn.stylefeng.roses.kernel.model.exception.RequestEmptyException;
+import cn.stylefeng.roses.kernel.model.response.ResponseData;
+import cn.stylefeng.roses.kernel.model.response.SuccessResponseData;
 import com.google.code.kaptcha.Constants;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;

guns-base-support/guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/system/controller/MenuController.java

@@ -33,9 +33,9 @@ import cn.stylefeng.guns.sys.modular.system.service.MenuService;
 import cn.stylefeng.guns.sys.modular.system.service.UserService;
 import cn.stylefeng.guns.sys.modular.system.warpper.MenuWrapper;
 import cn.stylefeng.roses.core.base.controller.BaseController;
-import cn.stylefeng.roses.core.reqres.response.ResponseData;
 import cn.stylefeng.roses.core.util.ToolUtil;
 import cn.stylefeng.roses.kernel.model.exception.ServiceException;
+import cn.stylefeng.roses.kernel.model.response.ResponseData;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;

guns-base-support/guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/system/controller/NoticeController.java

@@ -28,9 +28,9 @@ import cn.stylefeng.guns.sys.modular.system.entity.Notice;
 import cn.stylefeng.guns.sys.modular.system.service.NoticeService;
 import cn.stylefeng.guns.sys.modular.system.warpper.NoticeWrapper;
 import cn.stylefeng.roses.core.base.controller.BaseController;
-import cn.stylefeng.roses.core.reqres.response.ResponseData;
 import cn.stylefeng.roses.core.util.ToolUtil;
 import cn.stylefeng.roses.kernel.model.exception.ServiceException;
+import cn.stylefeng.roses.kernel.model.response.ResponseData;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;

guns-base-support/guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/system/controller/PositionController.java

@@ -7,10 +7,10 @@ import cn.stylefeng.guns.sys.modular.system.model.params.PositionParam;
 import cn.stylefeng.guns.sys.modular.system.service.PositionService;
 import cn.stylefeng.guns.sys.modular.system.service.UserPosService;
 import cn.stylefeng.roses.core.base.controller.BaseController;
-import cn.stylefeng.roses.core.reqres.response.ResponseData;
-import cn.stylefeng.roses.core.reqres.response.SuccessResponseData;
 import cn.stylefeng.roses.core.util.ToolUtil;
 import cn.stylefeng.roses.kernel.model.exception.RequestEmptyException;
+import cn.stylefeng.roses.kernel.model.response.ResponseData;
+import cn.stylefeng.roses.kernel.model.response.SuccessResponseData;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;

guns-base-support/guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/system/controller/RoleController.java

@@ -34,9 +34,9 @@ import cn.stylefeng.guns.sys.modular.system.service.RoleService;
 import cn.stylefeng.guns.sys.modular.system.service.UserService;
 import cn.stylefeng.guns.sys.modular.system.warpper.RoleWrapper;
 import cn.stylefeng.roses.core.base.controller.BaseController;
-import cn.stylefeng.roses.core.reqres.response.ResponseData;
 import cn.stylefeng.roses.core.util.ToolUtil;
 import cn.stylefeng.roses.kernel.model.exception.ServiceException;
+import cn.stylefeng.roses.kernel.model.response.ResponseData;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.beans.factory.annotation.Autowired;

guns-base-support/guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/system/controller/SystemController.java

@@ -29,12 +29,12 @@ import cn.stylefeng.guns.sys.modular.system.service.FileInfoService;
 import cn.stylefeng.guns.sys.modular.system.service.NoticeService;
 import cn.stylefeng.guns.sys.modular.system.service.UserService;
 import cn.stylefeng.roses.core.base.controller.BaseController;
-import cn.stylefeng.roses.core.reqres.response.ResponseData;
-import cn.stylefeng.roses.core.reqres.response.SuccessResponseData;
 import cn.stylefeng.roses.core.util.ToolUtil;
 import cn.stylefeng.roses.kernel.model.exception.RequestEmptyException;
 import cn.stylefeng.roses.kernel.model.exception.ServiceException;
 import cn.stylefeng.roses.kernel.model.exception.enums.CoreExceptionEnum;
+import cn.stylefeng.roses.kernel.model.response.ResponseData;
+import cn.stylefeng.roses.kernel.model.response.SuccessResponseData;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;

guns-base-support/guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/system/controller/UserMgrController.java

@@ -33,11 +33,11 @@ import cn.stylefeng.guns.sys.modular.system.service.UserService;
 import cn.stylefeng.guns.sys.modular.system.warpper.UserWrapper;
 import cn.stylefeng.roses.core.base.controller.BaseController;
 import cn.stylefeng.roses.core.datascope.DataScope;
-import cn.stylefeng.roses.core.reqres.response.ResponseData;
-import cn.stylefeng.roses.core.reqres.response.SuccessResponseData;
 import cn.stylefeng.roses.core.util.ToolUtil;
 import cn.stylefeng.roses.kernel.model.exception.RequestEmptyException;
 import cn.stylefeng.roses.kernel.model.exception.ServiceException;
+import cn.stylefeng.roses.kernel.model.response.ResponseData;
+import cn.stylefeng.roses.kernel.model.response.SuccessResponseData;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.beans.factory.annotation.Autowired;

guns-base-support/guns-vip-gen/src/main/resources/gunsTemplates/controller.java.btl

@@ -5,7 +5,7 @@ import ${package.Entity}.${entity};
 import ${package.EntitySpecParams}.${entity}Param;
 import ${package.Service}.${table.serviceName};
 import cn.stylefeng.roses.core.base.controller.BaseController;
-import cn.stylefeng.roses.core.reqres.response.ResponseData;
+import cn.stylefeng.roses.kernel.model.response.ResponseData;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;

guns-vip-main/src/main/java/cn/stylefeng/guns/GunsApplication.java

@@ -16,7 +16,6 @@
 package cn.stylefeng.guns;
 
 import cn.stylefeng.roses.core.config.MybatisDataSourceAutoConfiguration;
-import cn.stylefeng.roses.core.config.WebAutoConfiguration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.SpringApplication;
@@ -28,7 +27,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
  * @author stylefeng
  * @Date 2017/5/21 12:06
  */
-@SpringBootApplication(exclude = {WebAutoConfiguration.class, MybatisDataSourceAutoConfiguration.class})
+@SpringBootApplication(exclude = {MybatisDataSourceAutoConfiguration.class})
 public class GunsApplication {
 
     private final static Logger logger = LoggerFactory.getLogger(GunsApplication.class);

guns-vip-main/src/main/java/cn/stylefeng/guns/modular/demos/controller/ExcelController.java

@@ -12,8 +12,8 @@ import cn.stylefeng.guns.base.pojo.page.LayuiPageInfo;
 import cn.stylefeng.guns.modular.demos.entity.ExcelItem;
 import cn.stylefeng.guns.sys.core.exception.enums.BizExceptionEnum;
 import cn.stylefeng.guns.sys.modular.system.service.UserService;
-import cn.stylefeng.roses.core.reqres.response.ResponseData;
 import cn.stylefeng.roses.kernel.model.exception.ServiceException;
+import cn.stylefeng.roses.kernel.model.response.ResponseData;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;

guns-vip-main/src/main/java/cn/stylefeng/guns/modular/demos/controller/TestMultiTranController.java

@@ -17,7 +17,7 @@ package cn.stylefeng.guns.modular.demos.controller;
 
 import cn.stylefeng.guns.modular.demos.service.TranTestService;
 import cn.stylefeng.roses.core.base.controller.BaseController;
-import cn.stylefeng.roses.core.reqres.response.SuccessResponseData;
+import cn.stylefeng.roses.kernel.model.response.SuccessResponseData;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

guns-vip-main/src/main/java/cn/stylefeng/guns/modular/demos/controller/TestSingleTranController.java

@@ -17,7 +17,7 @@ package cn.stylefeng.guns.modular.demos.controller;
 
 import cn.stylefeng.guns.modular.demos.service.TranTestService;
 import cn.stylefeng.roses.core.base.controller.BaseController;
-import cn.stylefeng.roses.core.reqres.response.SuccessResponseData;
+import cn.stylefeng.roses.kernel.model.response.SuccessResponseData;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

guns-vip-main/src/main/java/cn/stylefeng/guns/modular/form/controller/EgFormController.java

@@ -5,7 +5,7 @@ import cn.stylefeng.guns.base.pojo.page.LayuiPageInfo;
 import cn.stylefeng.guns.modular.form.entity.EgForm;
 import cn.stylefeng.guns.modular.form.model.EgFormParam;
 import cn.stylefeng.roses.core.base.controller.BaseController;
-import cn.stylefeng.roses.core.reqres.response.ResponseData;
+import cn.stylefeng.roses.kernel.model.response.ResponseData;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;

pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.1.1.RELEASE</version>
+        <version>2.1.6.RELEASE</version>
     </parent>
 
     <groupId>cn.stylefeng</groupId>
@@ -48,7 +48,7 @@
             <dependency>
                 <groupId>cn.stylefeng.roses</groupId>
                 <artifactId>kernel-core</artifactId>
-                <version>1.2.8</version>
+                <version>2.2.4</version>
             </dependency>
 
             <!--数据库驱动,可根据自己需要自行删减-->