From fea28e018ce6997e6d355fe4ce34db61255c4bde Mon Sep 17 00:00:00 2001 From: lijiahang Date: Mon, 9 Oct 2023 17:47:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8C=85=E7=BB=93=E6=9E=84.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ops/framework/log/core}/annotation/IgnoreLog.java | 4 ++-- .../orion/ops/framework/log/core/enums}/IgnoreLogMode.java | 2 +- .../core/interceptor/AbstractLogPrinterInterceptor.java | 4 ++-- .../ops/framework/web/core}/annotation/IgnoreWrapper.java | 2 +- .../ops/framework/web/core}/annotation/RestWrapper.java | 2 +- .../framework/web/core/handler/WrapperResultHandler.java | 4 ++-- .../orion/ops/launch/controller/BootstrapController.java | 2 +- .../templates/orion-server-module-controller.java.vm | 6 +++--- .../orion/ops/module/asset/controller/HostController.java | 6 +++--- .../module/asset/controller/HostIdentityController.java | 6 +++--- .../ops/module/asset/controller/HostKeyController.java | 6 +++--- .../module/infra/controller/AuthenticationController.java | 6 +++--- .../ops/module/infra/controller/FavoriteController.java | 2 +- .../ops/module/infra/controller/PermissionController.java | 6 +++--- .../ops/module/infra/controller/PreferenceController.java | 2 +- .../ops/module/infra/controller/SystemMenuController.java | 6 +++--- .../ops/module/infra/controller/SystemRoleController.java | 6 +++--- .../ops/module/infra/controller/SystemUserController.java | 7 +++---- .../orion/ops/module/infra/controller/TagController.java | 6 +++--- .../orion/ops/module/infra/controller/TipsController.java | 2 +- 20 files changed, 43 insertions(+), 44 deletions(-) rename orion-ops-framework/{orion-ops-framework-common/src/main/java/com/orion/ops/framework/common => orion-ops-spring-boot-starter-log/src/main/java/com/orion/ops/framework/log/core}/annotation/IgnoreLog.java (78%) rename orion-ops-framework/{orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/constant => orion-ops-spring-boot-starter-log/src/main/java/com/orion/ops/framework/log/core/enums}/IgnoreLogMode.java (88%) rename orion-ops-framework/{orion-ops-framework-common/src/main/java/com/orion/ops/framework/common => orion-ops-spring-boot-starter-web/src/main/java/com/orion/ops/framework/web/core}/annotation/IgnoreWrapper.java (82%) rename orion-ops-framework/{orion-ops-framework-common/src/main/java/com/orion/ops/framework/common => orion-ops-spring-boot-starter-web/src/main/java/com/orion/ops/framework/web/core}/annotation/RestWrapper.java (84%) diff --git a/orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/annotation/IgnoreLog.java b/orion-ops-framework/orion-ops-spring-boot-starter-log/src/main/java/com/orion/ops/framework/log/core/annotation/IgnoreLog.java similarity index 78% rename from orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/annotation/IgnoreLog.java rename to orion-ops-framework/orion-ops-spring-boot-starter-log/src/main/java/com/orion/ops/framework/log/core/annotation/IgnoreLog.java index 0d7825b1..e9b632eb 100644 --- a/orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/annotation/IgnoreLog.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-log/src/main/java/com/orion/ops/framework/log/core/annotation/IgnoreLog.java @@ -1,6 +1,6 @@ -package com.orion.ops.framework.common.annotation; +package com.orion.ops.framework.log.core.annotation; -import com.orion.ops.framework.common.constant.IgnoreLogMode; +import com.orion.ops.framework.log.core.enums.IgnoreLogMode; import java.lang.annotation.*; diff --git a/orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/constant/IgnoreLogMode.java b/orion-ops-framework/orion-ops-spring-boot-starter-log/src/main/java/com/orion/ops/framework/log/core/enums/IgnoreLogMode.java similarity index 88% rename from orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/constant/IgnoreLogMode.java rename to orion-ops-framework/orion-ops-spring-boot-starter-log/src/main/java/com/orion/ops/framework/log/core/enums/IgnoreLogMode.java index 4060d9ff..b31a3a0b 100644 --- a/orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/constant/IgnoreLogMode.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-log/src/main/java/com/orion/ops/framework/log/core/enums/IgnoreLogMode.java @@ -1,4 +1,4 @@ -package com.orion.ops.framework.common.constant; +package com.orion.ops.framework.log.core.enums; /** * 日志忽略模式 diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-log/src/main/java/com/orion/ops/framework/log/core/interceptor/AbstractLogPrinterInterceptor.java b/orion-ops-framework/orion-ops-spring-boot-starter-log/src/main/java/com/orion/ops/framework/log/core/interceptor/AbstractLogPrinterInterceptor.java index 447ac59e..46b5670c 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-log/src/main/java/com/orion/ops/framework/log/core/interceptor/AbstractLogPrinterInterceptor.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-log/src/main/java/com/orion/ops/framework/log/core/interceptor/AbstractLogPrinterInterceptor.java @@ -10,11 +10,11 @@ import com.orion.lang.utils.Desensitizes; import com.orion.lang.utils.Objects1; import com.orion.lang.utils.collect.Maps; import com.orion.lang.utils.reflect.Classes; -import com.orion.ops.framework.common.annotation.IgnoreLog; -import com.orion.ops.framework.common.constant.IgnoreLogMode; import com.orion.ops.framework.common.meta.TraceIdHolder; import com.orion.ops.framework.common.security.SecurityHolder; +import com.orion.ops.framework.log.core.annotation.IgnoreLog; import com.orion.ops.framework.log.core.config.LogPrinterConfig; +import com.orion.ops.framework.log.core.enums.IgnoreLogMode; import org.aopalliance.intercept.MethodInvocation; import javax.annotation.Resource; diff --git a/orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/annotation/IgnoreWrapper.java b/orion-ops-framework/orion-ops-spring-boot-starter-web/src/main/java/com/orion/ops/framework/web/core/annotation/IgnoreWrapper.java similarity index 82% rename from orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/annotation/IgnoreWrapper.java rename to orion-ops-framework/orion-ops-spring-boot-starter-web/src/main/java/com/orion/ops/framework/web/core/annotation/IgnoreWrapper.java index 9ea2e2fb..939265c6 100644 --- a/orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/annotation/IgnoreWrapper.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-web/src/main/java/com/orion/ops/framework/web/core/annotation/IgnoreWrapper.java @@ -1,4 +1,4 @@ -package com.orion.ops.framework.common.annotation; +package com.orion.ops.framework.web.core.annotation; import java.lang.annotation.*; diff --git a/orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/annotation/RestWrapper.java b/orion-ops-framework/orion-ops-spring-boot-starter-web/src/main/java/com/orion/ops/framework/web/core/annotation/RestWrapper.java similarity index 84% rename from orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/annotation/RestWrapper.java rename to orion-ops-framework/orion-ops-spring-boot-starter-web/src/main/java/com/orion/ops/framework/web/core/annotation/RestWrapper.java index 5c064e1d..3b1fe5a1 100644 --- a/orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/annotation/RestWrapper.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-web/src/main/java/com/orion/ops/framework/web/core/annotation/RestWrapper.java @@ -1,4 +1,4 @@ -package com.orion.ops.framework.common.annotation; +package com.orion.ops.framework.web.core.annotation; import java.lang.annotation.*; diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-web/src/main/java/com/orion/ops/framework/web/core/handler/WrapperResultHandler.java b/orion-ops-framework/orion-ops-spring-boot-starter-web/src/main/java/com/orion/ops/framework/web/core/handler/WrapperResultHandler.java index f9a6be32..0224871f 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-web/src/main/java/com/orion/ops/framework/web/core/handler/WrapperResultHandler.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-web/src/main/java/com/orion/ops/framework/web/core/handler/WrapperResultHandler.java @@ -3,9 +3,9 @@ package com.orion.ops.framework.web.core.handler; import com.orion.lang.constant.StandardContentType; import com.orion.lang.define.wrapper.HttpWrapper; import com.orion.lang.define.wrapper.RpcWrapper; -import com.orion.ops.framework.common.annotation.IgnoreWrapper; -import com.orion.ops.framework.common.annotation.RestWrapper; import com.orion.ops.framework.common.constant.ResponseAdviceOrderConst; +import com.orion.ops.framework.web.core.annotation.IgnoreWrapper; +import com.orion.ops.framework.web.core.annotation.RestWrapper; import org.jetbrains.annotations.NotNull; import org.springframework.core.MethodParameter; import org.springframework.core.annotation.Order; diff --git a/orion-ops-launch/src/main/java/com/orion/ops/launch/controller/BootstrapController.java b/orion-ops-launch/src/main/java/com/orion/ops/launch/controller/BootstrapController.java index 799d4257..542bcda7 100644 --- a/orion-ops-launch/src/main/java/com/orion/ops/launch/controller/BootstrapController.java +++ b/orion-ops-launch/src/main/java/com/orion/ops/launch/controller/BootstrapController.java @@ -1,6 +1,6 @@ package com.orion.ops.launch.controller; -import com.orion.ops.framework.common.annotation.RestWrapper; +import com.orion.ops.framework.web.core.annotation.RestWrapper; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.GetMapping; diff --git a/orion-ops-launch/src/main/resources/templates/orion-server-module-controller.java.vm b/orion-ops-launch/src/main/resources/templates/orion-server-module-controller.java.vm index e738c8a5..71cf2317 100644 --- a/orion-ops-launch/src/main/resources/templates/orion-server-module-controller.java.vm +++ b/orion-ops-launch/src/main/resources/templates/orion-server-module-controller.java.vm @@ -1,10 +1,10 @@ package ${package.Controller}; import com.orion.lang.define.wrapper.DataGrid; -import com.orion.ops.framework.common.annotation.IgnoreLog; -import com.orion.ops.framework.common.annotation.RestWrapper; -import com.orion.ops.framework.common.constant.IgnoreLogMode; import com.orion.ops.framework.common.valid.group.Page; +import com.orion.ops.framework.log.core.annotation.IgnoreLog; +import com.orion.ops.framework.log.core.enums.IgnoreLogMode; +import com.orion.ops.framework.web.core.annotation.RestWrapper; import ${package.Service}.*; #foreach($pkg in ${customModuleFilePackages}) import ${pkg}.*; diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/HostController.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/HostController.java index cf29577d..f4d0d45b 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/HostController.java +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/HostController.java @@ -1,10 +1,10 @@ package com.orion.ops.module.asset.controller; import com.orion.lang.define.wrapper.DataGrid; -import com.orion.ops.framework.common.annotation.IgnoreLog; -import com.orion.ops.framework.common.annotation.RestWrapper; -import com.orion.ops.framework.common.constant.IgnoreLogMode; import com.orion.ops.framework.common.valid.group.Page; +import com.orion.ops.framework.log.core.annotation.IgnoreLog; +import com.orion.ops.framework.log.core.enums.IgnoreLogMode; +import com.orion.ops.framework.web.core.annotation.RestWrapper; import com.orion.ops.module.asset.entity.request.host.*; import com.orion.ops.module.asset.entity.vo.HostConfigVO; import com.orion.ops.module.asset.entity.vo.HostVO; diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/HostIdentityController.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/HostIdentityController.java index ba323554..cecd4e29 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/HostIdentityController.java +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/HostIdentityController.java @@ -1,10 +1,10 @@ package com.orion.ops.module.asset.controller; import com.orion.lang.define.wrapper.DataGrid; -import com.orion.ops.framework.common.annotation.IgnoreLog; -import com.orion.ops.framework.common.annotation.RestWrapper; -import com.orion.ops.framework.common.constant.IgnoreLogMode; import com.orion.ops.framework.common.valid.group.Page; +import com.orion.ops.framework.log.core.annotation.IgnoreLog; +import com.orion.ops.framework.log.core.enums.IgnoreLogMode; +import com.orion.ops.framework.web.core.annotation.RestWrapper; import com.orion.ops.module.asset.entity.request.host.HostIdentityCreateRequest; import com.orion.ops.module.asset.entity.request.host.HostIdentityQueryRequest; import com.orion.ops.module.asset.entity.request.host.HostIdentityUpdateRequest; diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/HostKeyController.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/HostKeyController.java index d578475b..84b98399 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/HostKeyController.java +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/HostKeyController.java @@ -1,10 +1,10 @@ package com.orion.ops.module.asset.controller; import com.orion.lang.define.wrapper.DataGrid; -import com.orion.ops.framework.common.annotation.IgnoreLog; -import com.orion.ops.framework.common.annotation.RestWrapper; -import com.orion.ops.framework.common.constant.IgnoreLogMode; import com.orion.ops.framework.common.valid.group.Page; +import com.orion.ops.framework.log.core.annotation.IgnoreLog; +import com.orion.ops.framework.log.core.enums.IgnoreLogMode; +import com.orion.ops.framework.web.core.annotation.RestWrapper; import com.orion.ops.module.asset.entity.request.host.HostKeyCreateRequest; import com.orion.ops.module.asset.entity.request.host.HostKeyQueryRequest; import com.orion.ops.module.asset.entity.request.host.HostKeyUpdateRequest; diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/AuthenticationController.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/AuthenticationController.java index adc6152e..7118a89e 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/AuthenticationController.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/AuthenticationController.java @@ -1,10 +1,10 @@ package com.orion.ops.module.infra.controller; import com.orion.lang.define.wrapper.HttpWrapper; -import com.orion.ops.framework.common.annotation.IgnoreLog; -import com.orion.ops.framework.common.annotation.RestWrapper; -import com.orion.ops.framework.common.constant.IgnoreLogMode; +import com.orion.ops.framework.log.core.annotation.IgnoreLog; +import com.orion.ops.framework.log.core.enums.IgnoreLogMode; import com.orion.ops.framework.security.core.utils.SecurityUtils; +import com.orion.ops.framework.web.core.annotation.RestWrapper; import com.orion.ops.module.infra.entity.request.user.UserLoginRequest; import com.orion.ops.module.infra.entity.request.user.UserResetPasswordRequest; import com.orion.ops.module.infra.entity.vo.UserLoginVO; diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/FavoriteController.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/FavoriteController.java index 7063334d..de20b1b8 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/FavoriteController.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/FavoriteController.java @@ -1,6 +1,6 @@ package com.orion.ops.module.infra.controller; -import com.orion.ops.framework.common.annotation.RestWrapper; +import com.orion.ops.framework.web.core.annotation.RestWrapper; import com.orion.ops.module.infra.entity.request.favorite.FavoriteOperatorRequest; import com.orion.ops.module.infra.service.FavoriteService; import io.swagger.v3.oas.annotations.Operation; diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/PermissionController.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/PermissionController.java index a26f7af3..ec7f64d0 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/PermissionController.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/PermissionController.java @@ -1,9 +1,9 @@ package com.orion.ops.module.infra.controller; import com.orion.lang.define.wrapper.HttpWrapper; -import com.orion.ops.framework.common.annotation.IgnoreLog; -import com.orion.ops.framework.common.annotation.RestWrapper; -import com.orion.ops.framework.common.constant.IgnoreLogMode; +import com.orion.ops.framework.log.core.annotation.IgnoreLog; +import com.orion.ops.framework.log.core.enums.IgnoreLogMode; +import com.orion.ops.framework.web.core.annotation.RestWrapper; import com.orion.ops.module.infra.entity.vo.SystemMenuVO; import com.orion.ops.module.infra.entity.vo.UserPermissionVO; import com.orion.ops.module.infra.service.PermissionService; diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/PreferenceController.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/PreferenceController.java index 2c1ef711..83af172a 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/PreferenceController.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/PreferenceController.java @@ -1,6 +1,6 @@ package com.orion.ops.module.infra.controller; -import com.orion.ops.framework.common.annotation.RestWrapper; +import com.orion.ops.framework.web.core.annotation.RestWrapper; import com.orion.ops.module.infra.entity.request.preference.PreferenceUpdateRequest; import com.orion.ops.module.infra.entity.vo.PreferenceVO; import com.orion.ops.module.infra.service.PreferenceService; diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/SystemMenuController.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/SystemMenuController.java index 12381d0e..0f917ec8 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/SystemMenuController.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/SystemMenuController.java @@ -1,8 +1,8 @@ package com.orion.ops.module.infra.controller; -import com.orion.ops.framework.common.annotation.IgnoreLog; -import com.orion.ops.framework.common.annotation.RestWrapper; -import com.orion.ops.framework.common.constant.IgnoreLogMode; +import com.orion.ops.framework.log.core.annotation.IgnoreLog; +import com.orion.ops.framework.log.core.enums.IgnoreLogMode; +import com.orion.ops.framework.web.core.annotation.RestWrapper; import com.orion.ops.module.infra.entity.request.menu.*; import com.orion.ops.module.infra.entity.vo.SystemMenuVO; import com.orion.ops.module.infra.service.SystemMenuService; diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/SystemRoleController.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/SystemRoleController.java index 36a563f2..890f5b87 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/SystemRoleController.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/SystemRoleController.java @@ -1,10 +1,10 @@ package com.orion.ops.module.infra.controller; import com.orion.lang.define.wrapper.DataGrid; -import com.orion.ops.framework.common.annotation.IgnoreLog; -import com.orion.ops.framework.common.annotation.RestWrapper; -import com.orion.ops.framework.common.constant.IgnoreLogMode; import com.orion.ops.framework.common.valid.group.Page; +import com.orion.ops.framework.log.core.annotation.IgnoreLog; +import com.orion.ops.framework.log.core.enums.IgnoreLogMode; +import com.orion.ops.framework.web.core.annotation.RestWrapper; import com.orion.ops.module.infra.entity.request.menu.SystemRoleGrantMenuRequest; import com.orion.ops.module.infra.entity.request.role.SystemRoleCreateRequest; import com.orion.ops.module.infra.entity.request.role.SystemRoleQueryRequest; diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/SystemUserController.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/SystemUserController.java index a5afd8ee..ef1f7f2f 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/SystemUserController.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/SystemUserController.java @@ -3,11 +3,10 @@ package com.orion.ops.module.infra.controller; import com.orion.lang.define.wrapper.DataGrid; import com.orion.lang.define.wrapper.HttpWrapper; import com.orion.lang.utils.collect.Lists; -import com.orion.ops.framework.common.annotation.IgnoreLog; -import com.orion.ops.framework.common.annotation.RestWrapper; -import com.orion.ops.framework.common.constant.IgnoreLogMode; -import com.orion.ops.framework.common.valid.group.Id; import com.orion.ops.framework.common.valid.group.Page; +import com.orion.ops.framework.log.core.annotation.IgnoreLog; +import com.orion.ops.framework.log.core.enums.IgnoreLogMode; +import com.orion.ops.framework.web.core.annotation.RestWrapper; import com.orion.ops.module.infra.entity.request.user.*; import com.orion.ops.module.infra.entity.vo.SystemUserVO; import com.orion.ops.module.infra.service.SystemUserRoleService; diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/TagController.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/TagController.java index 919a208a..22c3b1ca 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/TagController.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/TagController.java @@ -1,8 +1,8 @@ package com.orion.ops.module.infra.controller; -import com.orion.ops.framework.common.annotation.IgnoreLog; -import com.orion.ops.framework.common.annotation.RestWrapper; -import com.orion.ops.framework.common.constant.IgnoreLogMode; +import com.orion.ops.framework.log.core.annotation.IgnoreLog; +import com.orion.ops.framework.log.core.enums.IgnoreLogMode; +import com.orion.ops.framework.web.core.annotation.RestWrapper; import com.orion.ops.module.infra.entity.request.tag.TagCreateRequest; import com.orion.ops.module.infra.entity.vo.TagVO; import com.orion.ops.module.infra.service.TagService; diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/TipsController.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/TipsController.java index 39b59d9d..773bfae8 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/TipsController.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/TipsController.java @@ -1,6 +1,6 @@ package com.orion.ops.module.infra.controller; -import com.orion.ops.framework.common.annotation.RestWrapper; +import com.orion.ops.framework.web.core.annotation.RestWrapper; import com.orion.ops.module.infra.service.TipsService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter;