From ee5e0877e0549cbbc652ba925b815880409e8989 Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Fri, 26 Feb 2021 22:48:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=8E=A7=E5=88=B6=E5=99=A8?= =?UTF-8?q?=E5=8C=85=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/stylefeng/guns/core/error/CustomErrorAttributes.java | 4 ++-- .../stylefeng/guns/core/error/GlobalExceptionHandler.java | 4 ++-- .../guns/core/security/AuthJwtTokenSecurityInterceptor.java | 2 +- .../guns/core/security/PermissionSecurityInterceptor.java | 2 +- .../guns/core/security/base/BaseSecurityInterceptor.java | 4 ++-- .../guns/modular/business/controller/DemoController.java | 4 ++-- .../guns/modular/system/api/ApiViewController.java | 4 ++-- .../guns/modular/system/app/AppViewController.java | 4 ++-- .../guns/modular/system/common/CommonViewController.java | 4 ++-- .../guns/modular/system/config/ConfigViewController.java | 4 ++-- .../modular/system/dashboard/DashboardViewController.java | 4 ++-- .../modular/system/datasource/DataSourceViewController.java | 4 ++-- .../system/datasource/test/TestMultiTranController.java | 4 ++-- .../system/datasource/test/TestSingleTranController.java | 4 ++-- .../guns/modular/system/dict/DictTypeViewController.java | 5 ++--- .../guns/modular/system/dict/DictViewController.java | 4 ++-- .../guns/modular/system/error/ErrorViewController.java | 4 ++-- .../guns/modular/system/file/FileViewController.java | 4 ++-- .../guns/modular/system/i18n/TranslationViewController.java | 4 ++-- .../system/index/controller/IndexViewController.java | 4 ++-- .../guns/modular/system/log/LogViewController.java | 4 ++-- .../guns/modular/system/log/LoginLogViewController.java | 4 ++-- .../guns/modular/system/login/LoginViewController.java | 6 +++--- .../guns/modular/system/menu/MenuButtonViewController.java | 4 ++-- .../guns/modular/system/menu/MenuViewController.java | 4 ++-- .../guns/modular/system/message/MessageViewController.java | 4 ++-- .../guns/modular/system/monitor/MonitorController.java | 4 ++-- .../guns/modular/system/notice/NoticeViewController.java | 4 ++-- .../modular/system/online/OnlineUserViewController.java | 4 ++-- .../system/organization/OrganizationViewController.java | 4 ++-- .../modular/system/position/PositionViewController.java | 4 ++-- .../modular/system/resource/ResourceViewController.java | 4 ++-- .../guns/modular/system/role/RoleViewController.java | 4 ++-- .../guns/modular/system/timer/TimersViewController.java | 4 ++-- .../guns/modular/system/user/UserViewController.java | 4 ++-- 35 files changed, 69 insertions(+), 70 deletions(-) diff --git a/src/main/java/cn/stylefeng/guns/core/error/CustomErrorAttributes.java b/src/main/java/cn/stylefeng/guns/core/error/CustomErrorAttributes.java index 5203fb15..6c52efdf 100644 --- a/src/main/java/cn/stylefeng/guns/core/error/CustomErrorAttributes.java +++ b/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())); } -} \ No newline at end of file +} diff --git a/src/main/java/cn/stylefeng/guns/core/error/GlobalExceptionHandler.java b/src/main/java/cn/stylefeng/guns/core/error/GlobalExceptionHandler.java index f7c7d326..51aa2a9e 100644 --- a/src/main/java/cn/stylefeng/guns/core/error/GlobalExceptionHandler.java +++ b/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; diff --git a/src/main/java/cn/stylefeng/guns/core/security/AuthJwtTokenSecurityInterceptor.java b/src/main/java/cn/stylefeng/guns/core/security/AuthJwtTokenSecurityInterceptor.java index 4df247e4..0dd1f477 100644 --- a/src/main/java/cn/stylefeng/guns/core/security/AuthJwtTokenSecurityInterceptor.java +++ b/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; diff --git a/src/main/java/cn/stylefeng/guns/core/security/PermissionSecurityInterceptor.java b/src/main/java/cn/stylefeng/guns/core/security/PermissionSecurityInterceptor.java index 9857b158..c51cb4d8 100644 --- a/src/main/java/cn/stylefeng/guns/core/security/PermissionSecurityInterceptor.java +++ b/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; diff --git a/src/main/java/cn/stylefeng/guns/core/security/base/BaseSecurityInterceptor.java b/src/main/java/cn/stylefeng/guns/core/security/base/BaseSecurityInterceptor.java index b180c3ed..fd264c3a 100644 --- a/src/main/java/cn/stylefeng/guns/core/security/base/BaseSecurityInterceptor.java +++ b/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; diff --git a/src/main/java/cn/stylefeng/guns/modular/business/controller/DemoController.java b/src/main/java/cn/stylefeng/guns/modular/business/controller/DemoController.java index f93b5f44..f60b82f8 100644 --- a/src/main/java/cn/stylefeng/guns/modular/business/controller/DemoController.java +++ b/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; diff --git a/src/main/java/cn/stylefeng/guns/modular/system/api/ApiViewController.java b/src/main/java/cn/stylefeng/guns/modular/system/api/ApiViewController.java index 9c58a782..64e3309f 100644 --- a/src/main/java/cn/stylefeng/guns/modular/system/api/ApiViewController.java +++ b/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; /** diff --git a/src/main/java/cn/stylefeng/guns/modular/system/app/AppViewController.java b/src/main/java/cn/stylefeng/guns/modular/system/app/AppViewController.java index a0dcffa2..68ef2432 100644 --- a/src/main/java/cn/stylefeng/guns/modular/system/app/AppViewController.java +++ b/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; /** diff --git a/src/main/java/cn/stylefeng/guns/modular/system/common/CommonViewController.java b/src/main/java/cn/stylefeng/guns/modular/system/common/CommonViewController.java index a2cda93f..402e4892 100644 --- a/src/main/java/cn/stylefeng/guns/modular/system/common/CommonViewController.java +++ b/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; diff --git a/src/main/java/cn/stylefeng/guns/modular/system/config/ConfigViewController.java b/src/main/java/cn/stylefeng/guns/modular/system/config/ConfigViewController.java index f4649106..c8edb150 100644 --- a/src/main/java/cn/stylefeng/guns/modular/system/config/ConfigViewController.java +++ b/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; /** diff --git a/src/main/java/cn/stylefeng/guns/modular/system/dashboard/DashboardViewController.java b/src/main/java/cn/stylefeng/guns/modular/system/dashboard/DashboardViewController.java index 280dc7a8..73f36178 100644 --- a/src/main/java/cn/stylefeng/guns/modular/system/dashboard/DashboardViewController.java +++ b/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; /** diff --git a/src/main/java/cn/stylefeng/guns/modular/system/datasource/DataSourceViewController.java b/src/main/java/cn/stylefeng/guns/modular/system/datasource/DataSourceViewController.java index ea6a6dc3..f3abb62d 100644 --- a/src/main/java/cn/stylefeng/guns/modular/system/datasource/DataSourceViewController.java +++ b/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; /** diff --git a/src/main/java/cn/stylefeng/guns/modular/system/datasource/test/TestMultiTranController.java b/src/main/java/cn/stylefeng/guns/modular/system/datasource/test/TestMultiTranController.java index 1f9af02a..4d5a1160 100644 --- a/src/main/java/cn/stylefeng/guns/modular/system/datasource/test/TestMultiTranController.java +++ b/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; diff --git a/src/main/java/cn/stylefeng/guns/modular/system/datasource/test/TestSingleTranController.java b/src/main/java/cn/stylefeng/guns/modular/system/datasource/test/TestSingleTranController.java index af557001..634abc68 100644 --- a/src/main/java/cn/stylefeng/guns/modular/system/datasource/test/TestSingleTranController.java +++ b/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; diff --git a/src/main/java/cn/stylefeng/guns/modular/system/dict/DictTypeViewController.java b/src/main/java/cn/stylefeng/guns/modular/system/dict/DictTypeViewController.java index e9caa60d..ba53e113 100644 --- a/src/main/java/cn/stylefeng/guns/modular/system/dict/DictTypeViewController.java +++ b/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; /** diff --git a/src/main/java/cn/stylefeng/guns/modular/system/dict/DictViewController.java b/src/main/java/cn/stylefeng/guns/modular/system/dict/DictViewController.java index eaa9dc31..8ed8b937 100644 --- a/src/main/java/cn/stylefeng/guns/modular/system/dict/DictViewController.java +++ b/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; /** diff --git a/src/main/java/cn/stylefeng/guns/modular/system/error/ErrorViewController.java b/src/main/java/cn/stylefeng/guns/modular/system/error/ErrorViewController.java index e4d60a08..fd1a3cb3 100644 --- a/src/main/java/cn/stylefeng/guns/modular/system/error/ErrorViewController.java +++ b/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; diff --git a/src/main/java/cn/stylefeng/guns/modular/system/file/FileViewController.java b/src/main/java/cn/stylefeng/guns/modular/system/file/FileViewController.java index 244fd045..7c73a600 100644 --- a/src/main/java/cn/stylefeng/guns/modular/system/file/FileViewController.java +++ b/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; /** diff --git a/src/main/java/cn/stylefeng/guns/modular/system/i18n/TranslationViewController.java b/src/main/java/cn/stylefeng/guns/modular/system/i18n/TranslationViewController.java index 9c86cd67..8062b024 100644 --- a/src/main/java/cn/stylefeng/guns/modular/system/i18n/TranslationViewController.java +++ b/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; /** diff --git a/src/main/java/cn/stylefeng/guns/modular/system/index/controller/IndexViewController.java b/src/main/java/cn/stylefeng/guns/modular/system/index/controller/IndexViewController.java index 0a9c7df1..4d9784e5 100644 --- a/src/main/java/cn/stylefeng/guns/modular/system/index/controller/IndexViewController.java +++ b/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; diff --git a/src/main/java/cn/stylefeng/guns/modular/system/log/LogViewController.java b/src/main/java/cn/stylefeng/guns/modular/system/log/LogViewController.java index 58e1d57f..4c241b3e 100644 --- a/src/main/java/cn/stylefeng/guns/modular/system/log/LogViewController.java +++ b/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; /** diff --git a/src/main/java/cn/stylefeng/guns/modular/system/log/LoginLogViewController.java b/src/main/java/cn/stylefeng/guns/modular/system/log/LoginLogViewController.java index a2fae3e8..9c7d5c0e 100644 --- a/src/main/java/cn/stylefeng/guns/modular/system/log/LoginLogViewController.java +++ b/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; /** diff --git a/src/main/java/cn/stylefeng/guns/modular/system/login/LoginViewController.java b/src/main/java/cn/stylefeng/guns/modular/system/login/LoginViewController.java index dc9b1290..7cf7346b 100644 --- a/src/main/java/cn/stylefeng/guns/modular/system/login/LoginViewController.java +++ b/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; diff --git a/src/main/java/cn/stylefeng/guns/modular/system/menu/MenuButtonViewController.java b/src/main/java/cn/stylefeng/guns/modular/system/menu/MenuButtonViewController.java index 88f14f5f..3462bc63 100644 --- a/src/main/java/cn/stylefeng/guns/modular/system/menu/MenuButtonViewController.java +++ b/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; /** diff --git a/src/main/java/cn/stylefeng/guns/modular/system/menu/MenuViewController.java b/src/main/java/cn/stylefeng/guns/modular/system/menu/MenuViewController.java index e9306c9e..01b9795f 100644 --- a/src/main/java/cn/stylefeng/guns/modular/system/menu/MenuViewController.java +++ b/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; /** diff --git a/src/main/java/cn/stylefeng/guns/modular/system/message/MessageViewController.java b/src/main/java/cn/stylefeng/guns/modular/system/message/MessageViewController.java index de2cae00..bbdbca6a 100644 --- a/src/main/java/cn/stylefeng/guns/modular/system/message/MessageViewController.java +++ b/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; diff --git a/src/main/java/cn/stylefeng/guns/modular/system/monitor/MonitorController.java b/src/main/java/cn/stylefeng/guns/modular/system/monitor/MonitorController.java index 456a3360..7cd7de8b 100644 --- a/src/main/java/cn/stylefeng/guns/modular/system/monitor/MonitorController.java +++ b/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; diff --git a/src/main/java/cn/stylefeng/guns/modular/system/notice/NoticeViewController.java b/src/main/java/cn/stylefeng/guns/modular/system/notice/NoticeViewController.java index edbeb684..f48747fd 100644 --- a/src/main/java/cn/stylefeng/guns/modular/system/notice/NoticeViewController.java +++ b/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; /** diff --git a/src/main/java/cn/stylefeng/guns/modular/system/online/OnlineUserViewController.java b/src/main/java/cn/stylefeng/guns/modular/system/online/OnlineUserViewController.java index fc88cbfd..3126a3ad 100644 --- a/src/main/java/cn/stylefeng/guns/modular/system/online/OnlineUserViewController.java +++ b/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; /** diff --git a/src/main/java/cn/stylefeng/guns/modular/system/organization/OrganizationViewController.java b/src/main/java/cn/stylefeng/guns/modular/system/organization/OrganizationViewController.java index bc6d16fd..1acc7b59 100644 --- a/src/main/java/cn/stylefeng/guns/modular/system/organization/OrganizationViewController.java +++ b/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; /** diff --git a/src/main/java/cn/stylefeng/guns/modular/system/position/PositionViewController.java b/src/main/java/cn/stylefeng/guns/modular/system/position/PositionViewController.java index 8aefae34..b048480a 100644 --- a/src/main/java/cn/stylefeng/guns/modular/system/position/PositionViewController.java +++ b/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; /** diff --git a/src/main/java/cn/stylefeng/guns/modular/system/resource/ResourceViewController.java b/src/main/java/cn/stylefeng/guns/modular/system/resource/ResourceViewController.java index 23a13a42..7da7222a 100644 --- a/src/main/java/cn/stylefeng/guns/modular/system/resource/ResourceViewController.java +++ b/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; /** diff --git a/src/main/java/cn/stylefeng/guns/modular/system/role/RoleViewController.java b/src/main/java/cn/stylefeng/guns/modular/system/role/RoleViewController.java index 254dc560..d43c188d 100644 --- a/src/main/java/cn/stylefeng/guns/modular/system/role/RoleViewController.java +++ b/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; /** diff --git a/src/main/java/cn/stylefeng/guns/modular/system/timer/TimersViewController.java b/src/main/java/cn/stylefeng/guns/modular/system/timer/TimersViewController.java index 19c4abcf..fb21bf9e 100644 --- a/src/main/java/cn/stylefeng/guns/modular/system/timer/TimersViewController.java +++ b/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; /** diff --git a/src/main/java/cn/stylefeng/guns/modular/system/user/UserViewController.java b/src/main/java/cn/stylefeng/guns/modular/system/user/UserViewController.java index 4f64b086..d67a186a 100644 --- a/src/main/java/cn/stylefeng/guns/modular/system/user/UserViewController.java +++ b/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; /**