From c201eb301f77c9fe48ba2f3f27b02220b82e0b73 Mon Sep 17 00:00:00 2001 From: lijiahang Date: Thu, 23 May 2024 13:56:03 +0800 Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E6=B7=BB=E5=8A=A0=E6=BC=94?= =?UTF-8?q?=E7=A4=BA=E6=A8=A1=E5=BC=8F.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 1 + docker-compose.yml | 2 +- docker-upgrade.sh | 4 +++ docker/orion-visor-service/Dockerfile | 2 +- docker/orion-visor-service/build.sh | 2 +- docs/README.md | 1 + docs/about/change-log.md | 3 +- .../common/constant/BeanOrderConst.java | 27 ++++++++++++++ .../framework/common/constant/ErrorCode.java | 2 +- .../constant/ResponseAdviceOrderConst.java | 14 -------- .../log/core/aspect/OperatorLogAspect.java | 3 ++ .../generator/template/ServerTemplate.java | 8 ++--- .../core/generator/template/Table.java | 4 +-- .../orion-server-module-controller.java.vm | 20 +++++------ .../OrionWebAutoConfiguration.java | 10 +++--- ...iewDisableApi.java => DemoDisableApi.java} | 4 +-- .../web/core/aspect/DemoDisableApiAspect.java | 36 +++++++++++++++++++ .../core/aspect/PreviewDisableApiAspect.java | 29 --------------- .../core/handler/WrapperResultHandler.java | 4 +-- .../spring-configuration-metadata.json | 4 +-- .../src/main/resources/application-dev.yaml | 8 ++--- .../src/main/resources/application-prod.yaml | 4 +-- .../src/main/resources/application.yaml | 4 +-- .../controller/HostConfigController.java | 6 ++-- .../controller/HostConnectLogController.java | 4 +-- .../asset/controller/HostController.java | 6 ++-- .../asset/controller/HostGroupController.java | 8 +++-- .../controller/HostIdentityController.java | 7 ++-- .../asset/controller/HostKeyController.java | 4 +++ .../infra/controller/DictKeyController.java | 10 +++--- .../infra/controller/DictValueController.java | 12 +++---- .../infra/controller/MineController.java | 6 ++-- .../controller/SystemMenuController.java | 10 +++--- .../controller/SystemRoleController.java | 6 ++-- .../controller/SystemUserController.java | 10 +++--- 35 files changed, 163 insertions(+), 122 deletions(-) create mode 100644 orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/BeanOrderConst.java delete mode 100644 orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/ResponseAdviceOrderConst.java rename orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/com/orion/visor/framework/web/core/annotation/{PreviewDisableApi.java => DemoDisableApi.java} (80%) create mode 100644 orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/com/orion/visor/framework/web/core/aspect/DemoDisableApiAspect.java delete mode 100644 orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/com/orion/visor/framework/web/core/aspect/PreviewDisableApiAspect.java diff --git a/README.md b/README.md index fab9c48e..bff42e55 100644 --- a/README.md +++ b/README.md @@ -55,6 +55,7 @@ ⭐ 体验后可以点一下 `star` 这对我很重要! 🌈 如果本项目对你有帮助请帮忙推广一下 让更多的人知道此项目! +[github](https://github.com/lijiahangmax/orion-visor) [gitee](https://gitee.com/lijiahangmax/orion-visor) ## 快速开始 diff --git a/docker-compose.yml b/docker-compose.yml index a6c47451..bbbb6fd4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -13,7 +13,7 @@ services: - REDIS_HOST=orion-visor-redis - REDIS_PASSWORD=Data@123456 - SECRET_KEY=uQeacXV8b3isvKLK - - PREVIEW=false + - DEMO_MODE=false volumes: - /data/orion-visor-space/docker-volumes/orion-visor-service/root-orion:/root/orion depends_on: diff --git a/docker-upgrade.sh b/docker-upgrade.sh index 3b43d4f0..52f56f4e 100644 --- a/docker-upgrade.sh +++ b/docker-upgrade.sh @@ -1,4 +1,8 @@ #/bin/bash docker compose down sh ./pull.sh +# demo 启动 +if [ "$1" == "demo" ]; then + sed -i 's/DEMO_MODE=false/DEMO_MODE=true/g' docker-compose.yml +fi docker compose up -d diff --git a/docker/orion-visor-service/Dockerfile b/docker/orion-visor-service/Dockerfile index 6cfb0719..c85080fe 100644 --- a/docker/orion-visor-service/Dockerfile +++ b/docker/orion-visor-service/Dockerfile @@ -2,7 +2,7 @@ FROM nginx:alpine USER root RUN \ echo "" > /etc/apk/repositories && \ - echo "http://mirrors.aliyun.com/alpine/v3.8/main" >> /etc/apk/repositories &&\ + echo "http://mirrors.aliyun.com/alpine/v3.8/main" >> /etc/apk/repositories && \ echo "http://mirrors.aliyun.com/alpine/v3.8/community" >> /etc/apk/repositories && \ apk update RUN apk add openjdk8 diff --git a/docker/orion-visor-service/build.sh b/docker/orion-visor-service/build.sh index 55537cb6..8aaaeccc 100644 --- a/docker/orion-visor-service/build.sh +++ b/docker/orion-visor-service/build.sh @@ -3,7 +3,7 @@ version=2.0.2 mv ../../orion-visor-launch/target/orion-visor-launch.jar ./orion-visor-launch.jar mv ../../orion-visor-ui/dist ./dist docker build -t orion-visor-service:${version} . -rm -f ./orion-visor-launch.jar +rm -rf ./orion-visor-launch.jar rm -rf ./dist docker tag orion-visor-service:${version} registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:${version} docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:${version} diff --git a/docs/README.md b/docs/README.md index a54ce472..76aecba1 100644 --- a/docs/README.md +++ b/docs/README.md @@ -55,6 +55,7 @@ ⭐ 体验后可以点一下 `star` 这对我很重要! 🌈 如果本项目对你有帮助请帮忙推广一下 让更多的人知道此项目! +[github](https://github.com/lijiahangmax/orion-visor) [gitee](https://gitee.com/lijiahangmax/orion-visor) ## 快速开始 diff --git a/docs/about/change-log.md b/docs/about/change-log.md index d909913f..83017120 100644 --- a/docs/about/change-log.md +++ b/docs/about/change-log.md @@ -16,7 +16,8 @@ ### v2.0.2 -* ⭐ 添加预览模式 +* 🐞 修复 资产授权密钥时间显示错误 +* 🌈 添加 演示模式 * ⭐ 支持 Chrome PWA `2024-05-2` `release` diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/BeanOrderConst.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/BeanOrderConst.java new file mode 100644 index 00000000..c2054799 --- /dev/null +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/BeanOrderConst.java @@ -0,0 +1,27 @@ +package com.orion.visor.framework.common.constant; + +/** + * bean 排序常量 + * + * @author Jiahang Li + * @version 1.0.0 + * @since 2023/6/29 16:09 + */ +public interface BeanOrderConst { + + /** + * 公共返回值包装处理器 + */ + int RESPONSE_ADVICE_WRAPPER = Integer.MIN_VALUE + 1000; + + /** + * 演示模式切面 + */ + int DEMO_DISABLE_API_ASPECT = 20; + + /** + * 操作日志切面 + */ + int OPERATOR_LOG_ASPECT = 30; + +} diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/ErrorCode.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/ErrorCode.java index 5244fa43..ea012bce 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/ErrorCode.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/ErrorCode.java @@ -86,7 +86,7 @@ public enum ErrorCode implements CodeInfo { UNSUPPOETED(915, "不支持此操作"), - PREVIEW_DISABLE_API(916, "预览模式不支持此功能"), + DEMO_DISABLE_API(916, "演示模式不支持此功能"), ; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/ResponseAdviceOrderConst.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/ResponseAdviceOrderConst.java deleted file mode 100644 index dcff8f35..00000000 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/ResponseAdviceOrderConst.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.orion.visor.framework.common.constant; - -/** - * 结果增强器 排序常量 - * - * @author Jiahang Li - * @version 1.0.0 - * @since 2023/6/29 16:09 - */ -public interface ResponseAdviceOrderConst { - - int WRAPPER = Integer.MIN_VALUE + 1000; - -} diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/com/orion/visor/framework/biz/operator/log/core/aspect/OperatorLogAspect.java b/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/com/orion/visor/framework/biz/operator/log/core/aspect/OperatorLogAspect.java index 2a52dd43..daefca11 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/com/orion/visor/framework/biz/operator/log/core/aspect/OperatorLogAspect.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/com/orion/visor/framework/biz/operator/log/core/aspect/OperatorLogAspect.java @@ -11,6 +11,7 @@ import com.orion.visor.framework.biz.operator.log.core.model.OperatorType; import com.orion.visor.framework.biz.operator.log.core.service.OperatorLogFrameworkService; import com.orion.visor.framework.biz.operator.log.core.utils.OperatorLogFiller; import com.orion.visor.framework.biz.operator.log.core.utils.OperatorLogs; +import com.orion.visor.framework.common.constant.BeanOrderConst; import com.orion.visor.framework.common.security.LoginUser; import com.orion.visor.framework.common.security.SecurityHolder; import lombok.extern.slf4j.Slf4j; @@ -18,6 +19,7 @@ import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.reflect.MethodSignature; +import org.springframework.core.annotation.Order; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestHeader; @@ -41,6 +43,7 @@ import java.util.concurrent.ExecutorService; */ @Aspect @Slf4j +@Order(BeanOrderConst.OPERATOR_LOG_ASPECT) public class OperatorLogAspect { private static final ExecutorService LOG_SAVER = ExecutorBuilder.create() diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/generator/template/ServerTemplate.java b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/generator/template/ServerTemplate.java index 0c5ae490..c1b74336 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/generator/template/ServerTemplate.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/generator/template/ServerTemplate.java @@ -27,7 +27,7 @@ public class ServerTemplate extends Template { table.bizPackage = bizPackage; table.enableUnitTest = true; table.enableOperatorLog = true; - table.enablePreviewApi = true; + table.enableDemoApi = true; } /** @@ -104,12 +104,12 @@ public class ServerTemplate extends Template { } /** - * 是否生成预览 api 注解 + * 是否生成演示模式 api 注解 * * @return this */ - public ServerTemplate disablePreviewApi() { - table.enablePreviewApi = false; + public ServerTemplate disableDemoApi() { + table.enableDemoApi = false; return this; } diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/generator/template/Table.java b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/generator/template/Table.java index 19abb5da..1d659c7b 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/generator/template/Table.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/generator/template/Table.java @@ -59,9 +59,9 @@ public class Table { protected boolean enableOperatorLog; /** - * 是否生成预览 api 注解 + * 是否生成演示模式 api 注解 */ - protected boolean enablePreviewApi; + protected boolean enableDemoApi; /** * 缓存的 key diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-controller.java.vm b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-controller.java.vm index 4ace1623..e24ac874 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-controller.java.vm +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-controller.java.vm @@ -6,8 +6,8 @@ import com.orion.visor.framework.biz.operator.log.core.annotation.OperatorLog; #end import com.orion.visor.framework.common.validator.group.Page; import com.orion.visor.framework.log.core.annotation.IgnoreLog; -#if($meta.enablePreviewApi) -import com.orion.visor.framework.web.core.annotation.PreviewDisableApi; +#if($meta.enableDemoApi) +import com.orion.visor.framework.web.core.annotation.DemoDisableApi; #end import com.orion.visor.framework.log.core.enums.IgnoreLogMode; import com.orion.visor.framework.web.core.annotation.RestWrapper; @@ -54,8 +54,8 @@ public class ${table.controllerName} { @Resource private ${type}Service ${typeLower}Service; - #if($meta.enablePreviewApi) - @PreviewDisableApi + #if($meta.enableDemoApi) + @DemoDisableApi #end #if($meta.enableOperatorLog) @OperatorLog(${type}OperatorType.CREATE) @@ -67,8 +67,8 @@ public class ${table.controllerName} { return ${typeLower}Service.create${type}(request); } - #if($meta.enablePreviewApi) - @PreviewDisableApi + #if($meta.enableDemoApi) + @DemoDisableApi #end #if($meta.enableOperatorLog) @OperatorLog(${type}OperatorType.UPDATE) @@ -114,8 +114,8 @@ public class ${table.controllerName} { return ${typeLower}Service.get${type}Page(request); } - #if($meta.enablePreviewApi) - @PreviewDisableApi + #if($meta.enableDemoApi) + @DemoDisableApi #end #if($meta.enableOperatorLog) @OperatorLog(${type}OperatorType.DELETE) @@ -128,8 +128,8 @@ public class ${table.controllerName} { return ${typeLower}Service.delete${type}ById(id); } - #if($meta.enablePreviewApi) - @PreviewDisableApi + #if($meta.enableDemoApi) + @DemoDisableApi #end #if($meta.enableOperatorLog) @OperatorLog(${type}OperatorType.DELETE) diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/com/orion/visor/framework/web/configuration/OrionWebAutoConfiguration.java b/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/com/orion/visor/framework/web/configuration/OrionWebAutoConfiguration.java index bf77faa6..50626b11 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/com/orion/visor/framework/web/configuration/OrionWebAutoConfiguration.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/com/orion/visor/framework/web/configuration/OrionWebAutoConfiguration.java @@ -6,7 +6,7 @@ import com.orion.lang.utils.collect.Lists; import com.orion.visor.framework.common.constant.AutoConfigureOrderConst; import com.orion.visor.framework.common.constant.FilterOrderConst; import com.orion.visor.framework.common.web.filter.FilterCreator; -import com.orion.visor.framework.web.core.aspect.PreviewDisableApiAspect; +import com.orion.visor.framework.web.core.aspect.DemoDisableApiAspect; import com.orion.visor.framework.web.core.filter.TraceIdFilter; import com.orion.visor.framework.web.core.handler.GlobalExceptionHandler; import com.orion.visor.framework.web.core.handler.WrapperResultHandler; @@ -141,12 +141,12 @@ public class OrionWebAutoConfiguration implements WebMvcConfigurer { } /** - * @return 预览模式禁用 api 切面 + * @return 演示模式禁用 api 切面 */ @Bean - @ConditionalOnProperty(value = "orion.preview", havingValue = "true") - public PreviewDisableApiAspect previewDisableApiAspect() { - return new PreviewDisableApiAspect(); + @ConditionalOnProperty(value = "orion.demo", havingValue = "true") + public DemoDisableApiAspect demoDisableApiAspect() { + return new DemoDisableApiAspect(); } } diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/com/orion/visor/framework/web/core/annotation/PreviewDisableApi.java b/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/com/orion/visor/framework/web/core/annotation/DemoDisableApi.java similarity index 80% rename from orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/com/orion/visor/framework/web/core/annotation/PreviewDisableApi.java rename to orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/com/orion/visor/framework/web/core/annotation/DemoDisableApi.java index b5be604b..335784bd 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/com/orion/visor/framework/web/core/annotation/PreviewDisableApi.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/com/orion/visor/framework/web/core/annotation/DemoDisableApi.java @@ -3,7 +3,7 @@ package com.orion.visor.framework.web.core.annotation; import java.lang.annotation.*; /** - * 预览禁用 api + * 演示模式禁用 api * * @author Jiahang Li * @version 1.0.0 @@ -12,5 +12,5 @@ import java.lang.annotation.*; @Target({ElementType.METHOD}) @Retention(RetentionPolicy.RUNTIME) @Documented -public @interface PreviewDisableApi { +public @interface DemoDisableApi { } diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/com/orion/visor/framework/web/core/aspect/DemoDisableApiAspect.java b/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/com/orion/visor/framework/web/core/aspect/DemoDisableApiAspect.java new file mode 100644 index 00000000..86c1d272 --- /dev/null +++ b/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/com/orion/visor/framework/web/core/aspect/DemoDisableApiAspect.java @@ -0,0 +1,36 @@ +package com.orion.visor.framework.web.core.aspect; + +import com.orion.visor.framework.common.constant.BeanOrderConst; +import com.orion.visor.framework.common.constant.ErrorCode; +import com.orion.visor.framework.web.core.annotation.DemoDisableApi; +import lombok.extern.slf4j.Slf4j; +import org.aspectj.lang.annotation.Aspect; +import org.aspectj.lang.annotation.Before; +import org.aspectj.lang.annotation.Pointcut; +import org.springframework.core.annotation.Order; + +/** + * 演示模式禁用 api 切面 + * + * @author Jiahang Li + * @version 1.0.0 + * @since 2024/5/21 16:52 + */ +@Aspect +@Slf4j +@Order(BeanOrderConst.DEMO_DISABLE_API_ASPECT) +public class DemoDisableApiAspect { + + public DemoDisableApiAspect() { + } + + @Pointcut("@annotation(e)") + public void disableApi(DemoDisableApi e) { + } + + @Before(value = "disableApi(e)", argNames = "e") + public void beforeDisableApi(DemoDisableApi e) { + throw ErrorCode.DEMO_DISABLE_API.exception(); + } + +} diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/com/orion/visor/framework/web/core/aspect/PreviewDisableApiAspect.java b/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/com/orion/visor/framework/web/core/aspect/PreviewDisableApiAspect.java deleted file mode 100644 index 5edadaac..00000000 --- a/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/com/orion/visor/framework/web/core/aspect/PreviewDisableApiAspect.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.orion.visor.framework.web.core.aspect; - -import com.orion.visor.framework.common.constant.ErrorCode; -import com.orion.visor.framework.web.core.annotation.PreviewDisableApi; -import lombok.extern.slf4j.Slf4j; -import org.aspectj.lang.ProceedingJoinPoint; -import org.aspectj.lang.annotation.Around; -import org.aspectj.lang.annotation.Aspect; - -/** - * 预览禁用 api 切面 - * - * @author Jiahang Li - * @version 1.0.0 - * @since 2024/5/21 16:52 - */ -@Aspect -@Slf4j -public class PreviewDisableApiAspect { - - public PreviewDisableApiAspect() { - } - - @Around("@annotation(o)") - public Object around(ProceedingJoinPoint joinPoint, PreviewDisableApi o) { - throw ErrorCode.PREVIEW_DISABLE_API.exception(); - } - -} diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/com/orion/visor/framework/web/core/handler/WrapperResultHandler.java b/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/com/orion/visor/framework/web/core/handler/WrapperResultHandler.java index 07a9f088..afa88caf 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/com/orion/visor/framework/web/core/handler/WrapperResultHandler.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/com/orion/visor/framework/web/core/handler/WrapperResultHandler.java @@ -3,7 +3,7 @@ package com.orion.visor.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.visor.framework.common.constant.ResponseAdviceOrderConst; +import com.orion.visor.framework.common.constant.BeanOrderConst; import com.orion.visor.framework.web.core.annotation.IgnoreWrapper; import com.orion.visor.framework.web.core.annotation.RestWrapper; import org.jetbrains.annotations.NotNull; @@ -23,7 +23,7 @@ import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice; * @version 1.0.0 * @since 2023/6/15 17:38 */ -@Order(ResponseAdviceOrderConst.WRAPPER) +@Order(BeanOrderConst.RESPONSE_ADVICE_WRAPPER) @ControllerAdvice public class WrapperResultHandler implements ResponseBodyAdvice { diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/resources/META-INF/spring-configuration-metadata.json b/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/resources/META-INF/spring-configuration-metadata.json index f11d6c8f..daeca6de 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/resources/META-INF/spring-configuration-metadata.json +++ b/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/resources/META-INF/spring-configuration-metadata.json @@ -6,9 +6,9 @@ "description": "项目版本." }, { - "name": "orion.preview", + "name": "orion.demo", "type": "java.lang.Boolean", - "description": "是否为预览模式.", + "description": "是否为演示模式.", "defaultValue": false }, { diff --git a/orion-visor-launch/src/main/resources/application-dev.yaml b/orion-visor-launch/src/main/resources/application-dev.yaml index c7b1a286..4a305484 100644 --- a/orion-visor-launch/src/main/resources/application-dev.yaml +++ b/orion-visor-launch/src/main/resources/application-dev.yaml @@ -1,16 +1,16 @@ spring: datasource: druid: - url: jdbc:mysql://127.0.0.1:3306/orion_visor?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowPublicKeyRetrieval=true&useSSL=false&serverTimezone=Asia/Shanghai&autoReconnect=true + url: jdbc:mysql://116.62.194.246:3306/orion_visor?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowPublicKeyRetrieval=true&useSSL=false&serverTimezone=Asia/Shanghai&autoReconnect=true username: root - password: Data@123456 + password: LjhData@123456 initial-size: 0 min-idle: 1 max-active: 5 redis: - host: 127.0.0.1 + host: 116.62.194.246 port: 6379 - password: Data@123456 + password: Ljhlijiahang redisson: threads: 2 netty-threads: 2 diff --git a/orion-visor-launch/src/main/resources/application-prod.yaml b/orion-visor-launch/src/main/resources/application-prod.yaml index a69e67a0..f2633b48 100644 --- a/orion-visor-launch/src/main/resources/application-prod.yaml +++ b/orion-visor-launch/src/main/resources/application-prod.yaml @@ -41,8 +41,8 @@ knife4j: enable: false orion: - # 是否为预览模式 - preview: ${PREVIEW:false} + # 是否为演示模式 + demo: ${DEMO_MODE:false} logging: printer: mode: ROW diff --git a/orion-visor-launch/src/main/resources/application.yaml b/orion-visor-launch/src/main/resources/application.yaml index 52a08bfc..6b8dbceb 100644 --- a/orion-visor-launch/src/main/resources/application.yaml +++ b/orion-visor-launch/src/main/resources/application.yaml @@ -190,8 +190,8 @@ app: orion: # 版本 version: @revision@ - # 是否为预览模式 - preview: false + # 是否为演示模式 + demo: false api: # 公共 api 前缀 prefix: /orion-visor/api diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostConfigController.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostConfigController.java index 6d36443d..d3807ebf 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostConfigController.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostConfigController.java @@ -3,7 +3,7 @@ package com.orion.visor.module.asset.controller; import com.orion.visor.framework.biz.operator.log.core.annotation.OperatorLog; import com.orion.visor.framework.log.core.annotation.IgnoreLog; import com.orion.visor.framework.log.core.enums.IgnoreLogMode; -import com.orion.visor.framework.web.core.annotation.PreviewDisableApi; +import com.orion.visor.framework.web.core.annotation.DemoDisableApi; import com.orion.visor.framework.web.core.annotation.RestWrapper; import com.orion.visor.module.asset.define.operator.HostOperatorType; import com.orion.visor.module.asset.entity.request.host.HostConfigUpdateRequest; @@ -60,7 +60,7 @@ public class HostConfigController { return hostConfigService.getHostConfigList(hostId); } - @PreviewDisableApi + @DemoDisableApi @OperatorLog(HostOperatorType.UPDATE_CONFIG) @PutMapping("/update") @Operation(summary = "更新主机配置") @@ -69,7 +69,7 @@ public class HostConfigController { return hostConfigService.updateHostConfig(request); } - @PreviewDisableApi + @DemoDisableApi @OperatorLog(HostOperatorType.UPDATE_CONFIG_STATUS) @PutMapping("/update-status") @Operation(summary = "更新主机配置状态/动态初始化配置") diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostConnectLogController.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostConnectLogController.java index 6e6ac8ec..f4f738f8 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostConnectLogController.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostConnectLogController.java @@ -6,7 +6,7 @@ import com.orion.visor.framework.common.validator.group.Id; import com.orion.visor.framework.common.validator.group.Page; import com.orion.visor.framework.log.core.annotation.IgnoreLog; import com.orion.visor.framework.log.core.enums.IgnoreLogMode; -import com.orion.visor.framework.web.core.annotation.PreviewDisableApi; +import com.orion.visor.framework.web.core.annotation.DemoDisableApi; import com.orion.visor.framework.web.core.annotation.RestWrapper; import com.orion.visor.module.asset.define.operator.HostConnectLogOperatorType; import com.orion.visor.module.asset.entity.request.host.HostConnectLogQueryRequest; @@ -89,7 +89,7 @@ public class HostConnectLogController { return hostConnectLogService.clearHostConnectLog(request); } - @PreviewDisableApi + @DemoDisableApi @OperatorLog(HostConnectLogOperatorType.FORCE_OFFLINE) @PutMapping("/force-offline") @Operation(summary = "强制断开主机连接") diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostController.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostController.java index eea84d01..f89e1bf1 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostController.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostController.java @@ -5,7 +5,7 @@ import com.orion.visor.framework.biz.operator.log.core.annotation.OperatorLog; import com.orion.visor.framework.common.validator.group.Page; import com.orion.visor.framework.log.core.annotation.IgnoreLog; import com.orion.visor.framework.log.core.enums.IgnoreLogMode; -import com.orion.visor.framework.web.core.annotation.PreviewDisableApi; +import com.orion.visor.framework.web.core.annotation.DemoDisableApi; import com.orion.visor.framework.web.core.annotation.RestWrapper; import com.orion.visor.module.asset.define.operator.HostOperatorType; import com.orion.visor.module.asset.entity.request.host.HostCreateRequest; @@ -43,6 +43,7 @@ public class HostController { @Resource private HostService hostService; + @DemoDisableApi @OperatorLog(HostOperatorType.CREATE) @PostMapping("/create") @Operation(summary = "创建主机") @@ -51,6 +52,7 @@ public class HostController { return hostService.createHost(request); } + @DemoDisableApi @OperatorLog(HostOperatorType.UPDATE) @PutMapping("/update") @Operation(summary = "通过 id 更新主机") @@ -84,7 +86,7 @@ public class HostController { return hostService.getHostPage(request); } - @PreviewDisableApi + @DemoDisableApi @OperatorLog(HostOperatorType.DELETE) @DeleteMapping("/delete") @Operation(summary = "通过 id 删除主机") diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostGroupController.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostGroupController.java index be702526..a53a10eb 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostGroupController.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostGroupController.java @@ -3,7 +3,7 @@ package com.orion.visor.module.asset.controller; import com.orion.visor.framework.biz.operator.log.core.annotation.OperatorLog; import com.orion.visor.framework.log.core.annotation.IgnoreLog; import com.orion.visor.framework.log.core.enums.IgnoreLogMode; -import com.orion.visor.framework.web.core.annotation.PreviewDisableApi; +import com.orion.visor.framework.web.core.annotation.DemoDisableApi; import com.orion.visor.framework.web.core.annotation.RestWrapper; import com.orion.visor.module.asset.define.operator.HostGroupOperatorType; import com.orion.visor.module.asset.entity.request.host.HostGroupRelUpdateRequest; @@ -43,6 +43,7 @@ public class HostGroupController { @Resource private HostGroupService hostGroupService; + @DemoDisableApi @OperatorLog(HostGroupOperatorType.CREATE) @PostMapping("/create") @Operation(summary = "创建主机分组") @@ -59,6 +60,7 @@ public class HostGroupController { return hostGroupService.queryHostGroupTree(); } + @DemoDisableApi @OperatorLog(HostGroupOperatorType.RENAME) @PutMapping("/rename") @Operation(summary = "修改名称") @@ -67,6 +69,7 @@ public class HostGroupController { return hostGroupService.updateHostGroupName(request); } + @DemoDisableApi @OperatorLog(HostGroupOperatorType.MOVE) @PutMapping("/move") @Operation(summary = "移动位置") @@ -75,7 +78,7 @@ public class HostGroupController { return hostGroupService.moveHostGroup(request); } - @PreviewDisableApi + @DemoDisableApi @OperatorLog(HostGroupOperatorType.DELETE) @DeleteMapping("/delete") @Operation(summary = "删除主机分组") @@ -93,6 +96,7 @@ public class HostGroupController { return hostGroupService.queryHostGroupRel(groupId); } + @DemoDisableApi @OperatorLog(HostGroupOperatorType.UPDATE_REL) @PutMapping("/update-rel") @Operation(summary = "修改分组内主机") diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostIdentityController.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostIdentityController.java index b35adb12..68d8a0d6 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostIdentityController.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostIdentityController.java @@ -5,7 +5,7 @@ import com.orion.visor.framework.biz.operator.log.core.annotation.OperatorLog; import com.orion.visor.framework.common.validator.group.Page; import com.orion.visor.framework.log.core.annotation.IgnoreLog; import com.orion.visor.framework.log.core.enums.IgnoreLogMode; -import com.orion.visor.framework.web.core.annotation.PreviewDisableApi; +import com.orion.visor.framework.web.core.annotation.DemoDisableApi; import com.orion.visor.framework.web.core.annotation.RestWrapper; import com.orion.visor.module.asset.define.operator.HostIdentityOperatorType; import com.orion.visor.module.asset.entity.request.host.HostIdentityCreateRequest; @@ -43,6 +43,7 @@ public class HostIdentityController { @Resource private HostIdentityService hostIdentityService; + @DemoDisableApi @OperatorLog(HostIdentityOperatorType.CREATE) @PostMapping("/create") @Operation(summary = "创建主机身份") @@ -51,7 +52,7 @@ public class HostIdentityController { return hostIdentityService.createHostIdentity(request); } - @PreviewDisableApi + @DemoDisableApi @OperatorLog(HostIdentityOperatorType.UPDATE) @PutMapping("/update") @Operation(summary = "通过 id 更新主机身份") @@ -86,7 +87,7 @@ public class HostIdentityController { return hostIdentityService.getHostIdentityPage(request); } - @PreviewDisableApi + @DemoDisableApi @OperatorLog(HostIdentityOperatorType.DELETE) @DeleteMapping("/delete") @Operation(summary = "通过 id 删除主机身份") diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostKeyController.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostKeyController.java index 33751f34..1341d487 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostKeyController.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostKeyController.java @@ -5,6 +5,7 @@ import com.orion.visor.framework.biz.operator.log.core.annotation.OperatorLog; import com.orion.visor.framework.common.validator.group.Page; import com.orion.visor.framework.log.core.annotation.IgnoreLog; import com.orion.visor.framework.log.core.enums.IgnoreLogMode; +import com.orion.visor.framework.web.core.annotation.DemoDisableApi; import com.orion.visor.framework.web.core.annotation.RestWrapper; import com.orion.visor.module.asset.define.operator.HostKeyOperatorType; import com.orion.visor.module.asset.entity.request.host.HostKeyCreateRequest; @@ -42,6 +43,7 @@ public class HostKeyController { @Resource private HostKeyService hostKeyService; + @DemoDisableApi @OperatorLog(HostKeyOperatorType.CREATE) @PostMapping("/create") @Operation(summary = "创建主机密钥") @@ -50,6 +52,7 @@ public class HostKeyController { return hostKeyService.createHostKey(request); } + @DemoDisableApi @OperatorLog(HostKeyOperatorType.UPDATE) @PutMapping("/update") @Operation(summary = "通过 id 更新主机密钥") @@ -83,6 +86,7 @@ public class HostKeyController { return hostKeyService.getHostKeyPage(request); } + @DemoDisableApi @OperatorLog(HostKeyOperatorType.DELETE) @DeleteMapping("/delete") @Operation(summary = "通过 id 删除主机密钥") diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/DictKeyController.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/DictKeyController.java index 176b4a26..702dca72 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/DictKeyController.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/DictKeyController.java @@ -4,7 +4,7 @@ import com.orion.lang.define.wrapper.DataGrid; import com.orion.visor.framework.biz.operator.log.core.annotation.OperatorLog; import com.orion.visor.framework.log.core.annotation.IgnoreLog; import com.orion.visor.framework.log.core.enums.IgnoreLogMode; -import com.orion.visor.framework.web.core.annotation.PreviewDisableApi; +import com.orion.visor.framework.web.core.annotation.DemoDisableApi; import com.orion.visor.framework.web.core.annotation.RestWrapper; import com.orion.visor.module.infra.define.operator.DictKeyOperatorType; import com.orion.visor.module.infra.entity.request.dict.DictKeyCreateRequest; @@ -42,7 +42,7 @@ public class DictKeyController { @Resource private DictKeyService dictKeyService; - @PreviewDisableApi + @DemoDisableApi @OperatorLog(DictKeyOperatorType.CREATE) @PostMapping("/create") @Operation(summary = "创建字典配置项") @@ -51,7 +51,7 @@ public class DictKeyController { return dictKeyService.createDictKey(request); } - @PreviewDisableApi + @DemoDisableApi @OperatorLog(DictKeyOperatorType.UPDATE) @PutMapping("/update") @Operation(summary = "更新字典配置项") @@ -83,7 +83,7 @@ public class DictKeyController { return true; } - @PreviewDisableApi + @DemoDisableApi @OperatorLog(DictKeyOperatorType.DELETE) @DeleteMapping("/delete") @Operation(summary = "删除字典配置项") @@ -93,7 +93,7 @@ public class DictKeyController { return dictKeyService.deleteDictKeyById(id); } - @PreviewDisableApi + @DemoDisableApi @OperatorLog(DictKeyOperatorType.DELETE) @DeleteMapping("/batch-delete") @Operation(summary = "批量删除字典配置项") diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/DictValueController.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/DictValueController.java index 593e0278..1cc6957b 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/DictValueController.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/DictValueController.java @@ -6,7 +6,7 @@ import com.orion.visor.framework.biz.operator.log.core.annotation.OperatorLog; import com.orion.visor.framework.common.validator.group.Page; import com.orion.visor.framework.log.core.annotation.IgnoreLog; import com.orion.visor.framework.log.core.enums.IgnoreLogMode; -import com.orion.visor.framework.web.core.annotation.PreviewDisableApi; +import com.orion.visor.framework.web.core.annotation.DemoDisableApi; import com.orion.visor.framework.web.core.annotation.RestWrapper; import com.orion.visor.module.infra.define.operator.DictValueOperatorType; import com.orion.visor.module.infra.entity.request.dict.DictValueCreateRequest; @@ -46,7 +46,7 @@ public class DictValueController { @Resource private DictValueService dictValueService; - @PreviewDisableApi + @DemoDisableApi @OperatorLog(DictValueOperatorType.CREATE) @PostMapping("/create") @Operation(summary = "创建字典配置值") @@ -55,7 +55,7 @@ public class DictValueController { return dictValueService.createDictValue(request); } - @PreviewDisableApi + @DemoDisableApi @OperatorLog(DictValueOperatorType.UPDATE) @PutMapping("/update") @Operation(summary = "更新字典配置值") @@ -64,7 +64,7 @@ public class DictValueController { return dictValueService.updateDictValueById(request); } - @PreviewDisableApi + @DemoDisableApi @OperatorLog(DictValueOperatorType.UPDATE) @PutMapping("/rollback") @Operation(summary = "回滚字典配置值") @@ -88,7 +88,7 @@ public class DictValueController { return dictValueService.getDictValuePage(request); } - @PreviewDisableApi + @DemoDisableApi @OperatorLog(DictValueOperatorType.DELETE) @DeleteMapping("/delete") @Operation(summary = "删除字典配置值") @@ -98,7 +98,7 @@ public class DictValueController { return dictValueService.deleteDictValueById(id); } - @PreviewDisableApi + @DemoDisableApi @OperatorLog(DictValueOperatorType.DELETE) @DeleteMapping("/batch-delete") @Operation(summary = "批量删除字典配置值") diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/MineController.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/MineController.java index 048cfe61..a320a149 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/MineController.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/MineController.java @@ -5,7 +5,7 @@ import com.orion.visor.framework.biz.operator.log.core.annotation.OperatorLog; import com.orion.visor.framework.common.validator.group.Page; import com.orion.visor.framework.log.core.annotation.IgnoreLog; import com.orion.visor.framework.log.core.enums.IgnoreLogMode; -import com.orion.visor.framework.web.core.annotation.PreviewDisableApi; +import com.orion.visor.framework.web.core.annotation.DemoDisableApi; import com.orion.visor.framework.web.core.annotation.RestWrapper; import com.orion.visor.module.infra.define.operator.AuthenticationOperatorType; import com.orion.visor.module.infra.entity.request.operator.OperatorLogQueryRequest; @@ -58,7 +58,7 @@ public class MineController { return mineService.updateCurrentUser(request); } - @PreviewDisableApi + @DemoDisableApi @OperatorLog(AuthenticationOperatorType.UPDATE_PASSWORD) @Operation(summary = "修改当前用户密码") @PutMapping("/update-password") @@ -81,7 +81,7 @@ public class MineController { return mineService.getCurrentUserSessionList(); } - @PreviewDisableApi + @DemoDisableApi @PutMapping("/offline-session") @Operation(summary = "下线当前用户会话") public Boolean offlineCurrentUserSession(@Validated @RequestBody UserSessionOfflineRequest request) { diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/SystemMenuController.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/SystemMenuController.java index 8f55eb92..5455b48c 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/SystemMenuController.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/SystemMenuController.java @@ -3,7 +3,7 @@ package com.orion.visor.module.infra.controller; import com.orion.visor.framework.biz.operator.log.core.annotation.OperatorLog; import com.orion.visor.framework.log.core.annotation.IgnoreLog; import com.orion.visor.framework.log.core.enums.IgnoreLogMode; -import com.orion.visor.framework.web.core.annotation.PreviewDisableApi; +import com.orion.visor.framework.web.core.annotation.DemoDisableApi; import com.orion.visor.framework.web.core.annotation.RestWrapper; import com.orion.visor.module.infra.define.operator.SystemMenuOperatorType; import com.orion.visor.module.infra.entity.request.menu.SystemMenuCreateRequest; @@ -42,7 +42,7 @@ public class SystemMenuController { @Resource private SystemMenuService systemMenuService; - @PreviewDisableApi + @DemoDisableApi @OperatorLog(SystemMenuOperatorType.CREATE) @PostMapping("/create") @Operation(summary = "创建菜单") @@ -51,7 +51,7 @@ public class SystemMenuController { return systemMenuService.createSystemMenu(request); } - @PreviewDisableApi + @DemoDisableApi @OperatorLog(SystemMenuOperatorType.UPDATE) @PutMapping("/update") @Operation(summary = "通过 id 更新菜单") @@ -60,7 +60,7 @@ public class SystemMenuController { return systemMenuService.updateSystemMenuById(request); } - @PreviewDisableApi + @DemoDisableApi @OperatorLog(SystemMenuOperatorType.UPDATE_STATUS) @PutMapping("/update-status") @Operation(summary = "通过 id 级联更新菜单状态") @@ -86,7 +86,7 @@ public class SystemMenuController { return systemMenuService.getSystemMenuByIdList(request); } - @PreviewDisableApi + @DemoDisableApi @OperatorLog(SystemMenuOperatorType.DELETE) @DeleteMapping("/delete") @Operation(summary = "通过 id 级联删除菜单") diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/SystemRoleController.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/SystemRoleController.java index df46d243..a2e136c5 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/SystemRoleController.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/SystemRoleController.java @@ -5,7 +5,7 @@ import com.orion.visor.framework.biz.operator.log.core.annotation.OperatorLog; import com.orion.visor.framework.common.validator.group.Page; import com.orion.visor.framework.log.core.annotation.IgnoreLog; import com.orion.visor.framework.log.core.enums.IgnoreLogMode; -import com.orion.visor.framework.web.core.annotation.PreviewDisableApi; +import com.orion.visor.framework.web.core.annotation.DemoDisableApi; import com.orion.visor.framework.web.core.annotation.RestWrapper; import com.orion.visor.module.infra.define.operator.SystemRoleOperatorType; import com.orion.visor.module.infra.entity.request.menu.SystemRoleGrantMenuRequest; @@ -65,7 +65,7 @@ public class SystemRoleController { return systemRoleService.updateSystemRoleById(request); } - @PreviewDisableApi + @DemoDisableApi @OperatorLog(SystemRoleOperatorType.UPDATE_STATUS) @PutMapping("/update-status") @Operation(summary = "通过 id 更新角色状态") @@ -107,7 +107,7 @@ public class SystemRoleController { return systemRoleMenuService.getRoleMenuIdList(roleId); } - @PreviewDisableApi + @DemoDisableApi @OperatorLog(SystemRoleOperatorType.DELETE) @DeleteMapping("/delete") @Operation(summary = "通过 id 删除角色") diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/SystemUserController.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/SystemUserController.java index b82ad921..733f1e95 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/SystemUserController.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/SystemUserController.java @@ -6,7 +6,7 @@ import com.orion.visor.framework.biz.operator.log.core.annotation.OperatorLog; import com.orion.visor.framework.common.validator.group.Page; import com.orion.visor.framework.log.core.annotation.IgnoreLog; import com.orion.visor.framework.log.core.enums.IgnoreLogMode; -import com.orion.visor.framework.web.core.annotation.PreviewDisableApi; +import com.orion.visor.framework.web.core.annotation.DemoDisableApi; import com.orion.visor.framework.web.core.annotation.RestWrapper; import com.orion.visor.module.infra.define.operator.SystemUserOperatorType; import com.orion.visor.module.infra.entity.request.user.*; @@ -74,7 +74,7 @@ public class SystemUserController { // TODO 修改头像 最后再说 可有可无的功能 要是有 http 文件需求就写 - @PreviewDisableApi + @DemoDisableApi @OperatorLog(SystemUserOperatorType.UPDATE_STATUS) @PutMapping("/update-status") @Operation(summary = "修改用户状态") @@ -97,7 +97,7 @@ public class SystemUserController { } } - @PreviewDisableApi + @DemoDisableApi @OperatorLog(SystemUserOperatorType.RESET_PASSWORD) @PutMapping("/reset-password") @Operation(summary = "重置用户密码") @@ -140,7 +140,7 @@ public class SystemUserController { return systemUserService.getSystemUserPage(request); } - @PreviewDisableApi + @DemoDisableApi @OperatorLog(SystemUserOperatorType.DELETE) @DeleteMapping("/delete") @Operation(summary = "通过 id 删除用户") @@ -158,7 +158,7 @@ public class SystemUserController { return systemUserManagementService.getUserSessionList(id); } - @PreviewDisableApi + @DemoDisableApi @OperatorLog(SystemUserOperatorType.OFFLINE) @PutMapping("/session/offline") @Operation(summary = "下线用户会话")