更新控制器包结构

src/main/java/cn/stylefeng/guns/core/error/CustomErrorAttributes.java

@@ -5,7 +5,7 @@ import cn.hutool.http.HttpStatus;
 import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException;
 import cn.stylefeng.roses.kernel.rule.exception.enums.defaults.DefaultBusinessExceptionEnum;
 import cn.stylefeng.roses.kernel.rule.pojo.response.ErrorResponseData;
-import cn.stylefeng.roses.kernel.validator.exception.enums.ValidatorExceptionEnum;
+import cn.stylefeng.roses.kernel.validator.api.exception.enums.ValidatorExceptionEnum;
 import org.springframework.boot.web.error.ErrorAttributeOptions;
 import org.springframework.boot.web.servlet.error.DefaultErrorAttributes;
 import org.springframework.web.context.request.WebRequest;
@@ -43,4 +43,4 @@ public class CustomErrorAttributes extends DefaultErrorAttributes {
         return BeanUtil.beanToMap(new ErrorResponseData(DefaultBusinessExceptionEnum.SYSTEM_RUNTIME_ERROR.getErrorCode(), DefaultBusinessExceptionEnum.SYSTEM_RUNTIME_ERROR.getUserTip()));
     }
 
-}
+}

src/main/java/cn/stylefeng/guns/core/error/GlobalExceptionHandler.java

@@ -12,8 +12,8 @@ import cn.stylefeng.roses.kernel.rule.pojo.response.ErrorResponseData;
 import cn.stylefeng.roses.kernel.rule.util.ExceptionUtil;
 import cn.stylefeng.roses.kernel.rule.util.HttpServletUtil;
 import cn.stylefeng.roses.kernel.rule.util.ResponseRenderUtil;
-import cn.stylefeng.roses.kernel.validator.exception.ParamValidateException;
-import cn.stylefeng.roses.kernel.validator.exception.enums.ValidatorExceptionEnum;
+import cn.stylefeng.roses.kernel.validator.api.exception.ParamValidateException;
+import cn.stylefeng.roses.kernel.validator.api.exception.enums.ValidatorExceptionEnum;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.converter.HttpMessageNotReadableException;

src/main/java/cn/stylefeng/guns/core/security/AuthJwtTokenSecurityInterceptor.java

@@ -5,7 +5,7 @@ import cn.stylefeng.guns.core.security.base.BaseSecurityInterceptor;
 import cn.stylefeng.roses.kernel.auth.api.AuthServiceApi;
 import cn.stylefeng.roses.kernel.auth.api.exception.AuthException;
 import cn.stylefeng.roses.kernel.auth.api.exception.enums.AuthExceptionEnum;
-import cn.stylefeng.roses.kernel.resource.api.pojo.resource.ResourceDefinition;
+import cn.stylefeng.roses.kernel.scanner.api.pojo.resource.ResourceDefinition;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 

src/main/java/cn/stylefeng/guns/core/security/PermissionSecurityInterceptor.java

@@ -5,7 +5,7 @@ import cn.stylefeng.guns.core.security.base.BaseSecurityInterceptor;
 import cn.stylefeng.roses.kernel.auth.api.PermissionServiceApi;
 import cn.stylefeng.roses.kernel.auth.api.exception.AuthException;
 import cn.stylefeng.roses.kernel.auth.api.exception.enums.AuthExceptionEnum;
-import cn.stylefeng.roses.kernel.resource.api.pojo.resource.ResourceDefinition;
+import cn.stylefeng.roses.kernel.scanner.api.pojo.resource.ResourceDefinition;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 

src/main/java/cn/stylefeng/guns/core/security/base/BaseSecurityInterceptor.java

@@ -7,9 +7,9 @@ import cn.stylefeng.roses.kernel.auth.api.context.LoginContext;
 import cn.stylefeng.roses.kernel.auth.api.exception.AuthException;
 import cn.stylefeng.roses.kernel.auth.api.exception.enums.AuthExceptionEnum;
 import cn.stylefeng.roses.kernel.auth.api.expander.AuthConfigExpander;
