From a1477e96146989902faccfeec9d9f390c464adee Mon Sep 17 00:00:00 2001 From: lijiahang Date: Mon, 9 Oct 2023 18:48:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=93=8D=E4=BD=9C=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E6=A8=A1=E5=9D=97.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- orion-ops-dependencies/pom.xml | 5 +++ .../framework/common/entity/PageRequest.java | 2 +- .../common/{valid => validator}/group/Id.java | 2 +- .../{valid => validator}/group/Page.java | 2 +- .../pom.xml | 31 +++++++++++++++++++ .../log/core/annotation/OperatorLog.java | 9 ++++++ .../log/core/model/OperatorLogModel.java | 27 ++++++++++++++++ orion-ops-framework/pom.xml | 2 +- orion-ops-launch/pom.xml | 4 +++ .../orion-server-module-controller.java.vm | 2 +- .../orion-ops-module-asset-service/pom.xml | 8 ++--- .../asset/controller/HostController.java | 2 +- .../controller/HostIdentityController.java | 2 +- .../asset/controller/HostKeyController.java | 2 +- .../orion-ops-module-infra-service/pom.xml | 8 ++--- .../controller/SystemRoleController.java | 2 +- .../controller/SystemUserController.java | 2 +- 17 files changed, 94 insertions(+), 18 deletions(-) rename orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/{valid => validator}/group/Id.java (68%) rename orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/{valid => validator}/group/Page.java (69%) create mode 100644 orion-ops-framework/orion-ops-spring-boot-starter-biz-operator-log/pom.xml create mode 100644 orion-ops-framework/orion-ops-spring-boot-starter-biz-operator-log/src/main/java/com/orion/ops/framework/biz/operator/log/core/annotation/OperatorLog.java create mode 100644 orion-ops-framework/orion-ops-spring-boot-starter-biz-operator-log/src/main/java/com/orion/ops/framework/biz/operator/log/core/model/OperatorLogModel.java diff --git a/orion-ops-dependencies/pom.xml b/orion-ops-dependencies/pom.xml index f5195a72..0b3d30a8 100644 --- a/orion-ops-dependencies/pom.xml +++ b/orion-ops-dependencies/pom.xml @@ -134,6 +134,11 @@ orion-ops-spring-boot-starter-test ${revision} + + com.orion.ops + orion-ops-spring-boot-starter-biz-operator-log + ${revision} + diff --git a/orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/entity/PageRequest.java b/orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/entity/PageRequest.java index cade700f..46db7b2d 100644 --- a/orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/entity/PageRequest.java +++ b/orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/entity/PageRequest.java @@ -1,7 +1,7 @@ package com.orion.ops.framework.common.entity; import com.orion.lang.define.wrapper.IPageRequest; -import com.orion.ops.framework.common.valid.group.Page; +import com.orion.ops.framework.common.validator.group.Page; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import org.hibernate.validator.constraints.Range; diff --git a/orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/valid/group/Id.java b/orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/validator/group/Id.java similarity index 68% rename from orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/valid/group/Id.java rename to orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/validator/group/Id.java index 6159e805..15d3a54b 100644 --- a/orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/valid/group/Id.java +++ b/orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/validator/group/Id.java @@ -1,4 +1,4 @@ -package com.orion.ops.framework.common.valid.group; +package com.orion.ops.framework.common.validator.group; /** * 分页验证分组 diff --git a/orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/valid/group/Page.java b/orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/validator/group/Page.java similarity index 69% rename from orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/valid/group/Page.java rename to orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/validator/group/Page.java index 7638d9eb..819b14c9 100644 --- a/orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/valid/group/Page.java +++ b/orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/validator/group/Page.java @@ -1,4 +1,4 @@ -package com.orion.ops.framework.common.valid.group; +package com.orion.ops.framework.common.validator.group; /** * 分页验证分组 diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-biz-operator-log/pom.xml b/orion-ops-framework/orion-ops-spring-boot-starter-biz-operator-log/pom.xml new file mode 100644 index 00000000..869fe7ab --- /dev/null +++ b/orion-ops-framework/orion-ops-spring-boot-starter-biz-operator-log/pom.xml @@ -0,0 +1,31 @@ + + + + com.orion.ops + orion-ops-framework + ${revision} + + + 4.0.0 + orion-ops-spring-boot-starter-biz-operator-log + ${project.artifactId} + jar + + 项目操作日志包 + https://github.com/lijiahangmax/orion-ops-pro + + + + com.orion.ops + orion-ops-framework-common + + + + org.springframework.boot + spring-boot-starter + + + + \ No newline at end of file diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-biz-operator-log/src/main/java/com/orion/ops/framework/biz/operator/log/core/annotation/OperatorLog.java b/orion-ops-framework/orion-ops-spring-boot-starter-biz-operator-log/src/main/java/com/orion/ops/framework/biz/operator/log/core/annotation/OperatorLog.java new file mode 100644 index 00000000..c16c8bc4 --- /dev/null +++ b/orion-ops-framework/orion-ops-spring-boot-starter-biz-operator-log/src/main/java/com/orion/ops/framework/biz/operator/log/core/annotation/OperatorLog.java @@ -0,0 +1,9 @@ +package com.orion.ops.framework.biz.operator.log.core.annotation; + +/** + * @author Jiahang Li + * @version 1.0.0 + * @since 2023/10/9 18:44 + */ +public interface OperatorLog { +} diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-biz-operator-log/src/main/java/com/orion/ops/framework/biz/operator/log/core/model/OperatorLogModel.java b/orion-ops-framework/orion-ops-spring-boot-starter-biz-operator-log/src/main/java/com/orion/ops/framework/biz/operator/log/core/model/OperatorLogModel.java new file mode 100644 index 00000000..dbfbf078 --- /dev/null +++ b/orion-ops-framework/orion-ops-spring-boot-starter-biz-operator-log/src/main/java/com/orion/ops/framework/biz/operator/log/core/model/OperatorLogModel.java @@ -0,0 +1,27 @@ +package com.orion.ops.framework.biz.operator.log.core.model; + +import lombok.Data; + +/** + * 操作日志模型 + * + * @author Jiahang Li + * @version 1.0.0 + * @since 2023/10/9 18:44 + */ +@Data +public class OperatorLogModel { + // 用户操作日志 + // id + // user_id + // trace_id + // log_info + // module 模块 + // operator 操作 + // ip + // address + // user_agent + // params + // result + // duration +} diff --git a/orion-ops-framework/pom.xml b/orion-ops-framework/pom.xml index 3a2d44cb..580e8e6a 100644 --- a/orion-ops-framework/pom.xml +++ b/orion-ops-framework/pom.xml @@ -31,7 +31,7 @@ orion-ops-spring-boot-starter-security orion-ops-spring-boot-starter-monitor orion-ops-spring-boot-starter-test - + orion-ops-spring-boot-starter-biz-operator-log \ No newline at end of file diff --git a/orion-ops-launch/pom.xml b/orion-ops-launch/pom.xml index 2d5bc34b..f92c6832 100644 --- a/orion-ops-launch/pom.xml +++ b/orion-ops-launch/pom.xml @@ -81,6 +81,10 @@ com.orion.ops orion-ops-spring-boot-starter-monitor + + com.orion.ops + orion-ops-spring-boot-starter-biz-operator-log + 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 71cf2317..f3c9e767 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,7 +1,7 @@ package ${package.Controller}; import com.orion.lang.define.wrapper.DataGrid; -import com.orion.ops.framework.common.valid.group.Page; +import com.orion.ops.framework.common.validator.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; diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/pom.xml b/orion-ops-module-asset/orion-ops-module-asset-service/pom.xml index 3c4f5f65..75e0d154 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/pom.xml +++ b/orion-ops-module-asset/orion-ops-module-asset-service/pom.xml @@ -48,10 +48,10 @@ - - - - + + com.orion.ops + orion-ops-spring-boot-starter-biz-operator-log + 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 f4d0d45b..aa229027 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,7 +1,7 @@ package com.orion.ops.module.asset.controller; import com.orion.lang.define.wrapper.DataGrid; -import com.orion.ops.framework.common.valid.group.Page; +import com.orion.ops.framework.common.validator.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; 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 cecd4e29..dd1e3c35 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,7 +1,7 @@ package com.orion.ops.module.asset.controller; import com.orion.lang.define.wrapper.DataGrid; -import com.orion.ops.framework.common.valid.group.Page; +import com.orion.ops.framework.common.validator.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; 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 84b98399..2da9fd0e 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,7 +1,7 @@ package com.orion.ops.module.asset.controller; import com.orion.lang.define.wrapper.DataGrid; -import com.orion.ops.framework.common.valid.group.Page; +import com.orion.ops.framework.common.validator.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; diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/pom.xml b/orion-ops-module-infra/orion-ops-module-infra-service/pom.xml index 4eb35569..aacc5b2c 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/pom.xml +++ b/orion-ops-module-infra/orion-ops-module-infra-service/pom.xml @@ -41,10 +41,10 @@ - - - - + + com.orion.ops + orion-ops-spring-boot-starter-biz-operator-log + 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 890f5b87..7471b1d6 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,7 +1,7 @@ package com.orion.ops.module.infra.controller; import com.orion.lang.define.wrapper.DataGrid; -import com.orion.ops.framework.common.valid.group.Page; +import com.orion.ops.framework.common.validator.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; 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 ef1f7f2f..910cffba 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,7 +3,7 @@ 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.valid.group.Page; +import com.orion.ops.framework.common.validator.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;