-import cn.stylefeng.roses.kernel.resource.api.pojo.resource.ResourceDefinition;
-import cn.stylefeng.roses.kernel.resource.api.pojo.resource.ResourceUrlParam;
 import cn.stylefeng.roses.kernel.rule.util.AntPathMatcherUtil;
+import cn.stylefeng.roses.kernel.scanner.api.pojo.resource.ResourceDefinition;
+import cn.stylefeng.roses.kernel.scanner.api.pojo.resource.ResourceUrlParam;
 import cn.stylefeng.roses.kernel.system.api.ResourceServiceApi;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.servlet.HandlerInterceptor;

src/main/java/cn/stylefeng/guns/modular/business/controller/DemoController.java

@@ -1,10 +1,10 @@
 package cn.stylefeng.guns.modular.business.controller;
 
 import cn.stylefeng.guns.modular.business.service.DemoService;
-import cn.stylefeng.roses.kernel.resource.api.annotation.ApiResource;
-import cn.stylefeng.roses.kernel.resource.api.annotation.GetResource;
 import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData;
 import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData;
+import cn.stylefeng.roses.kernel.scanner.api.annotation.ApiResource;
+import cn.stylefeng.roses.kernel.scanner.api.annotation.GetResource;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;

src/main/java/cn/stylefeng/guns/modular/system/api/ApiViewController.java

@@ -1,7 +1,7 @@
 package cn.stylefeng.guns.modular.system.api;
 
-import cn.stylefeng.roses.kernel.resource.api.annotation.ApiResource;
-import cn.stylefeng.roses.kernel.resource.api.annotation.GetResource;
+import cn.stylefeng.roses.kernel.scanner.api.annotation.ApiResource;
+import cn.stylefeng.roses.kernel.scanner.api.annotation.GetResource;
 import org.springframework.stereotype.Controller;
 
 /**

src/main/java/cn/stylefeng/guns/modular/system/app/AppViewController.java

@@ -1,7 +1,7 @@
 package cn.stylefeng.guns.modular.system.app;
 
-import cn.stylefeng.roses.kernel.resource.api.annotation.ApiResource;
-import cn.stylefeng.roses.kernel.resource.api.annotation.GetResource;
+import cn.stylefeng.roses.kernel.scanner.api.annotation.ApiResource;
+import cn.stylefeng.roses.kernel.scanner.api.annotation.GetResource;
 import org.springframework.stereotype.Controller;
 
 /**

src/main/java/cn/stylefeng/guns/modular/system/common/CommonViewController.java

@@ -1,10 +1,10 @@
 package cn.stylefeng.guns.modular.system.common;
 
 import cn.stylefeng.guns.modular.system.common.pojo.CommonTreeRequest;
-import cn.stylefeng.roses.kernel.resource.api.annotation.ApiResource;
-import cn.stylefeng.roses.kernel.resource.api.annotation.GetResource;
 import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException;
 import cn.stylefeng.roses.kernel.rule.exception.enums.defaults.DefaultBusinessExceptionEnum;
+import cn.stylefeng.roses.kernel.scanner.api.annotation.ApiResource;
+import cn.stylefeng.roses.kernel.scanner.api.annotation.GetResource;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;

src/main/java/cn/stylefeng/guns/modular/system/config/ConfigViewController.java

@@ -1,7 +1,7 @@
 package cn.stylefeng.guns.modular.system.config;
 
-import cn.stylefeng.roses.kernel.resource.api.annotation.ApiResource;
-import cn.stylefeng.roses.kernel.resource.api.annotation.GetResource;
+import cn.stylefeng.roses.kernel.scanner.api.annotation.ApiResource;
+import cn.stylefeng.roses.kernel.scanner.api.annotation.GetResource;
 import org.springframework.stereotype.Controller;
 
 /**

src/main/java/cn/stylefeng/guns/modular/system/dashboard/DashboardViewController.java

@@ -1,7 +1,7 @@
 package cn.stylefeng.guns.modular.system.dashboard;
 
-import cn.stylefeng.roses.kernel.resource.api.annotation.ApiResource;
-import cn.stylefeng.roses.kernel.resource.api.annotation.GetResource;
+import cn.stylefeng.roses.kernel.scanner.api.annotation.ApiResource;
+import cn.stylefeng.roses.kernel.scanner.api.annotation.GetResource;
 import org.springframework.stereotype.Controller;
 
 /**

src/main/java/cn/stylefeng/guns/modular/system/datasource/DataSourceViewController.java

@@ -1,7 +1,7 @@
 package cn.stylefeng.guns.modular.system.datasource;
 
-import cn.stylefeng.roses.kernel.resource.api.annotation.ApiResource;
-import cn.stylefeng.roses.kernel.resource.api.annotation.GetResource;
+import cn.stylefeng.roses.kernel.scanner.api.annotation.ApiResource;
+import cn.stylefeng.roses.kernel.scanner.api.annotation.GetResource;
 import org.springframework.stereotype.Controller;
 
 /**

src/main/java/cn/stylefeng/guns/modular/system/datasource/test/TestMultiTranController.java

@@ -1,9 +1,9 @@
 package cn.stylefeng.guns.modular.system.datasource.test;
 
 import cn.stylefeng.guns.modular.system.datasource.test.service.TranTestService;
-import cn.stylefeng.roses.kernel.resource.api.annotation.ApiResource;
-import cn.stylefeng.roses.kernel.resource.api.annotation.GetResource;
 import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData;
+import cn.stylefeng.roses.kernel.scanner.api.annotation.ApiResource;
+import cn.stylefeng.roses.kernel.scanner.api.annotation.GetResource;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;

src/main/java/cn/stylefeng/guns/modular/system/datasource/test/TestSingleTranController.java

@@ -1,9 +1,9 @@
 package cn.stylefeng.guns.modular.system.datasource.test;
 
 import cn.stylefeng.guns.modular.system.datasource.test.service.TranTestService;
-import cn.stylefeng.roses.kernel.resource.api.annotation.ApiResource;
-import cn.stylefeng.roses.kernel.resource.api.annotation.GetResource;
 import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData;
+import cn.stylefeng.roses.kernel.scanner.api.annotation.ApiResource;
+import cn.stylefeng.roses.kernel.scanner.api.annotation.GetResource;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;

src/main/java/cn/stylefeng/guns/modular/system/dict/DictTypeViewController.java

@@ -1,8 +1,7 @@
 package cn.stylefeng.guns.modular.system.dict;
 
-
-import cn.stylefeng.roses.kernel.resource.api.annotation.ApiResource;
-import cn.stylefeng.roses.kernel.resource.api.annotation.GetResource;
+import cn.stylefeng.roses.kernel.scanner.api.annotation.ApiResource;
+import cn.stylefeng.roses.kernel.scanner.api.annotation.GetResource;
 import org.springframework.stereotype.Controller;
 
 /**

src/main/java/cn/stylefeng/guns/modular/system/dict/DictViewController.java

@@ -1,7 +1,7 @@
 package cn.stylefeng.guns.modular.system.dict;
 
-import cn.stylefeng.roses.kernel.resource.api.annotation.ApiResource;
-import cn.stylefeng.roses.kernel.resource.api.annotation.GetResource;
+import cn.stylefeng.roses.kernel.scanner.api.annotation.ApiResource;
+import cn.stylefeng.roses.kernel.scanner.api.annotation.GetResource;
 import org.springframework.stereotype.Controller;
 
 /**

src/main/java/cn/stylefeng/guns/modular/system/error/ErrorViewController.java

@@ -1,7 +1,7 @@
 package cn.stylefeng.guns.modular.system.error;
 
-import cn.stylefeng.roses.kernel.resource.api.annotation.ApiResource;
-import cn.stylefeng.roses.kernel.resource.api.annotation.GetResource;
+import cn.stylefeng.roses.kernel.scanner.api.annotation.ApiResource;
+import cn.stylefeng.roses.kernel.scanner.api.annotation.GetResource;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 

src/main/java/cn/stylefeng/guns/modular/system/file/FileViewController.java

@@ -1,7 +1,7 @@
 package cn.stylefeng.guns.modular.system.file;
 
-import cn.stylefeng.roses.kernel.resource.api.annotation.ApiResource;
-import cn.stylefeng.roses.kernel.resource.api.annotation.GetResource;
+import cn.stylefeng.roses.kernel.scanner.api.annotation.ApiResource;
+import cn.stylefeng.roses.kernel.scanner.api.annotation.GetResource;
 import org.springframework.stereotype.Controller;
 
 /**

src/main/java/cn/stylefeng/guns/modular/system/i18n/TranslationViewController.java

@@ -1,7 +1,7 @@
 package cn.stylefeng.guns.modular.system.i18n;
 
-import cn.stylefeng.roses.kernel.resource.api.annotation.ApiResource;
-import cn.stylefeng.roses.kernel.resource.api.annotation.GetResource;
+import cn.stylefeng.roses.kernel.scanner.api.annotation.ApiResource;
+import cn.stylefeng.roses.kernel.scanner.api.annotation.GetResource;
 import org.springframework.stereotype.Controller;
 
 /**

src/main/java/cn/stylefeng/guns/modular/system/index/controller/IndexViewController.java

@@ -2,8 +2,8 @@ package cn.stylefeng.guns.modular.system.index.controller;
 
 import cn.stylefeng.guns.modular.system.index.service.IndexService;
 import cn.stylefeng.roses.kernel.auth.api.context.LoginContext;
-import cn.stylefeng.roses.kernel.resource.api.annotation.ApiResource;
-import cn.stylefeng.roses.kernel.resource.api.annotation.GetResource;
+import cn.stylefeng.roses.kernel.scanner.api.annotation.ApiResource;
+import cn.stylefeng.roses.kernel.scanner.api.annotation.GetResource;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 

src/main/java/cn/stylefeng/guns/modular/system/log/LogViewController.java

@@ -1,7 +1,7 @@
 package cn.stylefeng.guns.modular.system.log;
 
-import cn.stylefeng.roses.kernel.resource.api.annotation.ApiResource;
-import cn.stylefeng.roses.kernel.resource.api.annotation.GetResource;
+import cn.stylefeng.roses.kernel.scanner.api.annotation.ApiResource;
+import cn.stylefeng.roses.kernel.scanner.api.annotation.GetResource;
 import org.springframework.stereotype.Controller;
 
 /**

src/main/java/cn/stylefeng/guns/modular/system/log/LoginLogViewController.java

@@ -1,7 +1,7 @@
 package cn.stylefeng.guns.modular.system.log;
 
-import cn.stylefeng.roses.kernel.resource.api.annotation.ApiResource;
-import cn.stylefeng.roses.kernel.resource.api.annotation.GetResource;
+import cn.stylefeng.roses.kernel.scanner.api.annotation.ApiResource;
+import cn.stylefeng.roses.kernel.scanner.api.annotation.GetResource;
 import org.springframework.stereotype.Controller;
 
 /**

src/main/java/cn/stylefeng/guns/modular/system/login/LoginViewController.java

@@ -4,11 +4,11 @@ import cn.stylefeng.roses.kernel.auth.api.AuthServiceApi;
 import cn.stylefeng.roses.kernel.auth.api.context.LoginContext;
 import cn.stylefeng.roses.kernel.auth.api.pojo.auth.LoginRequest;
 import cn.stylefeng.roses.kernel.auth.api.pojo.auth.LoginResponse;
-import cn.stylefeng.roses.kernel.resource.api.annotation.ApiResource;
-import cn.stylefeng.roses.kernel.resource.api.annotation.GetResource;
-import cn.stylefeng.roses.kernel.resource.api.annotation.PostResource;
 import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData;
 import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData;
+import cn.stylefeng.roses.kernel.scanner.api.annotation.ApiResource;
+import cn.stylefeng.roses.kernel.scanner.api.annotation.GetResource;
+import cn.stylefeng.roses.kernel.scanner.api.annotation.PostResource;
 import org.springframework.stereotype.Controller;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestBody;

src/main/java/cn/stylefeng/guns/modular/system/menu/MenuButtonViewController.java

@@ -1,7 +1,7 @@
 package cn.stylefeng.guns.modular.system.menu;
 
-import cn.stylefeng.roses.kernel.resource.api.annotation.ApiResource;
-import cn.stylefeng.roses.kernel.resource.api.annotation.GetResource;
+import cn.stylefeng.roses.kernel.scanner.api.annotation.ApiResource;
+import cn.stylefeng.roses.kernel.scanner.api.annotation.GetResource;
 import org.springframework.stereotype.Controller;
 
 /**

src/main/java/cn/stylefeng/guns/modular/system/menu/MenuViewController.java

@@ -1,7 +1,7 @@
 package cn.stylefeng.guns.modular.system.menu;
 
-import cn.stylefeng.roses.kernel.resource.api.annotation.ApiResource;
-import cn.stylefeng.roses.kernel.resource.api.annotation.GetResource;
+import cn.stylefeng.roses.kernel.scanner.api.annotation.ApiResource;
+import cn.stylefeng.roses.kernel.scanner.api.annotation.GetResource;
 import org.springframework.stereotype.Controller;
 
 /**

src/main/java/cn/stylefeng/guns/modular/system/message/MessageViewController.java

@@ -4,8 +4,8 @@ import cn.stylefeng.roses.kernel.message.api.MessageApi;
 import cn.stylefeng.roses.kernel.message.api.enums.MessageReadFlagEnum;
 import cn.stylefeng.roses.kernel.message.api.pojo.request.MessageRequest;
 import cn.stylefeng.roses.kernel.message.api.pojo.response.MessageResponse;
-import cn.stylefeng.roses.kernel.resource.api.annotation.ApiResource;
-import cn.stylefeng.roses.kernel.resource.api.annotation.GetResource;
+import cn.stylefeng.roses.kernel.scanner.api.annotation.ApiResource;
+import cn.stylefeng.roses.kernel.scanner.api.annotation.GetResource;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 

src/main/java/cn/stylefeng/guns/modular/system/monitor/MonitorController.java

@@ -1,8 +1,8 @@
 package cn.stylefeng.guns.modular.system.monitor;
 
 import cn.stylefeng.roses.kernel.monitor.system.holder.SystemHardwareInfoHolder;
-import cn.stylefeng.roses.kernel.resource.api.annotation.ApiResource;
-import cn.stylefeng.roses.kernel.resource.api.annotation.GetResource;
+import cn.stylefeng.roses.kernel.scanner.api.annotation.ApiResource;
+import cn.stylefeng.roses.kernel.scanner.api.annotation.GetResource;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 

src/main/java/cn/stylefeng/guns/modular/system/notice/NoticeViewController.java

@@ -1,7 +1,7 @@
 package cn.stylefeng.guns.modular.system.notice;
 
-import cn.stylefeng.roses.kernel.resource.api.annotation.ApiResource;
-import cn.stylefeng.roses.kernel.resource.api.annotation.GetResource;
+import cn.stylefeng.roses.kernel.scanner.api.annotation.ApiResource;
+import cn.stylefeng.roses.kernel.scanner.api.annotation.GetResource;
 import org.springframework.stereotype.Controller;
 
 /**

src/main/java/cn/stylefeng/guns/modular/system/online/OnlineUserViewController.java

@@ -1,7 +1,7 @@
 package cn.stylefeng.guns.modular.system.online;
 
-import cn.stylefeng.roses.kernel.resource.api.annotation.ApiResource;
-import cn.stylefeng.roses.kernel.resource.api.annotation.GetResource;
+import cn.stylefeng.roses.kernel.scanner.api.annotation.ApiResource;
+import cn.stylefeng.roses.kernel.scanner.api.annotation.GetResource;
 import org.springframework.stereotype.Controller;
 
 /**

src/main/java/cn/stylefeng/guns/modular/system/organization/OrganizationViewController.java

@@ -1,7 +1,7 @@
 package cn.stylefeng.guns.modular.system.organization;
 
-import cn.stylefeng.roses.kernel.resource.api.annotation.ApiResource;
-import cn.stylefeng.roses.kernel.resource.api.annotation.GetResource;
+import cn.stylefeng.roses.kernel.scanner.api.annotation.ApiResource;
+import cn.stylefeng.roses.kernel.scanner.api.annotation.GetResource;
 import org.springframework.stereotype.Controller;
 
 /**

src/main/java/cn/stylefeng/guns/modular/system/position/PositionViewController.java

@@ -1,7 +1,7 @@
 package cn.stylefeng.guns.modular.system.position;
 
-import cn.stylefeng.roses.kernel.resource.api.annotation.ApiResource;
-import cn.stylefeng.roses.kernel.resource.api.annotation.GetResource;
+import cn.stylefeng.roses.kernel.scanner.api.annotation.ApiResource;
+import cn.stylefeng.roses.kernel.scanner.api.annotation.GetResource;
 import org.springframework.stereotype.Controller;
 
 /**

src/main/java/cn/stylefeng/guns/modular/system/resource/ResourceViewController.java

@@ -1,7 +1,7 @@
 package cn.stylefeng.guns.modular.system.resource;
 
-import cn.stylefeng.roses.kernel.resource.api.annotation.ApiResource;
-import cn.stylefeng.roses.kernel.resource.api.annotation.GetResource;
+import cn.stylefeng.roses.kernel.scanner.api.annotation.ApiResource;
+import cn.stylefeng.roses.kernel.scanner.api.annotation.GetResource;
 import org.springframework.stereotype.Controller;
 
 /**

src/main/java/cn/stylefeng/guns/modular/system/role/RoleViewController.java

@@ -1,7 +1,7 @@
 package cn.stylefeng.guns.modular.system.role;
 
-import cn.stylefeng.roses.kernel.resource.api.annotation.ApiResource;
-import cn.stylefeng.roses.kernel.resource.api.annotation.GetResource;
+import cn.stylefeng.roses.kernel.scanner.api.annotation.ApiResource;
+import cn.stylefeng.roses.kernel.scanner.api.annotation.GetResource;
 import org.springframework.stereotype.Controller;
 
 /**

src/main/java/cn/stylefeng/guns/modular/system/timer/TimersViewController.java

@@ -1,7 +1,7 @@
 package cn.stylefeng.guns.modular.system.timer;
 
-import cn.stylefeng.roses.kernel.resource.api.annotation.ApiResource;
-import cn.stylefeng.roses.kernel.resource.api.annotation.GetResource;
+import cn.stylefeng.roses.kernel.scanner.api.annotation.ApiResource;
+import cn.stylefeng.roses.kernel.scanner.api.annotation.GetResource;
 import org.springframework.stereotype.Controller;
 
 /**

src/main/java/cn/stylefeng/guns/modular/system/user/UserViewController.java

@@ -1,7 +1,7 @@
 package cn.stylefeng.guns.modular.system.user;
 
-import cn.stylefeng.roses.kernel.resource.api.annotation.ApiResource;
-import cn.stylefeng.roses.kernel.resource.api.annotation.GetResource;
+import cn.stylefeng.roses.kernel.scanner.api.annotation.ApiResource;
+import cn.stylefeng.roses.kernel.scanner.api.annotation.GetResource;
 import org.springframework.stereotype.Controller;
 
 /**