diff --git a/README.md b/README.md index f40841d6..dcc7f4dc 100644 --- a/README.md +++ b/README.md @@ -60,7 +60,8 @@ * 🔗 演示地址: [https://do.orionsec.cn/#/](https://do.orionsec.cn/#/) * 🔏 演示账号: orionadmin/orionadmin -* ⭐ 体验后可以点一下 `star` 这对我很重要! [github](https://github.com/lijiahangmax/orion-ops) [gitee](https://gitee.com/lijiahangmax/orion-ops) [gitcode](https://gitcode.com/lijiahangmax/orion-ops/overview) +* ⭐ 体验后可以点一下 `star` + 这对我很重要! [github](https://github.com/lijiahangmax/orion-ops) [gitee](https://gitee.com/lijiahangmax/orion-ops) [gitcode](https://gitcode.com/lijiahangmax/orion-ops/overview) * 🌈 如果本项目对你有帮助请帮忙推广一下 让更多的人知道此项目! * 🎭 演示环境部分功能不可用, 完整功能请本地部署! * 📛 演示环境请不要随便删除数据! @@ -77,7 +78,7 @@ ## 重构版 orion-visor -`orion-visor` 为 `orion-ops` 的重构版本, 优化了交互逻辑以及UI风格、操作更友好、系统更快速&安全! 目前该项目已荣获 `GVP` +`orion-visor` 为 `orion-ops` 的重构版本, 优化了交互逻辑以及UI风格、操作更友好、系统更快速&安全! 目前该项目已荣获 `GVP` [项目地址](https://visor.orionsec.cn) ## 技术栈 @@ -153,9 +154,9 @@ ![流水线配置](https://yxythpt.oss-cn-shenzhen.aliyuncs.com/2022-04-25/files694386343461173439.png "流水线配置") ![流水线任务](https://yxythpt.oss-cn-shenzhen.aliyuncs.com/2022-04-25/files6446052342050924823.png "流水线任务") -### 登陆日志 +### 登录日志 -![登陆日志](http://bjucloud.oss-cn-qingdao.aliyuncs.com/album/2022/7/23/4a548584-6cee-4b95-9811-5d2a670bfca8.jpg "登陆日志") +![登录日志](http://bjucloud.oss-cn-qingdao.aliyuncs.com/album/2022/7/23/4a548584-6cee-4b95-9811-5d2a670bfca8.jpg "登录日志") ### 安全配置 @@ -187,7 +188,7 @@ orion-ops 作为开源项目, 欢迎任何人提出建议以及贡献代码。 联系方式 -📧 微信添加备注: ops +📧 问题/加群微信备注: ops 📧 合作/功能定制备注: 合作 ## 支持一下 diff --git a/docker-compose.yml b/docker-compose.yml index fa998b45..61bbadfc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.3' services: orion-ops: - image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops:1.2.9 + image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops:1.3.0 ports: - 1022:22 - 1080:80 @@ -19,7 +19,7 @@ services: - orion-ops-db - orion-ops-redis orion-ops-db: - image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops-mysql:1.2.9 + image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops-mysql:1.3.0 privileged: true environment: - MYSQL_DATABASE=orion-ops @@ -33,7 +33,7 @@ services: - /data/orion-ops-space/docker-volumes/mysql/var-lib-mysql-files:/var/lib/mysql-files - /data/orion-ops-space/docker-volumes/mysql/etc-mysql:/etc/mysql orion-ops-redis: - image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops-redis:1.2.9 + image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops-redis:1.3.0 privileged: true ports: - 16379:6379 @@ -43,7 +43,7 @@ services: - /data/orion-ops-space/docker-volumes/orion-ops-redis/data:/data command: sh -c "redis-server /usr/local/redis.conf --requirepass $${REDIS_PASSWORD}" orion-ops-adminer: - image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops-adminer:1.2.9 + image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops-adminer:1.3.0 restart: always ports: - 18080:8080 \ No newline at end of file diff --git a/docker/adminer/build.sh b/docker/adminer/build.sh index 584f2b83..1b492224 100644 --- a/docker/adminer/build.sh +++ b/docker/adminer/build.sh @@ -1,4 +1,4 @@ #/bin/bash -version=1.2.9 +version=1.3.0 docker build -t orion-ops-adminer:${version} . docker tag orion-ops-adminer:${version} registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops-adminer:${version} diff --git a/docker/mysql/build.sh b/docker/mysql/build.sh index 569e2995..aab137a4 100644 --- a/docker/mysql/build.sh +++ b/docker/mysql/build.sh @@ -1,5 +1,5 @@ #/bin/bash -version=1.2.9 +version=1.3.0 cp -r ../../sql ./sql docker build -t orion-ops-mysql:${version} . rm -rf ./sql diff --git a/docker/push.sh b/docker/push.sh index 3a7ee919..e960452a 100644 --- a/docker/push.sh +++ b/docker/push.sh @@ -1,5 +1,5 @@ #/bin/bash -version=1.2.9 +version=1.3.0 docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops-adminer:${version} docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops-mysql:${version} docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops-redis:${version} diff --git a/docker/redis/build.sh b/docker/redis/build.sh index e77df9d3..a22e04d6 100644 --- a/docker/redis/build.sh +++ b/docker/redis/build.sh @@ -1,4 +1,4 @@ #/bin/bash -version=1.2.9 +version=1.3.0 docker build -t orion-ops-redis:${version} . docker tag orion-ops-redis:${version} registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops-redis:${version} diff --git a/docker/service/build.sh b/docker/service/build.sh index 1b48dad0..5fb4e2af 100644 --- a/docker/service/build.sh +++ b/docker/service/build.sh @@ -1,5 +1,5 @@ #/bin/bash -version=1.2.9 +version=1.3.0 mv ../../orion-ops-api/orion-ops-web/target/orion-ops-web.jar ./ mv ../../orion-ops-vue/dist ./ cp $HOME/orion-ops/lib/machine-monitor-agent-latest.jar ./ diff --git a/orion-ops-api/orion-ops-common/pom.xml b/orion-ops-api/orion-ops-common/pom.xml index 339a624e..f40c44fc 100644 --- a/orion-ops-api/orion-ops-common/pom.xml +++ b/orion-ops-api/orion-ops-common/pom.xml @@ -3,9 +3,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - com.orion.ops + cn.orionsec.ops orion-ops-api - 1.2.9 + 1.3.0 ../pom.xml diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/annotation/DemoDisableApi.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/annotation/DemoDisableApi.java similarity index 96% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/annotation/DemoDisableApi.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/annotation/DemoDisableApi.java index 7b1229dc..23d6ffda 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/annotation/DemoDisableApi.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/annotation/DemoDisableApi.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.annotation; +package cn.orionsec.ops.annotation; import java.lang.annotation.*; diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/annotation/EventLog.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/annotation/EventLog.java similarity index 91% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/annotation/EventLog.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/annotation/EventLog.java index 8f6f9691..abbfcf5e 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/annotation/EventLog.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/annotation/EventLog.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.annotation; +package cn.orionsec.ops.annotation; -import com.orion.ops.constant.event.EventType; +import cn.orionsec.ops.constant.event.EventType; import java.lang.annotation.*; diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/annotation/IgnoreAuth.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/annotation/IgnoreAuth.java similarity index 96% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/annotation/IgnoreAuth.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/annotation/IgnoreAuth.java index 791df79d..6f40f844 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/annotation/IgnoreAuth.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/annotation/IgnoreAuth.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.annotation; +package cn.orionsec.ops.annotation; import java.lang.annotation.*; diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/annotation/IgnoreCheck.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/annotation/IgnoreCheck.java similarity index 96% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/annotation/IgnoreCheck.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/annotation/IgnoreCheck.java index 646e5c4b..265cb0ce 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/annotation/IgnoreCheck.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/annotation/IgnoreCheck.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.annotation; +package cn.orionsec.ops.annotation; import java.lang.annotation.*; diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/annotation/IgnoreLog.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/annotation/IgnoreLog.java similarity index 90% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/annotation/IgnoreLog.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/annotation/IgnoreLog.java index 4a2ed358..6e8a6606 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/annotation/IgnoreLog.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/annotation/IgnoreLog.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.annotation; +package cn.orionsec.ops.annotation; import java.lang.annotation.*; @@ -22,7 +22,7 @@ import java.lang.annotation.*; * * @author Jiahang Li * @version 1.0.0 - * @see com.orion.ops.interceptor.LogPrintInterceptor + * @see cn.orionsec.ops.interceptor.LogPrintInterceptor * @since 2022/4/20 10:33 */ @SuppressWarnings("ALL") diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/annotation/IgnoreWrapper.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/annotation/IgnoreWrapper.java similarity index 96% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/annotation/IgnoreWrapper.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/annotation/IgnoreWrapper.java index 5346b6f3..0bba65ee 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/annotation/IgnoreWrapper.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/annotation/IgnoreWrapper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.annotation; +package cn.orionsec.ops.annotation; import java.lang.annotation.*; diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/annotation/RequireRole.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/annotation/RequireRole.java similarity index 92% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/annotation/RequireRole.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/annotation/RequireRole.java index 57cdc789..4709556d 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/annotation/RequireRole.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/annotation/RequireRole.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.annotation; +package cn.orionsec.ops.annotation; -import com.orion.ops.constant.user.RoleType; +import cn.orionsec.ops.constant.user.RoleType; import java.lang.annotation.*; diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/annotation/RestWrapper.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/annotation/RestWrapper.java similarity index 96% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/annotation/RestWrapper.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/annotation/RestWrapper.java index d3cc622f..d74b16dc 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/annotation/RestWrapper.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/annotation/RestWrapper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.annotation; +package cn.orionsec.ops.annotation; import java.lang.annotation.*; diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/CnConst.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/CnConst.java similarity index 98% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/CnConst.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/CnConst.java index dcf3c663..8ea48e39 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/CnConst.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/CnConst.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.constant; +package cn.orionsec.ops.constant; /** * 中文常量 diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/Const.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/Const.java similarity index 99% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/Const.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/Const.java index 92088776..7aab5328 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/Const.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/Const.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.constant; +package cn.orionsec.ops.constant; import com.orion.lang.utils.collect.Lists; diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/KeyConst.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/KeyConst.java similarity index 97% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/KeyConst.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/KeyConst.java index e46bb353..9722f302 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/KeyConst.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/KeyConst.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.constant; +package cn.orionsec.ops.constant; /** * redis key 常量 @@ -28,14 +28,14 @@ public class KeyConst { } /** - * 登陆 token + * 登录 token *

* auth:login:{id} */ public static final String LOGIN_TOKEN_KEY = "auth:info:{}"; /** - * 登陆 token 绑定 token + * 登录 token 绑定 token *

* auth:login:{id}:{timestamp} */ diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/MessageConst.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/MessageConst.java similarity index 99% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/MessageConst.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/MessageConst.java index 8efc1565..8c19bcc2 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/MessageConst.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/MessageConst.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.constant; +package cn.orionsec.ops.constant; /** * 消息常量 diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/ParamConst.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/ParamConst.java similarity index 96% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/ParamConst.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/ParamConst.java index 4e34469a..6022b5c3 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/ParamConst.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/ParamConst.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.constant; +package cn.orionsec.ops.constant; /** * 参数常量 diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/PropertiesConst.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/PropertiesConst.java similarity index 96% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/PropertiesConst.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/PropertiesConst.java index 4c8af3ba..c486cc6f 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/PropertiesConst.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/PropertiesConst.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.constant; +package cn.orionsec.ops.constant; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; @@ -36,7 +36,7 @@ public class PropertiesConst { public static String ORION_OPS_VERSION; /** - * 登陆 token 请求头 + * 登录 token 请求头 */ public static String LOGIN_TOKEN_HEADER; diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/ResultCode.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/ResultCode.java similarity index 98% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/ResultCode.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/ResultCode.java index ecdf5af0..cf90e55b 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/ResultCode.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/ResultCode.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.constant; +package cn.orionsec.ops.constant; import com.orion.lang.define.wrapper.CodeInfo; diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/SchedulerPools.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/SchedulerPools.java similarity index 99% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/SchedulerPools.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/SchedulerPools.java index 1b2b799d..8a863551 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/SchedulerPools.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/SchedulerPools.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.constant; +package cn.orionsec.ops.constant; import com.orion.lang.define.thread.ExecutorBuilder; import com.orion.lang.utils.Systems; diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/alarm/AlarmGroupNotifyType.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/alarm/AlarmGroupNotifyType.java similarity index 96% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/alarm/AlarmGroupNotifyType.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/alarm/AlarmGroupNotifyType.java index d72ed722..72436d4d 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/alarm/AlarmGroupNotifyType.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/alarm/AlarmGroupNotifyType.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.constant.alarm; +package cn.orionsec.ops.constant.alarm; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/app/ActionStatus.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/app/ActionStatus.java similarity index 97% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/app/ActionStatus.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/app/ActionStatus.java index 1188e887..75a3063b 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/app/ActionStatus.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/app/ActionStatus.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.constant.app; +package cn.orionsec.ops.constant.app; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/app/ActionType.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/app/ActionType.java similarity index 98% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/app/ActionType.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/app/ActionType.java index 9536c1f6..5d8d052b 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/app/ActionType.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/app/ActionType.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.constant.app; +package cn.orionsec.ops.constant.app; import lombok.Getter; diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/app/ApplicationEnvAttr.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/app/ApplicationEnvAttr.java similarity index 90% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/app/ApplicationEnvAttr.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/app/ApplicationEnvAttr.java index f084cd48..20c0bf65 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/app/ApplicationEnvAttr.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/app/ApplicationEnvAttr.java @@ -13,8 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.constant.app; +package cn.orionsec.ops.constant.app; +import cn.orionsec.ops.constant.common.ExceptionHandlerType; +import cn.orionsec.ops.constant.common.SerialType; import lombok.Getter; import java.util.Arrays; @@ -56,15 +58,15 @@ public enum ApplicationEnvAttr { /** * 发布序列方式 * - * @see com.orion.ops.constant.common.SerialType + * @see SerialType */ RELEASE_SERIAL("发布序列方式 (serial/parallel)"), /** * 异常处理类型 * - * @see com.orion.ops.constant.common.SerialType#SERIAL - * @see com.orion.ops.constant.common.ExceptionHandlerType + * @see SerialType#SERIAL + * @see ExceptionHandlerType */ EXCEPTION_HANDLER("异常处理类型 (skip_all/skip_error)"), diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/app/BuildStatus.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/app/BuildStatus.java similarity index 97% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/app/BuildStatus.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/app/BuildStatus.java index 9167ba81..fcf5a360 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/app/BuildStatus.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/app/BuildStatus.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.constant.app; +package cn.orionsec.ops.constant.app; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/app/PipelineDetailStatus.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/app/PipelineDetailStatus.java similarity index 97% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/app/PipelineDetailStatus.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/app/PipelineDetailStatus.java index d0596603..9c9076dd 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/app/PipelineDetailStatus.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/app/PipelineDetailStatus.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.constant.app; +package cn.orionsec.ops.constant.app; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/app/PipelineLogStatus.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/app/PipelineLogStatus.java similarity index 97% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/app/PipelineLogStatus.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/app/PipelineLogStatus.java index 994baf73..32b7d9b4 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/app/PipelineLogStatus.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/app/PipelineLogStatus.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.constant.app; +package cn.orionsec.ops.constant.app; +import cn.orionsec.ops.utils.Valid; import com.orion.lang.utils.Strings; -import com.orion.ops.utils.Valid; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/app/PipelineStatus.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/app/PipelineStatus.java similarity index 97% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/app/PipelineStatus.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/app/PipelineStatus.java index 6d9eb68e..4fbf89c9 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/app/PipelineStatus.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/app/PipelineStatus.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.constant.app; +package cn.orionsec.ops.constant.app; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/app/ReleaseStatus.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/app/ReleaseStatus.java similarity index 97% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/app/ReleaseStatus.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/app/ReleaseStatus.java index 2ef09edb..b104601e 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/app/ReleaseStatus.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/app/ReleaseStatus.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.constant.app; +package cn.orionsec.ops.constant.app; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/app/ReleaseType.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/app/ReleaseType.java similarity index 97% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/app/ReleaseType.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/app/ReleaseType.java index 62baf5b8..9569c037 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/app/ReleaseType.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/app/ReleaseType.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.constant.app; +package cn.orionsec.ops.constant.app; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/app/RepositoryAuthType.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/app/RepositoryAuthType.java similarity index 95% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/app/RepositoryAuthType.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/app/RepositoryAuthType.java index 167ebb29..0e2a59e4 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/app/RepositoryAuthType.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/app/RepositoryAuthType.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.constant.app; +package cn.orionsec.ops.constant.app; -import com.orion.ops.constant.CnConst; +import cn.orionsec.ops.constant.CnConst; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/app/RepositoryStatus.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/app/RepositoryStatus.java similarity index 97% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/app/RepositoryStatus.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/app/RepositoryStatus.java index d3d3452c..eb76988e 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/app/RepositoryStatus.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/app/RepositoryStatus.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.constant.app; +package cn.orionsec.ops.constant.app; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/app/RepositoryTokenType.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/app/RepositoryTokenType.java similarity index 95% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/app/RepositoryTokenType.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/app/RepositoryTokenType.java index 21c6a8df..c243c902 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/app/RepositoryTokenType.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/app/RepositoryTokenType.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.constant.app; +package cn.orionsec.ops.constant.app; -import com.orion.ops.constant.Const; +import cn.orionsec.ops.constant.Const; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/app/RepositoryType.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/app/RepositoryType.java similarity index 97% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/app/RepositoryType.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/app/RepositoryType.java index 8327f771..c175b77d 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/app/RepositoryType.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/app/RepositoryType.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.constant.app; +package cn.orionsec.ops.constant.app; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/app/StageType.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/app/StageType.java similarity index 97% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/app/StageType.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/app/StageType.java index 27342a4b..34c8fa0c 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/app/StageType.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/app/StageType.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.constant.app; +package cn.orionsec.ops.constant.app; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/app/TimedType.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/app/TimedType.java similarity index 97% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/app/TimedType.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/app/TimedType.java index 34d7920b..6ea38b29 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/app/TimedType.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/app/TimedType.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.constant.app; +package cn.orionsec.ops.constant.app; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/app/TransferFileType.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/app/TransferFileType.java similarity index 97% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/app/TransferFileType.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/app/TransferFileType.java index 973f7f1a..222656c8 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/app/TransferFileType.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/app/TransferFileType.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.constant.app; +package cn.orionsec.ops.constant.app; import lombok.Getter; diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/app/TransferMode.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/app/TransferMode.java similarity index 97% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/app/TransferMode.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/app/TransferMode.java index 7b89e128..b58f40c0 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/app/TransferMode.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/app/TransferMode.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.constant.app; +package cn.orionsec.ops.constant.app; import lombok.Getter; diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/command/CommandConst.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/command/CommandConst.java similarity index 94% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/command/CommandConst.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/command/CommandConst.java index d45746b9..0fd8c8f6 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/command/CommandConst.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/command/CommandConst.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.constant.command; +package cn.orionsec.ops.constant.command; -import com.orion.ops.constant.env.EnvConst; +import cn.orionsec.ops.constant.env.EnvConst; /** * 命令常量 diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/command/ExecStatus.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/command/ExecStatus.java similarity index 97% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/command/ExecStatus.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/command/ExecStatus.java index c4112564..2a47c128 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/command/ExecStatus.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/command/ExecStatus.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.constant.command; +package cn.orionsec.ops.constant.command; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/command/ExecType.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/command/ExecType.java similarity index 96% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/command/ExecType.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/command/ExecType.java index 8080767b..4a6a9b76 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/command/ExecType.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/command/ExecType.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.constant.command; +package cn.orionsec.ops.constant.command; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/common/AuditStatus.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/common/AuditStatus.java similarity index 96% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/common/AuditStatus.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/common/AuditStatus.java index e428864f..d4f1669a 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/common/AuditStatus.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/common/AuditStatus.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.constant.common; +package cn.orionsec.ops.constant.common; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/common/EnableType.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/common/EnableType.java similarity index 97% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/common/EnableType.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/common/EnableType.java index 9b89e7ce..b07f95c7 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/common/EnableType.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/common/EnableType.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.constant.common; +package cn.orionsec.ops.constant.common; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/common/ExceptionHandlerType.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/common/ExceptionHandlerType.java similarity index 97% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/common/ExceptionHandlerType.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/common/ExceptionHandlerType.java index ee690043..04cc3146 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/common/ExceptionHandlerType.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/common/ExceptionHandlerType.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.constant.common; +package cn.orionsec.ops.constant.common; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/common/SerialType.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/common/SerialType.java similarity index 97% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/common/SerialType.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/common/SerialType.java index 646e2188..444c9356 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/common/SerialType.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/common/SerialType.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.constant.common; +package cn.orionsec.ops.constant.common; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/common/StainCode.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/common/StainCode.java similarity index 99% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/common/StainCode.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/common/StainCode.java index 101478a6..b2e3de77 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/common/StainCode.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/common/StainCode.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.constant.common; +package cn.orionsec.ops.constant.common; /** * ANSI 高亮颜色转义码 diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/common/TreeMoveType.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/common/TreeMoveType.java similarity index 97% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/common/TreeMoveType.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/common/TreeMoveType.java index b462e36d..14cd04d3 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/common/TreeMoveType.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/common/TreeMoveType.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.constant.common; +package cn.orionsec.ops.constant.common; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/download/FileDownloadType.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/download/FileDownloadType.java similarity index 75% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/download/FileDownloadType.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/download/FileDownloadType.java index 2872fb15..b48dc93d 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/download/FileDownloadType.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/download/FileDownloadType.java @@ -13,8 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.constant.download; +package cn.orionsec.ops.constant.download; +import cn.orionsec.ops.constant.system.SystemEnvAttr; import lombok.AllArgsConstructor; import lombok.Getter; @@ -32,28 +33,28 @@ public enum FileDownloadType { /** * 密钥 * - * @see com.orion.ops.constant.system.SystemEnvAttr#KEY_PATH + * @see SystemEnvAttr#KEY_PATH */ SECRET_KEY(10), /** * terminal 录屏 * - * @see com.orion.ops.constant.system.SystemEnvAttr#LOG_PATH + * @see SystemEnvAttr#LOG_PATH */ TERMINAL_SCREEN(20), /** * 命令 执行日志 * - * @see com.orion.ops.constant.system.SystemEnvAttr#LOG_PATH + * @see SystemEnvAttr#LOG_PATH */ EXEC_LOG(30), /** * sftp 下载文件 * - * @see com.orion.ops.constant.system.SystemEnvAttr#SWAP_PATH + * @see SystemEnvAttr#SWAP_PATH */ SFTP_DOWNLOAD(40), @@ -65,35 +66,35 @@ public enum FileDownloadType { /** * 应用构建日志 * - * @see com.orion.ops.constant.system.SystemEnvAttr#LOG_PATH + * @see SystemEnvAttr#LOG_PATH */ APP_BUILD_LOG(60), /** * 应用构建操作日志 * - * @see com.orion.ops.constant.system.SystemEnvAttr#LOG_PATH + * @see SystemEnvAttr#LOG_PATH */ APP_ACTION_LOG(70), /** * 应用构建 产物文件 * - * @see com.orion.ops.constant.system.SystemEnvAttr#DIST_PATH + * @see SystemEnvAttr#DIST_PATH */ APP_BUILD_BUNDLE(80), /** * 应用发布 机器日志 * - * @see com.orion.ops.constant.system.SystemEnvAttr#LOG_PATH + * @see SystemEnvAttr#LOG_PATH */ APP_RELEASE_MACHINE_LOG(90), /** * 调度任务机器日志 * - * @see com.orion.ops.constant.system.SystemEnvAttr#LOG_PATH + * @see SystemEnvAttr#LOG_PATH */ SCHEDULER_TASK_MACHINE_LOG(110), diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/env/EnvConst.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/env/EnvConst.java similarity index 98% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/env/EnvConst.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/env/EnvConst.java index ca7c3193..9e61de75 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/env/EnvConst.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/env/EnvConst.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.constant.env; +package cn.orionsec.ops.constant.env; /** * 环境变量常量 diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/env/EnvViewType.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/env/EnvViewType.java similarity index 97% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/env/EnvViewType.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/env/EnvViewType.java index 155bcc7f..a10f39b1 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/env/EnvViewType.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/env/EnvViewType.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.constant.env; +package cn.orionsec.ops.constant.env; +import cn.orionsec.ops.utils.AttrConverts; import com.orion.lang.define.collect.MutableLinkedHashMap; -import com.orion.ops.utils.AttrConverts; import lombok.AllArgsConstructor; import java.util.Map; diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/event/EventClassify.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/event/EventClassify.java similarity index 98% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/event/EventClassify.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/event/EventClassify.java index cb5029dd..b6930179 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/event/EventClassify.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/event/EventClassify.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.constant.event; +package cn.orionsec.ops.constant.event; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/event/EventKeys.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/event/EventKeys.java similarity index 98% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/event/EventKeys.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/event/EventKeys.java index 04a12870..89a02807 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/event/EventKeys.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/event/EventKeys.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.constant.event; +package cn.orionsec.ops.constant.event; /** * 事件key @@ -278,7 +278,7 @@ public class EventKeys { public static final String STATUS = "status"; /** - * 是否为自动续签登陆 + * 是否为自动续签登录 */ public static final String REFRESH_LOGIN = "refreshLogin"; diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/event/EventType.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/event/EventType.java similarity index 99% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/event/EventType.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/event/EventType.java index 13b1a400..40802a63 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/event/EventType.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/event/EventType.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.constant.event; +package cn.orionsec.ops.constant.event; import lombok.AllArgsConstructor; import lombok.Getter; @@ -32,9 +32,9 @@ public enum EventType { // -------------------- 认证操作 -------------------- /** - * 登陆 + * 登录 */ - LOGIN(100010, EventClassify.AUTHENTICATION, "登陆系统", "登陆系统"), + LOGIN(100010, EventClassify.AUTHENTICATION, "登录系统", "登录系统"), /** * 登出 diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/history/HistoryOperator.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/history/HistoryOperator.java similarity index 96% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/history/HistoryOperator.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/history/HistoryOperator.java index 05829961..fe816d30 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/history/HistoryOperator.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/history/HistoryOperator.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.constant.history; +package cn.orionsec.ops.constant.history; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/history/HistoryValueType.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/history/HistoryValueType.java similarity index 97% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/history/HistoryValueType.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/history/HistoryValueType.java index 1b8ab40c..a9b5e5d9 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/history/HistoryValueType.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/history/HistoryValueType.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.constant.history; +package cn.orionsec.ops.constant.history; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/machine/MachineAlarmType.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/machine/MachineAlarmType.java similarity index 97% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/machine/MachineAlarmType.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/machine/MachineAlarmType.java index a3249268..18d002b2 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/machine/MachineAlarmType.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/machine/MachineAlarmType.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.constant.machine; +package cn.orionsec.ops.constant.machine; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/machine/MachineAuthType.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/machine/MachineAuthType.java similarity index 95% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/machine/MachineAuthType.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/machine/MachineAuthType.java index 2d4015aa..4a7aeb58 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/machine/MachineAuthType.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/machine/MachineAuthType.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.constant.machine; +package cn.orionsec.ops.constant.machine; -import com.orion.ops.constant.CnConst; +import cn.orionsec.ops.constant.CnConst; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/machine/MachineConst.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/machine/MachineConst.java similarity index 92% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/machine/MachineConst.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/machine/MachineConst.java index cc723420..829d930f 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/machine/MachineConst.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/machine/MachineConst.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.constant.machine; +package cn.orionsec.ops.constant.machine; -import com.orion.ops.constant.Const; +import cn.orionsec.ops.constant.Const; /** * 机器常量 diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/machine/MachineEnvAttr.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/machine/MachineEnvAttr.java similarity index 89% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/machine/MachineEnvAttr.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/machine/MachineEnvAttr.java index 259bea9c..a00d9505 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/machine/MachineEnvAttr.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/machine/MachineEnvAttr.java @@ -13,8 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.constant.machine; +package cn.orionsec.ops.constant.machine; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.command.CommandConst; import lombok.Getter; import java.util.Arrays; @@ -34,28 +36,28 @@ public enum MachineEnvAttr { /** * sftp 文件名称编码格式 * - * @see com.orion.ops.constant.Const#UTF_8 + * @see Const#UTF_8 */ SFTP_CHARSET("SFTP 文件名称编码格式"), /** * 文件追踪偏移量 * - * @see com.orion.ops.constant.Const#TAIL_OFFSET_LINE + * @see Const#TAIL_OFFSET_LINE */ TAIL_OFFSET("文件追踪偏移量(行)"), /** * 文件追踪编码格式 * - * @see com.orion.ops.constant.Const#UTF_8 + * @see Const#UTF_8 */ TAIL_CHARSET("文件追踪编码格式"), /** * 文件追踪默认命令 * - * @see com.orion.ops.constant.command.CommandConst#TAIL_FILE_DEFAULT + * @see CommandConst#TAIL_FILE_DEFAULT */ TAIL_DEFAULT_COMMAND("文件追踪默认命令"), diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/machine/ProxyType.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/machine/ProxyType.java similarity index 95% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/machine/ProxyType.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/machine/ProxyType.java index 684e463e..42ba94ff 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/machine/ProxyType.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/machine/ProxyType.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.constant.machine; +package cn.orionsec.ops.constant.machine; -import com.orion.ops.constant.Const; +import cn.orionsec.ops.constant.Const; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/message/MessageClassify.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/message/MessageClassify.java similarity index 97% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/message/MessageClassify.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/message/MessageClassify.java index b48a4e4a..c3c2b6f0 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/message/MessageClassify.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/message/MessageClassify.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.constant.message; +package cn.orionsec.ops.constant.message; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/message/MessageType.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/message/MessageType.java similarity index 99% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/message/MessageType.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/message/MessageType.java index 6e723d80..68258623 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/message/MessageType.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/message/MessageType.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.constant.message; +package cn.orionsec.ops.constant.message; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/message/ReadStatus.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/message/ReadStatus.java similarity index 94% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/message/ReadStatus.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/message/ReadStatus.java index b0e97bc9..25c57460 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/message/ReadStatus.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/message/ReadStatus.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.constant.message; +package cn.orionsec.ops.constant.message; -import com.orion.ops.constant.CnConst; +import cn.orionsec.ops.constant.CnConst; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/monitor/MonitorConst.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/monitor/MonitorConst.java similarity index 94% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/monitor/MonitorConst.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/monitor/MonitorConst.java index e834c0bb..a9cd4a05 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/monitor/MonitorConst.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/monitor/MonitorConst.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.constant.monitor; +package cn.orionsec.ops.constant.monitor; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.PropertiesConst; -import com.orion.ops.utils.ResourceLoader; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.PropertiesConst; +import cn.orionsec.ops.utils.ResourceLoader; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/monitor/MonitorStatus.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/monitor/MonitorStatus.java similarity index 96% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/monitor/MonitorStatus.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/monitor/MonitorStatus.java index af69ec49..62478e15 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/monitor/MonitorStatus.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/monitor/MonitorStatus.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.constant.monitor; +package cn.orionsec.ops.constant.monitor; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/scheduler/SchedulerTaskMachineStatus.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/scheduler/SchedulerTaskMachineStatus.java similarity index 97% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/scheduler/SchedulerTaskMachineStatus.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/scheduler/SchedulerTaskMachineStatus.java index 84c94f54..07f06e48 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/scheduler/SchedulerTaskMachineStatus.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/scheduler/SchedulerTaskMachineStatus.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.constant.scheduler; +package cn.orionsec.ops.constant.scheduler; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/scheduler/SchedulerTaskStatus.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/scheduler/SchedulerTaskStatus.java similarity index 97% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/scheduler/SchedulerTaskStatus.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/scheduler/SchedulerTaskStatus.java index b36b3b2f..7d78d98c 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/scheduler/SchedulerTaskStatus.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/scheduler/SchedulerTaskStatus.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.constant.scheduler; +package cn.orionsec.ops.constant.scheduler; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/sftp/SftpNotifyType.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/sftp/SftpNotifyType.java similarity index 97% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/sftp/SftpNotifyType.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/sftp/SftpNotifyType.java index 3f16cc2a..677a8f24 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/sftp/SftpNotifyType.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/sftp/SftpNotifyType.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.constant.sftp; +package cn.orionsec.ops.constant.sftp; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/sftp/SftpPackageType.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/sftp/SftpPackageType.java similarity index 97% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/sftp/SftpPackageType.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/sftp/SftpPackageType.java index e9c91b6f..8e0405f6 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/sftp/SftpPackageType.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/sftp/SftpPackageType.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.constant.sftp; +package cn.orionsec.ops.constant.sftp; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/sftp/SftpTransferStatus.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/sftp/SftpTransferStatus.java similarity index 97% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/sftp/SftpTransferStatus.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/sftp/SftpTransferStatus.java index 025643ae..09f7785e 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/sftp/SftpTransferStatus.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/sftp/SftpTransferStatus.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.constant.sftp; +package cn.orionsec.ops.constant.sftp; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/sftp/SftpTransferType.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/sftp/SftpTransferType.java similarity index 97% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/sftp/SftpTransferType.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/sftp/SftpTransferType.java index 6cec4920..853006e3 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/sftp/SftpTransferType.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/sftp/SftpTransferType.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.constant.sftp; +package cn.orionsec.ops.constant.sftp; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/system/SystemCleanType.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/system/SystemCleanType.java similarity index 97% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/system/SystemCleanType.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/system/SystemCleanType.java index e0daa40f..ae82ea1f 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/system/SystemCleanType.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/system/SystemCleanType.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.constant.system; +package cn.orionsec.ops.constant.system; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/system/SystemConfigKey.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/system/SystemConfigKey.java similarity index 92% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/system/SystemConfigKey.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/system/SystemConfigKey.java index 51ec87a2..8e992c5f 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/system/SystemConfigKey.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/system/SystemConfigKey.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.constant.system; +package cn.orionsec.ops.constant.system; +import cn.orionsec.ops.constant.MessageConst; +import cn.orionsec.ops.constant.common.EnableType; import com.orion.lang.exception.argument.InvalidArgumentException; import com.orion.lang.function.Conversion; import com.orion.lang.utils.Exceptions; import com.orion.lang.utils.Strings; import com.orion.lang.utils.Valid; -import com.orion.ops.constant.MessageConst; -import com.orion.ops.constant.common.EnableType; import lombok.AllArgsConstructor; import lombok.Getter; @@ -64,7 +64,7 @@ public enum SystemConfigKey { }, /** - * 是否允许多端登陆 + * 是否允许多端登录 */ ALLOW_MULTIPLE_LOGIN(30, SystemEnvAttr.ALLOW_MULTIPLE_LOGIN) { @Override @@ -74,7 +74,7 @@ public enum SystemConfigKey { }, /** - * 是否启用登陆失败锁定 + * 是否启用登录失败锁定 */ LOGIN_FAILURE_LOCK(40, SystemEnvAttr.LOGIN_FAILURE_LOCK) { @Override @@ -84,7 +84,7 @@ public enum SystemConfigKey { }, /** - * 是否启用登陆IP绑定 + * 是否启用登录IP绑定 */ LOGIN_IP_BIND(50, SystemEnvAttr.LOGIN_IP_BIND) { @Override @@ -104,7 +104,7 @@ public enum SystemConfigKey { }, /** - * 登陆凭证有效期 (时) + * 登录凭证有效期 (时) */ LOGIN_TOKEN_EXPIRE(70, SystemEnvAttr.LOGIN_TOKEN_EXPIRE) { @Override @@ -119,7 +119,7 @@ public enum SystemConfigKey { }, /** - * 登陆失败锁定阈值 (次) + * 登录失败锁定阈值 (次) */ LOGIN_FAILURE_LOCK_THRESHOLD(80, SystemEnvAttr.LOGIN_FAILURE_LOCK_THRESHOLD) { @Override @@ -134,7 +134,7 @@ public enum SystemConfigKey { }, /** - * 登陆自动续签阈值 (时) + * 登录自动续签阈值 (时) */ LOGIN_TOKEN_AUTO_RENEW_THRESHOLD(90, SystemEnvAttr.LOGIN_TOKEN_AUTO_RENEW_THRESHOLD) { @Override @@ -202,11 +202,11 @@ public enum SystemConfigKey { private static final String FILE_CLEAN_THRESHOLD_TIPS = "文件清理阈值需要在 10 ~ 2048 之间"; - private static final String LOGIN_TOKEN_EXPIRE_TIPS = "登陆凭证有效期需要在 1 ~ 720 之间"; + private static final String LOGIN_TOKEN_EXPIRE_TIPS = "登录凭证有效期需要在 1 ~ 720 之间"; - private static final String LOGIN_FAILURE_LOCK_THRESHOLD_TIPS = "登陆失败锁定阈值需要在 1 ~ 100 之间"; + private static final String LOGIN_FAILURE_LOCK_THRESHOLD_TIPS = "登录失败锁定阈值需要在 1 ~ 100 之间"; - private static final String LOGIN_TOKEN_AUTO_RENEW_THRESHOLD_TIPS = "登陆自动续签阈值需要在 1 ~ 720 之间"; + private static final String LOGIN_TOKEN_AUTO_RENEW_THRESHOLD_TIPS = "登录自动续签阈值需要在 1 ~ 720 之间"; private static final String SFTP_UPLOAD_THRESHOLD_TIPS = "上传文件阈值需要在 10 ~ 2048 之间"; diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/system/SystemEnvAttr.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/system/SystemEnvAttr.java similarity index 87% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/system/SystemEnvAttr.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/system/SystemEnvAttr.java index 556dbd46..76f362d2 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/system/SystemEnvAttr.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/system/SystemEnvAttr.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.constant.system; +package cn.orionsec.ops.constant.system; import lombok.Getter; import lombok.Setter; @@ -123,19 +123,19 @@ public enum SystemEnvAttr { ENABLE_AUTO_CLEAN_FILE("是否启用自动清理", true), /** - * 是否允许多端登陆 + * 是否允许多端登录 */ - ALLOW_MULTIPLE_LOGIN("允许多端登陆", true), + ALLOW_MULTIPLE_LOGIN("允许多端登录", true), /** - * 是否启用登陆失败锁定 + * 是否启用登录失败锁定 */ - LOGIN_FAILURE_LOCK("是否启用登陆失败锁定", true), + LOGIN_FAILURE_LOCK("是否启用登录失败锁定", true), /** - * 是否启用登陆IP绑定 + * 是否启用登录IP绑定 */ - LOGIN_IP_BIND("是否启用登陆IP绑定", true), + LOGIN_IP_BIND("是否启用登录IP绑定", true), /** * 是否启用凭证自动续签 @@ -143,19 +143,19 @@ public enum SystemEnvAttr { LOGIN_TOKEN_AUTO_RENEW("是否启用凭证自动续签", true), /** - * 登陆凭证有效期 (时) + * 登录凭证有效期 (时) */ - LOGIN_TOKEN_EXPIRE("登陆凭证有效期 (时)", true), + LOGIN_TOKEN_EXPIRE("登录凭证有效期 (时)", true), /** - * 登陆失败锁定阈值 (次) + * 登录失败锁定阈值 (次) */ - LOGIN_FAILURE_LOCK_THRESHOLD("登陆失败锁定阈值", true), + LOGIN_FAILURE_LOCK_THRESHOLD("登录失败锁定阈值", true), /** - * 登陆自动续签阈值 (时) + * 登录自动续签阈值 (时) */ - LOGIN_TOKEN_AUTO_RENEW_THRESHOLD("登陆自动续签阈值 (时)", true), + LOGIN_TOKEN_AUTO_RENEW_THRESHOLD("登录自动续签阈值 (时)", true), /** * 自动恢复启用的调度任务 diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/system/ThreadPoolMetricsType.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/system/ThreadPoolMetricsType.java similarity index 96% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/system/ThreadPoolMetricsType.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/system/ThreadPoolMetricsType.java index 1b9325cd..12731408 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/system/ThreadPoolMetricsType.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/system/ThreadPoolMetricsType.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.constant.system; +package cn.orionsec.ops.constant.system; -import com.orion.ops.constant.SchedulerPools; +import cn.orionsec.ops.constant.SchedulerPools; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/tail/FileTailMode.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/tail/FileTailMode.java similarity index 86% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/tail/FileTailMode.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/tail/FileTailMode.java index 9dd64679..f31e5bab 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/tail/FileTailMode.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/tail/FileTailMode.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.constant.tail; +package cn.orionsec.ops.constant.tail; +import cn.orionsec.ops.constant.system.SystemEnvAttr; import com.orion.lang.utils.Strings; -import com.orion.ops.constant.system.SystemEnvAttr; import lombok.AllArgsConstructor; import lombok.Getter; @@ -34,8 +34,8 @@ public enum FileTailMode { /** * 仅宿主机 * - * @see com.orion.tail.Tracker - * @see com.orion.ops.handler.tail.impl.TrackerTailFileHandler + * @see cn.orionsec.ops.tail.Tracker + * @see cn.orionsec.ops.handler.tail.impl.TrackerTailFileHandler */ TRACKER("tracker"), @@ -44,7 +44,7 @@ public enum FileTailMode { *

* 宿主机 远程机器 * - * @see com.orion.ops.handler.tail.impl.ExecTailFileHandler + * @see cn.orionsec.ops.handler.tail.impl.ExecTailFileHandler */ TAIL("tail"), diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/tail/FileTailType.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/tail/FileTailType.java similarity index 82% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/tail/FileTailType.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/tail/FileTailType.java index e7fa6ac4..8518777e 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/tail/FileTailType.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/tail/FileTailType.java @@ -13,8 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.constant.tail; +package cn.orionsec.ops.constant.tail; +import cn.orionsec.ops.constant.system.SystemEnvAttr; import lombok.AllArgsConstructor; import lombok.Getter; @@ -32,7 +33,7 @@ public enum FileTailType { /** * 命令执行日志 * - * @see com.orion.ops.constant.system.SystemEnvAttr#LOG_PATH + * @see SystemEnvAttr#LOG_PATH */ EXEC_LOG(10, true), @@ -44,28 +45,28 @@ public enum FileTailType { /** * 应用构建日志 * - * @see com.orion.ops.constant.system.SystemEnvAttr#LOG_PATH + * @see SystemEnvAttr#LOG_PATH */ APP_BUILD_LOG(30, true), /** * 应用发布日志 * - * @see com.orion.ops.constant.system.SystemEnvAttr#LOG_PATH + * @see SystemEnvAttr#LOG_PATH */ APP_RELEASE_LOG(40, true), /** * 调度任务机器日志 * - * @see com.orion.ops.constant.system.SystemEnvAttr#LOG_PATH + * @see SystemEnvAttr#LOG_PATH */ SCHEDULER_TASK_MACHINE_LOG(50, true), /** * 应用操作日志 * - * @see com.orion.ops.constant.system.SystemEnvAttr#LOG_PATH + * @see SystemEnvAttr#LOG_PATH */ APP_ACTION_LOG(60, true), diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/terminal/TerminalClientOperate.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/terminal/TerminalClientOperate.java similarity index 97% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/terminal/TerminalClientOperate.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/terminal/TerminalClientOperate.java index 6003a144..d8e5700a 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/terminal/TerminalClientOperate.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/terminal/TerminalClientOperate.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.constant.terminal; +package cn.orionsec.ops.constant.terminal; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/terminal/TerminalConst.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/terminal/TerminalConst.java similarity index 94% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/terminal/TerminalConst.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/terminal/TerminalConst.java index 9456e38b..592f616c 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/terminal/TerminalConst.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/terminal/TerminalConst.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.constant.terminal; +package cn.orionsec.ops.constant.terminal; -import com.orion.ops.constant.Const; +import cn.orionsec.ops.constant.Const; /** * 终端常量 diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/user/RoleType.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/user/RoleType.java similarity index 97% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/user/RoleType.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/user/RoleType.java index d6b3655d..7395b7f0 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/user/RoleType.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/user/RoleType.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.constant.user; +package cn.orionsec.ops.constant.user; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/webhook/WebhookType.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/webhook/WebhookType.java similarity index 97% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/webhook/WebhookType.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/webhook/WebhookType.java index 24dc84ac..74c6aeee 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/webhook/WebhookType.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/webhook/WebhookType.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.constant.webhook; +package cn.orionsec.ops.constant.webhook; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/ws/WsCloseCode.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/ws/WsCloseCode.java similarity index 98% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/ws/WsCloseCode.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/ws/WsCloseCode.java index 8a1b5cae..8814c65c 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/ws/WsCloseCode.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/ws/WsCloseCode.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.constant.ws; +package cn.orionsec.ops.constant.ws; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/ws/WsCloseReason.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/ws/WsCloseReason.java similarity index 97% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/ws/WsCloseReason.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/ws/WsCloseReason.java index 061e482b..84215f48 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/ws/WsCloseReason.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/ws/WsCloseReason.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.constant.ws; +package cn.orionsec.ops.constant.ws; /** * ws服务端关闭reason diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/ws/WsProtocol.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/ws/WsProtocol.java similarity index 98% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/ws/WsProtocol.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/ws/WsProtocol.java index d388abb5..82918c23 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/constant/ws/WsProtocol.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/ws/WsProtocol.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.constant.ws; +package cn.orionsec.ops.constant.ws; import com.orion.lang.utils.Exceptions; import com.orion.lang.utils.Strings; diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/utils/AttrConverts.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/utils/AttrConverts.java similarity index 98% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/utils/AttrConverts.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/utils/AttrConverts.java index 4b6828b7..af6a0c7f 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/utils/AttrConverts.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/utils/AttrConverts.java @@ -13,8 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.utils; +package cn.orionsec.ops.utils; +import cn.orionsec.ops.constant.Const; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.parser.Feature; @@ -25,7 +26,6 @@ import com.orion.lang.utils.Strings; import com.orion.lang.utils.collect.Lists; import com.orion.lang.utils.collect.Maps; import com.orion.lang.utils.ext.dom.*; -import com.orion.ops.constant.Const; import org.dom4j.io.OutputFormat; import org.yaml.snakeyaml.Yaml; diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/utils/AvatarPicHolder.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/utils/AvatarPicHolder.java similarity index 95% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/utils/AvatarPicHolder.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/utils/AvatarPicHolder.java index 06fb5a38..e31d50ce 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/utils/AvatarPicHolder.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/utils/AvatarPicHolder.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.utils; +package cn.orionsec.ops.utils; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.system.SystemEnvAttr; import com.orion.lang.utils.Strings; import com.orion.lang.utils.codec.Base64s; import com.orion.lang.utils.io.FileReaders; import com.orion.lang.utils.io.Files1; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.system.SystemEnvAttr; import lombok.extern.slf4j.Slf4j; /** diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/utils/EventLogUtils.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/utils/EventLogUtils.java similarity index 93% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/utils/EventLogUtils.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/utils/EventLogUtils.java index dfafee12..6a00fc0c 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/utils/EventLogUtils.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/utils/EventLogUtils.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.utils; +package cn.orionsec.ops.utils; -import com.orion.ops.constant.event.EventKeys; +import cn.orionsec.ops.constant.event.EventKeys; import java.util.Map; diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/utils/FileCleaner.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/utils/FileCleaner.java similarity index 96% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/utils/FileCleaner.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/utils/FileCleaner.java index b2607a8e..d8926991 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/utils/FileCleaner.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/utils/FileCleaner.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.utils; +package cn.orionsec.ops.utils; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.system.SystemCleanType; +import cn.orionsec.ops.constant.system.SystemEnvAttr; import com.orion.lang.utils.io.Files1; import com.orion.lang.utils.time.Dates; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.system.SystemCleanType; -import com.orion.ops.constant.system.SystemEnvAttr; import lombok.extern.slf4j.Slf4j; import java.io.File; diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/utils/PathBuilders.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/utils/PathBuilders.java similarity index 99% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/utils/PathBuilders.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/utils/PathBuilders.java index 0327a5b9..d2810ec8 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/utils/PathBuilders.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/utils/PathBuilders.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.utils; +package cn.orionsec.ops.utils; +import cn.orionsec.ops.constant.Const; import com.orion.lang.id.ObjectIds; import com.orion.lang.utils.Systems; import com.orion.lang.utils.io.Files1; import com.orion.lang.utils.time.Dates; -import com.orion.ops.constant.Const; import java.util.List; diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/utils/ResourceLoader.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/utils/ResourceLoader.java similarity index 98% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/utils/ResourceLoader.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/utils/ResourceLoader.java index ff6a9275..b8b8d547 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/utils/ResourceLoader.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/utils/ResourceLoader.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.utils; +package cn.orionsec.ops.utils; import com.orion.lang.utils.Exceptions; import com.orion.lang.utils.Strings; diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/utils/Utils.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/utils/Utils.java similarity index 97% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/utils/Utils.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/utils/Utils.java index 37acee62..951bb5ce 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/utils/Utils.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/utils/Utils.java @@ -13,8 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.utils; +package cn.orionsec.ops.utils; +import cn.orionsec.ops.constant.CnConst; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.common.StainCode; +import cn.orionsec.ops.constant.system.SystemEnvAttr; import com.orion.ext.location.Region; import com.orion.ext.location.region.LocationRegions; import com.orion.lang.id.UUIds; @@ -22,10 +26,6 @@ import com.orion.lang.utils.Strings; import com.orion.lang.utils.io.Files1; import com.orion.lang.utils.net.IPs; import com.orion.lang.utils.time.Dates; -import com.orion.ops.constant.CnConst; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.common.StainCode; -import com.orion.ops.constant.system.SystemEnvAttr; import java.util.List; import java.util.stream.Collectors; diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/utils/Valid.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/utils/Valid.java similarity index 95% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/utils/Valid.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/utils/Valid.java index 16e680da..b9bd6795 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/utils/Valid.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/utils/Valid.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.utils; +package cn.orionsec.ops.utils; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.MessageConst; +import cn.orionsec.ops.constant.system.SystemEnvAttr; import com.orion.lang.define.wrapper.HttpWrapper; import com.orion.lang.utils.Arrays1; import com.orion.lang.utils.Exceptions; import com.orion.lang.utils.Strings; import com.orion.lang.utils.io.Files1; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.MessageConst; -import com.orion.ops.constant.system.SystemEnvAttr; import java.util.Collection; diff --git a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/utils/ValueMix.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/utils/ValueMix.java similarity index 98% rename from orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/utils/ValueMix.java rename to orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/utils/ValueMix.java index 9677c7b0..2d2bdb58 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/com/orion/ops/utils/ValueMix.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/utils/ValueMix.java @@ -13,8 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.utils; +package cn.orionsec.ops.utils; +import cn.orionsec.ops.constant.PropertiesConst; import com.orion.lang.utils.Arrays1; import com.orion.lang.utils.Strings; import com.orion.lang.utils.codec.Base62s; @@ -23,7 +24,6 @@ import com.orion.lang.utils.crypto.enums.PaddingMode; import com.orion.lang.utils.crypto.enums.WorkingMode; import com.orion.lang.utils.crypto.symmetric.EcbSymmetric; import com.orion.lang.utils.crypto.symmetric.SymmetricBuilder; -import com.orion.ops.constant.PropertiesConst; import java.util.Arrays; import java.util.Optional; diff --git a/orion-ops-api/orion-ops-common/src/test/java/com/orion/ops/constant/event/AddLicenseHeader.java b/orion-ops-api/orion-ops-common/src/test/java/cn/orionsec/ops/constant/event/AddLicenseHeader.java similarity index 98% rename from orion-ops-api/orion-ops-common/src/test/java/com/orion/ops/constant/event/AddLicenseHeader.java rename to orion-ops-api/orion-ops-common/src/test/java/cn/orionsec/ops/constant/event/AddLicenseHeader.java index 3bbff82f..f3307895 100644 --- a/orion-ops-api/orion-ops-common/src/test/java/com/orion/ops/constant/event/AddLicenseHeader.java +++ b/orion-ops-api/orion-ops-common/src/test/java/cn/orionsec/ops/constant/event/AddLicenseHeader.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.constant.event; +package cn.orionsec.ops.constant.event; import com.orion.lang.define.StopWatch; import com.orion.lang.utils.io.FileReaders; diff --git a/orion-ops-api/orion-ops-common/src/test/java/com/orion/ops/constant/event/EventClassifyTest.java b/orion-ops-api/orion-ops-common/src/test/java/cn/orionsec/ops/constant/event/EventClassifyTest.java similarity index 97% rename from orion-ops-api/orion-ops-common/src/test/java/com/orion/ops/constant/event/EventClassifyTest.java rename to orion-ops-api/orion-ops-common/src/test/java/cn/orionsec/ops/constant/event/EventClassifyTest.java index 85f6c401..830284eb 100644 --- a/orion-ops-api/orion-ops-common/src/test/java/com/orion/ops/constant/event/EventClassifyTest.java +++ b/orion-ops-api/orion-ops-common/src/test/java/cn/orionsec/ops/constant/event/EventClassifyTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.constant.event; +package cn.orionsec.ops.constant.event; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.annotation.JSONField; diff --git a/orion-ops-api/orion-ops-common/src/test/java/com/orion/ops/constant/event/EventTypeTest.java b/orion-ops-api/orion-ops-common/src/test/java/cn/orionsec/ops/constant/event/EventTypeTest.java similarity index 97% rename from orion-ops-api/orion-ops-common/src/test/java/com/orion/ops/constant/event/EventTypeTest.java rename to orion-ops-api/orion-ops-common/src/test/java/cn/orionsec/ops/constant/event/EventTypeTest.java index 2e6b338b..b4ff24f8 100644 --- a/orion-ops-api/orion-ops-common/src/test/java/com/orion/ops/constant/event/EventTypeTest.java +++ b/orion-ops-api/orion-ops-common/src/test/java/cn/orionsec/ops/constant/event/EventTypeTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.constant.event; +package cn.orionsec.ops.constant.event; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.annotation.JSONField; diff --git a/orion-ops-api/orion-ops-dao/pom.xml b/orion-ops-api/orion-ops-dao/pom.xml index d3b0ff3b..e46e3f78 100644 --- a/orion-ops-api/orion-ops-dao/pom.xml +++ b/orion-ops-api/orion-ops-dao/pom.xml @@ -2,9 +2,9 @@ - com.orion.ops + cn.orionsec.ops orion-ops-api - 1.2.9 + 1.3.0 ../pom.xml diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/AlarmGroupDAO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/AlarmGroupDAO.java similarity index 91% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/AlarmGroupDAO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/AlarmGroupDAO.java index 991b7440..e9c1ce17 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/AlarmGroupDAO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/AlarmGroupDAO.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.dao; +package cn.orionsec.ops.dao; +import cn.orionsec.ops.entity.domain.AlarmGroupDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.orion.ops.entity.domain.AlarmGroupDO; /** *

diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/AlarmGroupNotifyDAO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/AlarmGroupNotifyDAO.java similarity index 91% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/AlarmGroupNotifyDAO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/AlarmGroupNotifyDAO.java index 701c693c..a24406de 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/AlarmGroupNotifyDAO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/AlarmGroupNotifyDAO.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.dao; +package cn.orionsec.ops.dao; +import cn.orionsec.ops.entity.domain.AlarmGroupNotifyDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.orion.ops.entity.domain.AlarmGroupNotifyDO; /** *

diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/AlarmGroupUserDAO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/AlarmGroupUserDAO.java similarity index 91% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/AlarmGroupUserDAO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/AlarmGroupUserDAO.java index a679c7c4..9abea278 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/AlarmGroupUserDAO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/AlarmGroupUserDAO.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.dao; +package cn.orionsec.ops.dao; +import cn.orionsec.ops.entity.domain.AlarmGroupUserDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.orion.ops.entity.domain.AlarmGroupUserDO; /** *

diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/ApplicationActionDAO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/ApplicationActionDAO.java similarity index 89% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/ApplicationActionDAO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/ApplicationActionDAO.java index 97562adb..fbb174b2 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/ApplicationActionDAO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/ApplicationActionDAO.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.dao; +package cn.orionsec.ops.dao; +import cn.orionsec.ops.entity.domain.ApplicationActionDO; +import cn.orionsec.ops.entity.dto.ApplicationActionConfigDTO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.orion.ops.entity.domain.ApplicationActionDO; -import com.orion.ops.entity.dto.ApplicationActionConfigDTO; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/ApplicationActionLogDAO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/ApplicationActionLogDAO.java similarity index 95% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/ApplicationActionLogDAO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/ApplicationActionLogDAO.java index 8ab64d6b..c29bc7e8 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/ApplicationActionLogDAO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/ApplicationActionLogDAO.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.dao; +package cn.orionsec.ops.dao; +import cn.orionsec.ops.entity.domain.ApplicationActionLogDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.orion.ops.entity.domain.ApplicationActionLogDO; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/ApplicationBuildDAO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/ApplicationBuildDAO.java similarity index 95% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/ApplicationBuildDAO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/ApplicationBuildDAO.java index 218604bf..c15ed715 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/ApplicationBuildDAO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/ApplicationBuildDAO.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.dao; +package cn.orionsec.ops.dao; +import cn.orionsec.ops.entity.domain.ApplicationBuildDO; +import cn.orionsec.ops.entity.dto.ApplicationBuildStatisticsDTO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.orion.ops.entity.domain.ApplicationBuildDO; -import com.orion.ops.entity.dto.ApplicationBuildStatisticsDTO; import org.apache.ibatis.annotations.Param; import java.util.Date; diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/ApplicationEnvDAO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/ApplicationEnvDAO.java similarity index 94% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/ApplicationEnvDAO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/ApplicationEnvDAO.java index 90feda31..268af057 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/ApplicationEnvDAO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/ApplicationEnvDAO.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.dao; +package cn.orionsec.ops.dao; +import cn.orionsec.ops.entity.domain.ApplicationEnvDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.orion.ops.entity.domain.ApplicationEnvDO; import org.apache.ibatis.annotations.Param; /** diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/ApplicationInfoDAO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/ApplicationInfoDAO.java similarity index 94% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/ApplicationInfoDAO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/ApplicationInfoDAO.java index be3c33c0..dabee188 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/ApplicationInfoDAO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/ApplicationInfoDAO.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.dao; +package cn.orionsec.ops.dao; +import cn.orionsec.ops.entity.domain.ApplicationInfoDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.orion.ops.entity.domain.ApplicationInfoDO; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/ApplicationMachineDAO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/ApplicationMachineDAO.java similarity index 92% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/ApplicationMachineDAO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/ApplicationMachineDAO.java index 2e9f2d15..d2d0d330 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/ApplicationMachineDAO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/ApplicationMachineDAO.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.dao; +package cn.orionsec.ops.dao; +import cn.orionsec.ops.entity.domain.ApplicationMachineDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.orion.ops.entity.domain.ApplicationMachineDO; /** *

diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/ApplicationPipelineDAO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/ApplicationPipelineDAO.java similarity index 90% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/ApplicationPipelineDAO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/ApplicationPipelineDAO.java index 5132c11b..47b28af1 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/ApplicationPipelineDAO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/ApplicationPipelineDAO.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.dao; +package cn.orionsec.ops.dao; +import cn.orionsec.ops.entity.domain.ApplicationPipelineDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.orion.ops.entity.domain.ApplicationPipelineDO; /** *

diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/ApplicationPipelineDetailDAO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/ApplicationPipelineDetailDAO.java similarity index 90% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/ApplicationPipelineDetailDAO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/ApplicationPipelineDetailDAO.java index 421be7e9..13894770 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/ApplicationPipelineDetailDAO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/ApplicationPipelineDetailDAO.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.dao; +package cn.orionsec.ops.dao; +import cn.orionsec.ops.entity.domain.ApplicationPipelineDetailDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.orion.ops.entity.domain.ApplicationPipelineDetailDO; /** *

diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/ApplicationPipelineTaskDAO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/ApplicationPipelineTaskDAO.java similarity index 92% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/ApplicationPipelineTaskDAO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/ApplicationPipelineTaskDAO.java index ce7fe797..0861e453 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/ApplicationPipelineTaskDAO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/ApplicationPipelineTaskDAO.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.dao; +package cn.orionsec.ops.dao; +import cn.orionsec.ops.entity.domain.ApplicationPipelineTaskDO; +import cn.orionsec.ops.entity.dto.ApplicationPipelineTaskStatisticsDTO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.orion.ops.entity.domain.ApplicationPipelineTaskDO; -import com.orion.ops.entity.dto.ApplicationPipelineTaskStatisticsDTO; import org.apache.ibatis.annotations.Param; import java.util.Date; diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/ApplicationPipelineTaskDetailDAO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/ApplicationPipelineTaskDetailDAO.java similarity index 93% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/ApplicationPipelineTaskDetailDAO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/ApplicationPipelineTaskDetailDAO.java index 0f99f884..e19e83e9 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/ApplicationPipelineTaskDetailDAO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/ApplicationPipelineTaskDetailDAO.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.dao; +package cn.orionsec.ops.dao; +import cn.orionsec.ops.entity.domain.ApplicationPipelineTaskDetailDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.orion.ops.entity.domain.ApplicationPipelineTaskDetailDO; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/ApplicationPipelineTaskLogDAO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/ApplicationPipelineTaskLogDAO.java similarity index 90% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/ApplicationPipelineTaskLogDAO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/ApplicationPipelineTaskLogDAO.java index 0b392162..7e031bbd 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/ApplicationPipelineTaskLogDAO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/ApplicationPipelineTaskLogDAO.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.dao; +package cn.orionsec.ops.dao; +import cn.orionsec.ops.entity.domain.ApplicationPipelineTaskLogDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.orion.ops.entity.domain.ApplicationPipelineTaskLogDO; /** *

diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/ApplicationProfileDAO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/ApplicationProfileDAO.java similarity index 91% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/ApplicationProfileDAO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/ApplicationProfileDAO.java index 2dfbe6e7..67c43a49 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/ApplicationProfileDAO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/ApplicationProfileDAO.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.dao; +package cn.orionsec.ops.dao; +import cn.orionsec.ops.entity.domain.ApplicationProfileDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.orion.ops.entity.domain.ApplicationProfileDO; /** *

diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/ApplicationReleaseDAO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/ApplicationReleaseDAO.java similarity index 93% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/ApplicationReleaseDAO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/ApplicationReleaseDAO.java index 96442034..36452804 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/ApplicationReleaseDAO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/ApplicationReleaseDAO.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.dao; +package cn.orionsec.ops.dao; +import cn.orionsec.ops.entity.domain.ApplicationReleaseDO; +import cn.orionsec.ops.entity.dto.ApplicationReleaseStatisticsDTO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.orion.ops.entity.domain.ApplicationReleaseDO; -import com.orion.ops.entity.dto.ApplicationReleaseStatisticsDTO; import org.apache.ibatis.annotations.Param; import java.util.Date; diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/ApplicationReleaseMachineDAO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/ApplicationReleaseMachineDAO.java similarity index 94% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/ApplicationReleaseMachineDAO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/ApplicationReleaseMachineDAO.java index 12357eb7..8a7aa1c9 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/ApplicationReleaseMachineDAO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/ApplicationReleaseMachineDAO.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.dao; +package cn.orionsec.ops.dao; +import cn.orionsec.ops.entity.domain.ApplicationReleaseMachineDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.orion.ops.entity.domain.ApplicationReleaseMachineDO; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/ApplicationRepositoryDAO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/ApplicationRepositoryDAO.java similarity index 93% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/ApplicationRepositoryDAO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/ApplicationRepositoryDAO.java index e999084f..04f5fb9a 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/ApplicationRepositoryDAO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/ApplicationRepositoryDAO.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.dao; +package cn.orionsec.ops.dao; +import cn.orionsec.ops.entity.domain.ApplicationRepositoryDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.orion.ops.entity.domain.ApplicationRepositoryDO; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/CommandExecDAO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/CommandExecDAO.java similarity index 93% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/CommandExecDAO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/CommandExecDAO.java index 17a33789..63b8cb01 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/CommandExecDAO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/CommandExecDAO.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.dao; +package cn.orionsec.ops.dao; +import cn.orionsec.ops.entity.domain.CommandExecDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.orion.ops.entity.domain.CommandExecDO; import org.apache.ibatis.annotations.Param; /** diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/CommandTemplateDAO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/CommandTemplateDAO.java similarity index 91% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/CommandTemplateDAO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/CommandTemplateDAO.java index c30f43f4..ad76db4f 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/CommandTemplateDAO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/CommandTemplateDAO.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.dao; +package cn.orionsec.ops.dao; +import cn.orionsec.ops.entity.domain.CommandTemplateDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.orion.ops.entity.domain.CommandTemplateDO; /** *

diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/FileTailListDAO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/FileTailListDAO.java similarity index 91% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/FileTailListDAO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/FileTailListDAO.java index d2c1a28e..b260ed5b 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/FileTailListDAO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/FileTailListDAO.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.dao; +package cn.orionsec.ops.dao; +import cn.orionsec.ops.entity.domain.FileTailListDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.orion.ops.entity.domain.FileTailListDO; /** *

diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/FileTransferLogDAO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/FileTransferLogDAO.java similarity index 91% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/FileTransferLogDAO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/FileTransferLogDAO.java index d2f49278..60ca2244 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/FileTransferLogDAO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/FileTransferLogDAO.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.dao; +package cn.orionsec.ops.dao; +import cn.orionsec.ops.entity.domain.FileTransferLogDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.orion.ops.entity.domain.FileTransferLogDO; /** *

diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/HistoryValueSnapshotDAO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/HistoryValueSnapshotDAO.java similarity index 90% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/HistoryValueSnapshotDAO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/HistoryValueSnapshotDAO.java index 132fbb55..eef48140 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/HistoryValueSnapshotDAO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/HistoryValueSnapshotDAO.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.dao; +package cn.orionsec.ops.dao; +import cn.orionsec.ops.entity.domain.HistoryValueSnapshotDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.orion.ops.entity.domain.HistoryValueSnapshotDO; /** *

diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/MachineAlarmConfigDAO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/MachineAlarmConfigDAO.java similarity index 91% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/MachineAlarmConfigDAO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/MachineAlarmConfigDAO.java index cfed3a4d..dfbed6cf 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/MachineAlarmConfigDAO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/MachineAlarmConfigDAO.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.dao; +package cn.orionsec.ops.dao; +import cn.orionsec.ops.entity.domain.MachineAlarmConfigDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.orion.ops.entity.domain.MachineAlarmConfigDO; /** *

diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/MachineAlarmGroupDAO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/MachineAlarmGroupDAO.java similarity index 91% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/MachineAlarmGroupDAO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/MachineAlarmGroupDAO.java index 3e10a0e2..3e309895 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/MachineAlarmGroupDAO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/MachineAlarmGroupDAO.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.dao; +package cn.orionsec.ops.dao; +import cn.orionsec.ops.entity.domain.MachineAlarmGroupDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.orion.ops.entity.domain.MachineAlarmGroupDO; /** *

diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/MachineAlarmHistoryDAO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/MachineAlarmHistoryDAO.java similarity index 90% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/MachineAlarmHistoryDAO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/MachineAlarmHistoryDAO.java index b230fc22..b1716044 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/MachineAlarmHistoryDAO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/MachineAlarmHistoryDAO.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.dao; +package cn.orionsec.ops.dao; +import cn.orionsec.ops.entity.domain.MachineAlarmHistoryDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.orion.ops.entity.domain.MachineAlarmHistoryDO; /** *

diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/MachineEnvDAO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/MachineEnvDAO.java similarity index 94% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/MachineEnvDAO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/MachineEnvDAO.java index efe05ddc..cba96234 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/MachineEnvDAO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/MachineEnvDAO.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.dao; +package cn.orionsec.ops.dao; +import cn.orionsec.ops.entity.domain.MachineEnvDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.orion.ops.entity.domain.MachineEnvDO; import org.apache.ibatis.annotations.Param; /** diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/MachineGroupDAO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/MachineGroupDAO.java similarity index 94% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/MachineGroupDAO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/MachineGroupDAO.java index 1cfe1283..9933f787 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/MachineGroupDAO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/MachineGroupDAO.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.dao; +package cn.orionsec.ops.dao; +import cn.orionsec.ops.entity.domain.MachineGroupDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.orion.ops.entity.domain.MachineGroupDO; import org.apache.ibatis.annotations.Param; /** diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/MachineGroupRelDAO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/MachineGroupRelDAO.java similarity index 91% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/MachineGroupRelDAO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/MachineGroupRelDAO.java index 16149864..eb09a634 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/MachineGroupRelDAO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/MachineGroupRelDAO.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.dao; +package cn.orionsec.ops.dao; +import cn.orionsec.ops.entity.domain.MachineGroupRelDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.orion.ops.entity.domain.MachineGroupRelDO; /** *

diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/MachineInfoDAO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/MachineInfoDAO.java similarity index 95% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/MachineInfoDAO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/MachineInfoDAO.java index adaf2576..55405753 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/MachineInfoDAO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/MachineInfoDAO.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.dao; +package cn.orionsec.ops.dao; +import cn.orionsec.ops.entity.domain.MachineInfoDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.orion.ops.entity.domain.MachineInfoDO; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/MachineMonitorDAO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/MachineMonitorDAO.java similarity index 87% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/MachineMonitorDAO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/MachineMonitorDAO.java index ed3b74fc..e0468d5b 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/MachineMonitorDAO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/MachineMonitorDAO.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.dao; +package cn.orionsec.ops.dao; +import cn.orionsec.ops.entity.domain.MachineMonitorDO; +import cn.orionsec.ops.entity.dto.MachineMonitorDTO; +import cn.orionsec.ops.entity.query.MachineMonitorQuery; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.orion.ops.entity.domain.MachineMonitorDO; -import com.orion.ops.entity.dto.MachineMonitorDTO; -import com.orion.ops.entity.query.MachineMonitorQuery; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/MachineProxyDAO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/MachineProxyDAO.java similarity index 91% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/MachineProxyDAO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/MachineProxyDAO.java index 9c839a92..5f49e5a3 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/MachineProxyDAO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/MachineProxyDAO.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.dao; +package cn.orionsec.ops.dao; +import cn.orionsec.ops.entity.domain.MachineProxyDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.orion.ops.entity.domain.MachineProxyDO; /** *

diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/MachineSecretKeyDAO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/MachineSecretKeyDAO.java similarity index 89% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/MachineSecretKeyDAO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/MachineSecretKeyDAO.java index 480f3dc8..a4089a04 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/MachineSecretKeyDAO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/MachineSecretKeyDAO.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.dao; +package cn.orionsec.ops.dao; +import cn.orionsec.ops.entity.domain.MachineSecretKeyDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.orion.ops.entity.domain.MachineSecretKeyDO; import org.apache.ibatis.annotations.Param; import java.util.List; /** *

- * 机器 ssh 登陆密钥 Mapper 接口 + * 机器 ssh 登录密钥 Mapper 接口 *

* * @author Jiahang Li diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/MachineTerminalDAO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/MachineTerminalDAO.java similarity index 91% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/MachineTerminalDAO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/MachineTerminalDAO.java index c64e5851..85e271f3 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/MachineTerminalDAO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/MachineTerminalDAO.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.dao; +package cn.orionsec.ops.dao; +import cn.orionsec.ops.entity.domain.MachineTerminalDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.orion.ops.entity.domain.MachineTerminalDO; /** *

diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/MachineTerminalLogDAO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/MachineTerminalLogDAO.java similarity index 91% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/MachineTerminalLogDAO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/MachineTerminalLogDAO.java index 56b5a7c8..85464065 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/MachineTerminalLogDAO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/MachineTerminalLogDAO.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.dao; +package cn.orionsec.ops.dao; +import cn.orionsec.ops.entity.domain.MachineTerminalLogDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.orion.ops.entity.domain.MachineTerminalLogDO; /** *

diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/SchedulerTaskDAO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/SchedulerTaskDAO.java similarity index 91% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/SchedulerTaskDAO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/SchedulerTaskDAO.java index 32db3671..79ff96d6 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/SchedulerTaskDAO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/SchedulerTaskDAO.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.dao; +package cn.orionsec.ops.dao; +import cn.orionsec.ops.entity.domain.SchedulerTaskDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.orion.ops.entity.domain.SchedulerTaskDO; /** *

diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/SchedulerTaskMachineDAO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/SchedulerTaskMachineDAO.java similarity index 90% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/SchedulerTaskMachineDAO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/SchedulerTaskMachineDAO.java index 28b10ae9..04bb6f6e 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/SchedulerTaskMachineDAO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/SchedulerTaskMachineDAO.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.dao; +package cn.orionsec.ops.dao; +import cn.orionsec.ops.entity.domain.SchedulerTaskMachineDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.orion.ops.entity.domain.SchedulerTaskMachineDO; /** *

diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/SchedulerTaskMachineRecordDAO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/SchedulerTaskMachineRecordDAO.java similarity index 95% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/SchedulerTaskMachineRecordDAO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/SchedulerTaskMachineRecordDAO.java index 560e69cf..38587112 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/SchedulerTaskMachineRecordDAO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/SchedulerTaskMachineRecordDAO.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.dao; +package cn.orionsec.ops.dao; +import cn.orionsec.ops.entity.domain.SchedulerTaskMachineRecordDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.orion.ops.entity.domain.SchedulerTaskMachineRecordDO; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/SchedulerTaskRecordDAO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/SchedulerTaskRecordDAO.java similarity index 92% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/SchedulerTaskRecordDAO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/SchedulerTaskRecordDAO.java index 901ace94..d50d7929 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/SchedulerTaskRecordDAO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/SchedulerTaskRecordDAO.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.dao; +package cn.orionsec.ops.dao; +import cn.orionsec.ops.entity.domain.SchedulerTaskRecordDO; +import cn.orionsec.ops.entity.dto.SchedulerTaskRecordStatisticsDTO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.orion.ops.entity.domain.SchedulerTaskRecordDO; -import com.orion.ops.entity.dto.SchedulerTaskRecordStatisticsDTO; import org.apache.ibatis.annotations.Param; import java.util.Date; diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/SystemEnvDAO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/SystemEnvDAO.java similarity index 94% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/SystemEnvDAO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/SystemEnvDAO.java index bd529a77..31483b1e 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/SystemEnvDAO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/SystemEnvDAO.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.dao; +package cn.orionsec.ops.dao; +import cn.orionsec.ops.entity.domain.SystemEnvDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.orion.ops.entity.domain.SystemEnvDO; import org.apache.ibatis.annotations.Param; /** diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/UserEventLogDAO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/UserEventLogDAO.java similarity index 91% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/UserEventLogDAO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/UserEventLogDAO.java index 54747b5a..6d63d118 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/UserEventLogDAO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/UserEventLogDAO.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.dao; +package cn.orionsec.ops.dao; +import cn.orionsec.ops.entity.domain.UserEventLogDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.orion.ops.entity.domain.UserEventLogDO; /** *

diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/UserInfoDAO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/UserInfoDAO.java similarity index 93% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/UserInfoDAO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/UserInfoDAO.java index 58bcea52..1f8c8f36 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/UserInfoDAO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/UserInfoDAO.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.dao; +package cn.orionsec.ops.dao; +import cn.orionsec.ops.entity.domain.UserInfoDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.orion.ops.entity.domain.UserInfoDO; import org.apache.ibatis.annotations.Param; /** diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/WebSideMessageDAO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/WebSideMessageDAO.java similarity index 91% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/WebSideMessageDAO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/WebSideMessageDAO.java index 404f6c46..4c739788 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/WebSideMessageDAO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/WebSideMessageDAO.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.dao; +package cn.orionsec.ops.dao; +import cn.orionsec.ops.entity.domain.WebSideMessageDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.orion.ops.entity.domain.WebSideMessageDO; /** *

diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/WebhookConfigDAO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/WebhookConfigDAO.java similarity index 91% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/WebhookConfigDAO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/WebhookConfigDAO.java index b444b908..a532c0f3 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/dao/WebhookConfigDAO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/dao/WebhookConfigDAO.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.dao; +package cn.orionsec.ops.dao; +import cn.orionsec.ops.entity.domain.WebhookConfigDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.orion.ops.entity.domain.WebhookConfigDO; /** *

diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/AlarmGroupDO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/AlarmGroupDO.java similarity index 97% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/AlarmGroupDO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/AlarmGroupDO.java index 0e8d18ef..cdb443ac 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/AlarmGroupDO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/AlarmGroupDO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.domain; +package cn.orionsec.ops.entity.domain; import com.baomidou.mybatisplus.annotation.*; import io.swagger.annotations.ApiModel; diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/AlarmGroupNotifyDO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/AlarmGroupNotifyDO.java similarity index 98% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/AlarmGroupNotifyDO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/AlarmGroupNotifyDO.java index 4f8652b7..b79f8d57 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/AlarmGroupNotifyDO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/AlarmGroupNotifyDO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.domain; +package cn.orionsec.ops.entity.domain; import com.baomidou.mybatisplus.annotation.*; import io.swagger.annotations.ApiModel; diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/AlarmGroupUserDO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/AlarmGroupUserDO.java similarity index 98% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/AlarmGroupUserDO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/AlarmGroupUserDO.java index 40e3afd3..fc4d4239 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/AlarmGroupUserDO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/AlarmGroupUserDO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.domain; +package cn.orionsec.ops.entity.domain; import com.baomidou.mybatisplus.annotation.*; import io.swagger.annotations.ApiModel; diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/ApplicationActionDO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/ApplicationActionDO.java similarity index 94% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/ApplicationActionDO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/ApplicationActionDO.java index 4b11f83b..954dc282 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/ApplicationActionDO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/ApplicationActionDO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.domain; +package cn.orionsec.ops.entity.domain; import com.baomidou.mybatisplus.annotation.*; import io.swagger.annotations.ApiModel; @@ -56,14 +56,14 @@ public class ApplicationActionDO implements Serializable { private String actionName; /** - * @see com.orion.ops.constant.app.ActionType + * @see cn.orionsec.ops.constant.app.ActionType */ @ApiModelProperty(value = "类型") @TableField("action_type") private Integer actionType; /** - * @see com.orion.ops.constant.app.StageType + * @see cn.orionsec.ops.constant.app.StageType */ @ApiModelProperty(value = "阶段类型") @TableField("stage_type") diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/ApplicationActionLogDO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/ApplicationActionLogDO.java similarity index 94% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/ApplicationActionLogDO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/ApplicationActionLogDO.java index 7b069b7b..8492854c 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/ApplicationActionLogDO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/ApplicationActionLogDO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.domain; +package cn.orionsec.ops.entity.domain; import com.baomidou.mybatisplus.annotation.*; import io.swagger.annotations.ApiModel; @@ -44,7 +44,7 @@ public class ApplicationActionLogDO implements Serializable { private Long id; /** - * @see com.orion.ops.constant.app.StageType + * @see cn.orionsec.ops.constant.app.StageType */ @ApiModelProperty(value = "阶段类型 10构建 20发布") @TableField("stage_type") @@ -67,7 +67,7 @@ public class ApplicationActionLogDO implements Serializable { private String actionName; /** - * @see com.orion.ops.constant.app.ActionType + * @see cn.orionsec.ops.constant.app.ActionType */ @ApiModelProperty(value = "操作类型") @TableField("action_type") @@ -82,7 +82,7 @@ public class ApplicationActionLogDO implements Serializable { private String logPath; /** - * @see com.orion.ops.constant.app.ActionStatus + * @see cn.orionsec.ops.constant.app.ActionStatus */ @ApiModelProperty(value = "状态 10未开始 20进行中 30已完成 40执行失败 50已跳过 60已取消") @TableField("run_status") diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/ApplicationBuildDO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/ApplicationBuildDO.java similarity index 97% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/ApplicationBuildDO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/ApplicationBuildDO.java index 45a1da83..96a9003d 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/ApplicationBuildDO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/ApplicationBuildDO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.domain; +package cn.orionsec.ops.entity.domain; import com.baomidou.mybatisplus.annotation.*; import io.swagger.annotations.ApiModel; @@ -92,7 +92,7 @@ public class ApplicationBuildDO implements Serializable { private String bundlePath; /** - * @see com.orion.ops.constant.app.BuildStatus + * @see cn.orionsec.ops.constant.app.BuildStatus */ @ApiModelProperty(value = "状态 10未开始 20执行中 30已完成 40执行失败 50已取消") @TableField("build_status") diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/ApplicationEnvDO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/ApplicationEnvDO.java similarity index 93% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/ApplicationEnvDO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/ApplicationEnvDO.java index 5daff54b..2b0273ad 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/ApplicationEnvDO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/ApplicationEnvDO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.domain; +package cn.orionsec.ops.entity.domain; import com.baomidou.mybatisplus.annotation.*; import io.swagger.annotations.ApiModel; @@ -60,8 +60,8 @@ public class ApplicationEnvDO implements Serializable { private String attrValue; /** - * @see com.orion.ops.constant.Const#IS_SYSTEM - * @see com.orion.ops.constant.Const#NOT_SYSTEM + * @see cn.orionsec.ops.constant.Const#IS_SYSTEM + * @see cn.orionsec.ops.constant.Const#NOT_SYSTEM */ @ApiModelProperty(value = "是否为系统变量 1是 2否") @TableField("system_env") diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/ApplicationInfoDO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/ApplicationInfoDO.java similarity index 98% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/ApplicationInfoDO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/ApplicationInfoDO.java index 0371b0cd..8aef7a38 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/ApplicationInfoDO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/ApplicationInfoDO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.domain; +package cn.orionsec.ops.entity.domain; import com.baomidou.mybatisplus.annotation.*; import io.swagger.annotations.ApiModel; diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/ApplicationMachineDO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/ApplicationMachineDO.java similarity index 98% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/ApplicationMachineDO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/ApplicationMachineDO.java index fe8bdf1d..1eeb8673 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/ApplicationMachineDO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/ApplicationMachineDO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.domain; +package cn.orionsec.ops.entity.domain; import com.baomidou.mybatisplus.annotation.*; import io.swagger.annotations.ApiModel; diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/ApplicationPipelineDO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/ApplicationPipelineDO.java similarity index 98% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/ApplicationPipelineDO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/ApplicationPipelineDO.java index 50b4784a..188c02ff 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/ApplicationPipelineDO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/ApplicationPipelineDO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.domain; +package cn.orionsec.ops.entity.domain; import com.baomidou.mybatisplus.annotation.*; import io.swagger.annotations.ApiModel; diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/ApplicationPipelineDetailDO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/ApplicationPipelineDetailDO.java similarity index 95% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/ApplicationPipelineDetailDO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/ApplicationPipelineDetailDO.java index 6a11420f..1ca2d746 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/ApplicationPipelineDetailDO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/ApplicationPipelineDetailDO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.domain; +package cn.orionsec.ops.entity.domain; import com.baomidou.mybatisplus.annotation.*; import io.swagger.annotations.ApiModel; @@ -56,7 +56,7 @@ public class ApplicationPipelineDetailDO implements Serializable { private Long profileId; /** - * @see com.orion.ops.constant.app.StageType + * @see cn.orionsec.ops.constant.app.StageType */ @ApiModelProperty(value = "阶段类型 10构建 20发布") @TableField("stage_type") diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/ApplicationPipelineTaskDO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/ApplicationPipelineTaskDO.java similarity index 97% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/ApplicationPipelineTaskDO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/ApplicationPipelineTaskDO.java index b9c5908c..2d76ea35 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/ApplicationPipelineTaskDO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/ApplicationPipelineTaskDO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.domain; +package cn.orionsec.ops.entity.domain; import com.baomidou.mybatisplus.annotation.*; import io.swagger.annotations.ApiModel; @@ -72,7 +72,7 @@ public class ApplicationPipelineTaskDO implements Serializable { private String execDescription; /** - * @see com.orion.ops.constant.app.PipelineStatus + * @see cn.orionsec.ops.constant.app.PipelineStatus */ @ApiModelProperty(value = "执行状态 10待审核 20审核驳回 30待执行 35待调度 40执行中 50执行完成 60执行停止 70执行失败") @TableField("exec_status") diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/ApplicationPipelineTaskDetailDO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/ApplicationPipelineTaskDetailDO.java similarity index 93% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/ApplicationPipelineTaskDetailDO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/ApplicationPipelineTaskDetailDO.java index 470d940f..ed0563c8 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/ApplicationPipelineTaskDetailDO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/ApplicationPipelineTaskDetailDO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.domain; +package cn.orionsec.ops.entity.domain; import com.baomidou.mybatisplus.annotation.*; import io.swagger.annotations.ApiModel; @@ -72,21 +72,21 @@ public class ApplicationPipelineTaskDetailDO implements Serializable { private String appTag; /** - * @see com.orion.ops.constant.app.StageType + * @see cn.orionsec.ops.constant.app.StageType */ @ApiModelProperty(value = "阶段类型 10构建 20发布") @TableField("stage_type") private Integer stageType; /** - * @see com.orion.ops.entity.dto.ApplicationPipelineStageConfigDTO + * @see cn.orionsec.ops.entity.dto.ApplicationPipelineStageConfigDTO */ @ApiModelProperty(value = "阶段操作配置") @TableField("stage_config") private String stageConfig; /** - * @see com.orion.ops.constant.app.PipelineDetailStatus + * @see cn.orionsec.ops.constant.app.PipelineDetailStatus */ @ApiModelProperty(value = "状态 10未开始 20进行中 30已完成 40执行失败 50已跳过 60已终止") @TableField("exec_status") diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/ApplicationPipelineTaskLogDO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/ApplicationPipelineTaskLogDO.java similarity index 94% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/ApplicationPipelineTaskLogDO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/ApplicationPipelineTaskLogDO.java index cf23772f..d4ba3bfc 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/ApplicationPipelineTaskLogDO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/ApplicationPipelineTaskLogDO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.domain; +package cn.orionsec.ops.entity.domain; import com.baomidou.mybatisplus.annotation.*; import io.swagger.annotations.ApiModel; @@ -52,14 +52,14 @@ public class ApplicationPipelineTaskLogDO implements Serializable { private Long taskDetailId; /** - * @see com.orion.ops.constant.app.PipelineLogStatus + * @see cn.orionsec.ops.constant.app.PipelineLogStatus */ @ApiModelProperty(value = "日志状态 10创建 20执行 30成功 40失败 50停止 60跳过") @TableField("log_status") private Integer logStatus; /** - * @see com.orion.ops.constant.app.StageType + * @see cn.orionsec.ops.constant.app.StageType */ @ApiModelProperty(value = "阶段类型 10构建 20发布") @TableField("stage_type") diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/ApplicationProfileDO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/ApplicationProfileDO.java similarity index 93% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/ApplicationProfileDO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/ApplicationProfileDO.java index b4b6d0a7..2a3eb282 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/ApplicationProfileDO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/ApplicationProfileDO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.domain; +package cn.orionsec.ops.entity.domain; import com.baomidou.mybatisplus.annotation.*; import io.swagger.annotations.ApiModel; @@ -56,8 +56,8 @@ public class ApplicationProfileDO implements Serializable { private String description; /** - * @see com.orion.ops.constant.Const#ENABLE - * @see com.orion.ops.constant.Const#DISABLE + * @see cn.orionsec.ops.constant.Const#ENABLE + * @see cn.orionsec.ops.constant.Const#DISABLE */ @ApiModelProperty(value = "发布是否需要审核 1需要 2无需") @TableField("release_audit") diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/ApplicationReleaseDO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/ApplicationReleaseDO.java similarity index 93% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/ApplicationReleaseDO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/ApplicationReleaseDO.java index eab0ef5c..727a73f5 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/ApplicationReleaseDO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/ApplicationReleaseDO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.domain; +package cn.orionsec.ops.entity.domain; import com.baomidou.mybatisplus.annotation.*; import io.swagger.annotations.ApiModel; @@ -84,28 +84,28 @@ public class ApplicationReleaseDO implements Serializable { private String profileTag; /** - * @see com.orion.ops.constant.app.ReleaseType + * @see cn.orionsec.ops.constant.app.ReleaseType */ @ApiModelProperty(value = "发布类型 10正常发布 20回滚发布") @TableField("release_type") private Integer releaseType; /** - * @see com.orion.ops.constant.app.ReleaseStatus + * @see cn.orionsec.ops.constant.app.ReleaseStatus */ @ApiModelProperty(value = "发布状态 10待审核 20审核驳回 30待发布 35待调度 40发布中 50发布完成 60发布停止 70发布失败") @TableField("release_status") private Integer releaseStatus; /** - * @see com.orion.ops.constant.common.SerialType + * @see cn.orionsec.ops.constant.common.SerialType */ @ApiModelProperty(value = "发布序列 10串行 20并行") @TableField("release_serialize") private Integer releaseSerialize; /** - * @see com.orion.ops.constant.common.ExceptionHandlerType + * @see cn.orionsec.ops.constant.common.ExceptionHandlerType */ @ApiModelProperty(value = "异常处理 10跳过所有 20跳过错误") @TableField("exception_handler") @@ -120,7 +120,7 @@ public class ApplicationReleaseDO implements Serializable { private String transferPath; /** - * @see com.orion.ops.constant.app.TransferMode + * @see cn.orionsec.ops.constant.app.TransferMode */ @ApiModelProperty(value = "产物传输方式") @TableField("transfer_mode") @@ -131,7 +131,7 @@ public class ApplicationReleaseDO implements Serializable { private Long rollbackReleaseId; /** - * @see com.orion.ops.constant.app.TimedType + * @see cn.orionsec.ops.constant.app.TimedType */ @ApiModelProperty(value = "是否是定时发布 10普通发布 20定时发布") @TableField("timed_release") diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/ApplicationReleaseMachineDO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/ApplicationReleaseMachineDO.java similarity index 96% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/ApplicationReleaseMachineDO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/ApplicationReleaseMachineDO.java index 56fe2c4c..10e1a136 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/ApplicationReleaseMachineDO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/ApplicationReleaseMachineDO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.domain; +package cn.orionsec.ops.entity.domain; import com.baomidou.mybatisplus.annotation.*; import io.swagger.annotations.ApiModel; @@ -64,7 +64,7 @@ public class ApplicationReleaseMachineDO implements Serializable { private String machineHost; /** - * @see com.orion.ops.constant.app.ActionStatus + * @see cn.orionsec.ops.constant.app.ActionStatus */ @ApiModelProperty(value = "状态 10未开始 20进行中 30已完成 40执行失败 50已跳过 60已取消") @TableField("run_status") diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/ApplicationRepositoryDO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/ApplicationRepositoryDO.java similarity index 91% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/ApplicationRepositoryDO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/ApplicationRepositoryDO.java index b52246fc..99a5e117 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/ApplicationRepositoryDO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/ApplicationRepositoryDO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.domain; +package cn.orionsec.ops.entity.domain; import com.baomidou.mybatisplus.annotation.*; import io.swagger.annotations.ApiModel; @@ -52,7 +52,7 @@ public class ApplicationRepositoryDO implements Serializable { private String repoDescription; /** - * @see com.orion.ops.constant.app.RepositoryType + * @see cn.orionsec.ops.constant.app.RepositoryType */ @ApiModelProperty(value = "类型 1git") @TableField("repo_type") @@ -75,21 +75,21 @@ public class ApplicationRepositoryDO implements Serializable { private String repoPrivateToken; /** - * @see com.orion.ops.constant.app.RepositoryStatus + * @see cn.orionsec.ops.constant.app.RepositoryStatus */ @ApiModelProperty(value = "状态 10未初始化 20初始化中 30正常 40失败") @TableField("repo_status") private Integer repoStatus; /** - * @see com.orion.ops.constant.app.RepositoryAuthType + * @see cn.orionsec.ops.constant.app.RepositoryAuthType */ @ApiModelProperty(value = "认证类型 10密码 20令牌") @TableField("repo_auth_type") private Integer repoAuthType; /** - * @see com.orion.ops.constant.app.RepositoryTokenType + * @see cn.orionsec.ops.constant.app.RepositoryTokenType */ @ApiModelProperty(value = "令牌类型 10github 20gitee 30gitlab") @TableField("repo_token_type") diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/CommandExecDO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/CommandExecDO.java similarity index 95% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/CommandExecDO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/CommandExecDO.java index 1c1247c3..81aeaab1 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/CommandExecDO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/CommandExecDO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.domain; +package cn.orionsec.ops.entity.domain; import com.baomidou.mybatisplus.annotation.*; import io.swagger.annotations.ApiModel; @@ -52,7 +52,7 @@ public class CommandExecDO implements Serializable { private String userName; /** - * @see com.orion.ops.constant.command.ExecType + * @see cn.orionsec.ops.constant.command.ExecType */ @ApiModelProperty(value = "执行类型 10批量执行") @TableField("exec_type") @@ -75,7 +75,7 @@ public class CommandExecDO implements Serializable { private String machineTag; /** - * @see com.orion.ops.constant.command.ExecStatus + * @see cn.orionsec.ops.constant.command.ExecStatus */ @ApiModelProperty(value = "执行状态 10未开始 20执行中 30执行成功 40执行失败 50执行终止") @TableField("exec_status") diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/CommandTemplateDO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/CommandTemplateDO.java similarity index 98% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/CommandTemplateDO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/CommandTemplateDO.java index 0ee06461..4d48507e 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/CommandTemplateDO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/CommandTemplateDO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.domain; +package cn.orionsec.ops.entity.domain; import com.baomidou.mybatisplus.annotation.*; import io.swagger.annotations.ApiModel; diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/FileTailListDO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/FileTailListDO.java similarity index 96% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/FileTailListDO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/FileTailListDO.java index 3afed401..13e094fe 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/FileTailListDO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/FileTailListDO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.domain; +package cn.orionsec.ops.entity.domain; import com.baomidou.mybatisplus.annotation.*; import io.swagger.annotations.ApiModel; @@ -68,7 +68,7 @@ public class FileTailListDO implements Serializable { private String tailCommand; /** - * @see com.orion.ops.constant.tail.FileTailMode + * @see cn.orionsec.ops.constant.tail.FileTailMode */ @ApiModelProperty(value = "宿主机文件追踪类型 tracker/tail") @TableField("tail_mode") diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/FileTransferLogDO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/FileTransferLogDO.java similarity index 94% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/FileTransferLogDO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/FileTransferLogDO.java index bacc4b39..bba6f2c1 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/FileTransferLogDO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/FileTransferLogDO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.domain; +package cn.orionsec.ops.entity.domain; import com.baomidou.mybatisplus.annotation.*; import io.swagger.annotations.ApiModel; @@ -56,7 +56,7 @@ public class FileTransferLogDO implements Serializable { private String fileToken; /** - * @see com.orion.ops.constant.sftp.SftpTransferType + * @see cn.orionsec.ops.constant.sftp.SftpTransferType */ @ApiModelProperty(value = "传输类型 10上传 20下载 30传输") @TableField("transfer_type") @@ -87,7 +87,7 @@ public class FileTransferLogDO implements Serializable { private Double nowProgress; /** - * @see com.orion.ops.constant.sftp.SftpTransferStatus + * @see cn.orionsec.ops.constant.sftp.SftpTransferStatus */ @ApiModelProperty(value = "传输状态 10未开始 20进行中 30已暂停 40已完成 50已取消 60传输异常") @TableField("transfer_status") diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/HistoryValueSnapshotDO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/HistoryValueSnapshotDO.java similarity index 94% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/HistoryValueSnapshotDO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/HistoryValueSnapshotDO.java index 75dc748d..2080ddec 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/HistoryValueSnapshotDO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/HistoryValueSnapshotDO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.domain; +package cn.orionsec.ops.entity.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; @@ -51,14 +51,14 @@ public class HistoryValueSnapshotDO implements Serializable { private Long valueId; /** - * @see com.orion.ops.constant.history.HistoryOperator + * @see cn.orionsec.ops.constant.history.HistoryOperator */ @ApiModelProperty(value = "操作类型 1新增 2修改 3删除") @TableField("operator_type") private Integer operatorType; /** - * @see com.orion.ops.constant.history.HistoryValueType + * @see cn.orionsec.ops.constant.history.HistoryValueType */ @ApiModelProperty(value = "值类型 10机器环境变量 20应用环境变量") @TableField("value_type") diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/MachineAlarmConfigDO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/MachineAlarmConfigDO.java similarity index 95% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/MachineAlarmConfigDO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/MachineAlarmConfigDO.java index 85e06a59..5ff6d1aa 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/MachineAlarmConfigDO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/MachineAlarmConfigDO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.domain; +package cn.orionsec.ops.entity.domain; import com.baomidou.mybatisplus.annotation.*; import io.swagger.annotations.ApiModel; @@ -50,7 +50,7 @@ public class MachineAlarmConfigDO implements Serializable { private Long machineId; /** - * @see com.orion.ops.constant.machine.MachineAlarmType + * @see cn.orionsec.ops.constant.machine.MachineAlarmType */ @ApiModelProperty(value = "报警类型 10: cpu使用率 20: 内存使用率") @TableField("alarm_type") diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/MachineAlarmGroupDO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/MachineAlarmGroupDO.java similarity index 97% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/MachineAlarmGroupDO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/MachineAlarmGroupDO.java index 9c691189..71f88120 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/MachineAlarmGroupDO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/MachineAlarmGroupDO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.domain; +package cn.orionsec.ops.entity.domain; import com.baomidou.mybatisplus.annotation.*; import io.swagger.annotations.ApiModel; diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/MachineAlarmHistoryDO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/MachineAlarmHistoryDO.java similarity index 95% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/MachineAlarmHistoryDO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/MachineAlarmHistoryDO.java index a7463eb0..2be2065e 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/MachineAlarmHistoryDO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/MachineAlarmHistoryDO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.domain; +package cn.orionsec.ops.entity.domain; import com.baomidou.mybatisplus.annotation.*; import io.swagger.annotations.ApiModel; @@ -50,7 +50,7 @@ public class MachineAlarmHistoryDO implements Serializable { private Long machineId; /** - * @see com.orion.ops.constant.machine.MachineAlarmType + * @see cn.orionsec.ops.constant.machine.MachineAlarmType */ @ApiModelProperty(value = "报警类型 10: cpu使用率 20: 内存使用率") @TableField("alarm_type") diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/MachineEnvDO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/MachineEnvDO.java similarity index 98% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/MachineEnvDO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/MachineEnvDO.java index 2316d10f..d1154310 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/MachineEnvDO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/MachineEnvDO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.domain; +package cn.orionsec.ops.entity.domain; import com.baomidou.mybatisplus.annotation.*; import io.swagger.annotations.ApiModel; diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/MachineGroupDO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/MachineGroupDO.java similarity index 98% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/MachineGroupDO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/MachineGroupDO.java index 322a069b..1ba55842 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/MachineGroupDO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/MachineGroupDO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.domain; +package cn.orionsec.ops.entity.domain; import com.baomidou.mybatisplus.annotation.*; import io.swagger.annotations.ApiModel; diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/MachineGroupRelDO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/MachineGroupRelDO.java similarity index 97% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/MachineGroupRelDO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/MachineGroupRelDO.java index e7bd649d..0e8f9ba6 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/MachineGroupRelDO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/MachineGroupRelDO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.domain; +package cn.orionsec.ops.entity.domain; import com.baomidou.mybatisplus.annotation.*; import io.swagger.annotations.ApiModel; diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/MachineInfoDO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/MachineInfoDO.java similarity index 93% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/MachineInfoDO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/MachineInfoDO.java index 79daece4..19246e7a 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/MachineInfoDO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/MachineInfoDO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.domain; +package cn.orionsec.ops.entity.domain; import com.baomidou.mybatisplus.annotation.*; import io.swagger.annotations.ApiModel; @@ -80,15 +80,15 @@ public class MachineInfoDO implements Serializable { private String password; /** - * @see com.orion.ops.constant.machine.MachineAuthType + * @see cn.orionsec.ops.constant.machine.MachineAuthType */ @ApiModelProperty(value = "机器认证方式 1: 密码认证 2: 独立密钥") @TableField("auth_type") private Integer authType; /** - * @see com.orion.ops.constant.Const#ENABLE - * @see com.orion.ops.constant.Const#DISABLE + * @see cn.orionsec.ops.constant.Const#ENABLE + * @see cn.orionsec.ops.constant.Const#DISABLE */ @ApiModelProperty(value = "机器状态 1有效 2无效") @TableField("machine_status") diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/MachineMonitorDO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/MachineMonitorDO.java similarity index 95% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/MachineMonitorDO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/MachineMonitorDO.java index cf076a2d..06fbb969 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/MachineMonitorDO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/MachineMonitorDO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.domain; +package cn.orionsec.ops.entity.domain; import com.baomidou.mybatisplus.annotation.*; import io.swagger.annotations.ApiModel; @@ -48,7 +48,7 @@ public class MachineMonitorDO implements Serializable { private Long machineId; /** - * @see com.orion.ops.constant.monitor.MonitorStatus + * @see cn.orionsec.ops.constant.monitor.MonitorStatus */ @ApiModelProperty(value = "插件状态 1未安装 2安装中 3未运行 4运行中") @TableField("monitor_status") diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/MachineProxyDO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/MachineProxyDO.java similarity index 96% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/MachineProxyDO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/MachineProxyDO.java index 34999e85..c23d49dc 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/MachineProxyDO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/MachineProxyDO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.domain; +package cn.orionsec.ops.entity.domain; import com.baomidou.mybatisplus.annotation.*; import io.swagger.annotations.ApiModel; @@ -60,7 +60,7 @@ public class MachineProxyDO implements Serializable { private String proxyPassword; /** - * @see com.orion.ops.constant.machine.ProxyType + * @see cn.orionsec.ops.constant.machine.ProxyType */ @ApiModelProperty(value = "代理类型 1http代理 2socket4代理 3socket5代理") @TableField("proxy_type") diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/MachineSecretKeyDO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/MachineSecretKeyDO.java similarity index 94% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/MachineSecretKeyDO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/MachineSecretKeyDO.java index d5c0d23b..5a923416 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/MachineSecretKeyDO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/MachineSecretKeyDO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.domain; +package cn.orionsec.ops.entity.domain; import com.baomidou.mybatisplus.annotation.*; import io.swagger.annotations.ApiModel; @@ -25,14 +25,14 @@ import java.io.Serializable; import java.util.Date; /** - * 机器 ssh 登陆密钥 + * 机器 ssh 登录密钥 * * @author Jiahang Li * @since 2021-04-01 */ @Data @EqualsAndHashCode(callSuper = false) -@ApiModel(value = "机器ssh登陆密钥") +@ApiModel(value = "机器ssh登录密钥") @TableName("machine_secret_key") public class MachineSecretKeyDO implements Serializable { diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/MachineTerminalDO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/MachineTerminalDO.java similarity index 85% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/MachineTerminalDO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/MachineTerminalDO.java index 60f36756..50e8f1c2 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/MachineTerminalDO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/MachineTerminalDO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.domain; +package cn.orionsec.ops.entity.domain; import com.baomidou.mybatisplus.annotation.*; import io.swagger.annotations.ApiModel; @@ -55,36 +55,36 @@ public class MachineTerminalDO implements Serializable { private String terminalType; /** - * @see com.orion.ops.constant.terminal.TerminalConst#BACKGROUND_COLOR + * @see cn.orionsec.ops.constant.terminal.TerminalConst#BACKGROUND_COLOR */ @ApiModelProperty(value = "背景色") @TableField("background_color") private String backgroundColor; /** - * @see com.orion.ops.constant.terminal.TerminalConst#FONT_COLOR + * @see cn.orionsec.ops.constant.terminal.TerminalConst#FONT_COLOR */ @ApiModelProperty(value = "字体颜色") @TableField("font_color") private String fontColor; /** - * @see com.orion.ops.constant.terminal.TerminalConst#FONT_SIZE + * @see cn.orionsec.ops.constant.terminal.TerminalConst#FONT_SIZE */ @ApiModelProperty(value = "字体大小") @TableField("font_size") private Integer fontSize; /** - * @see com.orion.ops.constant.terminal.TerminalConst#FONT_FAMILY + * @see cn.orionsec.ops.constant.terminal.TerminalConst#FONT_FAMILY */ @ApiModelProperty(value = "字体名称") @TableField("font_family") private String fontFamily; /** - * @see com.orion.ops.constant.Const#ENABLE - * @see com.orion.ops.constant.Const#DISABLE + * @see cn.orionsec.ops.constant.Const#ENABLE + * @see cn.orionsec.ops.constant.Const#DISABLE */ @ApiModelProperty(value = "是否开启url link 1开启 2关闭") @TableField("enable_web_link") diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/MachineTerminalLogDO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/MachineTerminalLogDO.java similarity index 96% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/MachineTerminalLogDO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/MachineTerminalLogDO.java index b99f9e3d..926700a7 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/MachineTerminalLogDO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/MachineTerminalLogDO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.domain; +package cn.orionsec.ops.entity.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; @@ -83,7 +83,7 @@ public class MachineTerminalLogDO implements Serializable { private Date disconnectedTime; /** - * @see com.orion.ops.constant.ws.WsCloseCode + * @see cn.orionsec.ops.constant.ws.WsCloseCode */ @ApiModelProperty(value = "close code") @TableField("close_code") diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/SchedulerTaskDO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/SchedulerTaskDO.java similarity index 89% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/SchedulerTaskDO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/SchedulerTaskDO.java index bade9b8b..702bebe1 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/SchedulerTaskDO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/SchedulerTaskDO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.domain; +package cn.orionsec.ops.entity.domain; import com.baomidou.mybatisplus.annotation.*; import io.swagger.annotations.ApiModel; @@ -60,29 +60,29 @@ public class SchedulerTaskDO implements Serializable { private String expression; /** - * @see com.orion.ops.constant.Const#ENABLE - * @see com.orion.ops.constant.Const#DISABLE + * @see cn.orionsec.ops.constant.Const#ENABLE + * @see cn.orionsec.ops.constant.Const#DISABLE */ @ApiModelProperty(value = "启用状态 1启用 2停用") @TableField("enable_status") private Integer enableStatus; /** - * @see com.orion.ops.constant.scheduler.SchedulerTaskStatus + * @see cn.orionsec.ops.constant.scheduler.SchedulerTaskStatus */ @ApiModelProperty(value = "最近状态 10待调度 20调度中 30调度成功 40调度失败 50已停止") @TableField("lately_status") private Integer latelyStatus; /** - * @see com.orion.ops.constant.common.SerialType + * @see cn.orionsec.ops.constant.common.SerialType */ @ApiModelProperty(value = "调度序列 10串行 20并行") @TableField("serialize_type") private Integer serializeType; /** - * @see com.orion.ops.constant.common.ExceptionHandlerType + * @see cn.orionsec.ops.constant.common.ExceptionHandlerType */ @ApiModelProperty(value = "异常处理 10跳过所有 20跳过错误") @TableField("exception_handler") diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/SchedulerTaskMachineDO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/SchedulerTaskMachineDO.java similarity index 97% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/SchedulerTaskMachineDO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/SchedulerTaskMachineDO.java index f3f4c2a2..7b799310 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/SchedulerTaskMachineDO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/SchedulerTaskMachineDO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.domain; +package cn.orionsec.ops.entity.domain; import com.baomidou.mybatisplus.annotation.*; import io.swagger.annotations.ApiModel; diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/SchedulerTaskMachineRecordDO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/SchedulerTaskMachineRecordDO.java similarity index 96% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/SchedulerTaskMachineRecordDO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/SchedulerTaskMachineRecordDO.java index 2b128af1..69f058bf 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/SchedulerTaskMachineRecordDO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/SchedulerTaskMachineRecordDO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.domain; +package cn.orionsec.ops.entity.domain; import com.baomidou.mybatisplus.annotation.*; import io.swagger.annotations.ApiModel; @@ -76,7 +76,7 @@ public class SchedulerTaskMachineRecordDO implements Serializable { private String execCommand; /** - * @see com.orion.ops.constant.scheduler.SchedulerTaskMachineStatus + * @see cn.orionsec.ops.constant.scheduler.SchedulerTaskMachineStatus */ @ApiModelProperty(value = "执行状态 10待调度 20调度中 30调度成功 40调度失败 50已跳过 60已停止") @TableField("exec_status") diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/SchedulerTaskRecordDO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/SchedulerTaskRecordDO.java similarity index 95% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/SchedulerTaskRecordDO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/SchedulerTaskRecordDO.java index 679ac9b0..cf183881 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/SchedulerTaskRecordDO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/SchedulerTaskRecordDO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.domain; +package cn.orionsec.ops.entity.domain; import com.baomidou.mybatisplus.annotation.*; import io.swagger.annotations.ApiModel; @@ -52,7 +52,7 @@ public class SchedulerTaskRecordDO implements Serializable { private String taskName; /** - * @see com.orion.ops.constant.scheduler.SchedulerTaskStatus + * @see cn.orionsec.ops.constant.scheduler.SchedulerTaskStatus */ @ApiModelProperty(value = "任务状态 10待调度 20调度中 30调度成功 40调度失败 50已停止") @TableField("task_status") diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/SystemEnvDO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/SystemEnvDO.java similarity index 93% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/SystemEnvDO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/SystemEnvDO.java index a623765c..dafd6f23 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/SystemEnvDO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/SystemEnvDO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.domain; +package cn.orionsec.ops.entity.domain; import com.baomidou.mybatisplus.annotation.*; import io.swagger.annotations.ApiModel; @@ -52,8 +52,8 @@ public class SystemEnvDO implements Serializable { private String attrValue; /** - * @see com.orion.ops.constant.Const#IS_SYSTEM - * @see com.orion.ops.constant.Const#NOT_SYSTEM + * @see cn.orionsec.ops.constant.Const#IS_SYSTEM + * @see cn.orionsec.ops.constant.Const#NOT_SYSTEM */ @ApiModelProperty(value = "是否为系统变量 1是 2否") @TableField("system_env") diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/UserEventLogDO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/UserEventLogDO.java similarity index 90% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/UserEventLogDO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/UserEventLogDO.java index 65109ac2..03c2584d 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/UserEventLogDO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/UserEventLogDO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.domain; +package cn.orionsec.ops.entity.domain; import com.baomidou.mybatisplus.annotation.*; import io.swagger.annotations.ApiModel; @@ -52,14 +52,14 @@ public class UserEventLogDO implements Serializable { private String username; /** - * @see com.orion.ops.constant.event.EventClassify + * @see cn.orionsec.ops.constant.event.EventClassify */ @ApiModelProperty(value = "事件分类") @TableField("event_classify") private Integer eventClassify; /** - * @see com.orion.ops.constant.event.EventType + * @see cn.orionsec.ops.constant.event.EventType */ @ApiModelProperty(value = "事件类型") @TableField("event_type") @@ -74,8 +74,8 @@ public class UserEventLogDO implements Serializable { private String paramsJson; /** - * @see com.orion.ops.constant.Const#ENABLE - * @see com.orion.ops.constant.Const#DISABLE + * @see cn.orionsec.ops.constant.Const#ENABLE + * @see cn.orionsec.ops.constant.Const#DISABLE */ @ApiModelProperty(value = "是否执行成功 1成功 2失败") @TableField("exec_result") diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/UserInfoDO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/UserInfoDO.java similarity index 89% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/UserInfoDO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/UserInfoDO.java index fba1b731..43972d07 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/UserInfoDO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/UserInfoDO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.domain; +package cn.orionsec.ops.entity.domain; import com.baomidou.mybatisplus.annotation.*; import io.swagger.annotations.ApiModel; @@ -60,29 +60,29 @@ public class UserInfoDO implements Serializable { private String salt; /** - * @see com.orion.ops.constant.user.RoleType + * @see cn.orionsec.ops.constant.user.RoleType */ @ApiModelProperty(value = "角色类型 10管理员 20开发 30运维") @TableField("role_type") private Integer roleType; /** - * @see com.orion.ops.constant.Const#ENABLE - * @see com.orion.ops.constant.Const#DISABLE + * @see cn.orionsec.ops.constant.Const#ENABLE + * @see cn.orionsec.ops.constant.Const#DISABLE */ @ApiModelProperty(value = "用户状态 1启用 2禁用") @TableField("user_status") private Integer userStatus; /** - * @see com.orion.ops.constant.Const#ENABLE - * @see com.orion.ops.constant.Const#DISABLE + * @see cn.orionsec.ops.constant.Const#ENABLE + * @see cn.orionsec.ops.constant.Const#DISABLE */ @ApiModelProperty(value = "锁定状态 1正常 2锁定") @TableField("lock_status") private Integer lockStatus; - @ApiModelProperty(value = "登陆失败次数") + @ApiModelProperty(value = "登录失败次数") @TableField("failed_login_count") private Integer failedLoginCount; diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/WebSideMessageDO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/WebSideMessageDO.java similarity index 92% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/WebSideMessageDO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/WebSideMessageDO.java index 5c1bd9a5..fc61785a 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/WebSideMessageDO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/WebSideMessageDO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.domain; +package cn.orionsec.ops.entity.domain; import com.baomidou.mybatisplus.annotation.*; import io.swagger.annotations.ApiModel; @@ -44,21 +44,21 @@ public class WebSideMessageDO implements Serializable { private Long id; /** - * @see com.orion.ops.constant.message.MessageClassify + * @see cn.orionsec.ops.constant.message.MessageClassify */ @ApiModelProperty(value = "消息分类") @TableField("message_classify") private Integer messageClassify; /** - * @see com.orion.ops.constant.message.MessageType + * @see cn.orionsec.ops.constant.message.MessageType */ @ApiModelProperty(value = "消息类型") @TableField("message_type") private Integer messageType; /** - * @see com.orion.ops.constant.message.ReadStatus + * @see cn.orionsec.ops.constant.message.ReadStatus */ @ApiModelProperty(value = "是否已读 1未读 2已读") @TableField("read_status") diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/WebhookConfigDO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/WebhookConfigDO.java similarity index 95% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/WebhookConfigDO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/WebhookConfigDO.java index e2f2d564..cb6b680f 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/domain/WebhookConfigDO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/WebhookConfigDO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.domain; +package cn.orionsec.ops.entity.domain; import com.baomidou.mybatisplus.annotation.*; import io.swagger.annotations.ApiModel; @@ -54,7 +54,7 @@ public class WebhookConfigDO implements Serializable { private String webhookUrl; /** - * @see com.orion.ops.constant.webhook.WebhookType + * @see cn.orionsec.ops.constant.webhook.WebhookType */ @ApiModelProperty(value = "类型 10: 钉钉机器人") @TableField("webhook_type") diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/dto/ApplicationActionConfigDTO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/dto/ApplicationActionConfigDTO.java similarity index 97% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/dto/ApplicationActionConfigDTO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/dto/ApplicationActionConfigDTO.java index d1bfe8fe..cbf7033f 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/dto/ApplicationActionConfigDTO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/dto/ApplicationActionConfigDTO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.dto; +package cn.orionsec.ops.entity.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/dto/ApplicationBuildStatisticsDTO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/dto/ApplicationBuildStatisticsDTO.java similarity index 97% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/dto/ApplicationBuildStatisticsDTO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/dto/ApplicationBuildStatisticsDTO.java index 6a1ab41b..8531c72a 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/dto/ApplicationBuildStatisticsDTO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/dto/ApplicationBuildStatisticsDTO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.dto; +package cn.orionsec.ops.entity.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/dto/ApplicationPipelineTaskStatisticsDTO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/dto/ApplicationPipelineTaskStatisticsDTO.java similarity index 97% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/dto/ApplicationPipelineTaskStatisticsDTO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/dto/ApplicationPipelineTaskStatisticsDTO.java index b2eee357..816dc76a 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/dto/ApplicationPipelineTaskStatisticsDTO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/dto/ApplicationPipelineTaskStatisticsDTO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.dto; +package cn.orionsec.ops.entity.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/dto/ApplicationReleaseStatisticsDTO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/dto/ApplicationReleaseStatisticsDTO.java similarity index 97% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/dto/ApplicationReleaseStatisticsDTO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/dto/ApplicationReleaseStatisticsDTO.java index 3ec5a99a..a6be54e5 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/dto/ApplicationReleaseStatisticsDTO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/dto/ApplicationReleaseStatisticsDTO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.dto; +package cn.orionsec.ops.entity.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/dto/MachineMonitorDTO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/dto/MachineMonitorDTO.java similarity index 94% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/dto/MachineMonitorDTO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/dto/MachineMonitorDTO.java index 597a52ca..c2054352 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/dto/MachineMonitorDTO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/dto/MachineMonitorDTO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.dto; +package cn.orionsec.ops.entity.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -47,7 +47,7 @@ public class MachineMonitorDTO implements Serializable { private String machineHost; /** - * @see com.orion.ops.constant.monitor.MonitorStatus + * @see cn.orionsec.ops.constant.monitor.MonitorStatus */ @ApiModelProperty(value = "监控状态 1未安装 2安装中 3未运行 4运行中") private Integer monitorStatus; diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/dto/SchedulerTaskRecordStatisticsDTO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/dto/SchedulerTaskRecordStatisticsDTO.java similarity index 97% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/dto/SchedulerTaskRecordStatisticsDTO.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/dto/SchedulerTaskRecordStatisticsDTO.java index bfd18a6a..7c9d89c1 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/dto/SchedulerTaskRecordStatisticsDTO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/dto/SchedulerTaskRecordStatisticsDTO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.dto; +package cn.orionsec.ops.entity.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/query/MachineMonitorQuery.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/query/MachineMonitorQuery.java similarity index 92% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/query/MachineMonitorQuery.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/query/MachineMonitorQuery.java index 3d5f2ad9..8c484f1b 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/entity/query/MachineMonitorQuery.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/query/MachineMonitorQuery.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.query; +package cn.orionsec.ops.entity.query; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -38,7 +38,7 @@ public class MachineMonitorQuery { private String machineName; /** - * @see com.orion.ops.constant.monitor.MonitorStatus + * @see cn.orionsec.ops.constant.monitor.MonitorStatus */ @ApiModelProperty(value = "监控状态 1未安装 2安装中 3未运行 4运行中") private Integer monitorStatus; diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/utils/CodeGenerator.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/utils/CodeGenerator.java similarity index 98% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/utils/CodeGenerator.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/utils/CodeGenerator.java index 814a8457..7fa8bdf0 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/utils/CodeGenerator.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/utils/CodeGenerator.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.utils; +package cn.orionsec.ops.utils; import com.baomidou.mybatisplus.annotation.DbType; import com.baomidou.mybatisplus.annotation.IdType; @@ -141,7 +141,7 @@ public class CodeGenerator { // 包名策略配置 PackageConfig pkConfig = new PackageConfig() // 声明父包 - .setParent("com.orion.ops") + .setParent("cn.orionsec.ops") // 映射接口的包 .setMapper("dao") // service接口的包 diff --git a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/utils/DataQuery.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/utils/DataQuery.java similarity index 99% rename from orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/utils/DataQuery.java rename to orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/utils/DataQuery.java index 3ec8e66b..1466f652 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/com/orion/ops/utils/DataQuery.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/utils/DataQuery.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.utils; +package cn.orionsec.ops.utils; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/AlarmGroupMapper.xml b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/AlarmGroupMapper.xml index b14fccfe..b4b8e411 100644 --- a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/AlarmGroupMapper.xml +++ b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/AlarmGroupMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/AlarmGroupNotifyMapper.xml b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/AlarmGroupNotifyMapper.xml index 7d63ce0b..a3ee534e 100644 --- a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/AlarmGroupNotifyMapper.xml +++ b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/AlarmGroupNotifyMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/AlarmGroupUserMapper.xml b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/AlarmGroupUserMapper.xml index cdfb689c..085b4020 100644 --- a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/AlarmGroupUserMapper.xml +++ b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/AlarmGroupUserMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/ApplicationActionLogMapper.xml b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/ApplicationActionLogMapper.xml index f6e66a74..584f2293 100644 --- a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/ApplicationActionLogMapper.xml +++ b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/ApplicationActionLogMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/ApplicationActionMapper.xml b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/ApplicationActionMapper.xml index 218fab37..4ba6afa4 100644 --- a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/ApplicationActionMapper.xml +++ b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/ApplicationActionMapper.xml @@ -1,9 +1,9 @@ - + - + @@ -16,7 +16,7 @@ - + diff --git a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/ApplicationBuildMapper.xml b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/ApplicationBuildMapper.xml index 0f17c152..d514348d 100644 --- a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/ApplicationBuildMapper.xml +++ b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/ApplicationBuildMapper.xml @@ -1,9 +1,9 @@ - + - + @@ -29,7 +29,7 @@ - + diff --git a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/ApplicationEnvMapper.xml b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/ApplicationEnvMapper.xml index 7bf6144a..77593ef6 100644 --- a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/ApplicationEnvMapper.xml +++ b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/ApplicationEnvMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/ApplicationInfoMapper.xml b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/ApplicationInfoMapper.xml index d9ce341f..a6239aae 100644 --- a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/ApplicationInfoMapper.xml +++ b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/ApplicationInfoMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/ApplicationMachineMapper.xml b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/ApplicationMachineMapper.xml index c8ebd5e8..0df3a6ed 100644 --- a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/ApplicationMachineMapper.xml +++ b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/ApplicationMachineMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/ApplicationPipelineDetailMapper.xml b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/ApplicationPipelineDetailMapper.xml index 47c3eef4..c919754f 100644 --- a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/ApplicationPipelineDetailMapper.xml +++ b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/ApplicationPipelineDetailMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/ApplicationPipelineMapper.xml b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/ApplicationPipelineMapper.xml index a464c7ec..7c430ab6 100644 --- a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/ApplicationPipelineMapper.xml +++ b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/ApplicationPipelineMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/ApplicationPipelineTaskDetailMapper.xml b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/ApplicationPipelineTaskDetailMapper.xml index 8dd3ce0d..ac630158 100644 --- a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/ApplicationPipelineTaskDetailMapper.xml +++ b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/ApplicationPipelineTaskDetailMapper.xml @@ -1,9 +1,9 @@ - + - + @@ -31,7 +31,7 @@ id, task_id, rel_id, exec_status, exec_start_time, exec_end_time - SELECT FROM application_pipeline_task_detail diff --git a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/ApplicationPipelineTaskLogMapper.xml b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/ApplicationPipelineTaskLogMapper.xml index edeed60b..b1ceda27 100644 --- a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/ApplicationPipelineTaskLogMapper.xml +++ b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/ApplicationPipelineTaskLogMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/ApplicationPipelineTaskMapper.xml b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/ApplicationPipelineTaskMapper.xml index 5918067f..13978c0b 100644 --- a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/ApplicationPipelineTaskMapper.xml +++ b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/ApplicationPipelineTaskMapper.xml @@ -1,9 +1,9 @@ - + - + @@ -31,7 +31,7 @@ - + diff --git a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/ApplicationProfileMapper.xml b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/ApplicationProfileMapper.xml index 3080e80d..df9ff852 100644 --- a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/ApplicationProfileMapper.xml +++ b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/ApplicationProfileMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/ApplicationReleaseMachineMapper.xml b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/ApplicationReleaseMachineMapper.xml index e0b82af3..087a1389 100644 --- a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/ApplicationReleaseMachineMapper.xml +++ b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/ApplicationReleaseMachineMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/ApplicationReleaseMapper.xml b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/ApplicationReleaseMapper.xml index 39499a17..63bc1d90 100644 --- a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/ApplicationReleaseMapper.xml +++ b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/ApplicationReleaseMapper.xml @@ -1,9 +1,9 @@ - + - + @@ -42,7 +42,7 @@ - + diff --git a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/ApplicationRepositoryMapper.xml b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/ApplicationRepositoryMapper.xml index 3346f1cd..6b8961af 100644 --- a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/ApplicationRepositoryMapper.xml +++ b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/ApplicationRepositoryMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/CommandExecMapper.xml b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/CommandExecMapper.xml index 33b2a3bb..973596f6 100644 --- a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/CommandExecMapper.xml +++ b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/CommandExecMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/CommandTemplateMapper.xml b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/CommandTemplateMapper.xml index 771c4975..f4e0fd18 100644 --- a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/CommandTemplateMapper.xml +++ b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/CommandTemplateMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/FileTailListMapper.xml b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/FileTailListMapper.xml index e7ad5c76..4fb951db 100644 --- a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/FileTailListMapper.xml +++ b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/FileTailListMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/FileTransferLogMapper.xml b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/FileTransferLogMapper.xml index 933d1aef..83d95408 100644 --- a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/FileTransferLogMapper.xml +++ b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/FileTransferLogMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/HistoryValueSnapshotMapper.xml b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/HistoryValueSnapshotMapper.xml index e84d092b..654059d3 100644 --- a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/HistoryValueSnapshotMapper.xml +++ b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/HistoryValueSnapshotMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/MachineAlarmConfigMapper.xml b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/MachineAlarmConfigMapper.xml index 651f9892..beb24427 100644 --- a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/MachineAlarmConfigMapper.xml +++ b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/MachineAlarmConfigMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/MachineAlarmGroupMapper.xml b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/MachineAlarmGroupMapper.xml index bdef4a6e..e747f376 100644 --- a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/MachineAlarmGroupMapper.xml +++ b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/MachineAlarmGroupMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/MachineAlarmHistoryMapper.xml b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/MachineAlarmHistoryMapper.xml index fbd2088b..c12cff90 100644 --- a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/MachineAlarmHistoryMapper.xml +++ b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/MachineAlarmHistoryMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/MachineEnvMapper.xml b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/MachineEnvMapper.xml index 25b8643d..82df5575 100644 --- a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/MachineEnvMapper.xml +++ b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/MachineEnvMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/MachineGroupMapper.xml b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/MachineGroupMapper.xml index f9cde14a..137bb742 100644 --- a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/MachineGroupMapper.xml +++ b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/MachineGroupMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/MachineGroupRelMapper.xml b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/MachineGroupRelMapper.xml index 9d355a26..f4489de4 100644 --- a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/MachineGroupRelMapper.xml +++ b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/MachineGroupRelMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/MachineInfoMapper.xml b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/MachineInfoMapper.xml index 0be1a1b3..3e650049 100644 --- a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/MachineInfoMapper.xml +++ b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/MachineInfoMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/MachineMonitorMapper.xml b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/MachineMonitorMapper.xml index d0b5ae22..c039d26a 100644 --- a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/MachineMonitorMapper.xml +++ b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/MachineMonitorMapper.xml @@ -1,9 +1,9 @@ - + - + @@ -15,7 +15,7 @@ - + diff --git a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/MachineProxyMapper.xml b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/MachineProxyMapper.xml index dcc93479..97901dca 100644 --- a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/MachineProxyMapper.xml +++ b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/MachineProxyMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/MachineSecretKeyMapper.xml b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/MachineSecretKeyMapper.xml index d54b032b..dcab3f6f 100644 --- a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/MachineSecretKeyMapper.xml +++ b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/MachineSecretKeyMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/MachineTerminalLogMapper.xml b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/MachineTerminalLogMapper.xml index 3d9a8bb9..2a299657 100644 --- a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/MachineTerminalLogMapper.xml +++ b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/MachineTerminalLogMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/MachineTerminalMapper.xml b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/MachineTerminalMapper.xml index 8647832c..f39425ff 100644 --- a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/MachineTerminalMapper.xml +++ b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/MachineTerminalMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/ScheduleTaskMachineMapper.xml b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/ScheduleTaskMachineMapper.xml index 76438ff0..3933f829 100644 --- a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/ScheduleTaskMachineMapper.xml +++ b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/ScheduleTaskMachineMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/ScheduleTaskMachineRecordMapper.xml b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/ScheduleTaskMachineRecordMapper.xml index 4e26b795..4c9b1cc4 100644 --- a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/ScheduleTaskMachineRecordMapper.xml +++ b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/ScheduleTaskMachineRecordMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/ScheduleTaskMapper.xml b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/ScheduleTaskMapper.xml index f8f0ce1a..02089f68 100644 --- a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/ScheduleTaskMapper.xml +++ b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/ScheduleTaskMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/ScheduleTaskRecordMapper.xml b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/ScheduleTaskRecordMapper.xml index bcc314a2..73af2569 100644 --- a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/ScheduleTaskRecordMapper.xml +++ b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/ScheduleTaskRecordMapper.xml @@ -1,9 +1,9 @@ - + - + @@ -16,7 +16,7 @@ - + diff --git a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/SystemEnvMapper.xml b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/SystemEnvMapper.xml index 5db252b5..94461f4e 100644 --- a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/SystemEnvMapper.xml +++ b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/SystemEnvMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/UserEventLogMapper.xml b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/UserEventLogMapper.xml index 5718d1b7..25df2f0c 100644 --- a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/UserEventLogMapper.xml +++ b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/UserEventLogMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/UserInfoMapper.xml b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/UserInfoMapper.xml index b99ed525..b9fdcb59 100644 --- a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/UserInfoMapper.xml +++ b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/UserInfoMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/WebSideMessageMapper.xml b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/WebSideMessageMapper.xml index c67c0035..2588381e 100644 --- a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/WebSideMessageMapper.xml +++ b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/WebSideMessageMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/WebhookConfigMapper.xml b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/WebhookConfigMapper.xml index 2e5b73db..7e89fda5 100644 --- a/orion-ops-api/orion-ops-dao/src/main/resources/mapper/WebhookConfigMapper.xml +++ b/orion-ops-api/orion-ops-dao/src/main/resources/mapper/WebhookConfigMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/orion-ops-api/orion-ops-data/pom.xml b/orion-ops-api/orion-ops-data/pom.xml index e10694b6..bbf1e608 100644 --- a/orion-ops-api/orion-ops-data/pom.xml +++ b/orion-ops-api/orion-ops-data/pom.xml @@ -2,9 +2,9 @@ - com.orion.ops + cn.orionsec.ops orion-ops-api - 1.2.9 + 1.3.0 ../pom.xml @@ -21,7 +21,7 @@ - com.orion.ops + cn.orionsec.ops orion-ops-service ${project.version} diff --git a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/DataModuleConversionProvider.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/DataModuleConversionProvider.java similarity index 96% rename from orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/DataModuleConversionProvider.java rename to orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/DataModuleConversionProvider.java index cd0facf2..ab3304f9 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/DataModuleConversionProvider.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/DataModuleConversionProvider.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops; +package cn.orionsec.ops; /** * 数据模块转换资源入口 diff --git a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/constant/DataClearRange.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/constant/DataClearRange.java similarity index 97% rename from orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/constant/DataClearRange.java rename to orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/constant/DataClearRange.java index dc25daa0..10b534bf 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/constant/DataClearRange.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/constant/DataClearRange.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.constant; +package cn.orionsec.ops.constant; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/constant/DataClearType.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/constant/DataClearType.java similarity index 98% rename from orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/constant/DataClearType.java rename to orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/constant/DataClearType.java index d465640d..b01af5b0 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/constant/DataClearType.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/constant/DataClearType.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.constant; +package cn.orionsec.ops.constant; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/constant/ExportConst.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/constant/ExportConst.java similarity index 98% rename from orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/constant/ExportConst.java rename to orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/constant/ExportConst.java index c30bbe0b..7897d0f5 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/constant/ExportConst.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/constant/ExportConst.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.constant; +package cn.orionsec.ops.constant; import com.orion.lang.utils.Strings; import com.orion.lang.utils.time.Dates; diff --git a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/constant/ExportType.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/constant/ExportType.java similarity index 97% rename from orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/constant/ExportType.java rename to orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/constant/ExportType.java index 0079584d..bc909eef 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/constant/ExportType.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/constant/ExportType.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.constant; +package cn.orionsec.ops.constant; -import com.orion.ops.entity.exporter.*; +import cn.orionsec.ops.entity.exporter.*; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/constant/ImportType.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/constant/ImportType.java similarity index 96% rename from orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/constant/ImportType.java rename to orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/constant/ImportType.java index 2541e57e..1c5a3527 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/constant/ImportType.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/constant/ImportType.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.constant; +package cn.orionsec.ops.constant; -import com.orion.ops.entity.domain.*; -import com.orion.ops.entity.importer.*; -import com.orion.ops.handler.importer.validator.*; +import cn.orionsec.ops.entity.domain.*; +import cn.orionsec.ops.entity.importer.*; +import cn.orionsec.ops.handler.importer.validator.*; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/entity/exporter/ApplicationExportDTO.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/exporter/ApplicationExportDTO.java similarity index 96% rename from orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/entity/exporter/ApplicationExportDTO.java rename to orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/exporter/ApplicationExportDTO.java index 3cf231de..ede0960f 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/entity/exporter/ApplicationExportDTO.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/exporter/ApplicationExportDTO.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.exporter; +package cn.orionsec.ops.entity.exporter; +import cn.orionsec.ops.entity.domain.ApplicationInfoDO; import com.orion.lang.utils.convert.TypeStore; import com.orion.office.excel.annotation.ExportField; import com.orion.office.excel.annotation.ExportSheet; import com.orion.office.excel.annotation.ExportTitle; -import com.orion.ops.entity.domain.ApplicationInfoDO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/entity/exporter/ApplicationProfileExportDTO.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/exporter/ApplicationProfileExportDTO.java similarity index 93% rename from orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/entity/exporter/ApplicationProfileExportDTO.java rename to orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/exporter/ApplicationProfileExportDTO.java index 03607b9e..d6d66c33 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/entity/exporter/ApplicationProfileExportDTO.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/exporter/ApplicationProfileExportDTO.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.exporter; +package cn.orionsec.ops.entity.exporter; +import cn.orionsec.ops.constant.CnConst; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.entity.domain.ApplicationProfileDO; import com.orion.lang.utils.convert.TypeStore; import com.orion.office.excel.annotation.ExportField; import com.orion.office.excel.annotation.ExportSheet; import com.orion.office.excel.annotation.ExportTitle; import com.orion.office.excel.type.ExcelAlignType; -import com.orion.ops.constant.CnConst; -import com.orion.ops.constant.Const; -import com.orion.ops.entity.domain.ApplicationProfileDO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/entity/exporter/ApplicationRepositoryExportDTO.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/exporter/ApplicationRepositoryExportDTO.java similarity index 90% rename from orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/entity/exporter/ApplicationRepositoryExportDTO.java rename to orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/exporter/ApplicationRepositoryExportDTO.java index 1fcf959a..1e8b0183 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/entity/exporter/ApplicationRepositoryExportDTO.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/exporter/ApplicationRepositoryExportDTO.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.exporter; +package cn.orionsec.ops.entity.exporter; +import cn.orionsec.ops.constant.CnConst; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.app.RepositoryAuthType; +import cn.orionsec.ops.constant.app.RepositoryTokenType; +import cn.orionsec.ops.entity.domain.ApplicationRepositoryDO; import com.orion.lang.utils.convert.TypeStore; import com.orion.office.excel.annotation.ExportField; import com.orion.office.excel.annotation.ExportSheet; import com.orion.office.excel.annotation.ExportTitle; -import com.orion.ops.constant.CnConst; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.app.RepositoryAuthType; -import com.orion.ops.constant.app.RepositoryTokenType; -import com.orion.ops.entity.domain.ApplicationRepositoryDO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -52,14 +52,14 @@ public class ApplicationRepositoryExportDTO { private String url; /** - * @see com.orion.ops.constant.app.RepositoryAuthType + * @see RepositoryAuthType */ @ApiModelProperty(value = "认证方式(密码/令牌)") @ExportField(index = 2, header = "认证方式(密码/令牌)", width = 23, selectOptions = {CnConst.PASSWORD, CnConst.TOKEN}) private String authType; /** - * @see com.orion.ops.constant.app.RepositoryTokenType + * @see RepositoryTokenType */ @ApiModelProperty(value = "令牌类型") @ExportField(index = 3, header = "令牌类型", width = 13, selectOptions = {Const.GITHUB, Const.GITEE, Const.GITLAB}) diff --git a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/entity/exporter/CommandTemplateExportDTO.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/exporter/CommandTemplateExportDTO.java similarity index 95% rename from orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/entity/exporter/CommandTemplateExportDTO.java rename to orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/exporter/CommandTemplateExportDTO.java index c219c304..f76c53b5 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/entity/exporter/CommandTemplateExportDTO.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/exporter/CommandTemplateExportDTO.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.exporter; +package cn.orionsec.ops.entity.exporter; +import cn.orionsec.ops.entity.domain.CommandTemplateDO; import com.orion.lang.utils.convert.TypeStore; import com.orion.office.excel.annotation.ExportField; import com.orion.office.excel.annotation.ExportSheet; import com.orion.office.excel.annotation.ExportTitle; -import com.orion.ops.entity.domain.CommandTemplateDO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/entity/exporter/EventLogExportDTO.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/exporter/EventLogExportDTO.java similarity index 90% rename from orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/entity/exporter/EventLogExportDTO.java rename to orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/exporter/EventLogExportDTO.java index 99526fef..4967915f 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/entity/exporter/EventLogExportDTO.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/exporter/EventLogExportDTO.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.exporter; +package cn.orionsec.ops.entity.exporter; +import cn.orionsec.ops.constant.event.EventClassify; +import cn.orionsec.ops.constant.event.EventType; +import cn.orionsec.ops.entity.domain.UserEventLogDO; +import cn.orionsec.ops.utils.Utils; import com.orion.lang.utils.convert.TypeStore; import com.orion.lang.utils.time.Dates; import com.orion.office.excel.annotation.ExportField; import com.orion.office.excel.annotation.ExportSheet; import com.orion.office.excel.annotation.ExportTitle; import com.orion.office.excel.type.ExcelFieldType; -import com.orion.ops.constant.event.EventClassify; -import com.orion.ops.constant.event.EventType; -import com.orion.ops.entity.domain.UserEventLogDO; -import com.orion.ops.utils.Utils; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -50,14 +50,14 @@ public class EventLogExportDTO { private String username; /** - * @see com.orion.ops.constant.event.EventClassify + * @see EventClassify */ @ApiModelProperty(value = "事件分类") @ExportField(index = 1, header = "事件分类", width = 17) private String classify; /** - * @see com.orion.ops.constant.event.EventType + * @see EventType */ @ApiModelProperty(value = "事件类型") @ExportField(index = 2, header = "事件类型", width = 22) diff --git a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/entity/exporter/MachineAlarmHistoryExportDTO.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/exporter/MachineAlarmHistoryExportDTO.java similarity index 93% rename from orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/entity/exporter/MachineAlarmHistoryExportDTO.java rename to orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/exporter/MachineAlarmHistoryExportDTO.java index f641d669..35ac4da3 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/entity/exporter/MachineAlarmHistoryExportDTO.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/exporter/MachineAlarmHistoryExportDTO.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.exporter; +package cn.orionsec.ops.entity.exporter; +import cn.orionsec.ops.constant.machine.MachineAlarmType; +import cn.orionsec.ops.entity.domain.MachineAlarmHistoryDO; import com.orion.lang.utils.convert.TypeStore; import com.orion.lang.utils.time.Dates; import com.orion.office.excel.annotation.ExportField; import com.orion.office.excel.annotation.ExportFont; import com.orion.office.excel.annotation.ExportSheet; import com.orion.office.excel.annotation.ExportTitle; -import com.orion.ops.constant.machine.MachineAlarmType; -import com.orion.ops.entity.domain.MachineAlarmHistoryDO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -51,7 +51,7 @@ public class MachineAlarmHistoryExportDTO { private String host; /** - * @see com.orion.ops.constant.machine.MachineAlarmType + * @see MachineAlarmType */ @ApiModelProperty(value = "报警类型 10: cpu使用率 20: 内存使用率") @ExportField(index = 2, header = "报警类型", width = 18, wrapText = true) diff --git a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/entity/exporter/MachineInfoExportDTO.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/exporter/MachineInfoExportDTO.java similarity index 93% rename from orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/entity/exporter/MachineInfoExportDTO.java rename to orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/exporter/MachineInfoExportDTO.java index 50309c4d..0442507d 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/entity/exporter/MachineInfoExportDTO.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/exporter/MachineInfoExportDTO.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.exporter; +package cn.orionsec.ops.entity.exporter; +import cn.orionsec.ops.constant.CnConst; +import cn.orionsec.ops.constant.machine.MachineAuthType; +import cn.orionsec.ops.entity.domain.MachineInfoDO; import com.orion.lang.utils.convert.TypeStore; import com.orion.office.excel.annotation.ExportField; import com.orion.office.excel.annotation.ExportSheet; import com.orion.office.excel.annotation.ExportTitle; -import com.orion.ops.constant.CnConst; -import com.orion.ops.constant.machine.MachineAuthType; -import com.orion.ops.entity.domain.MachineInfoDO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -59,7 +59,7 @@ public class MachineInfoExportDTO { private Integer port; /** - * @see com.orion.ops.constant.machine.MachineAuthType + * @see MachineAuthType */ @ApiModelProperty(value = "认证方式") @ExportField(index = 4, header = "认证方式", width = 13, selectOptions = {CnConst.PASSWORD, CnConst.SECRET_KEY}) diff --git a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/entity/exporter/MachineProxyExportDTO.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/exporter/MachineProxyExportDTO.java similarity index 93% rename from orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/entity/exporter/MachineProxyExportDTO.java rename to orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/exporter/MachineProxyExportDTO.java index bda77462..e2563de6 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/entity/exporter/MachineProxyExportDTO.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/exporter/MachineProxyExportDTO.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.exporter; +package cn.orionsec.ops.entity.exporter; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.machine.ProxyType; +import cn.orionsec.ops.entity.domain.MachineProxyDO; import com.orion.lang.utils.convert.TypeStore; import com.orion.office.excel.annotation.ExportField; import com.orion.office.excel.annotation.ExportSheet; import com.orion.office.excel.annotation.ExportTitle; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.machine.ProxyType; -import com.orion.ops.entity.domain.MachineProxyDO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -50,7 +50,7 @@ public class MachineProxyExportDTO { private Integer port; /** - * @see com.orion.ops.constant.machine.ProxyType + * @see ProxyType */ @ApiModelProperty(value = "代理类型") @ExportField(index = 2, header = "代理类型", width = 13, selectOptions = {Const.PROTOCOL_HTTP, Const.SOCKS4, Const.SOCKS5}) diff --git a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/entity/exporter/MachineTailFileExportDTO.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/exporter/MachineTailFileExportDTO.java similarity index 96% rename from orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/entity/exporter/MachineTailFileExportDTO.java rename to orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/exporter/MachineTailFileExportDTO.java index 045da033..cbbefcce 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/entity/exporter/MachineTailFileExportDTO.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/exporter/MachineTailFileExportDTO.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.exporter; +package cn.orionsec.ops.entity.exporter; +import cn.orionsec.ops.entity.domain.FileTailListDO; import com.orion.lang.utils.convert.TypeStore; import com.orion.office.excel.annotation.ExportField; import com.orion.office.excel.annotation.ExportSheet; import com.orion.office.excel.annotation.ExportTitle; -import com.orion.ops.entity.domain.FileTailListDO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/entity/exporter/MachineTerminalLogExportDTO.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/exporter/MachineTerminalLogExportDTO.java similarity index 97% rename from orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/entity/exporter/MachineTerminalLogExportDTO.java rename to orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/exporter/MachineTerminalLogExportDTO.java index 32d0b2df..2bcd1f4d 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/entity/exporter/MachineTerminalLogExportDTO.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/exporter/MachineTerminalLogExportDTO.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.exporter; +package cn.orionsec.ops.entity.exporter; +import cn.orionsec.ops.entity.domain.MachineTerminalLogDO; import com.orion.lang.utils.convert.TypeStore; import com.orion.lang.utils.time.Dates; import com.orion.office.excel.annotation.ExportField; import com.orion.office.excel.annotation.ExportSheet; import com.orion.office.excel.annotation.ExportTitle; import com.orion.office.excel.type.ExcelFieldType; -import com.orion.ops.entity.domain.MachineTerminalLogDO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/entity/exporter/WebhookExportDTO.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/exporter/WebhookExportDTO.java similarity index 91% rename from orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/entity/exporter/WebhookExportDTO.java rename to orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/exporter/WebhookExportDTO.java index 2835044f..f8b02779 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/entity/exporter/WebhookExportDTO.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/exporter/WebhookExportDTO.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.exporter; +package cn.orionsec.ops.entity.exporter; +import cn.orionsec.ops.constant.webhook.WebhookType; +import cn.orionsec.ops.entity.domain.WebhookConfigDO; import com.orion.lang.utils.convert.TypeStore; import com.orion.office.excel.annotation.ExportField; import com.orion.office.excel.annotation.ExportSheet; import com.orion.office.excel.annotation.ExportTitle; -import com.orion.ops.constant.webhook.WebhookType; -import com.orion.ops.entity.domain.WebhookConfigDO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -43,7 +43,7 @@ public class WebhookExportDTO { private String name; /** - * @see com.orion.ops.constant.webhook.WebhookType + * @see WebhookType */ @ApiModelProperty(value = "类型") @ExportField(index = 1, header = "类型", width = 20, wrapText = true) diff --git a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/entity/importer/ApplicationImportDTO.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/importer/ApplicationImportDTO.java similarity index 93% rename from orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/entity/importer/ApplicationImportDTO.java rename to orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/importer/ApplicationImportDTO.java index 9f2dfb3c..5e3a177e 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/entity/importer/ApplicationImportDTO.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/importer/ApplicationImportDTO.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.importer; +package cn.orionsec.ops.entity.importer; +import cn.orionsec.ops.entity.domain.ApplicationInfoDO; +import cn.orionsec.ops.entity.vo.data.DataImportCheckRowVO; import com.orion.lang.utils.convert.TypeStore; import com.orion.office.excel.annotation.ImportField; -import com.orion.ops.entity.domain.ApplicationInfoDO; -import com.orion.ops.entity.vo.data.DataImportCheckRowVO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/entity/importer/ApplicationProfileImportDTO.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/importer/ApplicationProfileImportDTO.java similarity index 90% rename from orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/entity/importer/ApplicationProfileImportDTO.java rename to orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/importer/ApplicationProfileImportDTO.java index e63c2daa..bed48dfc 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/entity/importer/ApplicationProfileImportDTO.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/importer/ApplicationProfileImportDTO.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.importer; +package cn.orionsec.ops.entity.importer; +import cn.orionsec.ops.constant.CnConst; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.entity.domain.ApplicationProfileDO; +import cn.orionsec.ops.entity.vo.data.DataImportCheckRowVO; import com.orion.lang.utils.convert.TypeStore; import com.orion.office.excel.annotation.ImportField; -import com.orion.ops.constant.CnConst; -import com.orion.ops.constant.Const; -import com.orion.ops.entity.domain.ApplicationProfileDO; -import com.orion.ops.entity.vo.data.DataImportCheckRowVO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/entity/importer/ApplicationRepositoryImportDTO.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/importer/ApplicationRepositoryImportDTO.java similarity index 90% rename from orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/entity/importer/ApplicationRepositoryImportDTO.java rename to orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/importer/ApplicationRepositoryImportDTO.java index 123edf74..e138baec 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/entity/importer/ApplicationRepositoryImportDTO.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/importer/ApplicationRepositoryImportDTO.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.importer; +package cn.orionsec.ops.entity.importer; +import cn.orionsec.ops.constant.app.RepositoryAuthType; +import cn.orionsec.ops.constant.app.RepositoryTokenType; +import cn.orionsec.ops.constant.app.RepositoryType; +import cn.orionsec.ops.entity.domain.ApplicationRepositoryDO; +import cn.orionsec.ops.entity.vo.data.DataImportCheckRowVO; +import cn.orionsec.ops.utils.ValueMix; import com.orion.lang.utils.Strings; import com.orion.lang.utils.convert.TypeStore; import com.orion.office.excel.annotation.ImportField; -import com.orion.ops.constant.app.RepositoryAuthType; -import com.orion.ops.constant.app.RepositoryTokenType; -import com.orion.ops.constant.app.RepositoryType; -import com.orion.ops.entity.domain.ApplicationRepositoryDO; -import com.orion.ops.entity.vo.data.DataImportCheckRowVO; -import com.orion.ops.utils.ValueMix; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -53,14 +53,14 @@ public class ApplicationRepositoryImportDTO extends BaseDataImportDTO { private String url; /** - * @see com.orion.ops.constant.app.RepositoryAuthType + * @see RepositoryAuthType */ @ApiModelProperty(value = "认证方式") @ImportField(index = 2) private String authType; /** - * @see com.orion.ops.constant.app.RepositoryTokenType + * @see RepositoryTokenType */ @ApiModelProperty(value = "令牌类型") @ImportField(index = 3) diff --git a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/entity/importer/BaseDataImportDTO.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/importer/BaseDataImportDTO.java similarity index 95% rename from orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/entity/importer/BaseDataImportDTO.java rename to orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/importer/BaseDataImportDTO.java index d4f17728..bcb195d2 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/entity/importer/BaseDataImportDTO.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/importer/BaseDataImportDTO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.importer; +package cn.orionsec.ops.entity.importer; import lombok.Data; diff --git a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/entity/importer/CommandTemplateImportDTO.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/importer/CommandTemplateImportDTO.java similarity index 93% rename from orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/entity/importer/CommandTemplateImportDTO.java rename to orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/importer/CommandTemplateImportDTO.java index 7b60c2a5..185f92d1 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/entity/importer/CommandTemplateImportDTO.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/importer/CommandTemplateImportDTO.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.importer; +package cn.orionsec.ops.entity.importer; +import cn.orionsec.ops.entity.domain.CommandTemplateDO; +import cn.orionsec.ops.entity.vo.data.DataImportCheckRowVO; import com.orion.lang.utils.convert.TypeStore; import com.orion.office.excel.annotation.ImportField; -import com.orion.ops.entity.domain.CommandTemplateDO; -import com.orion.ops.entity.vo.data.DataImportCheckRowVO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/entity/importer/DataImportDTO.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/importer/DataImportDTO.java similarity index 88% rename from orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/entity/importer/DataImportDTO.java rename to orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/importer/DataImportDTO.java index 0da9d0e7..09ac6cf3 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/entity/importer/DataImportDTO.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/importer/DataImportDTO.java @@ -13,9 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.importer; +package cn.orionsec.ops.entity.importer; -import com.orion.ops.entity.vo.data.DataImportCheckVO; +import cn.orionsec.ops.constant.ImportType; +import cn.orionsec.ops.entity.vo.data.DataImportCheckVO; import lombok.Data; import java.util.Date; @@ -38,7 +39,7 @@ public class DataImportDTO { /** * 类型 * - * @see com.orion.ops.constant.ImportType + * @see ImportType */ private Integer type; diff --git a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/entity/importer/MachineInfoImportDTO.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/importer/MachineInfoImportDTO.java similarity index 92% rename from orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/entity/importer/MachineInfoImportDTO.java rename to orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/importer/MachineInfoImportDTO.java index 9f7cc78d..b2888ed0 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/entity/importer/MachineInfoImportDTO.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/importer/MachineInfoImportDTO.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.importer; +package cn.orionsec.ops.entity.importer; +import cn.orionsec.ops.constant.machine.MachineAuthType; +import cn.orionsec.ops.entity.domain.MachineInfoDO; +import cn.orionsec.ops.entity.vo.data.DataImportCheckRowVO; +import cn.orionsec.ops.utils.ValueMix; import com.orion.lang.utils.Strings; import com.orion.lang.utils.convert.TypeStore; import com.orion.office.excel.annotation.ImportField; -import com.orion.ops.constant.machine.MachineAuthType; -import com.orion.ops.entity.domain.MachineInfoDO; -import com.orion.ops.entity.vo.data.DataImportCheckRowVO; -import com.orion.ops.utils.ValueMix; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -58,7 +58,7 @@ public class MachineInfoImportDTO extends BaseDataImportDTO { private Integer port; /** - * @see com.orion.ops.constant.machine.MachineAuthType + * @see MachineAuthType */ @ApiModelProperty(value = "认证方式") @ImportField(index = 4) diff --git a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/entity/importer/MachineProxyImportDTO.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/importer/MachineProxyImportDTO.java similarity index 91% rename from orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/entity/importer/MachineProxyImportDTO.java rename to orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/importer/MachineProxyImportDTO.java index 76a4253c..d83c35a8 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/entity/importer/MachineProxyImportDTO.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/importer/MachineProxyImportDTO.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.importer; +package cn.orionsec.ops.entity.importer; +import cn.orionsec.ops.constant.machine.ProxyType; +import cn.orionsec.ops.entity.domain.MachineProxyDO; +import cn.orionsec.ops.entity.vo.data.DataImportCheckRowVO; +import cn.orionsec.ops.utils.ValueMix; import com.orion.lang.utils.Strings; import com.orion.lang.utils.convert.TypeStore; import com.orion.office.excel.annotation.ImportField; -import com.orion.ops.constant.machine.ProxyType; -import com.orion.ops.entity.domain.MachineProxyDO; -import com.orion.ops.entity.vo.data.DataImportCheckRowVO; -import com.orion.ops.utils.ValueMix; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -50,7 +50,7 @@ public class MachineProxyImportDTO extends BaseDataImportDTO { private Integer port; /** - * @see com.orion.ops.constant.machine.ProxyType + * @see ProxyType */ @ApiModelProperty(value = "代理类型") @ImportField(index = 2) diff --git a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/entity/importer/MachineTailFileImportDTO.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/importer/MachineTailFileImportDTO.java similarity index 92% rename from orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/entity/importer/MachineTailFileImportDTO.java rename to orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/importer/MachineTailFileImportDTO.java index 2c1c2f16..403e882d 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/entity/importer/MachineTailFileImportDTO.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/importer/MachineTailFileImportDTO.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.importer; +package cn.orionsec.ops.entity.importer; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.tail.FileTailMode; +import cn.orionsec.ops.entity.domain.FileTailListDO; +import cn.orionsec.ops.entity.vo.data.DataImportCheckRowVO; import com.orion.lang.utils.convert.TypeStore; import com.orion.office.excel.annotation.ImportField; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.tail.FileTailMode; -import com.orion.ops.entity.domain.FileTailListDO; -import com.orion.ops.entity.vo.data.DataImportCheckRowVO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/entity/importer/WebhookImportDTO.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/importer/WebhookImportDTO.java similarity index 89% rename from orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/entity/importer/WebhookImportDTO.java rename to orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/importer/WebhookImportDTO.java index 19eb0d0d..f0f3437f 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/entity/importer/WebhookImportDTO.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/importer/WebhookImportDTO.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.importer; +package cn.orionsec.ops.entity.importer; +import cn.orionsec.ops.constant.webhook.WebhookType; +import cn.orionsec.ops.entity.domain.WebhookConfigDO; +import cn.orionsec.ops.entity.vo.data.DataImportCheckRowVO; import com.orion.lang.utils.convert.TypeStore; import com.orion.office.excel.annotation.ImportField; -import com.orion.ops.constant.webhook.WebhookType; -import com.orion.ops.entity.domain.WebhookConfigDO; -import com.orion.ops.entity.vo.data.DataImportCheckRowVO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -44,7 +44,7 @@ public class WebhookImportDTO extends BaseDataImportDTO { private String name; /** - * @see com.orion.ops.constant.webhook.WebhookType + * @see WebhookType */ @ApiModelProperty(value = "类型") @ImportField(index = 1) diff --git a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/exporter/AbstractDataExporter.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/AbstractDataExporter.java similarity index 90% rename from orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/exporter/AbstractDataExporter.java rename to orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/AbstractDataExporter.java index e13a8dcd..63f0a5eb 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/exporter/AbstractDataExporter.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/AbstractDataExporter.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.exporter; +package cn.orionsec.ops.handler.exporter; +import cn.orionsec.ops.constant.ExportType; +import cn.orionsec.ops.constant.event.EventKeys; +import cn.orionsec.ops.constant.system.SystemEnvAttr; +import cn.orionsec.ops.entity.request.data.DataExportRequest; +import cn.orionsec.ops.utils.Currents; +import cn.orionsec.ops.utils.EventParamsHolder; +import cn.orionsec.ops.utils.PathBuilders; import com.orion.lang.utils.Strings; import com.orion.lang.utils.io.FileWriters; import com.orion.lang.utils.io.Files1; import com.orion.office.excel.writer.exporting.ExcelExport; -import com.orion.ops.constant.ExportType; -import com.orion.ops.constant.event.EventKeys; -import com.orion.ops.constant.system.SystemEnvAttr; -import com.orion.ops.entity.request.data.DataExportRequest; -import com.orion.ops.utils.Currents; -import com.orion.ops.utils.EventParamsHolder; -import com.orion.ops.utils.PathBuilders; import com.orion.web.servlet.web.Servlets; import javax.servlet.http.HttpServletResponse; diff --git a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/exporter/AppProfileDataExporter.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/AppProfileDataExporter.java similarity index 82% rename from orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/exporter/AppProfileDataExporter.java rename to orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/AppProfileDataExporter.java index 7611efd6..c4866471 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/exporter/AppProfileDataExporter.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/AppProfileDataExporter.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.exporter; +package cn.orionsec.ops.handler.exporter; +import cn.orionsec.ops.constant.ExportType; +import cn.orionsec.ops.dao.ApplicationProfileDAO; +import cn.orionsec.ops.entity.domain.ApplicationProfileDO; +import cn.orionsec.ops.entity.exporter.ApplicationProfileExportDTO; +import cn.orionsec.ops.entity.request.data.DataExportRequest; import com.orion.lang.utils.convert.Converts; -import com.orion.ops.constant.ExportType; -import com.orion.ops.dao.ApplicationProfileDAO; -import com.orion.ops.entity.domain.ApplicationProfileDO; -import com.orion.ops.entity.exporter.ApplicationProfileExportDTO; -import com.orion.ops.entity.request.data.DataExportRequest; import com.orion.spring.SpringHolder; import javax.servlet.http.HttpServletResponse; diff --git a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/exporter/AppRepositoryDataExporter.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/AppRepositoryDataExporter.java similarity index 82% rename from orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/exporter/AppRepositoryDataExporter.java rename to orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/AppRepositoryDataExporter.java index b6630622..1e539b6e 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/exporter/AppRepositoryDataExporter.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/AppRepositoryDataExporter.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.exporter; +package cn.orionsec.ops.handler.exporter; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.ExportType; +import cn.orionsec.ops.dao.ApplicationRepositoryDAO; +import cn.orionsec.ops.entity.domain.ApplicationRepositoryDO; +import cn.orionsec.ops.entity.exporter.ApplicationRepositoryExportDTO; +import cn.orionsec.ops.entity.request.data.DataExportRequest; import com.orion.lang.utils.convert.Converts; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.ExportType; -import com.orion.ops.dao.ApplicationRepositoryDAO; -import com.orion.ops.entity.domain.ApplicationRepositoryDO; -import com.orion.ops.entity.exporter.ApplicationRepositoryExportDTO; -import com.orion.ops.entity.request.data.DataExportRequest; import com.orion.spring.SpringHolder; import javax.servlet.http.HttpServletResponse; diff --git a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/exporter/ApplicationDataExporter.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/ApplicationDataExporter.java similarity index 85% rename from orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/exporter/ApplicationDataExporter.java rename to orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/ApplicationDataExporter.java index d1608764..feca7cc7 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/exporter/ApplicationDataExporter.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/ApplicationDataExporter.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.exporter; +package cn.orionsec.ops.handler.exporter; +import cn.orionsec.ops.constant.ExportType; +import cn.orionsec.ops.dao.ApplicationInfoDAO; +import cn.orionsec.ops.dao.ApplicationRepositoryDAO; +import cn.orionsec.ops.entity.domain.ApplicationInfoDO; +import cn.orionsec.ops.entity.domain.ApplicationRepositoryDO; +import cn.orionsec.ops.entity.exporter.ApplicationExportDTO; +import cn.orionsec.ops.entity.request.data.DataExportRequest; import com.orion.lang.utils.convert.Converts; -import com.orion.ops.constant.ExportType; -import com.orion.ops.dao.ApplicationInfoDAO; -import com.orion.ops.dao.ApplicationRepositoryDAO; -import com.orion.ops.entity.domain.ApplicationInfoDO; -import com.orion.ops.entity.domain.ApplicationRepositoryDO; -import com.orion.ops.entity.exporter.ApplicationExportDTO; -import com.orion.ops.entity.request.data.DataExportRequest; import com.orion.spring.SpringHolder; import javax.servlet.http.HttpServletResponse; diff --git a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/exporter/CommandTemplateDataExporter.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/CommandTemplateDataExporter.java similarity index 82% rename from orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/exporter/CommandTemplateDataExporter.java rename to orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/CommandTemplateDataExporter.java index 87fd4937..004d6bc7 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/exporter/CommandTemplateDataExporter.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/CommandTemplateDataExporter.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.exporter; +package cn.orionsec.ops.handler.exporter; +import cn.orionsec.ops.constant.ExportType; +import cn.orionsec.ops.dao.CommandTemplateDAO; +import cn.orionsec.ops.entity.domain.CommandTemplateDO; +import cn.orionsec.ops.entity.exporter.CommandTemplateExportDTO; +import cn.orionsec.ops.entity.request.data.DataExportRequest; import com.orion.lang.utils.convert.Converts; -import com.orion.ops.constant.ExportType; -import com.orion.ops.dao.CommandTemplateDAO; -import com.orion.ops.entity.domain.CommandTemplateDO; -import com.orion.ops.entity.exporter.CommandTemplateExportDTO; -import com.orion.ops.entity.request.data.DataExportRequest; import com.orion.spring.SpringHolder; import javax.servlet.http.HttpServletResponse; diff --git a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/exporter/IDataExporter.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/IDataExporter.java similarity index 93% rename from orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/exporter/IDataExporter.java rename to orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/IDataExporter.java index 0f3a04ec..9d66c2f1 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/exporter/IDataExporter.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/IDataExporter.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.exporter; +package cn.orionsec.ops.handler.exporter; +import cn.orionsec.ops.constant.ExportType; +import cn.orionsec.ops.constant.MessageConst; +import cn.orionsec.ops.entity.request.data.DataExportRequest; import com.orion.lang.utils.Exceptions; -import com.orion.ops.constant.ExportType; -import com.orion.ops.constant.MessageConst; -import com.orion.ops.entity.request.data.DataExportRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; diff --git a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/exporter/MachineAlarmHistoryDataExporter.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/MachineAlarmHistoryDataExporter.java similarity index 86% rename from orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/exporter/MachineAlarmHistoryDataExporter.java rename to orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/MachineAlarmHistoryDataExporter.java index 949505b3..cbf50138 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/exporter/MachineAlarmHistoryDataExporter.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/MachineAlarmHistoryDataExporter.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.exporter; +package cn.orionsec.ops.handler.exporter; +import cn.orionsec.ops.constant.ExportType; +import cn.orionsec.ops.constant.event.EventKeys; +import cn.orionsec.ops.dao.MachineAlarmHistoryDAO; +import cn.orionsec.ops.dao.MachineInfoDAO; +import cn.orionsec.ops.entity.domain.MachineAlarmHistoryDO; +import cn.orionsec.ops.entity.domain.MachineInfoDO; +import cn.orionsec.ops.entity.exporter.MachineAlarmHistoryExportDTO; +import cn.orionsec.ops.entity.request.data.DataExportRequest; +import cn.orionsec.ops.utils.EventParamsHolder; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.orion.lang.utils.convert.Converts; -import com.orion.ops.constant.ExportType; -import com.orion.ops.constant.event.EventKeys; -import com.orion.ops.dao.MachineAlarmHistoryDAO; -import com.orion.ops.dao.MachineInfoDAO; -import com.orion.ops.entity.domain.MachineAlarmHistoryDO; -import com.orion.ops.entity.domain.MachineInfoDO; -import com.orion.ops.entity.exporter.MachineAlarmHistoryExportDTO; -import com.orion.ops.entity.request.data.DataExportRequest; -import com.orion.ops.utils.EventParamsHolder; import com.orion.spring.SpringHolder; import javax.servlet.http.HttpServletResponse; diff --git a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/exporter/MachineInfoDataExporter.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/MachineInfoDataExporter.java similarity index 85% rename from orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/exporter/MachineInfoDataExporter.java rename to orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/MachineInfoDataExporter.java index ea36d000..a93c81f3 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/exporter/MachineInfoDataExporter.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/MachineInfoDataExporter.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.exporter; +package cn.orionsec.ops.handler.exporter; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.ExportType; +import cn.orionsec.ops.dao.MachineInfoDAO; +import cn.orionsec.ops.dao.MachineSecretKeyDAO; +import cn.orionsec.ops.entity.domain.MachineInfoDO; +import cn.orionsec.ops.entity.domain.MachineSecretKeyDO; +import cn.orionsec.ops.entity.exporter.MachineInfoExportDTO; +import cn.orionsec.ops.entity.request.data.DataExportRequest; import com.orion.lang.utils.convert.Converts; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.ExportType; -import com.orion.ops.dao.MachineInfoDAO; -import com.orion.ops.dao.MachineSecretKeyDAO; -import com.orion.ops.entity.domain.MachineInfoDO; -import com.orion.ops.entity.domain.MachineSecretKeyDO; -import com.orion.ops.entity.exporter.MachineInfoExportDTO; -import com.orion.ops.entity.request.data.DataExportRequest; import com.orion.spring.SpringHolder; import javax.servlet.http.HttpServletResponse; diff --git a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/exporter/MachineProxyDataExporter.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/MachineProxyDataExporter.java similarity index 83% rename from orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/exporter/MachineProxyDataExporter.java rename to orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/MachineProxyDataExporter.java index f582bc0d..81ea7697 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/exporter/MachineProxyDataExporter.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/MachineProxyDataExporter.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.exporter; +package cn.orionsec.ops.handler.exporter; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.ExportType; +import cn.orionsec.ops.dao.MachineProxyDAO; +import cn.orionsec.ops.entity.domain.MachineProxyDO; +import cn.orionsec.ops.entity.exporter.MachineProxyExportDTO; +import cn.orionsec.ops.entity.request.data.DataExportRequest; import com.orion.lang.utils.convert.Converts; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.ExportType; -import com.orion.ops.dao.MachineProxyDAO; -import com.orion.ops.entity.domain.MachineProxyDO; -import com.orion.ops.entity.exporter.MachineProxyExportDTO; -import com.orion.ops.entity.request.data.DataExportRequest; import com.orion.spring.SpringHolder; import javax.servlet.http.HttpServletResponse; diff --git a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/exporter/TailFileDataExporter.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/TailFileDataExporter.java similarity index 86% rename from orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/exporter/TailFileDataExporter.java rename to orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/TailFileDataExporter.java index e21e1588..af16b3e8 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/exporter/TailFileDataExporter.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/TailFileDataExporter.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.exporter; +package cn.orionsec.ops.handler.exporter; +import cn.orionsec.ops.constant.ExportType; +import cn.orionsec.ops.constant.event.EventKeys; +import cn.orionsec.ops.dao.FileTailListDAO; +import cn.orionsec.ops.dao.MachineInfoDAO; +import cn.orionsec.ops.entity.domain.FileTailListDO; +import cn.orionsec.ops.entity.domain.MachineInfoDO; +import cn.orionsec.ops.entity.exporter.MachineTailFileExportDTO; +import cn.orionsec.ops.entity.request.data.DataExportRequest; +import cn.orionsec.ops.utils.EventParamsHolder; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.orion.lang.utils.convert.Converts; -import com.orion.ops.constant.ExportType; -import com.orion.ops.constant.event.EventKeys; -import com.orion.ops.dao.FileTailListDAO; -import com.orion.ops.dao.MachineInfoDAO; -import com.orion.ops.entity.domain.FileTailListDO; -import com.orion.ops.entity.domain.MachineInfoDO; -import com.orion.ops.entity.exporter.MachineTailFileExportDTO; -import com.orion.ops.entity.request.data.DataExportRequest; -import com.orion.ops.utils.EventParamsHolder; import com.orion.spring.SpringHolder; import javax.servlet.http.HttpServletResponse; diff --git a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/exporter/TerminalLogDataExporter.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/TerminalLogDataExporter.java similarity index 83% rename from orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/exporter/TerminalLogDataExporter.java rename to orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/TerminalLogDataExporter.java index 68e51a10..b109d1b1 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/exporter/TerminalLogDataExporter.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/TerminalLogDataExporter.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.exporter; +package cn.orionsec.ops.handler.exporter; +import cn.orionsec.ops.constant.ExportType; +import cn.orionsec.ops.constant.event.EventKeys; +import cn.orionsec.ops.dao.MachineTerminalLogDAO; +import cn.orionsec.ops.entity.domain.MachineTerminalLogDO; +import cn.orionsec.ops.entity.exporter.MachineTerminalLogExportDTO; +import cn.orionsec.ops.entity.request.data.DataExportRequest; +import cn.orionsec.ops.utils.EventParamsHolder; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.orion.lang.utils.convert.Converts; -import com.orion.ops.constant.ExportType; -import com.orion.ops.constant.event.EventKeys; -import com.orion.ops.dao.MachineTerminalLogDAO; -import com.orion.ops.entity.domain.MachineTerminalLogDO; -import com.orion.ops.entity.exporter.MachineTerminalLogExportDTO; -import com.orion.ops.entity.request.data.DataExportRequest; -import com.orion.ops.utils.EventParamsHolder; import com.orion.spring.SpringHolder; import javax.servlet.http.HttpServletResponse; diff --git a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/exporter/UserEventLogDataExporter.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/UserEventLogDataExporter.java similarity index 84% rename from orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/exporter/UserEventLogDataExporter.java rename to orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/UserEventLogDataExporter.java index 2e1bf35b..df4f2d20 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/exporter/UserEventLogDataExporter.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/UserEventLogDataExporter.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.exporter; +package cn.orionsec.ops.handler.exporter; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.ExportType; +import cn.orionsec.ops.constant.event.EventKeys; +import cn.orionsec.ops.dao.UserEventLogDAO; +import cn.orionsec.ops.entity.domain.UserEventLogDO; +import cn.orionsec.ops.entity.exporter.EventLogExportDTO; +import cn.orionsec.ops.entity.request.data.DataExportRequest; +import cn.orionsec.ops.utils.Currents; +import cn.orionsec.ops.utils.EventParamsHolder; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.orion.lang.utils.convert.Converts; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.ExportType; -import com.orion.ops.constant.event.EventKeys; -import com.orion.ops.dao.UserEventLogDAO; -import com.orion.ops.entity.domain.UserEventLogDO; -import com.orion.ops.entity.exporter.EventLogExportDTO; -import com.orion.ops.entity.request.data.DataExportRequest; -import com.orion.ops.utils.Currents; -import com.orion.ops.utils.EventParamsHolder; import com.orion.spring.SpringHolder; import javax.servlet.http.HttpServletResponse; diff --git a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/exporter/WebhookDataExporter.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/WebhookDataExporter.java similarity index 83% rename from orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/exporter/WebhookDataExporter.java rename to orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/WebhookDataExporter.java index 4a0cfc9f..6f0cba8d 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/exporter/WebhookDataExporter.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/WebhookDataExporter.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.exporter; +package cn.orionsec.ops.handler.exporter; +import cn.orionsec.ops.constant.ExportType; +import cn.orionsec.ops.constant.event.EventKeys; +import cn.orionsec.ops.dao.WebhookConfigDAO; +import cn.orionsec.ops.entity.domain.WebhookConfigDO; +import cn.orionsec.ops.entity.exporter.WebhookExportDTO; +import cn.orionsec.ops.entity.request.data.DataExportRequest; +import cn.orionsec.ops.utils.EventParamsHolder; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.orion.lang.utils.convert.Converts; -import com.orion.ops.constant.ExportType; -import com.orion.ops.constant.event.EventKeys; -import com.orion.ops.dao.WebhookConfigDAO; -import com.orion.ops.entity.domain.WebhookConfigDO; -import com.orion.ops.entity.exporter.WebhookExportDTO; -import com.orion.ops.entity.request.data.DataExportRequest; -import com.orion.ops.utils.EventParamsHolder; import com.orion.spring.SpringHolder; import javax.servlet.http.HttpServletResponse; diff --git a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/checker/AbstractDataChecker.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/checker/AbstractDataChecker.java similarity index 95% rename from orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/checker/AbstractDataChecker.java rename to orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/checker/AbstractDataChecker.java index 614a84c3..5c770f27 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/checker/AbstractDataChecker.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/checker/AbstractDataChecker.java @@ -13,8 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.importer.checker; +package cn.orionsec.ops.handler.importer.checker; +import cn.orionsec.ops.constant.ImportType; +import cn.orionsec.ops.constant.KeyConst; +import cn.orionsec.ops.entity.importer.BaseDataImportDTO; +import cn.orionsec.ops.entity.importer.DataImportDTO; +import cn.orionsec.ops.entity.vo.data.DataImportCheckRowVO; +import cn.orionsec.ops.entity.vo.data.DataImportCheckVO; +import cn.orionsec.ops.utils.Currents; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -27,13 +34,6 @@ import com.orion.lang.utils.collect.Maps; import com.orion.lang.utils.convert.Converts; import com.orion.office.excel.Excels; import com.orion.office.excel.reader.ExcelBeanReader; -import com.orion.ops.constant.ImportType; -import com.orion.ops.constant.KeyConst; -import com.orion.ops.entity.importer.BaseDataImportDTO; -import com.orion.ops.entity.importer.DataImportDTO; -import com.orion.ops.entity.vo.data.DataImportCheckRowVO; -import com.orion.ops.entity.vo.data.DataImportCheckVO; -import com.orion.ops.utils.Currents; import com.orion.spring.SpringHolder; import org.apache.poi.ss.usermodel.Workbook; import org.springframework.data.redis.core.RedisTemplate; diff --git a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/checker/AppProfileDataChecker.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/checker/AppProfileDataChecker.java similarity index 85% rename from orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/checker/AppProfileDataChecker.java rename to orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/checker/AppProfileDataChecker.java index 3e075d56..2a0acf6c 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/checker/AppProfileDataChecker.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/checker/AppProfileDataChecker.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.importer.checker; +package cn.orionsec.ops.handler.importer.checker; -import com.orion.ops.constant.ImportType; -import com.orion.ops.dao.ApplicationProfileDAO; -import com.orion.ops.entity.domain.ApplicationProfileDO; -import com.orion.ops.entity.importer.ApplicationProfileImportDTO; -import com.orion.ops.entity.vo.data.DataImportCheckVO; +import cn.orionsec.ops.constant.ImportType; +import cn.orionsec.ops.dao.ApplicationProfileDAO; +import cn.orionsec.ops.entity.domain.ApplicationProfileDO; +import cn.orionsec.ops.entity.importer.ApplicationProfileImportDTO; +import cn.orionsec.ops.entity.vo.data.DataImportCheckVO; import com.orion.spring.SpringHolder; import org.apache.poi.ss.usermodel.Workbook; diff --git a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/checker/AppRepositoryDataChecker.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/checker/AppRepositoryDataChecker.java similarity index 85% rename from orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/checker/AppRepositoryDataChecker.java rename to orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/checker/AppRepositoryDataChecker.java index c30e2d3c..837d1a07 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/checker/AppRepositoryDataChecker.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/checker/AppRepositoryDataChecker.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.importer.checker; +package cn.orionsec.ops.handler.importer.checker; -import com.orion.ops.constant.ImportType; -import com.orion.ops.dao.ApplicationRepositoryDAO; -import com.orion.ops.entity.domain.ApplicationRepositoryDO; -import com.orion.ops.entity.importer.ApplicationRepositoryImportDTO; -import com.orion.ops.entity.vo.data.DataImportCheckVO; +import cn.orionsec.ops.constant.ImportType; +import cn.orionsec.ops.dao.ApplicationRepositoryDAO; +import cn.orionsec.ops.entity.domain.ApplicationRepositoryDO; +import cn.orionsec.ops.entity.importer.ApplicationRepositoryImportDTO; +import cn.orionsec.ops.entity.vo.data.DataImportCheckVO; import com.orion.spring.SpringHolder; import org.apache.poi.ss.usermodel.Workbook; diff --git a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/checker/ApplicationDataChecker.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/checker/ApplicationDataChecker.java similarity index 83% rename from orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/checker/ApplicationDataChecker.java rename to orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/checker/ApplicationDataChecker.java index 5a0ce4f7..1c19baf4 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/checker/ApplicationDataChecker.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/checker/ApplicationDataChecker.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.importer.checker; +package cn.orionsec.ops.handler.importer.checker; -import com.orion.ops.constant.ImportType; -import com.orion.ops.constant.MessageConst; -import com.orion.ops.dao.ApplicationInfoDAO; -import com.orion.ops.dao.ApplicationRepositoryDAO; -import com.orion.ops.entity.domain.ApplicationInfoDO; -import com.orion.ops.entity.domain.ApplicationRepositoryDO; -import com.orion.ops.entity.importer.ApplicationImportDTO; -import com.orion.ops.entity.vo.data.DataImportCheckVO; +import cn.orionsec.ops.constant.ImportType; +import cn.orionsec.ops.constant.MessageConst; +import cn.orionsec.ops.dao.ApplicationInfoDAO; +import cn.orionsec.ops.dao.ApplicationRepositoryDAO; +import cn.orionsec.ops.entity.domain.ApplicationInfoDO; +import cn.orionsec.ops.entity.domain.ApplicationRepositoryDO; +import cn.orionsec.ops.entity.importer.ApplicationImportDTO; +import cn.orionsec.ops.entity.vo.data.DataImportCheckVO; import com.orion.spring.SpringHolder; import org.apache.poi.ss.usermodel.Workbook; diff --git a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/checker/CommandTemplateDataChecker.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/checker/CommandTemplateDataChecker.java similarity index 85% rename from orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/checker/CommandTemplateDataChecker.java rename to orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/checker/CommandTemplateDataChecker.java index c54f09a4..007d9756 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/checker/CommandTemplateDataChecker.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/checker/CommandTemplateDataChecker.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.importer.checker; +package cn.orionsec.ops.handler.importer.checker; -import com.orion.ops.constant.ImportType; -import com.orion.ops.dao.CommandTemplateDAO; -import com.orion.ops.entity.domain.CommandTemplateDO; -import com.orion.ops.entity.importer.CommandTemplateImportDTO; -import com.orion.ops.entity.vo.data.DataImportCheckVO; +import cn.orionsec.ops.constant.ImportType; +import cn.orionsec.ops.dao.CommandTemplateDAO; +import cn.orionsec.ops.entity.domain.CommandTemplateDO; +import cn.orionsec.ops.entity.importer.CommandTemplateImportDTO; +import cn.orionsec.ops.entity.vo.data.DataImportCheckVO; import com.orion.spring.SpringHolder; import org.apache.poi.ss.usermodel.Workbook; diff --git a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/checker/IDataChecker.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/checker/IDataChecker.java similarity index 93% rename from orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/checker/IDataChecker.java rename to orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/checker/IDataChecker.java index 032ab2d8..4796fb79 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/checker/IDataChecker.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/checker/IDataChecker.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.importer.checker; +package cn.orionsec.ops.handler.importer.checker; +import cn.orionsec.ops.constant.ImportType; +import cn.orionsec.ops.entity.vo.data.DataImportCheckVO; import com.orion.lang.utils.Exceptions; -import com.orion.ops.constant.ImportType; -import com.orion.ops.entity.vo.data.DataImportCheckVO; import org.apache.poi.ss.usermodel.Workbook; /** diff --git a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/checker/MachineInfoDataChecker.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/checker/MachineInfoDataChecker.java similarity index 83% rename from orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/checker/MachineInfoDataChecker.java rename to orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/checker/MachineInfoDataChecker.java index b54a2793..ebee14a0 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/checker/MachineInfoDataChecker.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/checker/MachineInfoDataChecker.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.importer.checker; +package cn.orionsec.ops.handler.importer.checker; -import com.orion.ops.constant.ImportType; -import com.orion.ops.constant.MessageConst; -import com.orion.ops.dao.MachineInfoDAO; -import com.orion.ops.dao.MachineSecretKeyDAO; -import com.orion.ops.entity.domain.MachineInfoDO; -import com.orion.ops.entity.domain.MachineSecretKeyDO; -import com.orion.ops.entity.importer.MachineInfoImportDTO; -import com.orion.ops.entity.vo.data.DataImportCheckVO; +import cn.orionsec.ops.constant.ImportType; +import cn.orionsec.ops.constant.MessageConst; +import cn.orionsec.ops.dao.MachineInfoDAO; +import cn.orionsec.ops.dao.MachineSecretKeyDAO; +import cn.orionsec.ops.entity.domain.MachineInfoDO; +import cn.orionsec.ops.entity.domain.MachineSecretKeyDO; +import cn.orionsec.ops.entity.importer.MachineInfoImportDTO; +import cn.orionsec.ops.entity.vo.data.DataImportCheckVO; import com.orion.spring.SpringHolder; import org.apache.poi.ss.usermodel.Workbook; diff --git a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/checker/MachineProxyDataChecker.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/checker/MachineProxyDataChecker.java similarity index 83% rename from orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/checker/MachineProxyDataChecker.java rename to orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/checker/MachineProxyDataChecker.java index 405931c6..477cc675 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/checker/MachineProxyDataChecker.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/checker/MachineProxyDataChecker.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.importer.checker; +package cn.orionsec.ops.handler.importer.checker; -import com.orion.ops.constant.ImportType; -import com.orion.ops.entity.domain.MachineProxyDO; -import com.orion.ops.entity.importer.MachineProxyImportDTO; -import com.orion.ops.entity.vo.data.DataImportCheckVO; +import cn.orionsec.ops.constant.ImportType; +import cn.orionsec.ops.entity.domain.MachineProxyDO; +import cn.orionsec.ops.entity.importer.MachineProxyImportDTO; +import cn.orionsec.ops.entity.vo.data.DataImportCheckVO; import org.apache.poi.ss.usermodel.Workbook; import java.util.List; diff --git a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/checker/TailFileDataChecker.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/checker/TailFileDataChecker.java similarity index 83% rename from orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/checker/TailFileDataChecker.java rename to orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/checker/TailFileDataChecker.java index fc9b88e3..42868ff4 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/checker/TailFileDataChecker.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/checker/TailFileDataChecker.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.importer.checker; +package cn.orionsec.ops.handler.importer.checker; -import com.orion.ops.constant.ImportType; -import com.orion.ops.constant.MessageConst; -import com.orion.ops.dao.FileTailListDAO; -import com.orion.ops.dao.MachineInfoDAO; -import com.orion.ops.entity.domain.FileTailListDO; -import com.orion.ops.entity.domain.MachineInfoDO; -import com.orion.ops.entity.importer.MachineTailFileImportDTO; -import com.orion.ops.entity.vo.data.DataImportCheckVO; +import cn.orionsec.ops.constant.ImportType; +import cn.orionsec.ops.constant.MessageConst; +import cn.orionsec.ops.dao.FileTailListDAO; +import cn.orionsec.ops.dao.MachineInfoDAO; +import cn.orionsec.ops.entity.domain.FileTailListDO; +import cn.orionsec.ops.entity.domain.MachineInfoDO; +import cn.orionsec.ops.entity.importer.MachineTailFileImportDTO; +import cn.orionsec.ops.entity.vo.data.DataImportCheckVO; import com.orion.spring.SpringHolder; import org.apache.poi.ss.usermodel.Workbook; diff --git a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/checker/WebhookDataChecker.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/checker/WebhookDataChecker.java similarity index 85% rename from orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/checker/WebhookDataChecker.java rename to orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/checker/WebhookDataChecker.java index 1eb3ceb6..09379997 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/checker/WebhookDataChecker.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/checker/WebhookDataChecker.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.importer.checker; +package cn.orionsec.ops.handler.importer.checker; -import com.orion.ops.constant.ImportType; -import com.orion.ops.dao.WebhookConfigDAO; -import com.orion.ops.entity.domain.WebhookConfigDO; -import com.orion.ops.entity.importer.WebhookImportDTO; -import com.orion.ops.entity.vo.data.DataImportCheckVO; +import cn.orionsec.ops.constant.ImportType; +import cn.orionsec.ops.dao.WebhookConfigDAO; +import cn.orionsec.ops.entity.domain.WebhookConfigDO; +import cn.orionsec.ops.entity.importer.WebhookImportDTO; +import cn.orionsec.ops.entity.vo.data.DataImportCheckVO; import com.orion.spring.SpringHolder; import org.apache.poi.ss.usermodel.Workbook; diff --git a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/impl/AbstractDataImporter.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/impl/AbstractDataImporter.java similarity index 91% rename from orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/impl/AbstractDataImporter.java rename to orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/impl/AbstractDataImporter.java index 7d2240b0..9ed8f486 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/impl/AbstractDataImporter.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/impl/AbstractDataImporter.java @@ -13,8 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.importer.impl; +package cn.orionsec.ops.handler.importer.impl; +import cn.orionsec.ops.constant.ImportType; +import cn.orionsec.ops.constant.SchedulerPools; +import cn.orionsec.ops.constant.event.EventKeys; +import cn.orionsec.ops.constant.message.MessageType; +import cn.orionsec.ops.constant.system.SystemEnvAttr; +import cn.orionsec.ops.entity.importer.BaseDataImportDTO; +import cn.orionsec.ops.entity.importer.DataImportDTO; +import cn.orionsec.ops.entity.vo.data.DataImportCheckRowVO; +import cn.orionsec.ops.entity.vo.data.DataImportCheckVO; +import cn.orionsec.ops.service.api.DataImportService; +import cn.orionsec.ops.service.api.WebSideMessageService; +import cn.orionsec.ops.utils.PathBuilders; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.serializer.SerializerFeature; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -25,18 +37,6 @@ import com.orion.lang.utils.convert.Converts; import com.orion.lang.utils.io.FileWriters; import com.orion.lang.utils.io.Files1; import com.orion.lang.utils.time.Dates; -import com.orion.ops.constant.ImportType; -import com.orion.ops.constant.SchedulerPools; -import com.orion.ops.constant.event.EventKeys; -import com.orion.ops.constant.message.MessageType; -import com.orion.ops.constant.system.SystemEnvAttr; -import com.orion.ops.entity.importer.BaseDataImportDTO; -import com.orion.ops.entity.importer.DataImportDTO; -import com.orion.ops.entity.vo.data.DataImportCheckRowVO; -import com.orion.ops.entity.vo.data.DataImportCheckVO; -import com.orion.ops.service.api.DataImportService; -import com.orion.ops.service.api.WebSideMessageService; -import com.orion.ops.utils.PathBuilders; import com.orion.spring.SpringHolder; import lombok.extern.slf4j.Slf4j; diff --git a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/impl/AppProfileDataImporter.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/impl/AppProfileDataImporter.java similarity index 83% rename from orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/impl/AppProfileDataImporter.java rename to orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/impl/AppProfileDataImporter.java index 142fc202..c1b60a63 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/impl/AppProfileDataImporter.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/impl/AppProfileDataImporter.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.importer.impl; +package cn.orionsec.ops.handler.importer.impl; -import com.orion.ops.dao.ApplicationProfileDAO; -import com.orion.ops.entity.domain.ApplicationProfileDO; -import com.orion.ops.entity.importer.DataImportDTO; -import com.orion.ops.service.api.ApplicationProfileService; +import cn.orionsec.ops.dao.ApplicationProfileDAO; +import cn.orionsec.ops.entity.domain.ApplicationProfileDO; +import cn.orionsec.ops.entity.importer.DataImportDTO; +import cn.orionsec.ops.service.api.ApplicationProfileService; import com.orion.spring.SpringHolder; /** diff --git a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/impl/AppRepositoryDataImporter.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/impl/AppRepositoryDataImporter.java similarity index 86% rename from orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/impl/AppRepositoryDataImporter.java rename to orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/impl/AppRepositoryDataImporter.java index aaba1758..e2afc8b9 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/impl/AppRepositoryDataImporter.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/impl/AppRepositoryDataImporter.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.importer.impl; +package cn.orionsec.ops.handler.importer.impl; +import cn.orionsec.ops.constant.app.RepositoryStatus; +import cn.orionsec.ops.dao.ApplicationRepositoryDAO; +import cn.orionsec.ops.entity.domain.ApplicationRepositoryDO; +import cn.orionsec.ops.entity.importer.DataImportDTO; +import cn.orionsec.ops.utils.Utils; import com.orion.lang.utils.io.Files1; -import com.orion.ops.constant.app.RepositoryStatus; -import com.orion.ops.dao.ApplicationRepositoryDAO; -import com.orion.ops.entity.domain.ApplicationRepositoryDO; -import com.orion.ops.entity.importer.DataImportDTO; -import com.orion.ops.utils.Utils; import com.orion.spring.SpringHolder; import java.io.File; diff --git a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/impl/ApplicationDataImporter.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/impl/ApplicationDataImporter.java similarity index 84% rename from orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/impl/ApplicationDataImporter.java rename to orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/impl/ApplicationDataImporter.java index 582904cc..a4cbb962 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/impl/ApplicationDataImporter.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/impl/ApplicationDataImporter.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.importer.impl; +package cn.orionsec.ops.handler.importer.impl; -import com.orion.ops.dao.ApplicationInfoDAO; -import com.orion.ops.entity.domain.ApplicationInfoDO; -import com.orion.ops.entity.importer.DataImportDTO; -import com.orion.ops.service.api.ApplicationInfoService; +import cn.orionsec.ops.dao.ApplicationInfoDAO; +import cn.orionsec.ops.entity.domain.ApplicationInfoDO; +import cn.orionsec.ops.entity.importer.DataImportDTO; +import cn.orionsec.ops.service.api.ApplicationInfoService; import com.orion.spring.SpringHolder; /** diff --git a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/impl/CommandTemplateDataImporter.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/impl/CommandTemplateDataImporter.java similarity index 88% rename from orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/impl/CommandTemplateDataImporter.java rename to orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/impl/CommandTemplateDataImporter.java index 69127c96..9dc9f3e5 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/impl/CommandTemplateDataImporter.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/impl/CommandTemplateDataImporter.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.importer.impl; +package cn.orionsec.ops.handler.importer.impl; -import com.orion.ops.dao.CommandTemplateDAO; -import com.orion.ops.entity.domain.CommandTemplateDO; -import com.orion.ops.entity.importer.DataImportDTO; +import cn.orionsec.ops.dao.CommandTemplateDAO; +import cn.orionsec.ops.entity.domain.CommandTemplateDO; +import cn.orionsec.ops.entity.importer.DataImportDTO; import com.orion.spring.SpringHolder; /** diff --git a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/impl/IDataImporter.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/impl/IDataImporter.java similarity index 93% rename from orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/impl/IDataImporter.java rename to orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/impl/IDataImporter.java index e0e6b46d..fddcbd91 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/impl/IDataImporter.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/impl/IDataImporter.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.importer.impl; +package cn.orionsec.ops.handler.importer.impl; +import cn.orionsec.ops.constant.ImportType; +import cn.orionsec.ops.entity.importer.DataImportDTO; import com.orion.lang.utils.Exceptions; -import com.orion.ops.constant.ImportType; -import com.orion.ops.entity.importer.DataImportDTO; /** * 数据导入器 接口 diff --git a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/impl/MachineInfoDataImporter.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/impl/MachineInfoDataImporter.java similarity index 87% rename from orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/impl/MachineInfoDataImporter.java rename to orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/impl/MachineInfoDataImporter.java index f6e71c48..8fdaf7a1 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/impl/MachineInfoDataImporter.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/impl/MachineInfoDataImporter.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.importer.impl; +package cn.orionsec.ops.handler.importer.impl; -import com.orion.ops.dao.MachineInfoDAO; -import com.orion.ops.entity.domain.MachineInfoDO; -import com.orion.ops.entity.importer.DataImportDTO; -import com.orion.ops.service.api.MachineEnvService; +import cn.orionsec.ops.dao.MachineInfoDAO; +import cn.orionsec.ops.entity.domain.MachineInfoDO; +import cn.orionsec.ops.entity.importer.DataImportDTO; +import cn.orionsec.ops.service.api.MachineEnvService; import com.orion.spring.SpringHolder; import java.util.Optional; diff --git a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/impl/MachineProxyDataImporter.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/impl/MachineProxyDataImporter.java similarity index 84% rename from orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/impl/MachineProxyDataImporter.java rename to orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/impl/MachineProxyDataImporter.java index 274218a6..a6a66f7c 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/impl/MachineProxyDataImporter.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/impl/MachineProxyDataImporter.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.importer.impl; +package cn.orionsec.ops.handler.importer.impl; -import com.orion.ops.dao.MachineProxyDAO; -import com.orion.ops.entity.domain.MachineProxyDO; -import com.orion.ops.entity.importer.DataImportDTO; +import cn.orionsec.ops.dao.MachineProxyDAO; +import cn.orionsec.ops.entity.domain.MachineProxyDO; +import cn.orionsec.ops.entity.importer.DataImportDTO; import com.orion.spring.SpringHolder; /** diff --git a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/impl/TailFileDataImporter.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/impl/TailFileDataImporter.java similarity index 84% rename from orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/impl/TailFileDataImporter.java rename to orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/impl/TailFileDataImporter.java index 716af961..9b51aa5c 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/impl/TailFileDataImporter.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/impl/TailFileDataImporter.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.importer.impl; +package cn.orionsec.ops.handler.importer.impl; -import com.orion.ops.dao.FileTailListDAO; -import com.orion.ops.entity.domain.FileTailListDO; -import com.orion.ops.entity.importer.DataImportDTO; +import cn.orionsec.ops.dao.FileTailListDAO; +import cn.orionsec.ops.entity.domain.FileTailListDO; +import cn.orionsec.ops.entity.importer.DataImportDTO; import com.orion.spring.SpringHolder; /** diff --git a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/impl/WebhookDataImporter.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/impl/WebhookDataImporter.java similarity index 84% rename from orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/impl/WebhookDataImporter.java rename to orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/impl/WebhookDataImporter.java index eae3cfe4..0189facc 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/impl/WebhookDataImporter.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/impl/WebhookDataImporter.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.importer.impl; +package cn.orionsec.ops.handler.importer.impl; -import com.orion.ops.dao.WebhookConfigDAO; -import com.orion.ops.entity.domain.WebhookConfigDO; -import com.orion.ops.entity.importer.DataImportDTO; +import cn.orionsec.ops.dao.WebhookConfigDAO; +import cn.orionsec.ops.entity.domain.WebhookConfigDO; +import cn.orionsec.ops.entity.importer.DataImportDTO; import com.orion.spring.SpringHolder; /** diff --git a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/validator/ApplicationProfileValidator.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/validator/ApplicationProfileValidator.java similarity index 93% rename from orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/validator/ApplicationProfileValidator.java rename to orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/validator/ApplicationProfileValidator.java index a59fa5c1..72d81088 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/validator/ApplicationProfileValidator.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/validator/ApplicationProfileValidator.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.importer.validator; +package cn.orionsec.ops.handler.importer.validator; +import cn.orionsec.ops.constant.CnConst; +import cn.orionsec.ops.entity.importer.ApplicationProfileImportDTO; +import cn.orionsec.ops.utils.Valid; import com.orion.lang.utils.Strings; -import com.orion.ops.constant.CnConst; -import com.orion.ops.entity.importer.ApplicationProfileImportDTO; -import com.orion.ops.utils.Valid; /** * 应用环境表 数据验证器 diff --git a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/validator/ApplicationRepositoryValidator.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/validator/ApplicationRepositoryValidator.java similarity index 95% rename from orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/validator/ApplicationRepositoryValidator.java rename to orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/validator/ApplicationRepositoryValidator.java index 8c88dac2..680bb0e1 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/validator/ApplicationRepositoryValidator.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/validator/ApplicationRepositoryValidator.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.importer.validator; +package cn.orionsec.ops.handler.importer.validator; +import cn.orionsec.ops.constant.app.RepositoryAuthType; +import cn.orionsec.ops.constant.app.RepositoryTokenType; +import cn.orionsec.ops.entity.importer.ApplicationRepositoryImportDTO; +import cn.orionsec.ops.utils.Valid; +import cn.orionsec.ops.utils.ValueMix; import com.orion.lang.utils.Exceptions; import com.orion.lang.utils.Strings; -import com.orion.ops.constant.app.RepositoryAuthType; -import com.orion.ops.constant.app.RepositoryTokenType; -import com.orion.ops.entity.importer.ApplicationRepositoryImportDTO; -import com.orion.ops.utils.Valid; -import com.orion.ops.utils.ValueMix; import java.util.Arrays; import java.util.stream.Collectors; diff --git a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/validator/ApplicationValidator.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/validator/ApplicationValidator.java similarity index 94% rename from orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/validator/ApplicationValidator.java rename to orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/validator/ApplicationValidator.java index 9874532c..bb98580d 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/validator/ApplicationValidator.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/validator/ApplicationValidator.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.importer.validator; +package cn.orionsec.ops.handler.importer.validator; +import cn.orionsec.ops.entity.importer.ApplicationImportDTO; +import cn.orionsec.ops.utils.Valid; import com.orion.lang.utils.Strings; -import com.orion.ops.entity.importer.ApplicationImportDTO; -import com.orion.ops.utils.Valid; /** * 应用表 数据验证器 diff --git a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/validator/CommandTemplateValidator.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/validator/CommandTemplateValidator.java similarity index 94% rename from orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/validator/CommandTemplateValidator.java rename to orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/validator/CommandTemplateValidator.java index 536824cc..ea300815 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/validator/CommandTemplateValidator.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/validator/CommandTemplateValidator.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.importer.validator; +package cn.orionsec.ops.handler.importer.validator; +import cn.orionsec.ops.entity.importer.CommandTemplateImportDTO; +import cn.orionsec.ops.utils.Valid; import com.orion.lang.utils.Strings; -import com.orion.ops.entity.importer.CommandTemplateImportDTO; -import com.orion.ops.utils.Valid; /** * 命令模板 数据验证器 diff --git a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/validator/DataValidator.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/validator/DataValidator.java similarity index 94% rename from orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/validator/DataValidator.java rename to orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/validator/DataValidator.java index 1b9be28a..7e5cfec5 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/validator/DataValidator.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/validator/DataValidator.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.importer.validator; +package cn.orionsec.ops.handler.importer.validator; /** * 数据验证器 diff --git a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/validator/FileTailValidator.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/validator/FileTailValidator.java similarity index 96% rename from orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/validator/FileTailValidator.java rename to orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/validator/FileTailValidator.java index d9e95613..7b302ec9 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/validator/FileTailValidator.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/validator/FileTailValidator.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.importer.validator; +package cn.orionsec.ops.handler.importer.validator; +import cn.orionsec.ops.entity.importer.MachineTailFileImportDTO; +import cn.orionsec.ops.utils.Valid; import com.orion.lang.utils.Charsets; -import com.orion.ops.entity.importer.MachineTailFileImportDTO; -import com.orion.ops.utils.Valid; /** * 文件tail 数据验证器 diff --git a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/validator/MachineProxyValidator.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/validator/MachineProxyValidator.java similarity index 94% rename from orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/validator/MachineProxyValidator.java rename to orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/validator/MachineProxyValidator.java index 5a976178..e319d6eb 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/validator/MachineProxyValidator.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/validator/MachineProxyValidator.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.importer.validator; +package cn.orionsec.ops.handler.importer.validator; +import cn.orionsec.ops.constant.machine.ProxyType; +import cn.orionsec.ops.entity.importer.MachineProxyImportDTO; +import cn.orionsec.ops.utils.Valid; +import cn.orionsec.ops.utils.ValueMix; import com.orion.lang.utils.Strings; -import com.orion.ops.constant.machine.ProxyType; -import com.orion.ops.entity.importer.MachineProxyImportDTO; -import com.orion.ops.utils.Valid; -import com.orion.ops.utils.ValueMix; import java.util.Arrays; import java.util.stream.Collectors; diff --git a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/validator/MachineValidator.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/validator/MachineValidator.java similarity index 95% rename from orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/validator/MachineValidator.java rename to orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/validator/MachineValidator.java index 00e47f0f..076a9a89 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/validator/MachineValidator.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/validator/MachineValidator.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.importer.validator; +package cn.orionsec.ops.handler.importer.validator; +import cn.orionsec.ops.constant.machine.MachineAuthType; +import cn.orionsec.ops.entity.importer.MachineInfoImportDTO; +import cn.orionsec.ops.utils.Valid; +import cn.orionsec.ops.utils.ValueMix; import com.orion.lang.utils.Strings; -import com.orion.ops.constant.machine.MachineAuthType; -import com.orion.ops.entity.importer.MachineInfoImportDTO; -import com.orion.ops.utils.Valid; -import com.orion.ops.utils.ValueMix; import java.util.Arrays; import java.util.stream.Collectors; diff --git a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/validator/WebhookValidator.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/validator/WebhookValidator.java similarity index 92% rename from orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/validator/WebhookValidator.java rename to orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/validator/WebhookValidator.java index 69808eb9..bbccee49 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/handler/importer/validator/WebhookValidator.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/validator/WebhookValidator.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.importer.validator; +package cn.orionsec.ops.handler.importer.validator; -import com.orion.ops.constant.webhook.WebhookType; -import com.orion.ops.entity.importer.WebhookImportDTO; -import com.orion.ops.utils.Valid; +import cn.orionsec.ops.constant.webhook.WebhookType; +import cn.orionsec.ops.entity.importer.WebhookImportDTO; +import cn.orionsec.ops.utils.Valid; import java.util.Arrays; import java.util.stream.Collectors; diff --git a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/service/api/DataClearService.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/service/api/DataClearService.java similarity index 95% rename from orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/service/api/DataClearService.java rename to orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/service/api/DataClearService.java index dc0fabd1..20dc714a 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/service/api/DataClearService.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/service/api/DataClearService.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.api; +package cn.orionsec.ops.service.api; -import com.orion.ops.entity.request.data.DataClearRequest; +import cn.orionsec.ops.entity.request.data.DataClearRequest; /** * 数据清理服务 diff --git a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/service/api/DataImportService.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/service/api/DataImportService.java similarity index 92% rename from orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/service/api/DataImportService.java rename to orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/service/api/DataImportService.java index 542bc4db..b75b4b83 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/service/api/DataImportService.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/service/api/DataImportService.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.api; +package cn.orionsec.ops.service.api; -import com.orion.ops.entity.importer.DataImportDTO; +import cn.orionsec.ops.entity.importer.DataImportDTO; /** * 数据导入服务 diff --git a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/service/impl/DataClearServiceImpl.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/service/impl/DataClearServiceImpl.java similarity index 94% rename from orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/service/impl/DataClearServiceImpl.java rename to orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/service/impl/DataClearServiceImpl.java index c2ccc631..09a3459c 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/service/impl/DataClearServiceImpl.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/service/impl/DataClearServiceImpl.java @@ -13,26 +13,26 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.impl; +package cn.orionsec.ops.service.impl; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.DataClearRange; +import cn.orionsec.ops.constant.app.BuildStatus; +import cn.orionsec.ops.constant.app.PipelineStatus; +import cn.orionsec.ops.constant.app.ReleaseStatus; +import cn.orionsec.ops.constant.command.ExecStatus; +import cn.orionsec.ops.constant.event.EventKeys; +import cn.orionsec.ops.constant.scheduler.SchedulerTaskStatus; +import cn.orionsec.ops.dao.*; +import cn.orionsec.ops.entity.domain.*; +import cn.orionsec.ops.entity.request.data.DataClearRequest; +import cn.orionsec.ops.service.api.DataClearService; +import cn.orionsec.ops.utils.Currents; +import cn.orionsec.ops.utils.EventParamsHolder; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.support.SFunction; import com.orion.lang.utils.time.Dates; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.DataClearRange; -import com.orion.ops.constant.app.BuildStatus; -import com.orion.ops.constant.app.PipelineStatus; -import com.orion.ops.constant.app.ReleaseStatus; -import com.orion.ops.constant.command.ExecStatus; -import com.orion.ops.constant.event.EventKeys; -import com.orion.ops.constant.scheduler.SchedulerTaskStatus; -import com.orion.ops.dao.*; -import com.orion.ops.entity.domain.*; -import com.orion.ops.entity.request.data.DataClearRequest; -import com.orion.ops.service.api.DataClearService; -import com.orion.ops.utils.Currents; -import com.orion.ops.utils.EventParamsHolder; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/service/impl/DataImportServiceImpl.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/service/impl/DataImportServiceImpl.java similarity index 86% rename from orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/service/impl/DataImportServiceImpl.java rename to orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/service/impl/DataImportServiceImpl.java index 5e931bb1..6b141f58 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/com/orion/ops/service/impl/DataImportServiceImpl.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/service/impl/DataImportServiceImpl.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.impl; +package cn.orionsec.ops.service.impl; +import cn.orionsec.ops.constant.KeyConst; +import cn.orionsec.ops.constant.MessageConst; +import cn.orionsec.ops.entity.dto.user.UserDTO; +import cn.orionsec.ops.entity.importer.DataImportDTO; +import cn.orionsec.ops.service.api.DataImportService; +import cn.orionsec.ops.utils.Currents; import com.alibaba.fastjson.JSON; import com.orion.lang.utils.Exceptions; import com.orion.lang.utils.Strings; -import com.orion.ops.constant.KeyConst; -import com.orion.ops.constant.MessageConst; -import com.orion.ops.entity.dto.user.UserDTO; -import com.orion.ops.entity.importer.DataImportDTO; -import com.orion.ops.service.api.DataImportService; -import com.orion.ops.utils.Currents; import lombok.extern.slf4j.Slf4j; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; diff --git a/orion-ops-api/orion-ops-mapping/pom.xml b/orion-ops-api/orion-ops-mapping/pom.xml index 9d564077..bd30bffd 100644 --- a/orion-ops-api/orion-ops-mapping/pom.xml +++ b/orion-ops-api/orion-ops-mapping/pom.xml @@ -2,9 +2,9 @@ - com.orion.ops + cn.orionsec.ops orion-ops-api - 1.2.9 + 1.3.0 ../pom.xml @@ -15,21 +15,21 @@ - com.orion.ops + cn.orionsec.ops orion-ops-dao ${project.version} - com.orion.ops + cn.orionsec.ops orion-ops-model ${project.version} - com.orion.ops + cn.orionsec.ops orion-ops-data ${project.version} diff --git a/orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/MappingConversionProvider.java b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/MappingConversionProvider.java similarity index 89% rename from orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/MappingConversionProvider.java rename to orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/MappingConversionProvider.java index b9fb2fe7..281108c4 100644 --- a/orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/MappingConversionProvider.java +++ b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/MappingConversionProvider.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops; +package cn.orionsec.ops; import com.orion.lang.support.Attempt; import com.orion.lang.utils.reflect.PackageScanner; @@ -34,9 +34,9 @@ public class MappingConversionProvider implements InitializingBean { private final String CONVERSION_PACKAGE = this.getClass().getPackage().getName() + ".mapping.*"; - private static final String EXPORTER_PACKAGE = "com.orion.ops.entity.exporter"; + private static final String EXPORTER_PACKAGE = "cn.orionsec.ops.entity.exporter"; - private static final String IMPORTER_PACKAGE = "com.orion.ops.entity.importer"; + private static final String IMPORTER_PACKAGE = "cn.orionsec.ops.entity.importer"; @Override public void afterPropertiesSet() throws Exception { diff --git a/orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/alarm/AlarmGroupConversion.java b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/alarm/AlarmGroupConversion.java similarity index 85% rename from orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/alarm/AlarmGroupConversion.java rename to orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/alarm/AlarmGroupConversion.java index b3977420..dee2fa68 100644 --- a/orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/alarm/AlarmGroupConversion.java +++ b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/alarm/AlarmGroupConversion.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.mapping.alarm; +package cn.orionsec.ops.mapping.alarm; +import cn.orionsec.ops.entity.domain.AlarmGroupDO; +import cn.orionsec.ops.entity.domain.AlarmGroupUserDO; +import cn.orionsec.ops.entity.vo.alarm.AlarmGroupUserVO; +import cn.orionsec.ops.entity.vo.alarm.AlarmGroupVO; import com.orion.lang.utils.convert.TypeStore; -import com.orion.ops.entity.domain.AlarmGroupDO; -import com.orion.ops.entity.domain.AlarmGroupUserDO; -import com.orion.ops.entity.vo.alarm.AlarmGroupUserVO; -import com.orion.ops.entity.vo.alarm.AlarmGroupVO; /** * 报警组 对象转换器 diff --git a/orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/app/ApplicationActionConversion.java b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/app/ApplicationActionConversion.java similarity index 95% rename from orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/app/ApplicationActionConversion.java rename to orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/app/ApplicationActionConversion.java index 80312137..7cb87932 100644 --- a/orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/app/ApplicationActionConversion.java +++ b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/app/ApplicationActionConversion.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.mapping.app; +package cn.orionsec.ops.mapping.app; +import cn.orionsec.ops.entity.domain.ApplicationActionDO; +import cn.orionsec.ops.entity.domain.ApplicationActionLogDO; +import cn.orionsec.ops.entity.vo.app.*; +import cn.orionsec.ops.utils.Utils; import com.orion.lang.utils.convert.TypeStore; import com.orion.lang.utils.time.Dates; -import com.orion.ops.entity.domain.ApplicationActionDO; -import com.orion.ops.entity.domain.ApplicationActionLogDO; -import com.orion.ops.entity.vo.app.*; -import com.orion.ops.utils.Utils; import java.util.Date; import java.util.Optional; diff --git a/orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/app/ApplicationBuildConversion.java b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/app/ApplicationBuildConversion.java similarity index 95% rename from orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/app/ApplicationBuildConversion.java rename to orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/app/ApplicationBuildConversion.java index 07d44311..56d1ce70 100644 --- a/orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/app/ApplicationBuildConversion.java +++ b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/app/ApplicationBuildConversion.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.mapping.app; +package cn.orionsec.ops.mapping.app; +import cn.orionsec.ops.constant.app.BuildStatus; +import cn.orionsec.ops.entity.domain.ApplicationBuildDO; +import cn.orionsec.ops.entity.dto.ApplicationBuildStatisticsDTO; +import cn.orionsec.ops.entity.vo.app.*; +import cn.orionsec.ops.utils.Utils; import com.orion.lang.utils.convert.TypeStore; import com.orion.lang.utils.time.Dates; -import com.orion.ops.constant.app.BuildStatus; -import com.orion.ops.entity.domain.ApplicationBuildDO; -import com.orion.ops.entity.dto.ApplicationBuildStatisticsDTO; -import com.orion.ops.entity.vo.app.*; -import com.orion.ops.utils.Utils; import java.util.Date; import java.util.Optional; diff --git a/orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/app/ApplicationConversion.java b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/app/ApplicationConversion.java similarity index 89% rename from orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/app/ApplicationConversion.java rename to orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/app/ApplicationConversion.java index 46230e7c..10cb5ba3 100644 --- a/orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/app/ApplicationConversion.java +++ b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/app/ApplicationConversion.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.mapping.app; +package cn.orionsec.ops.mapping.app; +import cn.orionsec.ops.entity.domain.ApplicationInfoDO; +import cn.orionsec.ops.entity.vo.app.ApplicationDetailVO; +import cn.orionsec.ops.entity.vo.app.ApplicationInfoVO; import com.orion.lang.utils.convert.TypeStore; -import com.orion.ops.entity.domain.ApplicationInfoDO; -import com.orion.ops.entity.vo.app.ApplicationDetailVO; -import com.orion.ops.entity.vo.app.ApplicationInfoVO; /** * 应用信息 对象转换器 diff --git a/orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/app/ApplicationEnvConversion.java b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/app/ApplicationEnvConversion.java similarity index 86% rename from orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/app/ApplicationEnvConversion.java rename to orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/app/ApplicationEnvConversion.java index 21319256..27fea7ae 100644 --- a/orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/app/ApplicationEnvConversion.java +++ b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/app/ApplicationEnvConversion.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.mapping.app; +package cn.orionsec.ops.mapping.app; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.app.ApplicationEnvAttr; +import cn.orionsec.ops.entity.domain.ApplicationEnvDO; +import cn.orionsec.ops.entity.vo.app.ApplicationEnvVO; import com.orion.lang.utils.convert.TypeStore; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.app.ApplicationEnvAttr; -import com.orion.ops.entity.domain.ApplicationEnvDO; -import com.orion.ops.entity.vo.app.ApplicationEnvVO; /** * 应用环境变量 对象转换器 diff --git a/orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/app/ApplicationMachineConversion.java b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/app/ApplicationMachineConversion.java similarity index 89% rename from orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/app/ApplicationMachineConversion.java rename to orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/app/ApplicationMachineConversion.java index 421b5809..e8a296a5 100644 --- a/orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/app/ApplicationMachineConversion.java +++ b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/app/ApplicationMachineConversion.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.mapping.app; +package cn.orionsec.ops.mapping.app; +import cn.orionsec.ops.entity.domain.ApplicationMachineDO; +import cn.orionsec.ops.entity.vo.app.ApplicationMachineVO; import com.orion.lang.utils.convert.TypeStore; -import com.orion.ops.entity.domain.ApplicationMachineDO; -import com.orion.ops.entity.vo.app.ApplicationMachineVO; /** * 应用机器 对象转换器 diff --git a/orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/app/ApplicationPipelineConversion.java b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/app/ApplicationPipelineConversion.java similarity index 85% rename from orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/app/ApplicationPipelineConversion.java rename to orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/app/ApplicationPipelineConversion.java index 6b7afffa..4afd069c 100644 --- a/orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/app/ApplicationPipelineConversion.java +++ b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/app/ApplicationPipelineConversion.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.mapping.app; +package cn.orionsec.ops.mapping.app; +import cn.orionsec.ops.entity.domain.ApplicationPipelineDO; +import cn.orionsec.ops.entity.domain.ApplicationPipelineDetailDO; +import cn.orionsec.ops.entity.vo.app.ApplicationPipelineDetailVO; +import cn.orionsec.ops.entity.vo.app.ApplicationPipelineStatisticsDetailVO; +import cn.orionsec.ops.entity.vo.app.ApplicationPipelineVO; import com.orion.lang.utils.convert.TypeStore; -import com.orion.ops.entity.domain.ApplicationPipelineDO; -import com.orion.ops.entity.domain.ApplicationPipelineDetailDO; -import com.orion.ops.entity.vo.app.ApplicationPipelineDetailVO; -import com.orion.ops.entity.vo.app.ApplicationPipelineStatisticsDetailVO; -import com.orion.ops.entity.vo.app.ApplicationPipelineVO; /** * 应用流水线 对象转换器 diff --git a/orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/app/ApplicationPipelineTaskConversion.java b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/app/ApplicationPipelineTaskConversion.java similarity index 95% rename from orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/app/ApplicationPipelineTaskConversion.java rename to orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/app/ApplicationPipelineTaskConversion.java index f39491c0..3c28fe8f 100644 --- a/orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/app/ApplicationPipelineTaskConversion.java +++ b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/app/ApplicationPipelineTaskConversion.java @@ -13,21 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.mapping.app; +package cn.orionsec.ops.mapping.app; +import cn.orionsec.ops.constant.app.PipelineStatus; +import cn.orionsec.ops.entity.domain.ApplicationPipelineTaskDO; +import cn.orionsec.ops.entity.domain.ApplicationPipelineTaskDetailDO; +import cn.orionsec.ops.entity.domain.ApplicationPipelineTaskLogDO; +import cn.orionsec.ops.entity.dto.ApplicationPipelineTaskStatisticsDTO; +import cn.orionsec.ops.entity.dto.app.ApplicationPipelineStageConfigDTO; +import cn.orionsec.ops.entity.request.app.ApplicationPipelineTaskDetailRequest; +import cn.orionsec.ops.entity.vo.app.*; +import cn.orionsec.ops.utils.Utils; import com.alibaba.fastjson.JSON; import com.orion.lang.utils.convert.Converts; import com.orion.lang.utils.convert.TypeStore; import com.orion.lang.utils.time.Dates; -import com.orion.ops.constant.app.PipelineStatus; -import com.orion.ops.entity.domain.ApplicationPipelineTaskDO; -import com.orion.ops.entity.domain.ApplicationPipelineTaskDetailDO; -import com.orion.ops.entity.domain.ApplicationPipelineTaskLogDO; -import com.orion.ops.entity.dto.app.ApplicationPipelineStageConfigDTO; -import com.orion.ops.entity.dto.ApplicationPipelineTaskStatisticsDTO; -import com.orion.ops.entity.request.app.ApplicationPipelineTaskDetailRequest; -import com.orion.ops.entity.vo.app.*; -import com.orion.ops.utils.Utils; import java.util.Date; import java.util.Optional; diff --git a/orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/app/ApplicationProfileConversion.java b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/app/ApplicationProfileConversion.java similarity index 87% rename from orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/app/ApplicationProfileConversion.java rename to orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/app/ApplicationProfileConversion.java index 0b974be7..085a804f 100644 --- a/orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/app/ApplicationProfileConversion.java +++ b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/app/ApplicationProfileConversion.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.mapping.app; +package cn.orionsec.ops.mapping.app; +import cn.orionsec.ops.entity.domain.ApplicationProfileDO; +import cn.orionsec.ops.entity.dto.app.ApplicationProfileDTO; +import cn.orionsec.ops.entity.vo.app.ApplicationProfileFastVO; +import cn.orionsec.ops.entity.vo.app.ApplicationProfileVO; import com.orion.lang.utils.convert.TypeStore; -import com.orion.ops.entity.domain.ApplicationProfileDO; -import com.orion.ops.entity.dto.app.ApplicationProfileDTO; -import com.orion.ops.entity.vo.app.ApplicationProfileFastVO; -import com.orion.ops.entity.vo.app.ApplicationProfileVO; /** * 应用环境 对象转换器 diff --git a/orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/app/ApplicationReleaseConversion.java b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/app/ApplicationReleaseConversion.java similarity index 96% rename from orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/app/ApplicationReleaseConversion.java rename to orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/app/ApplicationReleaseConversion.java index f25be38b..7248e776 100644 --- a/orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/app/ApplicationReleaseConversion.java +++ b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/app/ApplicationReleaseConversion.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.mapping.app; +package cn.orionsec.ops.mapping.app; +import cn.orionsec.ops.constant.app.ReleaseStatus; +import cn.orionsec.ops.entity.domain.ApplicationReleaseDO; +import cn.orionsec.ops.entity.domain.ApplicationReleaseMachineDO; +import cn.orionsec.ops.entity.dto.ApplicationReleaseStatisticsDTO; +import cn.orionsec.ops.entity.vo.app.*; +import cn.orionsec.ops.utils.Utils; import com.orion.lang.utils.convert.TypeStore; import com.orion.lang.utils.time.Dates; -import com.orion.ops.constant.app.ReleaseStatus; -import com.orion.ops.entity.domain.ApplicationReleaseDO; -import com.orion.ops.entity.domain.ApplicationReleaseMachineDO; -import com.orion.ops.entity.dto.ApplicationReleaseStatisticsDTO; -import com.orion.ops.entity.vo.app.*; -import com.orion.ops.utils.Utils; import java.util.Date; import java.util.Optional; diff --git a/orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/app/ApplicationRepositoryConversion.java b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/app/ApplicationRepositoryConversion.java similarity index 89% rename from orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/app/ApplicationRepositoryConversion.java rename to orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/app/ApplicationRepositoryConversion.java index 09e1b5e4..ac6fd06d 100644 --- a/orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/app/ApplicationRepositoryConversion.java +++ b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/app/ApplicationRepositoryConversion.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.mapping.app; +package cn.orionsec.ops.mapping.app; +import cn.orionsec.ops.entity.domain.ApplicationRepositoryDO; +import cn.orionsec.ops.entity.vo.app.ApplicationRepositoryBranchVO; +import cn.orionsec.ops.entity.vo.app.ApplicationRepositoryCommitVO; +import cn.orionsec.ops.entity.vo.app.ApplicationRepositoryVO; import com.orion.ext.vcs.git.info.BranchInfo; import com.orion.ext.vcs.git.info.LogInfo; import com.orion.lang.utils.convert.TypeStore; import com.orion.lang.utils.time.Dates; -import com.orion.ops.entity.domain.ApplicationRepositoryDO; -import com.orion.ops.entity.vo.app.ApplicationRepositoryBranchVO; -import com.orion.ops.entity.vo.app.ApplicationRepositoryCommitVO; -import com.orion.ops.entity.vo.app.ApplicationRepositoryVO; import java.util.Date; import java.util.Optional; diff --git a/orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/exec/CommandExecConversion.java b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/exec/CommandExecConversion.java similarity index 92% rename from orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/exec/CommandExecConversion.java rename to orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/exec/CommandExecConversion.java index a47c6ebc..99a1cb61 100644 --- a/orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/exec/CommandExecConversion.java +++ b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/exec/CommandExecConversion.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.mapping.exec; +package cn.orionsec.ops.mapping.exec; +import cn.orionsec.ops.entity.domain.CommandExecDO; +import cn.orionsec.ops.entity.vo.exec.CommandExecStatusVO; +import cn.orionsec.ops.entity.vo.exec.CommandExecVO; +import cn.orionsec.ops.utils.Utils; import com.orion.lang.utils.convert.TypeStore; import com.orion.lang.utils.time.Dates; -import com.orion.ops.entity.domain.CommandExecDO; -import com.orion.ops.entity.vo.exec.CommandExecStatusVO; -import com.orion.ops.entity.vo.exec.CommandExecVO; -import com.orion.ops.utils.Utils; import java.util.Date; import java.util.Optional; diff --git a/orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/file/FileTailConversion.java b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/file/FileTailConversion.java similarity index 91% rename from orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/file/FileTailConversion.java rename to orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/file/FileTailConversion.java index 0384dfaf..16908ece 100644 --- a/orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/file/FileTailConversion.java +++ b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/file/FileTailConversion.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.mapping.file; +package cn.orionsec.ops.mapping.file; +import cn.orionsec.ops.entity.domain.FileTailListDO; +import cn.orionsec.ops.entity.dto.file.FileTailDTO; +import cn.orionsec.ops.entity.vo.tail.FileTailVO; import com.orion.lang.utils.convert.TypeStore; import com.orion.lang.utils.io.Files1; import com.orion.lang.utils.time.Dates; -import com.orion.ops.entity.domain.FileTailListDO; -import com.orion.ops.entity.dto.file.FileTailDTO; -import com.orion.ops.entity.vo.tail.FileTailVO; /** * 文件 tail 对象转换器 diff --git a/orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/file/FileTransferLogConversion.java b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/file/FileTransferLogConversion.java similarity index 91% rename from orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/file/FileTransferLogConversion.java rename to orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/file/FileTransferLogConversion.java index 1e52a340..8b0975d5 100644 --- a/orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/file/FileTransferLogConversion.java +++ b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/file/FileTransferLogConversion.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.mapping.file; +package cn.orionsec.ops.mapping.file; +import cn.orionsec.ops.entity.domain.FileTransferLogDO; +import cn.orionsec.ops.entity.vo.sftp.FileTransferLogVO; import com.orion.lang.utils.convert.TypeStore; import com.orion.lang.utils.io.Files1; -import com.orion.ops.entity.domain.FileTransferLogDO; -import com.orion.ops.entity.vo.sftp.FileTransferLogVO; /** * 文件传输日志 对象转换器 diff --git a/orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/history/HistoryValueConversion.java b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/history/HistoryValueConversion.java similarity index 90% rename from orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/history/HistoryValueConversion.java rename to orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/history/HistoryValueConversion.java index b36153a7..5d8eb586 100644 --- a/orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/history/HistoryValueConversion.java +++ b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/history/HistoryValueConversion.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.mapping.history; +package cn.orionsec.ops.mapping.history; +import cn.orionsec.ops.entity.domain.HistoryValueSnapshotDO; +import cn.orionsec.ops.entity.vo.history.HistoryValueVO; import com.orion.lang.utils.convert.TypeStore; import com.orion.lang.utils.time.Dates; -import com.orion.ops.entity.domain.HistoryValueSnapshotDO; -import com.orion.ops.entity.vo.history.HistoryValueVO; /** * 历史值 对象转换器 diff --git a/orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/home/StatisticsConversion.java b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/home/StatisticsConversion.java similarity index 88% rename from orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/home/StatisticsConversion.java rename to orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/home/StatisticsConversion.java index c2752afa..d6f5840e 100644 --- a/orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/home/StatisticsConversion.java +++ b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/home/StatisticsConversion.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.mapping.home; +package cn.orionsec.ops.mapping.home; +import cn.orionsec.ops.entity.dto.statistic.StatisticsCountDTO; +import cn.orionsec.ops.entity.vo.home.HomeStatisticsCountVO; import com.orion.lang.utils.convert.TypeStore; -import com.orion.ops.entity.dto.statistic.StatisticsCountDTO; -import com.orion.ops.entity.vo.home.HomeStatisticsCountVO; /** * 统计数据 对象转换器 diff --git a/orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/machine/MachineAlarmConversion.java b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/machine/MachineAlarmConversion.java similarity index 86% rename from orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/machine/MachineAlarmConversion.java rename to orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/machine/MachineAlarmConversion.java index 8f4e6703..4cf6c50f 100644 --- a/orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/machine/MachineAlarmConversion.java +++ b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/machine/MachineAlarmConversion.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.mapping.machine; +package cn.orionsec.ops.mapping.machine; +import cn.orionsec.ops.entity.domain.MachineAlarmConfigDO; +import cn.orionsec.ops.entity.domain.MachineAlarmHistoryDO; +import cn.orionsec.ops.entity.vo.machine.MachineAlarmConfigVO; +import cn.orionsec.ops.entity.vo.machine.MachineAlarmHistoryVO; import com.orion.lang.utils.convert.TypeStore; import com.orion.lang.utils.time.Dates; -import com.orion.ops.entity.domain.MachineAlarmConfigDO; -import com.orion.ops.entity.domain.MachineAlarmHistoryDO; -import com.orion.ops.entity.vo.machine.MachineAlarmConfigVO; -import com.orion.ops.entity.vo.machine.MachineAlarmHistoryVO; /** * 机器报警 对象转换器 diff --git a/orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/machine/MachineConversion.java b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/machine/MachineConversion.java similarity index 91% rename from orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/machine/MachineConversion.java rename to orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/machine/MachineConversion.java index f6f5b745..74a41c40 100644 --- a/orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/machine/MachineConversion.java +++ b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/machine/MachineConversion.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.mapping.machine; +package cn.orionsec.ops.mapping.machine; +import cn.orionsec.ops.entity.domain.MachineInfoDO; +import cn.orionsec.ops.entity.request.machine.MachineInfoRequest; +import cn.orionsec.ops.entity.vo.machine.MachineInfoVO; import com.orion.lang.utils.convert.TypeStore; -import com.orion.ops.entity.domain.MachineInfoDO; -import com.orion.ops.entity.request.machine.MachineInfoRequest; -import com.orion.ops.entity.vo.machine.MachineInfoVO; /** * 机器信息 对象转换器 diff --git a/orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/machine/MachineEnvConversion.java b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/machine/MachineEnvConversion.java similarity index 86% rename from orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/machine/MachineEnvConversion.java rename to orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/machine/MachineEnvConversion.java index 722ad708..33042a0c 100644 --- a/orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/machine/MachineEnvConversion.java +++ b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/machine/MachineEnvConversion.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.mapping.machine; +package cn.orionsec.ops.mapping.machine; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.machine.MachineEnvAttr; +import cn.orionsec.ops.entity.domain.MachineEnvDO; +import cn.orionsec.ops.entity.vo.machine.MachineEnvVO; import com.orion.lang.utils.convert.TypeStore; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.machine.MachineEnvAttr; -import com.orion.ops.entity.domain.MachineEnvDO; -import com.orion.ops.entity.vo.machine.MachineEnvVO; /** * 机器环境变量 对象转换器 diff --git a/orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/machine/MachineGroupConversion.java b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/machine/MachineGroupConversion.java similarity index 88% rename from orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/machine/MachineGroupConversion.java rename to orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/machine/MachineGroupConversion.java index 1594298e..a59b3d95 100644 --- a/orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/machine/MachineGroupConversion.java +++ b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/machine/MachineGroupConversion.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.mapping.machine; +package cn.orionsec.ops.mapping.machine; +import cn.orionsec.ops.entity.domain.MachineGroupDO; +import cn.orionsec.ops.entity.vo.machine.MachineGroupTreeVO; import com.orion.lang.utils.convert.TypeStore; -import com.orion.ops.entity.domain.MachineGroupDO; -import com.orion.ops.entity.vo.machine.MachineGroupTreeVO; /** * 机器分组 对象转换器 diff --git a/orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/machine/MachineMonitorConversion.java b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/machine/MachineMonitorConversion.java similarity index 88% rename from orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/machine/MachineMonitorConversion.java rename to orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/machine/MachineMonitorConversion.java index d0d04cdf..f5552959 100644 --- a/orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/machine/MachineMonitorConversion.java +++ b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/machine/MachineMonitorConversion.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.mapping.machine; +package cn.orionsec.ops.mapping.machine; +import cn.orionsec.ops.constant.monitor.MonitorConst; +import cn.orionsec.ops.entity.domain.MachineMonitorDO; +import cn.orionsec.ops.entity.dto.MachineMonitorDTO; +import cn.orionsec.ops.entity.vo.machine.MachineMonitorVO; import com.orion.lang.utils.convert.TypeStore; -import com.orion.ops.constant.monitor.MonitorConst; -import com.orion.ops.entity.domain.MachineMonitorDO; -import com.orion.ops.entity.dto.MachineMonitorDTO; -import com.orion.ops.entity.vo.machine.MachineMonitorVO; /** * 机器监控 对象转换器 diff --git a/orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/machine/MachineProxyConversion.java b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/machine/MachineProxyConversion.java similarity index 89% rename from orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/machine/MachineProxyConversion.java rename to orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/machine/MachineProxyConversion.java index 657abf4b..c4c73061 100644 --- a/orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/machine/MachineProxyConversion.java +++ b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/machine/MachineProxyConversion.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.mapping.machine; +package cn.orionsec.ops.mapping.machine; +import cn.orionsec.ops.entity.domain.MachineProxyDO; +import cn.orionsec.ops.entity.vo.machine.MachineProxyVO; import com.orion.lang.utils.convert.TypeStore; -import com.orion.ops.entity.domain.MachineProxyDO; -import com.orion.ops.entity.vo.machine.MachineProxyVO; /** * 机器代理 对象转换器 diff --git a/orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/machine/MachineSecretKeyConversion.java b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/machine/MachineSecretKeyConversion.java similarity index 88% rename from orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/machine/MachineSecretKeyConversion.java rename to orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/machine/MachineSecretKeyConversion.java index 628b53d1..d8679eb9 100644 --- a/orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/machine/MachineSecretKeyConversion.java +++ b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/machine/MachineSecretKeyConversion.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.mapping.machine; +package cn.orionsec.ops.mapping.machine; +import cn.orionsec.ops.entity.domain.MachineSecretKeyDO; +import cn.orionsec.ops.entity.vo.machine.MachineSecretKeyVO; import com.orion.lang.utils.convert.TypeStore; -import com.orion.ops.entity.domain.MachineSecretKeyDO; -import com.orion.ops.entity.vo.machine.MachineSecretKeyVO; /** * 机器密钥 对象转换器 diff --git a/orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/machine/MachineTerminalConversion.java b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/machine/MachineTerminalConversion.java similarity index 89% rename from orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/machine/MachineTerminalConversion.java rename to orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/machine/MachineTerminalConversion.java index 5b23525f..b53ce032 100644 --- a/orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/machine/MachineTerminalConversion.java +++ b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/machine/MachineTerminalConversion.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.mapping.machine; +package cn.orionsec.ops.mapping.machine; +import cn.orionsec.ops.entity.config.TerminalConnectConfig; +import cn.orionsec.ops.entity.domain.MachineTerminalDO; +import cn.orionsec.ops.entity.domain.MachineTerminalLogDO; +import cn.orionsec.ops.entity.vo.machine.MachineTerminalLogVO; +import cn.orionsec.ops.entity.vo.machine.MachineTerminalManagerVO; +import cn.orionsec.ops.entity.vo.machine.MachineTerminalVO; import com.orion.lang.utils.convert.TypeStore; import com.orion.lang.utils.time.Dates; -import com.orion.ops.entity.domain.MachineTerminalDO; -import com.orion.ops.entity.domain.MachineTerminalLogDO; -import com.orion.ops.entity.config.TerminalConnectConfig; -import com.orion.ops.entity.vo.machine.MachineTerminalLogVO; -import com.orion.ops.entity.vo.machine.MachineTerminalManagerVO; -import com.orion.ops.entity.vo.machine.MachineTerminalVO; import java.util.Optional; diff --git a/orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/message/WebSideMessageConversion.java b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/message/WebSideMessageConversion.java similarity index 90% rename from orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/message/WebSideMessageConversion.java rename to orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/message/WebSideMessageConversion.java index 2e518961..b7489939 100644 --- a/orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/message/WebSideMessageConversion.java +++ b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/message/WebSideMessageConversion.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.mapping.message; +package cn.orionsec.ops.mapping.message; +import cn.orionsec.ops.entity.domain.WebSideMessageDO; +import cn.orionsec.ops.entity.vo.message.WebSideMessageVO; import com.orion.lang.utils.convert.TypeStore; import com.orion.lang.utils.time.Dates; -import com.orion.ops.entity.domain.WebSideMessageDO; -import com.orion.ops.entity.vo.message.WebSideMessageVO; /** * 站内信 对象转换器 diff --git a/orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/scheduler/SchedulerTaskConversion.java b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/scheduler/SchedulerTaskConversion.java similarity index 92% rename from orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/scheduler/SchedulerTaskConversion.java rename to orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/scheduler/SchedulerTaskConversion.java index 92cedfae..65f9f74e 100644 --- a/orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/scheduler/SchedulerTaskConversion.java +++ b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/scheduler/SchedulerTaskConversion.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.mapping.scheduler; +package cn.orionsec.ops.mapping.scheduler; +import cn.orionsec.ops.entity.domain.SchedulerTaskDO; +import cn.orionsec.ops.entity.vo.scheduler.SchedulerTaskVO; import com.orion.lang.utils.convert.TypeStore; import com.orion.lang.utils.time.cron.Cron; import com.orion.lang.utils.time.cron.CronSupport; -import com.orion.ops.entity.domain.SchedulerTaskDO; -import com.orion.ops.entity.vo.scheduler.SchedulerTaskVO; /** * 定时任务配置 对象转换器 diff --git a/orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/scheduler/SchedulerTaskRecordConversion.java b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/scheduler/SchedulerTaskRecordConversion.java similarity index 95% rename from orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/scheduler/SchedulerTaskRecordConversion.java rename to orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/scheduler/SchedulerTaskRecordConversion.java index bb4328b3..f4f6f6ce 100644 --- a/orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/scheduler/SchedulerTaskRecordConversion.java +++ b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/scheduler/SchedulerTaskRecordConversion.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.mapping.scheduler; +package cn.orionsec.ops.mapping.scheduler; +import cn.orionsec.ops.entity.domain.SchedulerTaskMachineRecordDO; +import cn.orionsec.ops.entity.domain.SchedulerTaskRecordDO; +import cn.orionsec.ops.entity.dto.SchedulerTaskRecordStatisticsDTO; +import cn.orionsec.ops.entity.vo.scheduler.*; +import cn.orionsec.ops.utils.Utils; import com.orion.lang.utils.convert.TypeStore; import com.orion.lang.utils.time.Dates; -import com.orion.ops.entity.domain.SchedulerTaskMachineRecordDO; -import com.orion.ops.entity.domain.SchedulerTaskRecordDO; -import com.orion.ops.entity.dto.SchedulerTaskRecordStatisticsDTO; -import com.orion.ops.entity.vo.scheduler.*; -import com.orion.ops.utils.Utils; import java.util.Date; import java.util.Optional; diff --git a/orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/sftp/SftpConversion.java b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/sftp/SftpConversion.java similarity index 89% rename from orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/sftp/SftpConversion.java rename to orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/sftp/SftpConversion.java index 498315a7..b5f17d3c 100644 --- a/orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/sftp/SftpConversion.java +++ b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/sftp/SftpConversion.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.mapping.sftp; +package cn.orionsec.ops.mapping.sftp; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.entity.dto.sftp.SftpUploadInfoDTO; +import cn.orionsec.ops.entity.request.sftp.FileUploadRequest; +import cn.orionsec.ops.entity.vo.sftp.FileDetailVO; import com.orion.lang.utils.convert.TypeStore; import com.orion.lang.utils.io.FileType; import com.orion.lang.utils.io.Files1; import com.orion.net.base.file.sftp.SftpFile; -import com.orion.ops.constant.Const; -import com.orion.ops.entity.dto.sftp.SftpUploadInfoDTO; -import com.orion.ops.entity.request.sftp.FileUploadRequest; -import com.orion.ops.entity.vo.sftp.FileDetailVO; import java.util.Optional; diff --git a/orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/system/SystemAnalysisConversion.java b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/system/SystemAnalysisConversion.java similarity index 91% rename from orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/system/SystemAnalysisConversion.java rename to orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/system/SystemAnalysisConversion.java index e43b06c3..0d44d6ce 100644 --- a/orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/system/SystemAnalysisConversion.java +++ b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/system/SystemAnalysisConversion.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.mapping.system; +package cn.orionsec.ops.mapping.system; +import cn.orionsec.ops.entity.dto.system.SystemSpaceAnalysisDTO; +import cn.orionsec.ops.entity.vo.system.SystemAnalysisVO; import com.orion.lang.utils.convert.TypeStore; -import com.orion.ops.entity.dto.system.SystemSpaceAnalysisDTO; -import com.orion.ops.entity.vo.system.SystemAnalysisVO; /** * 系统统计分析 对象转换器 diff --git a/orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/system/SystemEnvConversion.java b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/system/SystemEnvConversion.java similarity index 86% rename from orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/system/SystemEnvConversion.java rename to orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/system/SystemEnvConversion.java index ed9e04d6..a3d2bfee 100644 --- a/orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/system/SystemEnvConversion.java +++ b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/system/SystemEnvConversion.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.mapping.system; +package cn.orionsec.ops.mapping.system; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.system.SystemEnvAttr; +import cn.orionsec.ops.entity.domain.SystemEnvDO; +import cn.orionsec.ops.entity.vo.system.SystemEnvVO; import com.orion.lang.utils.convert.TypeStore; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.system.SystemEnvAttr; -import com.orion.ops.entity.domain.SystemEnvDO; -import com.orion.ops.entity.vo.system.SystemEnvVO; /** * 系统环境变量 对象转换器 diff --git a/orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/template/CommandTemplateConversion.java b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/template/CommandTemplateConversion.java similarity index 91% rename from orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/template/CommandTemplateConversion.java rename to orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/template/CommandTemplateConversion.java index 6b70bf2e..553a65a2 100644 --- a/orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/template/CommandTemplateConversion.java +++ b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/template/CommandTemplateConversion.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.mapping.template; +package cn.orionsec.ops.mapping.template; +import cn.orionsec.ops.entity.domain.CommandTemplateDO; +import cn.orionsec.ops.entity.vo.template.CommandTemplateVO; import com.orion.lang.utils.convert.TypeStore; import com.orion.lang.utils.time.Dates; -import com.orion.ops.entity.domain.CommandTemplateDO; -import com.orion.ops.entity.vo.template.CommandTemplateVO; /** * 命令模板 对象转换器 diff --git a/orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/upload/BatchUploadConversion.java b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/upload/BatchUploadConversion.java similarity index 84% rename from orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/upload/BatchUploadConversion.java rename to orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/upload/BatchUploadConversion.java index f6464492..5ab4b5fb 100644 --- a/orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/upload/BatchUploadConversion.java +++ b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/upload/BatchUploadConversion.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.mapping.upload; +package cn.orionsec.ops.mapping.upload; +import cn.orionsec.ops.entity.domain.MachineInfoDO; +import cn.orionsec.ops.entity.dto.sftp.SftpUploadInfoDTO; +import cn.orionsec.ops.entity.request.upload.BatchUploadRequest; +import cn.orionsec.ops.entity.vo.upload.BatchUploadCheckFileVO; +import cn.orionsec.ops.entity.vo.upload.BatchUploadCheckMachineVO; import com.orion.lang.utils.convert.TypeStore; -import com.orion.ops.entity.domain.MachineInfoDO; -import com.orion.ops.entity.dto.sftp.SftpUploadInfoDTO; -import com.orion.ops.entity.request.upload.BatchUploadRequest; -import com.orion.ops.entity.vo.upload.BatchUploadCheckFileVO; -import com.orion.ops.entity.vo.upload.BatchUploadCheckMachineVO; /** * 文件批量上传 对象转换器 diff --git a/orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/user/UserEventLogConversion.java b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/user/UserEventLogConversion.java similarity index 91% rename from orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/user/UserEventLogConversion.java rename to orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/user/UserEventLogConversion.java index ee87f2da..b8a144ad 100644 --- a/orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/user/UserEventLogConversion.java +++ b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/user/UserEventLogConversion.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.mapping.user; +package cn.orionsec.ops.mapping.user; +import cn.orionsec.ops.entity.domain.UserEventLogDO; +import cn.orionsec.ops.entity.vo.user.UserEventLogVO; import com.orion.lang.utils.convert.TypeStore; import com.orion.lang.utils.time.Dates; -import com.orion.ops.entity.domain.UserEventLogDO; -import com.orion.ops.entity.vo.user.UserEventLogVO; /** * 用户操作日志 对象转换器 diff --git a/orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/user/UserInfoConversion.java b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/user/UserInfoConversion.java similarity index 91% rename from orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/user/UserInfoConversion.java rename to orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/user/UserInfoConversion.java index 172eee62..3afb1291 100644 --- a/orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/user/UserInfoConversion.java +++ b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/user/UserInfoConversion.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.mapping.user; +package cn.orionsec.ops.mapping.user; +import cn.orionsec.ops.entity.domain.UserInfoDO; +import cn.orionsec.ops.entity.dto.user.UserDTO; +import cn.orionsec.ops.entity.vo.user.UserInfoVO; import com.orion.lang.utils.convert.TypeStore; import com.orion.lang.utils.time.Dates; -import com.orion.ops.entity.domain.UserInfoDO; -import com.orion.ops.entity.dto.user.UserDTO; -import com.orion.ops.entity.vo.user.UserInfoVO; import java.util.Date; import java.util.Optional; diff --git a/orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/webhook/WebhookConfigConversion.java b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/webhook/WebhookConfigConversion.java similarity index 89% rename from orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/webhook/WebhookConfigConversion.java rename to orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/webhook/WebhookConfigConversion.java index 874e71b8..66063198 100644 --- a/orion-ops-api/orion-ops-mapping/src/main/java/com/orion/ops/mapping/webhook/WebhookConfigConversion.java +++ b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/webhook/WebhookConfigConversion.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.mapping.webhook; +package cn.orionsec.ops.mapping.webhook; +import cn.orionsec.ops.entity.domain.WebhookConfigDO; +import cn.orionsec.ops.entity.vo.webhook.WebhookConfigVO; import com.orion.lang.utils.convert.TypeStore; -import com.orion.ops.entity.domain.WebhookConfigDO; -import com.orion.ops.entity.vo.webhook.WebhookConfigVO; /** * webhook 配置 对象转换器 diff --git a/orion-ops-api/orion-ops-model/pom.xml b/orion-ops-api/orion-ops-model/pom.xml index 85f3c261..5ad0ed6e 100644 --- a/orion-ops-api/orion-ops-model/pom.xml +++ b/orion-ops-api/orion-ops-model/pom.xml @@ -2,9 +2,9 @@ - com.orion.ops + cn.orionsec.ops orion-ops-api - 1.2.9 + 1.3.0 ../pom.xml diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/config/TerminalConnectConfig.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/config/TerminalConnectConfig.java similarity index 97% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/config/TerminalConnectConfig.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/config/TerminalConnectConfig.java index b35f624a..1db53661 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/config/TerminalConnectConfig.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/config/TerminalConnectConfig.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.config; +package cn.orionsec.ops.entity.config; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/dto/app/ApplicationPipelineStageConfigDTO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/dto/app/ApplicationPipelineStageConfigDTO.java similarity index 97% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/dto/app/ApplicationPipelineStageConfigDTO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/dto/app/ApplicationPipelineStageConfigDTO.java index aec300e1..6dabf24a 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/dto/app/ApplicationPipelineStageConfigDTO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/dto/app/ApplicationPipelineStageConfigDTO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.dto.app; +package cn.orionsec.ops.entity.dto.app; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/dto/app/ApplicationProfileDTO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/dto/app/ApplicationProfileDTO.java similarity index 96% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/dto/app/ApplicationProfileDTO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/dto/app/ApplicationProfileDTO.java index 8d707e05..1f298143 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/dto/app/ApplicationProfileDTO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/dto/app/ApplicationProfileDTO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.dto.app; +package cn.orionsec.ops.entity.dto.app; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/dto/file/FileDownloadDTO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/dto/file/FileDownloadDTO.java similarity index 92% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/dto/file/FileDownloadDTO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/dto/file/FileDownloadDTO.java index 37cdb392..3f0a2e84 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/dto/file/FileDownloadDTO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/dto/file/FileDownloadDTO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.dto.file; +package cn.orionsec.ops.entity.dto.file; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -41,7 +41,7 @@ public class FileDownloadDTO { private Long userId; /** - * @see com.orion.ops.constant.download.FileDownloadType + * @see cn.orionsec.ops.constant.download.FileDownloadType */ @ApiModelProperty(value = "下载类型") private Integer type; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/dto/file/FileTailDTO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/dto/file/FileTailDTO.java similarity index 78% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/dto/file/FileTailDTO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/dto/file/FileTailDTO.java index 9be1965e..4909e6ba 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/dto/file/FileTailDTO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/dto/file/FileTailDTO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.dto.file; +package cn.orionsec.ops.entity.dto.file; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -41,22 +41,22 @@ public class FileTailDTO { private Long machineId; /** - * @see com.orion.ops.constant.system.SystemEnvAttr#TAIL_MODE - * @see com.orion.ops.constant.tail.FileTailMode + * @see cn.orionsec.ops.constant.system.SystemEnvAttr#TAIL_MODE + * @see cn.orionsec.ops.constant.tail.FileTailMode */ @ApiModelProperty(value = "tail 模式") private String mode; /** - * @see com.orion.ops.constant.machine.MachineEnvAttr#TAIL_OFFSET - * @see com.orion.ops.constant.Const#TAIL_OFFSET_LINE + * @see cn.orionsec.ops.constant.machine.MachineEnvAttr#TAIL_OFFSET + * @see cn.orionsec.ops.constant.Const#TAIL_OFFSET_LINE */ @ApiModelProperty(value = "尾行偏移量") private Integer offset; /** - * @see com.orion.ops.constant.machine.MachineEnvAttr#TAIL_CHARSET - * @see com.orion.ops.constant.Const#UTF_8 + * @see cn.orionsec.ops.constant.machine.MachineEnvAttr#TAIL_CHARSET + * @see cn.orionsec.ops.constant.Const#UTF_8 */ @ApiModelProperty(value = "编码集") private String charset; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/dto/sftp/FileTransferNotifyDTO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/dto/sftp/FileTransferNotifyDTO.java similarity index 92% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/dto/sftp/FileTransferNotifyDTO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/dto/sftp/FileTransferNotifyDTO.java index 9a967930..931a3a82 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/dto/sftp/FileTransferNotifyDTO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/dto/sftp/FileTransferNotifyDTO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.dto.sftp; +package cn.orionsec.ops.entity.dto.sftp; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -32,7 +32,7 @@ import lombok.Data; public class FileTransferNotifyDTO { /** - * @see com.orion.ops.constant.sftp.SftpNotifyType + * @see cn.orionsec.ops.constant.sftp.SftpNotifyType */ @ApiModelProperty(value = "通知类型") private Integer type; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/dto/sftp/FileTransferNotifyProgressDTO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/dto/sftp/FileTransferNotifyProgressDTO.java similarity index 96% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/dto/sftp/FileTransferNotifyProgressDTO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/dto/sftp/FileTransferNotifyProgressDTO.java index e3c233e6..709eef80 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/dto/sftp/FileTransferNotifyProgressDTO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/dto/sftp/FileTransferNotifyProgressDTO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.dto.sftp; +package cn.orionsec.ops.entity.dto.sftp; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/dto/sftp/SftpSessionTokenDTO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/dto/sftp/SftpSessionTokenDTO.java similarity index 96% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/dto/sftp/SftpSessionTokenDTO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/dto/sftp/SftpSessionTokenDTO.java index 29e6aed2..09befa6e 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/dto/sftp/SftpSessionTokenDTO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/dto/sftp/SftpSessionTokenDTO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.dto.sftp; +package cn.orionsec.ops.entity.dto.sftp; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/dto/sftp/SftpUploadInfoDTO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/dto/sftp/SftpUploadInfoDTO.java similarity index 96% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/dto/sftp/SftpUploadInfoDTO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/dto/sftp/SftpUploadInfoDTO.java index d99b863f..4b4f88f0 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/dto/sftp/SftpUploadInfoDTO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/dto/sftp/SftpUploadInfoDTO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.dto.sftp; +package cn.orionsec.ops.entity.dto.sftp; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/dto/statistic/StatisticsCountDTO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/dto/statistic/StatisticsCountDTO.java similarity index 96% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/dto/statistic/StatisticsCountDTO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/dto/statistic/StatisticsCountDTO.java index f93bdb84..b61d7c1f 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/dto/statistic/StatisticsCountDTO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/dto/statistic/StatisticsCountDTO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.dto.statistic; +package cn.orionsec.ops.entity.dto.statistic; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/dto/system/SystemSpaceAnalysisDTO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/dto/system/SystemSpaceAnalysisDTO.java similarity index 97% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/dto/system/SystemSpaceAnalysisDTO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/dto/system/SystemSpaceAnalysisDTO.java index 815c7c34..8286b718 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/dto/system/SystemSpaceAnalysisDTO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/dto/system/SystemSpaceAnalysisDTO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.dto.system; +package cn.orionsec.ops.entity.dto.system; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/dto/terminal/TerminalConnectDTO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/dto/terminal/TerminalConnectDTO.java similarity index 92% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/dto/terminal/TerminalConnectDTO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/dto/terminal/TerminalConnectDTO.java index 2de56460..90a18cdb 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/dto/terminal/TerminalConnectDTO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/dto/terminal/TerminalConnectDTO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.dto.terminal; +package cn.orionsec.ops.entity.dto.terminal; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -36,7 +36,7 @@ public class TerminalConnectDTO { @ApiModelProperty(value = "行数") private Integer rows; - @ApiModelProperty(value = "登陆 token") + @ApiModelProperty(value = "登录 token") private String loginToken; } diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/dto/terminal/TerminalSizeDTO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/dto/terminal/TerminalSizeDTO.java similarity index 95% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/dto/terminal/TerminalSizeDTO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/dto/terminal/TerminalSizeDTO.java index 24b741d6..2aae97a0 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/dto/terminal/TerminalSizeDTO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/dto/terminal/TerminalSizeDTO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.dto.terminal; +package cn.orionsec.ops.entity.dto.terminal; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/dto/terminal/TerminalWatcherDTO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/dto/terminal/TerminalWatcherDTO.java similarity index 93% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/dto/terminal/TerminalWatcherDTO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/dto/terminal/TerminalWatcherDTO.java index b3bcd68e..3f4b96f0 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/dto/terminal/TerminalWatcherDTO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/dto/terminal/TerminalWatcherDTO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.dto.terminal; +package cn.orionsec.ops.entity.dto.terminal; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -44,7 +44,7 @@ public class TerminalWatcherDTO { private String token; /** - * @see com.orion.ops.constant.Const#ENABLE + * @see cn.orionsec.ops.constant.Const#ENABLE */ @ApiModelProperty(value = "是否只读") private Integer readonly; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/dto/user/LoginBindDTO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/dto/user/LoginBindDTO.java similarity index 84% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/dto/user/LoginBindDTO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/dto/user/LoginBindDTO.java index 6785c24a..dae94e5a 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/dto/user/LoginBindDTO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/dto/user/LoginBindDTO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.dto.user; +package cn.orionsec.ops.entity.dto.user; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -23,7 +23,7 @@ import lombok.EqualsAndHashCode; import java.io.Serializable; /** - * 登陆绑定信息 + * 登录绑定信息 * * @author Jiahang Li * @version 1.0.0 @@ -31,13 +31,13 @@ import java.io.Serializable; */ @Data @EqualsAndHashCode(callSuper = false) -@ApiModel(value = "登陆绑定信息") +@ApiModel(value = "登录绑定信息") public class LoginBindDTO implements Serializable { - @ApiModelProperty(value = "登陆时间戳") + @ApiModelProperty(value = "登录时间戳") private Long timestamp; - @ApiModelProperty(value = "登陆 IP") + @ApiModelProperty(value = "登录 IP") private String loginIp; } diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/dto/user/UserDTO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/dto/user/UserDTO.java similarity index 89% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/dto/user/UserDTO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/dto/user/UserDTO.java index 655341bf..cebb43ff 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/dto/user/UserDTO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/dto/user/UserDTO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.dto.user; +package cn.orionsec.ops.entity.dto.user; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -45,7 +45,7 @@ public class UserDTO implements Serializable { private String nickname; /** - * @see com.orion.ops.constant.user.RoleType + * @see cn.orionsec.ops.constant.user.RoleType */ @ApiModelProperty(value = "角色类型") private Integer roleType; @@ -54,8 +54,8 @@ public class UserDTO implements Serializable { private Long timestamp; /** - * @see com.orion.ops.constant.Const#ENABLE - * @see com.orion.ops.constant.Const#DISABLE + * @see cn.orionsec.ops.constant.Const#ENABLE + * @see cn.orionsec.ops.constant.Const#DISABLE */ @ApiModelProperty(value = "用户状态 1启用 2禁用") private Integer userStatus; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/alarm/AlarmGroupNotifyRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/alarm/AlarmGroupNotifyRequest.java similarity index 92% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/alarm/AlarmGroupNotifyRequest.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/alarm/AlarmGroupNotifyRequest.java index 6f4d19aa..a5adbb0d 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/alarm/AlarmGroupNotifyRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/alarm/AlarmGroupNotifyRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.request.alarm; +package cn.orionsec.ops.entity.request.alarm; import com.orion.lang.define.wrapper.PageRequest; import io.swagger.annotations.ApiModel; @@ -38,7 +38,7 @@ public class AlarmGroupNotifyRequest extends PageRequest { private Long notifyId; /** - * @see com.orion.ops.constant.alarm.AlarmGroupNotifyType + * @see cn.orionsec.ops.constant.alarm.AlarmGroupNotifyType */ @ApiModelProperty(value = "通知类型") private Integer notifyType; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/alarm/AlarmGroupRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/alarm/AlarmGroupRequest.java similarity index 96% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/alarm/AlarmGroupRequest.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/alarm/AlarmGroupRequest.java index bd1f1b97..d15c82fd 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/alarm/AlarmGroupRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/alarm/AlarmGroupRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.request.alarm; +package cn.orionsec.ops.entity.request.alarm; import com.orion.lang.define.wrapper.PageRequest; import io.swagger.annotations.ApiModel; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/app/AppBuildStatisticsRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/AppBuildStatisticsRequest.java similarity index 96% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/app/AppBuildStatisticsRequest.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/AppBuildStatisticsRequest.java index e5bcfd43..aa073d49 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/app/AppBuildStatisticsRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/AppBuildStatisticsRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.request.app; +package cn.orionsec.ops.entity.request.app; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/app/AppPipelineTaskStatisticsRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/AppPipelineTaskStatisticsRequest.java similarity index 95% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/app/AppPipelineTaskStatisticsRequest.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/AppPipelineTaskStatisticsRequest.java index adec532e..68986c40 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/app/AppPipelineTaskStatisticsRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/AppPipelineTaskStatisticsRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.request.app; +package cn.orionsec.ops.entity.request.app; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/app/AppReleaseStatisticsRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/AppReleaseStatisticsRequest.java similarity index 96% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/app/AppReleaseStatisticsRequest.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/AppReleaseStatisticsRequest.java index aff3e1f8..9ed5d0d4 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/app/AppReleaseStatisticsRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/AppReleaseStatisticsRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.request.app; +package cn.orionsec.ops.entity.request.app; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/app/ApplicationActionLogRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/ApplicationActionLogRequest.java similarity index 95% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/app/ApplicationActionLogRequest.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/ApplicationActionLogRequest.java index 24c1e754..06c01460 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/app/ApplicationActionLogRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/ApplicationActionLogRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.request.app; +package cn.orionsec.ops.entity.request.app; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/app/ApplicationBuildRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/ApplicationBuildRequest.java similarity index 93% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/app/ApplicationBuildRequest.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/ApplicationBuildRequest.java index 52d2e17c..1ea5da6a 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/app/ApplicationBuildRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/ApplicationBuildRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.request.app; +package cn.orionsec.ops.entity.request.app; import com.orion.lang.define.wrapper.PageRequest; import io.swagger.annotations.ApiModel; @@ -60,7 +60,7 @@ public class ApplicationBuildRequest extends PageRequest { private String commitId; /** - * @see com.orion.ops.constant.app.BuildStatus + * @see cn.orionsec.ops.constant.app.BuildStatus */ @ApiModelProperty(value = "状态 10未开始 20执行中 30已完成 40执行失败 50已取消") private Integer status; @@ -69,7 +69,7 @@ public class ApplicationBuildRequest extends PageRequest { private String description; /** - * @see com.orion.ops.constant.Const#ENABLE + * @see cn.orionsec.ops.constant.Const#ENABLE */ @ApiModelProperty(value = "只看自己") private Integer onlyMyself; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/app/ApplicationConfigActionRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/ApplicationConfigActionRequest.java similarity index 92% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/app/ApplicationConfigActionRequest.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/ApplicationConfigActionRequest.java index 7329c38a..dfd9865c 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/app/ApplicationConfigActionRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/ApplicationConfigActionRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.request.app; +package cn.orionsec.ops.entity.request.app; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -35,7 +35,7 @@ public class ApplicationConfigActionRequest { private String name; /** - * @see com.orion.ops.constant.app.ActionType + * @see cn.orionsec.ops.constant.app.ActionType */ @ApiModelProperty(value = "类型") private Integer type; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/app/ApplicationConfigEnvRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/ApplicationConfigEnvRequest.java similarity index 71% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/app/ApplicationConfigEnvRequest.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/ApplicationConfigEnvRequest.java index 50b562c2..a67cf9d0 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/app/ApplicationConfigEnvRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/ApplicationConfigEnvRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.request.app; +package cn.orionsec.ops.entity.request.app; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -32,40 +32,40 @@ import lombok.Data; public class ApplicationConfigEnvRequest { /** - * @see com.orion.ops.constant.app.ApplicationEnvAttr#BUNDLE_PATH + * @see cn.orionsec.ops.constant.app.ApplicationEnvAttr#BUNDLE_PATH */ @ApiModelProperty(value = "构建产物路径") private String bundlePath; /** - * @see com.orion.ops.constant.app.ApplicationEnvAttr#TRANSFER_PATH + * @see cn.orionsec.ops.constant.app.ApplicationEnvAttr#TRANSFER_PATH */ @ApiModelProperty(value = "产物传输绝对路径") private String transferPath; /** - * @see com.orion.ops.constant.app.ApplicationEnvAttr#TRANSFER_MODE + * @see cn.orionsec.ops.constant.app.ApplicationEnvAttr#TRANSFER_MODE */ @ApiModelProperty(value = "产物传输方式 (sftp/scp)") private String transferMode; /** - * @see com.orion.ops.constant.app.ApplicationEnvAttr#TRANSFER_FILE_TYPE + * @see cn.orionsec.ops.constant.app.ApplicationEnvAttr#TRANSFER_FILE_TYPE */ @ApiModelProperty(value = "产物传输文件类型 (normal/zip)") private String transferFileType; /** - * @see com.orion.ops.constant.app.ApplicationEnvAttr#RELEASE_SERIAL - * @see com.orion.ops.constant.common.SerialType + * @see cn.orionsec.ops.constant.app.ApplicationEnvAttr#RELEASE_SERIAL + * @see cn.orionsec.ops.constant.common.SerialType */ @ApiModelProperty(value = "发布序列 10串行 20并行") private Integer releaseSerial; /** - * @see com.orion.ops.constant.app.ApplicationEnvAttr#EXCEPTION_HANDLER - * @see com.orion.ops.constant.common.ExceptionHandlerType - * @see com.orion.ops.constant.common.SerialType#SERIAL + * @see cn.orionsec.ops.constant.app.ApplicationEnvAttr#EXCEPTION_HANDLER + * @see cn.orionsec.ops.constant.common.ExceptionHandlerType + * @see cn.orionsec.ops.constant.common.SerialType#SERIAL */ @ApiModelProperty(value = "异常处理 10跳过所有 20跳过错误") private Integer exceptionHandler; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/app/ApplicationConfigRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/ApplicationConfigRequest.java similarity index 94% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/app/ApplicationConfigRequest.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/ApplicationConfigRequest.java index c273db51..b6cc7a77 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/app/ApplicationConfigRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/ApplicationConfigRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.request.app; +package cn.orionsec.ops.entity.request.app; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -40,7 +40,7 @@ public class ApplicationConfigRequest { private Long profileId; /** - * @see com.orion.ops.constant.app.StageType + * @see cn.orionsec.ops.constant.app.StageType */ @ApiModelProperty(value = "阶段类型") private Integer stageType; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/app/ApplicationEnvRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/ApplicationEnvRequest.java similarity index 94% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/app/ApplicationEnvRequest.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/ApplicationEnvRequest.java index ab848f52..aac061e6 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/app/ApplicationEnvRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/ApplicationEnvRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.request.app; +package cn.orionsec.ops.entity.request.app; import com.orion.lang.define.wrapper.PageRequest; import io.swagger.annotations.ApiModel; @@ -58,7 +58,7 @@ public class ApplicationEnvRequest extends PageRequest { private String description; /** - * @see com.orion.ops.constant.env.EnvViewType + * @see cn.orionsec.ops.constant.env.EnvViewType */ @ApiModelProperty(value = "视图类型") private Integer viewType; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/app/ApplicationInfoRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/ApplicationInfoRequest.java similarity index 89% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/app/ApplicationInfoRequest.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/ApplicationInfoRequest.java index 380521ce..dfe68aa0 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/app/ApplicationInfoRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/ApplicationInfoRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.request.app; +package cn.orionsec.ops.entity.request.app; import com.orion.lang.define.wrapper.PageRequest; import io.swagger.annotations.ApiModel; @@ -53,8 +53,8 @@ public class ApplicationInfoRequest extends PageRequest { private String description; /** - * @see com.orion.ops.constant.Const#INCREMENT - * @see com.orion.ops.constant.Const#DECREMENT + * @see cn.orionsec.ops.constant.Const#INCREMENT + * @see cn.orionsec.ops.constant.Const#DECREMENT */ @ApiModelProperty(value = "排序调整方向") private Integer sortAdjust; @@ -63,7 +63,7 @@ public class ApplicationInfoRequest extends PageRequest { private Long machineId; /** - * @see com.orion.ops.constant.Const#ENABLE + * @see cn.orionsec.ops.constant.Const#ENABLE */ @ApiModelProperty(value = "是否查询机器") private Integer queryMachine; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/app/ApplicationPipelineDetailRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/ApplicationPipelineDetailRequest.java similarity index 92% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/app/ApplicationPipelineDetailRequest.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/ApplicationPipelineDetailRequest.java index 4960a9b8..f146df75 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/app/ApplicationPipelineDetailRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/ApplicationPipelineDetailRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.request.app; +package cn.orionsec.ops.entity.request.app; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -35,7 +35,7 @@ public class ApplicationPipelineDetailRequest { private Long appId; /** - * @see com.orion.ops.constant.app.StageType + * @see cn.orionsec.ops.constant.app.StageType */ @ApiModelProperty(value = "阶段类型 10构建 20发布") private Integer stageType; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/app/ApplicationPipelineRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/ApplicationPipelineRequest.java similarity index 94% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/app/ApplicationPipelineRequest.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/ApplicationPipelineRequest.java index 3903f98c..90df6367 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/app/ApplicationPipelineRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/ApplicationPipelineRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.request.app; +package cn.orionsec.ops.entity.request.app; import com.orion.lang.define.wrapper.PageRequest; import io.swagger.annotations.ApiModel; @@ -55,7 +55,7 @@ public class ApplicationPipelineRequest extends PageRequest { private String description; /** - * @see com.orion.ops.constant.Const#ENABLE + * @see cn.orionsec.ops.constant.Const#ENABLE */ @ApiModelProperty(value = "是否查询详情") private Integer queryDetail; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/app/ApplicationPipelineTaskDetailRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/ApplicationPipelineTaskDetailRequest.java similarity index 95% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/app/ApplicationPipelineTaskDetailRequest.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/ApplicationPipelineTaskDetailRequest.java index aa521006..5a6ca343 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/app/ApplicationPipelineTaskDetailRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/ApplicationPipelineTaskDetailRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.request.app; +package cn.orionsec.ops.entity.request.app; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -61,7 +61,7 @@ public class ApplicationPipelineTaskDetailRequest { private Long profileId; /** - * @see com.orion.ops.constant.app.StageType + * @see cn.orionsec.ops.constant.app.StageType */ @ApiModelProperty(value = "阶段类型 10构建 20发布", hidden = true) private Integer stageType; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/app/ApplicationPipelineTaskRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/ApplicationPipelineTaskRequest.java similarity index 92% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/app/ApplicationPipelineTaskRequest.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/ApplicationPipelineTaskRequest.java index 0c884d58..b64bb3d9 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/app/ApplicationPipelineTaskRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/ApplicationPipelineTaskRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.request.app; +package cn.orionsec.ops.entity.request.app; import com.orion.lang.define.wrapper.PageRequest; import io.swagger.annotations.ApiModel; @@ -65,7 +65,7 @@ public class ApplicationPipelineTaskRequest extends PageRequest { private String description; /** - * @see com.orion.ops.constant.app.TimedType + * @see cn.orionsec.ops.constant.app.TimedType */ @ApiModelProperty(value = "是否是定时执行 10普通执行 20定时执行") private Integer timedExec; @@ -74,13 +74,13 @@ public class ApplicationPipelineTaskRequest extends PageRequest { private Date timedExecTime; /** - * @see com.orion.ops.constant.app.PipelineStatus + * @see cn.orionsec.ops.constant.app.PipelineStatus */ @ApiModelProperty(value = "执行状态 10待审核 20审核驳回 30待执行 35待调度 40执行中 50执行完成 60执行停止 70执行失败") private Integer status; /** - * @see com.orion.ops.constant.common.AuditStatus + * @see cn.orionsec.ops.constant.common.AuditStatus */ @ApiModelProperty(value = "审核状态 10通过 20驳回") private Integer auditStatus; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/app/ApplicationProfileRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/ApplicationProfileRequest.java similarity index 91% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/app/ApplicationProfileRequest.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/ApplicationProfileRequest.java index 8f34c052..ad375ec4 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/app/ApplicationProfileRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/ApplicationProfileRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.request.app; +package cn.orionsec.ops.entity.request.app; import com.orion.lang.define.wrapper.PageRequest; import io.swagger.annotations.ApiModel; @@ -47,8 +47,8 @@ public class ApplicationProfileRequest extends PageRequest { private String description; /** - * @see com.orion.ops.constant.Const#ENABLE - * @see com.orion.ops.constant.Const#DISABLE + * @see cn.orionsec.ops.constant.Const#ENABLE + * @see cn.orionsec.ops.constant.Const#DISABLE */ @ApiModelProperty(value = "发布是否需要审核 1需要 2无需") private Integer releaseAudit; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/app/ApplicationReleaseAuditRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/ApplicationReleaseAuditRequest.java similarity index 92% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/app/ApplicationReleaseAuditRequest.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/ApplicationReleaseAuditRequest.java index 70bf344f..d96b9b61 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/app/ApplicationReleaseAuditRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/ApplicationReleaseAuditRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.request.app; +package cn.orionsec.ops.entity.request.app; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -35,7 +35,7 @@ public class ApplicationReleaseAuditRequest { private Long id; /** - * @see com.orion.ops.constant.common.AuditStatus + * @see cn.orionsec.ops.constant.common.AuditStatus */ @ApiModelProperty(value = "状态 10通过 20驳回") private Integer status; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/app/ApplicationReleaseRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/ApplicationReleaseRequest.java similarity index 92% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/app/ApplicationReleaseRequest.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/ApplicationReleaseRequest.java index 802aceac..2fe0d209 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/app/ApplicationReleaseRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/ApplicationReleaseRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.request.app; +package cn.orionsec.ops.entity.request.app; import com.orion.lang.define.wrapper.PageRequest; import io.swagger.annotations.ApiModel; @@ -62,13 +62,13 @@ public class ApplicationReleaseRequest extends PageRequest { private List machineIdList; /** - * @see com.orion.ops.constant.app.ReleaseStatus + * @see cn.orionsec.ops.constant.app.ReleaseStatus */ @ApiModelProperty(value = "状态") private Integer status; /** - * @see com.orion.ops.constant.app.TimedType + * @see cn.orionsec.ops.constant.app.TimedType */ @ApiModelProperty(value = "是否是定时发布 10普通发布 20定时发布") private Integer timedRelease; @@ -77,7 +77,7 @@ public class ApplicationReleaseRequest extends PageRequest { private Date timedReleaseTime; /** - * @see com.orion.ops.constant.Const#ENABLE + * @see cn.orionsec.ops.constant.Const#ENABLE */ @ApiModelProperty(value = "只看自己") private Integer onlyMyself; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/app/ApplicationRepositoryRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/ApplicationRepositoryRequest.java similarity index 89% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/app/ApplicationRepositoryRequest.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/ApplicationRepositoryRequest.java index 84996671..1d2f0e58 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/app/ApplicationRepositoryRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/ApplicationRepositoryRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.request.app; +package cn.orionsec.ops.entity.request.app; import com.orion.lang.define.wrapper.PageRequest; import io.swagger.annotations.ApiModel; @@ -47,25 +47,25 @@ public class ApplicationRepositoryRequest extends PageRequest { private String description; /** - * @see com.orion.ops.constant.app.RepositoryType + * @see cn.orionsec.ops.constant.app.RepositoryType */ @ApiModelProperty(value = "类型 1git") private Integer type; /** - * @see com.orion.ops.constant.app.RepositoryStatus + * @see cn.orionsec.ops.constant.app.RepositoryStatus */ @ApiModelProperty(value = "状态 10未初始化 20初始化中 30正常 40失败") private Integer status; /** - * @see com.orion.ops.constant.app.RepositoryAuthType + * @see cn.orionsec.ops.constant.app.RepositoryAuthType */ @ApiModelProperty(value = "认证类型 10密码 20令牌") private Integer authType; /** - * @see com.orion.ops.constant.app.RepositoryTokenType + * @see cn.orionsec.ops.constant.app.RepositoryTokenType */ @ApiModelProperty(value = "令牌类型 10github 20gitee 30gitlab") private Integer tokenType; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/app/ApplicationSyncConfigRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/ApplicationSyncConfigRequest.java similarity index 96% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/app/ApplicationSyncConfigRequest.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/ApplicationSyncConfigRequest.java index b3617210..091e11e5 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/app/ApplicationSyncConfigRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/ApplicationSyncConfigRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.request.app; +package cn.orionsec.ops.entity.request.app; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/data/DataClearRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/data/DataClearRequest.java similarity index 78% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/data/DataClearRequest.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/data/DataClearRequest.java index b7da1a29..408aaa0a 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/data/DataClearRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/data/DataClearRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.request.data; +package cn.orionsec.ops.entity.request.data; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -40,13 +40,13 @@ public class DataClearRequest { private Integer reserveTotal; /** - * @see com.orion.ops.constant.DataClearType + * @see cn.orionsec.ops.constant.DataClearType */ @ApiModelProperty(value = "清理类型") private Integer clearType; /** - * @see com.orion.ops.constant.DataClearRange + * @see cn.orionsec.ops.constant.DataClearRange */ @ApiModelProperty(value = "清理区间") private Integer range; @@ -64,29 +64,29 @@ public class DataClearRequest { private Long profileId; /** - * @see com.orion.ops.constant.Const#ENABLE - * @see com.orion.ops.constant.Const#DISABLE + * @see cn.orionsec.ops.constant.Const#ENABLE + * @see cn.orionsec.ops.constant.Const#DISABLE */ @ApiModelProperty(value = "只清理我创建的") private Integer iCreated; /** - * @see com.orion.ops.constant.Const#ENABLE - * @see com.orion.ops.constant.Const#DISABLE + * @see cn.orionsec.ops.constant.Const#ENABLE + * @see cn.orionsec.ops.constant.Const#DISABLE */ @ApiModelProperty(value = "只清理我审核的") private Integer iAudited; /** - * @see com.orion.ops.constant.Const#ENABLE - * @see com.orion.ops.constant.Const#DISABLE + * @see cn.orionsec.ops.constant.Const#ENABLE + * @see cn.orionsec.ops.constant.Const#DISABLE */ @ApiModelProperty(value = "只清理我执行的") private Integer iExecute; /** - * @see com.orion.ops.constant.Const#ENABLE - * @see com.orion.ops.constant.Const#DISABLE + * @see cn.orionsec.ops.constant.Const#ENABLE + * @see cn.orionsec.ops.constant.Const#DISABLE */ @ApiModelProperty(value = "只清理未读的") private Integer onlyRead; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/data/DataExportRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/data/DataExportRequest.java similarity index 87% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/data/DataExportRequest.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/data/DataExportRequest.java index b396425d..c6d688bc 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/data/DataExportRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/data/DataExportRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.request.data; +package cn.orionsec.ops.entity.request.data; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -32,14 +32,14 @@ import lombok.Data; public class DataExportRequest { /** - * @see com.orion.ops.constant.ExportType + * @see cn.orionsec.ops.constant.ExportType */ @ApiModelProperty(value = "导出类型") private Integer exportType; /** - * @see com.orion.ops.constant.Const#ENABLE - * @see com.orion.ops.constant.Const#DISABLE + * @see cn.orionsec.ops.constant.Const#ENABLE + * @see cn.orionsec.ops.constant.Const#DISABLE */ @ApiModelProperty(value = "是否导出密码") private Integer exportPassword; @@ -63,7 +63,7 @@ public class DataExportRequest { private Integer status; /** - * @see com.orion.ops.constant.Const#ENABLE + * @see cn.orionsec.ops.constant.Const#ENABLE */ @ApiModelProperty(value = "只看自己") private Integer onlyMyself; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/data/DataImportRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/data/DataImportRequest.java similarity index 95% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/data/DataImportRequest.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/data/DataImportRequest.java index 7cceb092..2c191c5e 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/data/DataImportRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/data/DataImportRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.request.data; +package cn.orionsec.ops.entity.request.data; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/exec/CommandExecRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/exec/CommandExecRequest.java similarity index 93% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/exec/CommandExecRequest.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/exec/CommandExecRequest.java index d67d8dbd..923c35b2 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/exec/CommandExecRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/exec/CommandExecRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.request.exec; +package cn.orionsec.ops.entity.request.exec; import com.orion.lang.define.wrapper.PageRequest; import io.swagger.annotations.ApiModel; @@ -64,13 +64,13 @@ public class CommandExecRequest extends PageRequest { private String username; /** - * @see com.orion.ops.constant.command.ExecStatus + * @see cn.orionsec.ops.constant.command.ExecStatus */ @ApiModelProperty(value = "状态") private Integer status; /** - * @see com.orion.ops.constant.command.ExecType + * @see cn.orionsec.ops.constant.command.ExecType */ @ApiModelProperty(value = "类型") private Integer type; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/file/FileDownloadRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/file/FileDownloadRequest.java similarity index 91% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/file/FileDownloadRequest.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/file/FileDownloadRequest.java index f4fb8e19..5348616c 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/file/FileDownloadRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/file/FileDownloadRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.request.file; +package cn.orionsec.ops.entity.request.file; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -35,7 +35,7 @@ public class FileDownloadRequest { private Long id; /** - * @see com.orion.ops.constant.download.FileDownloadType + * @see cn.orionsec.ops.constant.download.FileDownloadType */ @ApiModelProperty(value = "下载类型") private Integer type; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/file/FileTailRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/file/FileTailRequest.java similarity index 88% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/file/FileTailRequest.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/file/FileTailRequest.java index 2fcb089f..de9f5d56 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/file/FileTailRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/file/FileTailRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.request.file; +package cn.orionsec.ops.entity.request.file; import com.orion.lang.define.wrapper.PageRequest; import io.swagger.annotations.ApiModel; @@ -52,13 +52,13 @@ public class FileTailRequest extends PageRequest { private Long machineId; /** - * @see com.orion.ops.constant.Const#TAIL_OFFSET_LINE + * @see cn.orionsec.ops.constant.Const#TAIL_OFFSET_LINE */ @ApiModelProperty(value = "文件尾部偏移行") private Integer offset; /** - * @see com.orion.ops.constant.Const#UTF_8 + * @see cn.orionsec.ops.constant.Const#UTF_8 */ @ApiModelProperty(value = "编码集") private String charset; @@ -67,7 +67,7 @@ public class FileTailRequest extends PageRequest { private String command; /** - * @see com.orion.ops.constant.tail.FileTailMode + * @see cn.orionsec.ops.constant.tail.FileTailMode */ @ApiModelProperty(value = "宿主机文件追踪类型 tracker/tail") private String tailMode; @@ -76,7 +76,7 @@ public class FileTailRequest extends PageRequest { private Long relId; /** - * @see com.orion.ops.constant.tail.FileTailType + * @see cn.orionsec.ops.constant.tail.FileTailType */ @ApiModelProperty(value = "类型") private Integer type; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/history/HistoryValueRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/history/HistoryValueRequest.java similarity index 92% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/history/HistoryValueRequest.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/history/HistoryValueRequest.java index 0b02898f..644fccc7 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/history/HistoryValueRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/history/HistoryValueRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.request.history; +package cn.orionsec.ops.entity.request.history; import com.orion.lang.define.wrapper.PageRequest; import io.swagger.annotations.ApiModel; @@ -41,7 +41,7 @@ public class HistoryValueRequest extends PageRequest { private Long valueId; /** - * @see com.orion.ops.constant.history.HistoryValueType + * @see cn.orionsec.ops.constant.history.HistoryValueType */ @ApiModelProperty(value = "值类型") private Integer valueType; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/home/HomeStatisticsRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/home/HomeStatisticsRequest.java similarity index 95% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/home/HomeStatisticsRequest.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/home/HomeStatisticsRequest.java index aaecf9ac..018b0551 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/home/HomeStatisticsRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/home/HomeStatisticsRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.request.home; +package cn.orionsec.ops.entity.request.home; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/machine/MachineAlarmConfigRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineAlarmConfigRequest.java similarity index 93% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/machine/MachineAlarmConfigRequest.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineAlarmConfigRequest.java index 103b3475..6574330c 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/machine/MachineAlarmConfigRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineAlarmConfigRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.request.machine; +package cn.orionsec.ops.entity.request.machine; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -37,7 +37,7 @@ public class MachineAlarmConfigRequest { private Long machineId; /** - * @see com.orion.ops.constant.machine.MachineAlarmType + * @see cn.orionsec.ops.constant.machine.MachineAlarmType */ @ApiModelProperty(value = "报警类型 10: cpu使用率 20: 内存使用率") private Integer type; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/machine/MachineAlarmHistoryRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineAlarmHistoryRequest.java similarity index 94% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/machine/MachineAlarmHistoryRequest.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineAlarmHistoryRequest.java index 59a4e209..e679ceca 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/machine/MachineAlarmHistoryRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineAlarmHistoryRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.request.machine; +package cn.orionsec.ops.entity.request.machine; import com.orion.lang.define.wrapper.PageRequest; import io.swagger.annotations.ApiModel; @@ -43,7 +43,7 @@ public class MachineAlarmHistoryRequest extends PageRequest { private Long machineId; /** - * @see com.orion.ops.constant.machine.MachineAlarmType + * @see cn.orionsec.ops.constant.machine.MachineAlarmType */ @ApiModelProperty(value = "报警类型 10: cpu使用率 20: 内存使用率") private Integer type; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/machine/MachineAlarmRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineAlarmRequest.java similarity index 92% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/machine/MachineAlarmRequest.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineAlarmRequest.java index 2d078ac4..11189fec 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/machine/MachineAlarmRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineAlarmRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.request.machine; +package cn.orionsec.ops.entity.request.machine; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -37,7 +37,7 @@ public class MachineAlarmRequest { private Long machineId; /** - * @see com.orion.ops.constant.machine.MachineAlarmType + * @see cn.orionsec.ops.constant.machine.MachineAlarmType */ @ApiModelProperty(value = "报警类型 10: cpu使用率 20: 内存使用率") private Integer type; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/machine/MachineEnvRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineEnvRequest.java similarity index 94% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/machine/MachineEnvRequest.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineEnvRequest.java index b231058b..1b35e1a6 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/machine/MachineEnvRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineEnvRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.request.machine; +package cn.orionsec.ops.entity.request.machine; import com.orion.lang.define.wrapper.PageRequest; import io.swagger.annotations.ApiModel; @@ -55,7 +55,7 @@ public class MachineEnvRequest extends PageRequest { private String description; /** - * @see com.orion.ops.constant.env.EnvViewType + * @see cn.orionsec.ops.constant.env.EnvViewType */ @ApiModelProperty(value = "视图类型") private Integer viewType; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/machine/MachineGroupRelRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineGroupRelRequest.java similarity index 96% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/machine/MachineGroupRelRequest.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineGroupRelRequest.java index a3ffca82..82de83e5 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/machine/MachineGroupRelRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineGroupRelRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.request.machine; +package cn.orionsec.ops.entity.request.machine; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/machine/MachineGroupRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineGroupRequest.java similarity index 93% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/machine/MachineGroupRequest.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineGroupRequest.java index 53c06cef..19437e3c 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/machine/MachineGroupRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineGroupRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.request.machine; +package cn.orionsec.ops.entity.request.machine; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -52,7 +52,7 @@ public class MachineGroupRequest { private Integer sort; /** - * @see com.orion.ops.constant.common.TreeMoveType + * @see cn.orionsec.ops.constant.common.TreeMoveType */ @ApiModelProperty(value = "移动类型") private Integer moveType; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/machine/MachineInfoRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineInfoRequest.java similarity index 91% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/machine/MachineInfoRequest.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineInfoRequest.java index 0bf4280b..7ba92779 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/machine/MachineInfoRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineInfoRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.request.machine; +package cn.orionsec.ops.entity.request.machine; import com.orion.lang.define.wrapper.PageRequest; import io.swagger.annotations.ApiModel; @@ -70,14 +70,14 @@ public class MachineInfoRequest extends PageRequest { private String password; /** - * @see com.orion.ops.constant.machine.MachineAuthType + * @see cn.orionsec.ops.constant.machine.MachineAuthType */ @ApiModelProperty(value = "机器认证方式 1: 密码认证 2: 独立密钥") private Integer authType; /** - * @see com.orion.ops.constant.Const#ENABLE - * @see com.orion.ops.constant.Const#DISABLE + * @see cn.orionsec.ops.constant.Const#ENABLE + * @see cn.orionsec.ops.constant.Const#DISABLE */ @ApiModelProperty(value = "机器状态 1有效 2无效") private Integer status; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/machine/MachineKeyRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineKeyRequest.java similarity index 97% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/machine/MachineKeyRequest.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineKeyRequest.java index a3968d4b..4627d63c 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/machine/MachineKeyRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineKeyRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.request.machine; +package cn.orionsec.ops.entity.request.machine; import com.orion.lang.define.wrapper.PageRequest; import io.swagger.annotations.ApiModel; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/machine/MachineMonitorEndpointRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineMonitorEndpointRequest.java similarity index 96% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/machine/MachineMonitorEndpointRequest.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineMonitorEndpointRequest.java index a17fd687..01bc6f61 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/machine/MachineMonitorEndpointRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineMonitorEndpointRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.request.machine; +package cn.orionsec.ops.entity.request.machine; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/machine/MachineMonitorRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineMonitorRequest.java similarity index 93% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/machine/MachineMonitorRequest.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineMonitorRequest.java index 8648090d..5544cdb9 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/machine/MachineMonitorRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineMonitorRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.request.machine; +package cn.orionsec.ops.entity.request.machine; import com.orion.lang.define.wrapper.PageRequest; import io.swagger.annotations.ApiModel; @@ -44,7 +44,7 @@ public class MachineMonitorRequest extends PageRequest { private String machineName; /** - * @see com.orion.ops.constant.monitor.MonitorStatus + * @see cn.orionsec.ops.constant.monitor.MonitorStatus */ @ApiModelProperty(value = "安装状态") private Integer status; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/machine/MachineMonitorSyncRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineMonitorSyncRequest.java similarity index 91% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/machine/MachineMonitorSyncRequest.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineMonitorSyncRequest.java index 1447250a..101efb11 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/machine/MachineMonitorSyncRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineMonitorSyncRequest.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.request.machine; +package cn.orionsec.ops.entity.request.machine; -import com.orion.ops.entity.vo.machine.MachineAlarmConfigVO; +import cn.orionsec.ops.entity.vo.machine.MachineAlarmConfigVO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/machine/MachineProxyRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineProxyRequest.java similarity index 94% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/machine/MachineProxyRequest.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineProxyRequest.java index 7066cb40..0d6e6116 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/machine/MachineProxyRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineProxyRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.request.machine; +package cn.orionsec.ops.entity.request.machine; import com.orion.lang.define.wrapper.PageRequest; import io.swagger.annotations.ApiModel; @@ -55,7 +55,7 @@ public class MachineProxyRequest extends PageRequest { private String password; /** - * @see com.orion.ops.constant.machine.ProxyType + * @see cn.orionsec.ops.constant.machine.ProxyType */ @ApiModelProperty(value = "代理类型") private Integer type; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/machine/MachineTerminalLogRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineTerminalLogRequest.java similarity index 97% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/machine/MachineTerminalLogRequest.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineTerminalLogRequest.java index d10a99de..3a64595e 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/machine/MachineTerminalLogRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineTerminalLogRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.request.machine; +package cn.orionsec.ops.entity.request.machine; import com.orion.lang.define.wrapper.PageRequest; import io.swagger.annotations.ApiModel; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/machine/MachineTerminalManagerRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineTerminalManagerRequest.java similarity index 95% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/machine/MachineTerminalManagerRequest.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineTerminalManagerRequest.java index 52876c51..aa314d30 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/machine/MachineTerminalManagerRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineTerminalManagerRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.request.machine; +package cn.orionsec.ops.entity.request.machine; import com.orion.lang.define.wrapper.PageRequest; import io.swagger.annotations.ApiModel; @@ -64,7 +64,7 @@ public class MachineTerminalManagerRequest extends PageRequest { private String machineTag; /** - * @see com.orion.ops.constant.Const#ENABLE + * @see cn.orionsec.ops.constant.Const#ENABLE */ @ApiModelProperty(value = "是否只读") private Integer readonly; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/machine/MachineTerminalRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineTerminalRequest.java similarity index 91% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/machine/MachineTerminalRequest.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineTerminalRequest.java index 91cab305..78648d5d 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/machine/MachineTerminalRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineTerminalRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.request.machine; +package cn.orionsec.ops.entity.request.machine; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -56,8 +56,8 @@ public class MachineTerminalRequest { private String fontFamily; /** - * @see com.orion.ops.constant.Const#ENABLE - * @see com.orion.ops.constant.Const#DISABLE + * @see cn.orionsec.ops.constant.Const#ENABLE + * @see cn.orionsec.ops.constant.Const#DISABLE */ @ApiModelProperty(value = "是否开启url link 1开启 2关闭") private Integer enableWebLink; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/message/WebSideMessageRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/message/WebSideMessageRequest.java similarity index 89% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/message/WebSideMessageRequest.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/message/WebSideMessageRequest.java index e531e582..4b40c7f4 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/message/WebSideMessageRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/message/WebSideMessageRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.request.message; +package cn.orionsec.ops.entity.request.message; import com.orion.lang.define.wrapper.PageRequest; import io.swagger.annotations.ApiModel; @@ -44,19 +44,19 @@ public class WebSideMessageRequest extends PageRequest { private List idList; /** - * @see com.orion.ops.constant.message.MessageClassify + * @see cn.orionsec.ops.constant.message.MessageClassify */ @ApiModelProperty(value = "消息分类") private Integer classify; /** - * @see com.orion.ops.constant.message.MessageType + * @see cn.orionsec.ops.constant.message.MessageType */ @ApiModelProperty(value = "消息类型") private Integer type; /** - * @see com.orion.ops.constant.message.ReadStatus + * @see cn.orionsec.ops.constant.message.ReadStatus */ @ApiModelProperty(value = "是否已读 1未读 2已读") private Integer status; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/scheduler/SchedulerTaskRecordRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/scheduler/SchedulerTaskRecordRequest.java similarity index 93% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/scheduler/SchedulerTaskRecordRequest.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/scheduler/SchedulerTaskRecordRequest.java index 87567382..45cc8441 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/scheduler/SchedulerTaskRecordRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/scheduler/SchedulerTaskRecordRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.request.scheduler; +package cn.orionsec.ops.entity.request.scheduler; import com.orion.lang.define.wrapper.PageRequest; import io.swagger.annotations.ApiModel; @@ -58,7 +58,7 @@ public class SchedulerTaskRecordRequest extends PageRequest { private String taskName; /** - * @see com.orion.ops.constant.scheduler.SchedulerTaskStatus + * @see cn.orionsec.ops.constant.scheduler.SchedulerTaskStatus */ @ApiModelProperty(value = "状态") private Integer status; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/scheduler/SchedulerTaskRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/scheduler/SchedulerTaskRequest.java similarity index 86% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/scheduler/SchedulerTaskRequest.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/scheduler/SchedulerTaskRequest.java index 49256c06..b56ea7ee 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/scheduler/SchedulerTaskRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/scheduler/SchedulerTaskRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.request.scheduler; +package cn.orionsec.ops.entity.request.scheduler; import com.orion.lang.define.wrapper.PageRequest; import io.swagger.annotations.ApiModel; @@ -52,26 +52,26 @@ public class SchedulerTaskRequest extends PageRequest { private String expression; /** - * @see com.orion.ops.constant.Const#ENABLE - * @see com.orion.ops.constant.Const#DISABLE + * @see cn.orionsec.ops.constant.Const#ENABLE + * @see cn.orionsec.ops.constant.Const#DISABLE */ @ApiModelProperty(value = "启用状态 1启用 2停用") private Integer enableStatus; /** - * @see com.orion.ops.constant.scheduler.SchedulerTaskStatus + * @see cn.orionsec.ops.constant.scheduler.SchedulerTaskStatus */ @ApiModelProperty(value = "最近状态 10待调度 20调度中 30调度成功 40调度失败 50已停止") private Integer latelyStatus; /** - * @see com.orion.ops.constant.common.SerialType + * @see cn.orionsec.ops.constant.common.SerialType */ @ApiModelProperty(value = "调度序列 10串行 20并行") private Integer serializeType; /** - * @see com.orion.ops.constant.common.ExceptionHandlerType + * @see cn.orionsec.ops.constant.common.ExceptionHandlerType */ @ApiModelProperty(value = "异常处理 10跳过所有 20跳过错误") private Integer exceptionHandler; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/scheduler/SchedulerTaskStatisticsRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/scheduler/SchedulerTaskStatisticsRequest.java similarity index 95% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/scheduler/SchedulerTaskStatisticsRequest.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/scheduler/SchedulerTaskStatisticsRequest.java index f7ca5a43..06a386cd 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/scheduler/SchedulerTaskStatisticsRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/scheduler/SchedulerTaskStatisticsRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.request.scheduler; +package cn.orionsec.ops.entity.request.scheduler; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/sftp/FileBaseRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/sftp/FileBaseRequest.java similarity index 96% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/sftp/FileBaseRequest.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/sftp/FileBaseRequest.java index a13c2b86..ff58fdb1 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/sftp/FileBaseRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/sftp/FileBaseRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.request.sftp; +package cn.orionsec.ops.entity.request.sftp; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/sftp/FileChangeGroupRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/sftp/FileChangeGroupRequest.java similarity index 96% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/sftp/FileChangeGroupRequest.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/sftp/FileChangeGroupRequest.java index d03d3364..c8b3e5da 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/sftp/FileChangeGroupRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/sftp/FileChangeGroupRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.request.sftp; +package cn.orionsec.ops.entity.request.sftp; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/sftp/FileChmodRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/sftp/FileChmodRequest.java similarity index 96% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/sftp/FileChmodRequest.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/sftp/FileChmodRequest.java index 5f770529..105f04d0 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/sftp/FileChmodRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/sftp/FileChmodRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.request.sftp; +package cn.orionsec.ops.entity.request.sftp; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/sftp/FileChownRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/sftp/FileChownRequest.java similarity index 96% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/sftp/FileChownRequest.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/sftp/FileChownRequest.java index f99efb99..3177b950 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/sftp/FileChownRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/sftp/FileChownRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.request.sftp; +package cn.orionsec.ops.entity.request.sftp; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/sftp/FileDownloadRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/sftp/FileDownloadRequest.java similarity index 96% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/sftp/FileDownloadRequest.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/sftp/FileDownloadRequest.java index d37ae637..f5715910 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/sftp/FileDownloadRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/sftp/FileDownloadRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.request.sftp; +package cn.orionsec.ops.entity.request.sftp; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/sftp/FileListRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/sftp/FileListRequest.java similarity index 96% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/sftp/FileListRequest.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/sftp/FileListRequest.java index b38e40bd..dcbfa1e2 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/sftp/FileListRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/sftp/FileListRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.request.sftp; +package cn.orionsec.ops.entity.request.sftp; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/sftp/FileMkdirRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/sftp/FileMkdirRequest.java similarity index 96% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/sftp/FileMkdirRequest.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/sftp/FileMkdirRequest.java index 956d355f..478c07e5 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/sftp/FileMkdirRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/sftp/FileMkdirRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.request.sftp; +package cn.orionsec.ops.entity.request.sftp; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/sftp/FileMoveRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/sftp/FileMoveRequest.java similarity index 96% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/sftp/FileMoveRequest.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/sftp/FileMoveRequest.java index f6c37437..e43b4f69 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/sftp/FileMoveRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/sftp/FileMoveRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.request.sftp; +package cn.orionsec.ops.entity.request.sftp; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/sftp/FileOpenRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/sftp/FileOpenRequest.java similarity index 95% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/sftp/FileOpenRequest.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/sftp/FileOpenRequest.java index b6ca7751..ef1a76f6 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/sftp/FileOpenRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/sftp/FileOpenRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.request.sftp; +package cn.orionsec.ops.entity.request.sftp; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/sftp/FilePresentCheckRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/sftp/FilePresentCheckRequest.java similarity index 96% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/sftp/FilePresentCheckRequest.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/sftp/FilePresentCheckRequest.java index b729a57e..fef31ccb 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/sftp/FilePresentCheckRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/sftp/FilePresentCheckRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.request.sftp; +package cn.orionsec.ops.entity.request.sftp; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/sftp/FileRemoveRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/sftp/FileRemoveRequest.java similarity index 96% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/sftp/FileRemoveRequest.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/sftp/FileRemoveRequest.java index 1226bf32..c3b4720d 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/sftp/FileRemoveRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/sftp/FileRemoveRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.request.sftp; +package cn.orionsec.ops.entity.request.sftp; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/sftp/FileTouchRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/sftp/FileTouchRequest.java similarity index 96% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/sftp/FileTouchRequest.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/sftp/FileTouchRequest.java index fa3f5a31..6e8faaaf 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/sftp/FileTouchRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/sftp/FileTouchRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.request.sftp; +package cn.orionsec.ops.entity.request.sftp; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/sftp/FileTruncateRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/sftp/FileTruncateRequest.java similarity index 96% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/sftp/FileTruncateRequest.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/sftp/FileTruncateRequest.java index 9c6b8a1d..af944a14 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/sftp/FileTruncateRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/sftp/FileTruncateRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.request.sftp; +package cn.orionsec.ops.entity.request.sftp; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/sftp/FileUploadRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/sftp/FileUploadRequest.java similarity index 96% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/sftp/FileUploadRequest.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/sftp/FileUploadRequest.java index e44ad0ba..3f4ab06c 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/sftp/FileUploadRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/sftp/FileUploadRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.request.sftp; +package cn.orionsec.ops.entity.request.sftp; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/system/ConfigIpListRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/system/ConfigIpListRequest.java similarity index 96% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/system/ConfigIpListRequest.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/system/ConfigIpListRequest.java index bcd0a677..ccced1ed 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/system/ConfigIpListRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/system/ConfigIpListRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.request.system; +package cn.orionsec.ops.entity.request.system; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/system/SystemEnvRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/system/SystemEnvRequest.java similarity index 93% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/system/SystemEnvRequest.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/system/SystemEnvRequest.java index 025f8456..ff649741 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/system/SystemEnvRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/system/SystemEnvRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.request.system; +package cn.orionsec.ops.entity.request.system; import com.orion.lang.define.wrapper.PageRequest; import io.swagger.annotations.ApiModel; @@ -52,7 +52,7 @@ public class SystemEnvRequest extends PageRequest { private String description; /** - * @see com.orion.ops.constant.env.EnvViewType + * @see cn.orionsec.ops.constant.env.EnvViewType */ @ApiModelProperty(value = "视图类型") private Integer viewType; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/system/SystemFileCleanRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/system/SystemFileCleanRequest.java similarity index 90% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/system/SystemFileCleanRequest.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/system/SystemFileCleanRequest.java index 2e1910c3..006a6b4f 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/system/SystemFileCleanRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/system/SystemFileCleanRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.request.system; +package cn.orionsec.ops.entity.request.system; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -32,7 +32,7 @@ import lombok.Data; public class SystemFileCleanRequest { /** - * @see com.orion.ops.constant.system.SystemCleanType + * @see cn.orionsec.ops.constant.system.SystemCleanType */ @ApiModelProperty(value = "文件清理类型") private Integer cleanType; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/system/SystemOptionRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/system/SystemOptionRequest.java similarity index 91% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/system/SystemOptionRequest.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/system/SystemOptionRequest.java index bd9e9497..4ceefe2a 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/system/SystemOptionRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/system/SystemOptionRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.request.system; +package cn.orionsec.ops.entity.request.system; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -32,7 +32,7 @@ import lombok.Data; public class SystemOptionRequest { /** - * @see com.orion.ops.constant.system.SystemConfigKey + * @see cn.orionsec.ops.constant.system.SystemConfigKey */ @ApiModelProperty(value = "配置项") private Integer option; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/template/CommandTemplateRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/template/CommandTemplateRequest.java similarity index 96% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/template/CommandTemplateRequest.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/template/CommandTemplateRequest.java index 214d1310..3bfe5b63 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/template/CommandTemplateRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/template/CommandTemplateRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.request.template; +package cn.orionsec.ops.entity.request.template; import com.orion.lang.define.wrapper.PageRequest; import io.swagger.annotations.ApiModel; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/upload/BatchUploadRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/upload/BatchUploadRequest.java similarity index 96% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/upload/BatchUploadRequest.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/upload/BatchUploadRequest.java index 814d201c..da1cd828 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/upload/BatchUploadRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/upload/BatchUploadRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.request.upload; +package cn.orionsec.ops.entity.request.upload; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/user/EventLogRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/user/EventLogRequest.java similarity index 85% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/user/EventLogRequest.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/user/EventLogRequest.java index 0c737fb5..5bc9cae9 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/user/EventLogRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/user/EventLogRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.request.user; +package cn.orionsec.ops.entity.request.user; import com.orion.lang.define.wrapper.PageRequest; import io.swagger.annotations.ApiModel; @@ -43,13 +43,13 @@ public class EventLogRequest extends PageRequest { private String username; /** - * @see com.orion.ops.constant.event.EventClassify + * @see cn.orionsec.ops.constant.event.EventClassify */ @ApiModelProperty(value = "事件分类") private Integer classify; /** - * @see com.orion.ops.constant.event.EventType + * @see cn.orionsec.ops.constant.event.EventType */ @ApiModelProperty(value = "事件类型") private Integer type; @@ -61,8 +61,8 @@ public class EventLogRequest extends PageRequest { private String params; /** - * @see com.orion.ops.constant.Const#ENABLE - * @see com.orion.ops.constant.Const#DISABLE + * @see cn.orionsec.ops.constant.Const#ENABLE + * @see cn.orionsec.ops.constant.Const#DISABLE */ @ApiModelProperty(value = "是否执行成功 1成功 2失败") private Integer result; @@ -74,13 +74,13 @@ public class EventLogRequest extends PageRequest { private Date rangeEnd; /** - * @see com.orion.ops.constant.Const#ENABLE + * @see cn.orionsec.ops.constant.Const#ENABLE */ @ApiModelProperty(value = "只看自己") private Integer onlyMyself; /** - * @see com.orion.ops.constant.Const#ENABLE + * @see cn.orionsec.ops.constant.Const#ENABLE */ @ApiModelProperty(value = "是否解析ip") private Integer parserIp; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/user/UserInfoRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/user/UserInfoRequest.java similarity index 90% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/user/UserInfoRequest.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/user/UserInfoRequest.java index abf20ef9..fdfe0a9e 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/user/UserInfoRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/user/UserInfoRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.request.user; +package cn.orionsec.ops.entity.request.user; import com.orion.lang.define.wrapper.PageRequest; import io.swagger.annotations.ApiModel; @@ -52,14 +52,14 @@ public class UserInfoRequest extends PageRequest { private String password; /** - * @see com.orion.ops.constant.user.RoleType + * @see cn.orionsec.ops.constant.user.RoleType */ @ApiModelProperty(value = "角色类型 10管理员 20开发 30运维") private Integer role; /** - * @see com.orion.ops.constant.Const#ENABLE - * @see com.orion.ops.constant.Const#DISABLE + * @see cn.orionsec.ops.constant.Const#ENABLE + * @see cn.orionsec.ops.constant.Const#DISABLE */ @ApiModelProperty(value = "用户状态 1启用 2禁用") private Integer status; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/user/UserLoginRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/user/UserLoginRequest.java similarity index 96% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/user/UserLoginRequest.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/user/UserLoginRequest.java index 3280fcb3..1d4e9404 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/user/UserLoginRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/user/UserLoginRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.request.user; +package cn.orionsec.ops.entity.request.user; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/user/UserResetRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/user/UserResetRequest.java similarity index 96% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/user/UserResetRequest.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/user/UserResetRequest.java index 03565e6b..6290f667 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/user/UserResetRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/user/UserResetRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.request.user; +package cn.orionsec.ops.entity.request.user; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/webhook/WebhookConfigRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/webhook/WebhookConfigRequest.java similarity index 93% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/webhook/WebhookConfigRequest.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/webhook/WebhookConfigRequest.java index feaa95fe..7c579ee1 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/request/webhook/WebhookConfigRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/webhook/WebhookConfigRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.request.webhook; +package cn.orionsec.ops.entity.request.webhook; import com.orion.lang.define.wrapper.PageRequest; import io.swagger.annotations.ApiModel; @@ -44,7 +44,7 @@ public class WebhookConfigRequest extends PageRequest { private String url; /** - * @see com.orion.ops.constant.webhook.WebhookType + * @see cn.orionsec.ops.constant.webhook.WebhookType */ @ApiModelProperty(value = "类型 10: 钉钉机器人") private Integer type; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/alarm/AlarmGroupUserVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/alarm/AlarmGroupUserVO.java similarity index 96% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/alarm/AlarmGroupUserVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/alarm/AlarmGroupUserVO.java index 02920628..08a4bd7f 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/alarm/AlarmGroupUserVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/alarm/AlarmGroupUserVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.alarm; +package cn.orionsec.ops.entity.vo.alarm; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/alarm/AlarmGroupVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/alarm/AlarmGroupVO.java similarity index 97% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/alarm/AlarmGroupVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/alarm/AlarmGroupVO.java index 5e7353f1..ee45bcef 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/alarm/AlarmGroupVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/alarm/AlarmGroupVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.alarm; +package cn.orionsec.ops.entity.vo.alarm; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationActionLogStatisticsVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationActionLogStatisticsVO.java similarity index 94% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationActionLogStatisticsVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationActionLogStatisticsVO.java index a779c3a2..40342c78 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationActionLogStatisticsVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationActionLogStatisticsVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.app; +package cn.orionsec.ops.entity.vo.app; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -38,7 +38,7 @@ public class ApplicationActionLogStatisticsVO { private Long actionId; /** - * @see com.orion.ops.constant.app.ActionStatus + * @see cn.orionsec.ops.constant.app.ActionStatus */ @ApiModelProperty(value = "状态 10未开始 20进行中 30已完成 40执行失败 50已跳过 60已取消") private Integer status; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationActionLogVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationActionLogVO.java similarity index 94% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationActionLogVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationActionLogVO.java index 9bbe9fbc..b40bf1d4 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationActionLogVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationActionLogVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.app; +package cn.orionsec.ops.entity.vo.app; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -46,7 +46,7 @@ public class ApplicationActionLogVO { private String actionName; /** - * @see com.orion.ops.constant.app.ActionType + * @see cn.orionsec.ops.constant.app.ActionType */ @ApiModelProperty(value = "操作类型") private Integer actionType; @@ -55,7 +55,7 @@ public class ApplicationActionLogVO { private String actionCommand; /** - * @see com.orion.ops.constant.app.ActionStatus + * @see cn.orionsec.ops.constant.app.ActionStatus */ @ApiModelProperty(value = "状态 10未开始 20进行中 30已完成 40执行失败 50已跳过 60已取消") private Integer status; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationActionStatisticsVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationActionStatisticsVO.java similarity index 97% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationActionStatisticsVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationActionStatisticsVO.java index fb7f5b66..24ce3eb6 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationActionStatisticsVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationActionStatisticsVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.app; +package cn.orionsec.ops.entity.vo.app; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationActionStatusVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationActionStatusVO.java similarity index 94% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationActionStatusVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationActionStatusVO.java index c8ee221e..e0b796a0 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationActionStatusVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationActionStatusVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.app; +package cn.orionsec.ops.entity.vo.app; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -37,7 +37,7 @@ public class ApplicationActionStatusVO { private Long id; /** - * @see com.orion.ops.constant.app.ActionStatus + * @see cn.orionsec.ops.constant.app.ActionStatus */ @ApiModelProperty(value = "状态") private Integer status; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationActionVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationActionVO.java similarity index 93% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationActionVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationActionVO.java index 1c4e5807..df0b30ff 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationActionVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationActionVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.app; +package cn.orionsec.ops.entity.vo.app; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -38,7 +38,7 @@ public class ApplicationActionVO { private String name; /** - * @see com.orion.ops.constant.app.ActionType + * @see cn.orionsec.ops.constant.app.ActionType */ @ApiModelProperty(value = "类型") private Integer type; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationBuildReleaseListVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationBuildReleaseListVO.java similarity index 97% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationBuildReleaseListVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationBuildReleaseListVO.java index eae12996..dac7e4a7 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationBuildReleaseListVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationBuildReleaseListVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.app; +package cn.orionsec.ops.entity.vo.app; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationBuildStatisticsChartVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationBuildStatisticsChartVO.java similarity index 97% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationBuildStatisticsChartVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationBuildStatisticsChartVO.java index 03d24c31..86ac075b 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationBuildStatisticsChartVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationBuildStatisticsChartVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.app; +package cn.orionsec.ops.entity.vo.app; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationBuildStatisticsMetricsVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationBuildStatisticsMetricsVO.java similarity index 97% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationBuildStatisticsMetricsVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationBuildStatisticsMetricsVO.java index 30f69600..3237e281 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationBuildStatisticsMetricsVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationBuildStatisticsMetricsVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.app; +package cn.orionsec.ops.entity.vo.app; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationBuildStatisticsMetricsWrapperVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationBuildStatisticsMetricsWrapperVO.java similarity index 96% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationBuildStatisticsMetricsWrapperVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationBuildStatisticsMetricsWrapperVO.java index 9dd72780..e8a06acc 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationBuildStatisticsMetricsWrapperVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationBuildStatisticsMetricsWrapperVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.app; +package cn.orionsec.ops.entity.vo.app; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationBuildStatisticsRecordVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationBuildStatisticsRecordVO.java similarity index 94% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationBuildStatisticsRecordVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationBuildStatisticsRecordVO.java index 7e5340f2..d53b9248 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationBuildStatisticsRecordVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationBuildStatisticsRecordVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.app; +package cn.orionsec.ops.entity.vo.app; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -44,7 +44,7 @@ public class ApplicationBuildStatisticsRecordVO { private Date buildDate; /** - * @see com.orion.ops.constant.app.BuildStatus + * @see cn.orionsec.ops.constant.app.BuildStatus */ @ApiModelProperty(value = "状态 10未开始 20执行中 30已完成 40执行失败 50已取消") private Integer status; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationBuildStatisticsViewVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationBuildStatisticsViewVO.java similarity index 97% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationBuildStatisticsViewVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationBuildStatisticsViewVO.java index 3a6b5305..7f325eb9 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationBuildStatisticsViewVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationBuildStatisticsViewVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.app; +package cn.orionsec.ops.entity.vo.app; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationBuildStatusVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationBuildStatusVO.java similarity index 95% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationBuildStatusVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationBuildStatusVO.java index d5d1c630..bf039c92 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationBuildStatusVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationBuildStatusVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.app; +package cn.orionsec.ops.entity.vo.app; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -38,7 +38,7 @@ public class ApplicationBuildStatusVO { private Long id; /** - * @see com.orion.ops.constant.app.BuildStatus + * @see cn.orionsec.ops.constant.app.BuildStatus */ @ApiModelProperty(value = "状态") private Integer status; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationBuildVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationBuildVO.java similarity index 97% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationBuildVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationBuildVO.java index 14fb4a60..855aed9c 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationBuildVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationBuildVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.app; +package cn.orionsec.ops.entity.vo.app; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -71,7 +71,7 @@ public class ApplicationBuildVO { private String commitId; /** - * @see com.orion.ops.constant.app.BuildStatus + * @see cn.orionsec.ops.constant.app.BuildStatus */ @ApiModelProperty(value = "状态 10未开始 20执行中 30已完成 40执行失败 50已取消") private Integer status; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationConfigEnvVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationConfigEnvVO.java similarity index 71% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationConfigEnvVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationConfigEnvVO.java index 71d9e1e2..c9bac581 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationConfigEnvVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationConfigEnvVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.app; +package cn.orionsec.ops.entity.vo.app; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -32,40 +32,40 @@ import lombok.Data; public class ApplicationConfigEnvVO { /** - * @see com.orion.ops.constant.app.ApplicationEnvAttr#BUNDLE_PATH + * @see cn.orionsec.ops.constant.app.ApplicationEnvAttr#BUNDLE_PATH */ @ApiModelProperty(value = "构建产物路径") private String bundlePath; /** - * @see com.orion.ops.constant.app.ApplicationEnvAttr#TRANSFER_PATH + * @see cn.orionsec.ops.constant.app.ApplicationEnvAttr#TRANSFER_PATH */ @ApiModelProperty(value = "产物传输绝对路径") private String transferPath; /** - * @see com.orion.ops.constant.app.ApplicationEnvAttr#TRANSFER_MODE + * @see cn.orionsec.ops.constant.app.ApplicationEnvAttr#TRANSFER_MODE */ @ApiModelProperty(value = "产物传输方式 (sftp/scp)") private String transferMode; /** - * @see com.orion.ops.constant.app.ApplicationEnvAttr#TRANSFER_FILE_TYPE + * @see cn.orionsec.ops.constant.app.ApplicationEnvAttr#TRANSFER_FILE_TYPE */ @ApiModelProperty(value = "产物传输文件类型 (normal/zip)") private String transferFileType; /** - * @see com.orion.ops.constant.app.ApplicationEnvAttr#RELEASE_SERIAL - * @see com.orion.ops.constant.common.SerialType + * @see cn.orionsec.ops.constant.app.ApplicationEnvAttr#RELEASE_SERIAL + * @see cn.orionsec.ops.constant.common.SerialType */ @ApiModelProperty(value = "发布序列 10串行 20并行") private Integer releaseSerial; /** - * @see com.orion.ops.constant.app.ApplicationEnvAttr#EXCEPTION_HANDLER - * @see com.orion.ops.constant.common.ExceptionHandlerType - * @see com.orion.ops.constant.common.SerialType#SERIAL + * @see cn.orionsec.ops.constant.app.ApplicationEnvAttr#EXCEPTION_HANDLER + * @see cn.orionsec.ops.constant.common.ExceptionHandlerType + * @see cn.orionsec.ops.constant.common.SerialType#SERIAL */ @ApiModelProperty(value = "异常处理 10跳过所有 20跳过错误") private Integer exceptionHandler; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationDetailVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationDetailVO.java similarity index 97% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationDetailVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationDetailVO.java index 7822d16b..70e1fa1b 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationDetailVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationDetailVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.app; +package cn.orionsec.ops.entity.vo.app; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationEnvVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationEnvVO.java similarity index 90% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationEnvVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationEnvVO.java index 1c623c4a..1efc4304 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationEnvVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationEnvVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.app; +package cn.orionsec.ops.entity.vo.app; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -49,8 +49,8 @@ public class ApplicationEnvVO { private String value; /** - * @see com.orion.ops.constant.Const#FORBID_DELETE_CAN - * @see com.orion.ops.constant.Const#FORBID_DELETE_NOT + * @see cn.orionsec.ops.constant.Const#FORBID_DELETE_CAN + * @see cn.orionsec.ops.constant.Const#FORBID_DELETE_NOT */ @ApiModelProperty(value = "是否禁止删除 1可以删除 2禁止删除") private Integer forbidDelete; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationInfoVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationInfoVO.java similarity index 91% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationInfoVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationInfoVO.java index 87740cfd..0cfff3e5 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationInfoVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationInfoVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.app; +package cn.orionsec.ops.entity.vo.app; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -55,8 +55,8 @@ public class ApplicationInfoVO { private String description; /** - * @see com.orion.ops.constant.Const#CONFIGURED - * @see com.orion.ops.constant.Const#NOT_CONFIGURED + * @see cn.orionsec.ops.constant.Const#CONFIGURED + * @see cn.orionsec.ops.constant.Const#NOT_CONFIGURED */ @ApiModelProperty(value = "是否已经配置 1已配置 2未配置") private Integer isConfig; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationMachineVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationMachineVO.java similarity index 97% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationMachineVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationMachineVO.java index 1b9f3149..fd208ed1 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationMachineVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationMachineVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.app; +package cn.orionsec.ops.entity.vo.app; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationPipelineDetailVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationPipelineDetailVO.java similarity index 94% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationPipelineDetailVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationPipelineDetailVO.java index 3cfd4940..5cd89649 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationPipelineDetailVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationPipelineDetailVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.app; +package cn.orionsec.ops.entity.vo.app; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -53,7 +53,7 @@ public class ApplicationPipelineDetailVO { private Long repoId; /** - * @see com.orion.ops.constant.app.StageType + * @see cn.orionsec.ops.constant.app.StageType */ @ApiModelProperty(value = "阶段类型 10构建 20发布") private Integer stageType; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationPipelineStageConfigVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationPipelineStageConfigVO.java similarity index 93% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationPipelineStageConfigVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationPipelineStageConfigVO.java index 1ecd3390..b6f254cb 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationPipelineStageConfigVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationPipelineStageConfigVO.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.app; +package cn.orionsec.ops.entity.vo.app; -import com.orion.ops.entity.vo.machine.MachineInfoVO; +import cn.orionsec.ops.entity.vo.machine.MachineInfoVO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationPipelineStatisticsDetailVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationPipelineStatisticsDetailVO.java similarity index 94% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationPipelineStatisticsDetailVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationPipelineStatisticsDetailVO.java index b786e870..5eac6c5e 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationPipelineStatisticsDetailVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationPipelineStatisticsDetailVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.app; +package cn.orionsec.ops.entity.vo.app; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -41,7 +41,7 @@ public class ApplicationPipelineStatisticsDetailVO { private String appName; /** - * @see com.orion.ops.constant.app.StageType + * @see cn.orionsec.ops.constant.app.StageType */ @ApiModelProperty(value = "阶段类型 10构建 20发布") private Integer stageType; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationPipelineTaskDetailStatusVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationPipelineTaskDetailStatusVO.java similarity index 94% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationPipelineTaskDetailStatusVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationPipelineTaskDetailStatusVO.java index bfbd488d..fd1c6175 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationPipelineTaskDetailStatusVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationPipelineTaskDetailStatusVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.app; +package cn.orionsec.ops.entity.vo.app; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -43,7 +43,7 @@ public class ApplicationPipelineTaskDetailStatusVO { private Long relId; /** - * @see com.orion.ops.constant.app.PipelineDetailStatus + * @see cn.orionsec.ops.constant.app.PipelineDetailStatus */ @ApiModelProperty(value = "状态 10未开始 20进行中 30已完成 40执行失败 50已跳过 60已终止") private Integer status; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationPipelineTaskDetailVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationPipelineTaskDetailVO.java similarity index 93% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationPipelineTaskDetailVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationPipelineTaskDetailVO.java index f3d4df64..bd6a38c7 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationPipelineTaskDetailVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationPipelineTaskDetailVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.app; +package cn.orionsec.ops.entity.vo.app; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -52,7 +52,7 @@ public class ApplicationPipelineTaskDetailVO { private String appTag; /** - * @see com.orion.ops.constant.app.StageType + * @see cn.orionsec.ops.constant.app.StageType */ @ApiModelProperty(value = "阶段类型 10构建 20发布") private Integer stageType; @@ -61,7 +61,7 @@ public class ApplicationPipelineTaskDetailVO { private ApplicationPipelineStageConfigVO config; /** - * @see com.orion.ops.constant.app.PipelineDetailStatus + * @see cn.orionsec.ops.constant.app.PipelineDetailStatus */ @ApiModelProperty(value = "状态 10未开始 20进行中 30已完成 40执行失败 50已跳过 60已终止") private Integer status; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationPipelineTaskListVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationPipelineTaskListVO.java similarity index 96% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationPipelineTaskListVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationPipelineTaskListVO.java index 55b25a37..d15d6427 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationPipelineTaskListVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationPipelineTaskListVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.app; +package cn.orionsec.ops.entity.vo.app; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -49,7 +49,7 @@ public class ApplicationPipelineTaskListVO { private String description; /** - * @see com.orion.ops.constant.app.PipelineStatus + * @see cn.orionsec.ops.constant.app.PipelineStatus */ @ApiModelProperty(value = "执行状态 10待审核 20审核驳回 30待执行 35待调度 40执行中 50执行完成 60执行停止 70执行失败") private Integer status; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationPipelineTaskLogVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationPipelineTaskLogVO.java similarity index 91% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationPipelineTaskLogVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationPipelineTaskLogVO.java index a37a37b5..e65b6260 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationPipelineTaskLogVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationPipelineTaskLogVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.app; +package cn.orionsec.ops.entity.vo.app; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -43,13 +43,13 @@ public class ApplicationPipelineTaskLogVO { private Long taskDetailId; /** - * @see com.orion.ops.constant.app.PipelineLogStatus + * @see cn.orionsec.ops.constant.app.PipelineLogStatus */ @ApiModelProperty(value = "日志状态 10创建 20执行 30成功 40失败 50停止 60跳过") private Integer status; /** - * @see com.orion.ops.constant.app.StageType + * @see cn.orionsec.ops.constant.app.StageType */ @ApiModelProperty(value = "阶段类型 10构建 20发布") private Integer type; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationPipelineTaskStatisticsChartVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationPipelineTaskStatisticsChartVO.java similarity index 97% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationPipelineTaskStatisticsChartVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationPipelineTaskStatisticsChartVO.java index 69c91d64..be4da981 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationPipelineTaskStatisticsChartVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationPipelineTaskStatisticsChartVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.app; +package cn.orionsec.ops.entity.vo.app; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationPipelineTaskStatisticsDetailVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationPipelineTaskStatisticsDetailVO.java similarity index 91% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationPipelineTaskStatisticsDetailVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationPipelineTaskStatisticsDetailVO.java index be308317..ee23b20e 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationPipelineTaskStatisticsDetailVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationPipelineTaskStatisticsDetailVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.app; +package cn.orionsec.ops.entity.vo.app; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -41,13 +41,13 @@ public class ApplicationPipelineTaskStatisticsDetailVO { private Long relId; /** - * @see com.orion.ops.constant.app.StageType + * @see cn.orionsec.ops.constant.app.StageType */ @ApiModelProperty(value = "阶段类型 10构建 20发布") private Integer stageType; /** - * @see com.orion.ops.constant.app.PipelineDetailStatus + * @see cn.orionsec.ops.constant.app.PipelineDetailStatus */ @ApiModelProperty(value = "状态 10未开始 20进行中 30已完成 40执行失败 50已跳过 60已终止") private Integer status; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationPipelineTaskStatisticsMetricsVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationPipelineTaskStatisticsMetricsVO.java similarity index 97% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationPipelineTaskStatisticsMetricsVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationPipelineTaskStatisticsMetricsVO.java index d1688dd9..edb567ab 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationPipelineTaskStatisticsMetricsVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationPipelineTaskStatisticsMetricsVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.app; +package cn.orionsec.ops.entity.vo.app; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationPipelineTaskStatisticsMetricsWrapperVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationPipelineTaskStatisticsMetricsWrapperVO.java similarity index 96% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationPipelineTaskStatisticsMetricsWrapperVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationPipelineTaskStatisticsMetricsWrapperVO.java index 86a1360d..56cf8463 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationPipelineTaskStatisticsMetricsWrapperVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationPipelineTaskStatisticsMetricsWrapperVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.app; +package cn.orionsec.ops.entity.vo.app; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationPipelineTaskStatisticsTaskVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationPipelineTaskStatisticsTaskVO.java similarity index 94% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationPipelineTaskStatisticsTaskVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationPipelineTaskStatisticsTaskVO.java index 24378f16..6cc44290 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationPipelineTaskStatisticsTaskVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationPipelineTaskStatisticsTaskVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.app; +package cn.orionsec.ops.entity.vo.app; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -44,7 +44,7 @@ public class ApplicationPipelineTaskStatisticsTaskVO { private Date execDate; /** - * @see com.orion.ops.constant.app.PipelineStatus + * @see cn.orionsec.ops.constant.app.PipelineStatus */ @ApiModelProperty(value = "执行状态 10待审核 20审核驳回 30待执行 35待调度 40执行中 50执行完成 60执行停止 70执行失败") private Integer status; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationPipelineTaskStatisticsViewVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationPipelineTaskStatisticsViewVO.java similarity index 97% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationPipelineTaskStatisticsViewVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationPipelineTaskStatisticsViewVO.java index 091ee307..e91bfb39 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationPipelineTaskStatisticsViewVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationPipelineTaskStatisticsViewVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.app; +package cn.orionsec.ops.entity.vo.app; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationPipelineTaskStatusVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationPipelineTaskStatusVO.java similarity index 94% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationPipelineTaskStatusVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationPipelineTaskStatusVO.java index d3660fd3..768291a1 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationPipelineTaskStatusVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationPipelineTaskStatusVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.app; +package cn.orionsec.ops.entity.vo.app; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -38,7 +38,7 @@ public class ApplicationPipelineTaskStatusVO { private Long id; /** - * @see com.orion.ops.constant.app.PipelineStatus + * @see cn.orionsec.ops.constant.app.PipelineStatus */ @ApiModelProperty(value = "状态") private Integer status; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationPipelineTaskVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationPipelineTaskVO.java similarity index 97% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationPipelineTaskVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationPipelineTaskVO.java index fc6e21f9..0c2f1e9e 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationPipelineTaskVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationPipelineTaskVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.app; +package cn.orionsec.ops.entity.vo.app; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -59,7 +59,7 @@ public class ApplicationPipelineTaskVO { private String description; /** - * @see com.orion.ops.constant.app.PipelineStatus + * @see cn.orionsec.ops.constant.app.PipelineStatus */ @ApiModelProperty(value = "执行状态 10待审核 20审核驳回 30待执行 35待调度 40执行中 50执行完成 60执行停止 70执行失败") private Integer status; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationPipelineVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationPipelineVO.java similarity index 97% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationPipelineVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationPipelineVO.java index 2ed6744e..bf8d12aa 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationPipelineVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationPipelineVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.app; +package cn.orionsec.ops.entity.vo.app; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationProfileFastVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationProfileFastVO.java similarity index 96% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationProfileFastVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationProfileFastVO.java index 6646f13e..ca3c9544 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationProfileFastVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationProfileFastVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.app; +package cn.orionsec.ops.entity.vo.app; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationProfileVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationProfileVO.java similarity index 90% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationProfileVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationProfileVO.java index 812e8446..97467335 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationProfileVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationProfileVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.app; +package cn.orionsec.ops.entity.vo.app; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -44,8 +44,8 @@ public class ApplicationProfileVO { private String description; /** - * @see com.orion.ops.constant.Const#ENABLE - * @see com.orion.ops.constant.Const#DISABLE + * @see cn.orionsec.ops.constant.Const#ENABLE + * @see cn.orionsec.ops.constant.Const#DISABLE */ @ApiModelProperty(value = "发布是否需要审核 1需要 2无需") private Integer releaseAudit; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationReleaseDetailVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationReleaseDetailVO.java similarity index 92% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationReleaseDetailVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationReleaseDetailVO.java index 30ded4ef..9fc82433 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationReleaseDetailVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationReleaseDetailVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.app; +package cn.orionsec.ops.entity.vo.app; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -68,31 +68,31 @@ public class ApplicationReleaseDetailVO { private String profileTag; /** - * @see com.orion.ops.constant.app.ReleaseType + * @see cn.orionsec.ops.constant.app.ReleaseType */ @ApiModelProperty(value = "发布类型 10正常发布 20回滚发布") private Integer type; /** - * @see com.orion.ops.constant.app.ReleaseStatus + * @see cn.orionsec.ops.constant.app.ReleaseStatus */ @ApiModelProperty(value = "发布状态 10待审核 20审核驳回 30待发布 35待调度 40发布中 50发布完成 60发布停止 70发布失败") private Integer status; /** - * @see com.orion.ops.constant.common.SerialType + * @see cn.orionsec.ops.constant.common.SerialType */ @ApiModelProperty(value = "发布序列 10串行 20并行") private Integer serializer; /** - * @see com.orion.ops.constant.common.ExceptionHandlerType + * @see cn.orionsec.ops.constant.common.ExceptionHandlerType */ @ApiModelProperty(value = "异常处理 10跳过所有 20跳过错误") private Integer exceptionHandler; /** - * @see com.orion.ops.constant.app.TimedType + * @see cn.orionsec.ops.constant.app.TimedType */ @ApiModelProperty(value = "是否是定时发布 10普通发布 20定时发布") private Integer timedRelease; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationReleaseListVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationReleaseListVO.java similarity index 90% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationReleaseListVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationReleaseListVO.java index 97b66d94..9bb084a6 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationReleaseListVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationReleaseListVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.app; +package cn.orionsec.ops.entity.vo.app; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -59,31 +59,31 @@ public class ApplicationReleaseListVO { private String appTag; /** - * @see com.orion.ops.constant.app.ReleaseType + * @see cn.orionsec.ops.constant.app.ReleaseType */ @ApiModelProperty(value = "发布类型 10正常发布 20回滚发布") private Integer type; /** - * @see com.orion.ops.constant.app.ReleaseStatus + * @see cn.orionsec.ops.constant.app.ReleaseStatus */ @ApiModelProperty(value = "发布状态 10待审核 20审核驳回 30待发布 35待调度 40发布中 50发布完成 60发布停止 70发布失败") private Integer status; /** - * @see com.orion.ops.constant.common.SerialType + * @see cn.orionsec.ops.constant.common.SerialType */ @ApiModelProperty(value = "发布序列 10串行 20并行") private Integer serializer; /** - * @see com.orion.ops.constant.common.ExceptionHandlerType + * @see cn.orionsec.ops.constant.common.ExceptionHandlerType */ @ApiModelProperty(value = "异常处理 10跳过所有 20跳过错误") private Integer exceptionHandler; /** - * @see com.orion.ops.constant.app.TimedType + * @see cn.orionsec.ops.constant.app.TimedType */ @ApiModelProperty(value = "是否是定时发布 10普通发布 20定时发布") private Integer timedRelease; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationReleaseMachineStatusVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationReleaseMachineStatusVO.java similarity index 95% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationReleaseMachineStatusVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationReleaseMachineStatusVO.java index bec53b11..48e80d76 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationReleaseMachineStatusVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationReleaseMachineStatusVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.app; +package cn.orionsec.ops.entity.vo.app; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -38,7 +38,7 @@ public class ApplicationReleaseMachineStatusVO { private Long id; /** - * @see com.orion.ops.constant.app.ActionStatus + * @see cn.orionsec.ops.constant.app.ActionStatus */ @ApiModelProperty(value = "状态") private Integer status; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationReleaseMachineVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationReleaseMachineVO.java similarity index 96% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationReleaseMachineVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationReleaseMachineVO.java index 17c5b8f2..5fb97933 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationReleaseMachineVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationReleaseMachineVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.app; +package cn.orionsec.ops.entity.vo.app; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -53,7 +53,7 @@ public class ApplicationReleaseMachineVO { private String machineHost; /** - * @see com.orion.ops.constant.app.ActionType + * @see cn.orionsec.ops.constant.app.ActionType */ @ApiModelProperty(value = "状态 10未开始 20进行中 30已完成 40执行失败 50已跳过 60已取消") private Integer status; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationReleaseStatisticsChartVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationReleaseStatisticsChartVO.java similarity index 97% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationReleaseStatisticsChartVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationReleaseStatisticsChartVO.java index 0dbe90c9..5ecbb6af 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationReleaseStatisticsChartVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationReleaseStatisticsChartVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.app; +package cn.orionsec.ops.entity.vo.app; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationReleaseStatisticsMachineVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationReleaseStatisticsMachineVO.java similarity index 94% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationReleaseStatisticsMachineVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationReleaseStatisticsMachineVO.java index bb596316..06b7d9b1 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationReleaseStatisticsMachineVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationReleaseStatisticsMachineVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.app; +package cn.orionsec.ops.entity.vo.app; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -43,7 +43,7 @@ public class ApplicationReleaseStatisticsMachineVO { private String machineName; /** - * @see com.orion.ops.constant.app.ActionStatus + * @see cn.orionsec.ops.constant.app.ActionStatus */ @ApiModelProperty(value = "状态 10未开始 20进行中 30已完成 40执行失败 50已跳过 60已取消") private Integer status; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationReleaseStatisticsMetricsVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationReleaseStatisticsMetricsVO.java similarity index 97% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationReleaseStatisticsMetricsVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationReleaseStatisticsMetricsVO.java index b7cf0a1b..0cadca9a 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationReleaseStatisticsMetricsVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationReleaseStatisticsMetricsVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.app; +package cn.orionsec.ops.entity.vo.app; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationReleaseStatisticsMetricsWrapperVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationReleaseStatisticsMetricsWrapperVO.java similarity index 96% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationReleaseStatisticsMetricsWrapperVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationReleaseStatisticsMetricsWrapperVO.java index 1d6f237d..1db101ca 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationReleaseStatisticsMetricsWrapperVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationReleaseStatisticsMetricsWrapperVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.app; +package cn.orionsec.ops.entity.vo.app; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationReleaseStatisticsRecordVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationReleaseStatisticsRecordVO.java similarity index 94% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationReleaseStatisticsRecordVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationReleaseStatisticsRecordVO.java index 1cdf805c..a0f6d7a4 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationReleaseStatisticsRecordVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationReleaseStatisticsRecordVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.app; +package cn.orionsec.ops.entity.vo.app; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -44,7 +44,7 @@ public class ApplicationReleaseStatisticsRecordVO { private Date releaseDate; /** - * @see com.orion.ops.constant.app.ReleaseStatus + * @see cn.orionsec.ops.constant.app.ReleaseStatus */ @ApiModelProperty(value = "发布状态 10待审核 20审核驳回 30待发布 35待调度 40发布中 50发布完成 60发布停止 70发布失败") private Integer status; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationReleaseStatisticsViewVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationReleaseStatisticsViewVO.java similarity index 97% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationReleaseStatisticsViewVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationReleaseStatisticsViewVO.java index 597c7a06..3ad50b7c 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationReleaseStatisticsViewVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationReleaseStatisticsViewVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.app; +package cn.orionsec.ops.entity.vo.app; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationReleaseStatusVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationReleaseStatusVO.java similarity index 94% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationReleaseStatusVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationReleaseStatusVO.java index c2185f7d..6df9bf27 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationReleaseStatusVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationReleaseStatusVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.app; +package cn.orionsec.ops.entity.vo.app; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -38,7 +38,7 @@ public class ApplicationReleaseStatusVO { private Long id; /** - * @see com.orion.ops.constant.app.ReleaseStatus + * @see cn.orionsec.ops.constant.app.ReleaseStatus */ @ApiModelProperty(value = "状态") private Integer status; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationRepositoryBranchVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationRepositoryBranchVO.java similarity index 92% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationRepositoryBranchVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationRepositoryBranchVO.java index 7fde72d4..511e53be 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationRepositoryBranchVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationRepositoryBranchVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.app; +package cn.orionsec.ops.entity.vo.app; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -35,7 +35,7 @@ public class ApplicationRepositoryBranchVO { private String name; /** - * @see com.orion.ops.constant.Const#IS_DEFAULT + * @see cn.orionsec.ops.constant.Const#IS_DEFAULT */ @ApiModelProperty(value = "是否为默认") private Integer isDefault; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationRepositoryCommitVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationRepositoryCommitVO.java similarity index 97% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationRepositoryCommitVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationRepositoryCommitVO.java index 7f7f48a3..a4c73003 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationRepositoryCommitVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationRepositoryCommitVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.app; +package cn.orionsec.ops.entity.vo.app; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationRepositoryInfoVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationRepositoryInfoVO.java similarity index 96% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationRepositoryInfoVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationRepositoryInfoVO.java index c95796be..24a068e8 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationRepositoryInfoVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationRepositoryInfoVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.app; +package cn.orionsec.ops.entity.vo.app; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationRepositoryVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationRepositoryVO.java similarity index 87% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationRepositoryVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationRepositoryVO.java index f7d271a5..c206a8ac 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/app/ApplicationRepositoryVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/app/ApplicationRepositoryVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.app; +package cn.orionsec.ops.entity.vo.app; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -43,7 +43,7 @@ public class ApplicationRepositoryVO { private String description; /** - * @see com.orion.ops.constant.app.RepositoryType + * @see cn.orionsec.ops.constant.app.RepositoryType */ @ApiModelProperty(value = "类型 1git") private Integer type; @@ -55,19 +55,19 @@ public class ApplicationRepositoryVO { private String username; /** - * @see com.orion.ops.constant.app.RepositoryStatus + * @see cn.orionsec.ops.constant.app.RepositoryStatus */ @ApiModelProperty(value = "状态 10未初始化 20初始化中 30正常 40失败") private Integer status; /** - * @see com.orion.ops.constant.app.RepositoryAuthType + * @see cn.orionsec.ops.constant.app.RepositoryAuthType */ @ApiModelProperty(value = "认证类型 10密码 20令牌") private Integer authType; /** - * @see com.orion.ops.constant.app.RepositoryTokenType + * @see cn.orionsec.ops.constant.app.RepositoryTokenType */ @ApiModelProperty(value = "令牌类型 10github 20gitee 30gitlab") private Integer tokenType; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/data/DataImportCheckRowVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/data/DataImportCheckRowVO.java similarity index 97% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/data/DataImportCheckRowVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/data/DataImportCheckRowVO.java index b3003bce..fb3ce70a 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/data/DataImportCheckRowVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/data/DataImportCheckRowVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.data; +package cn.orionsec.ops.entity.vo.data; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/data/DataImportCheckVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/data/DataImportCheckVO.java similarity index 97% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/data/DataImportCheckVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/data/DataImportCheckVO.java index ae692097..079dd6d1 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/data/DataImportCheckVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/data/DataImportCheckVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.data; +package cn.orionsec.ops.entity.vo.data; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/exec/CommandExecStatusVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/exec/CommandExecStatusVO.java similarity index 97% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/exec/CommandExecStatusVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/exec/CommandExecStatusVO.java index 8a43f67a..45625497 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/exec/CommandExecStatusVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/exec/CommandExecStatusVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.exec; +package cn.orionsec.ops.entity.vo.exec; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/exec/CommandExecVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/exec/CommandExecVO.java similarity index 94% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/exec/CommandExecVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/exec/CommandExecVO.java index 7ad12509..16068daa 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/exec/CommandExecVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/exec/CommandExecVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.exec; +package cn.orionsec.ops.entity.vo.exec; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -43,13 +43,13 @@ public class CommandExecVO { private String username; /** - * @see com.orion.ops.constant.command.ExecType + * @see cn.orionsec.ops.constant.command.ExecType */ @ApiModelProperty(value = "类型") private Integer type; /** - * @see com.orion.ops.constant.command.ExecStatus + * @see cn.orionsec.ops.constant.command.ExecStatus */ @ApiModelProperty(value = "状态") private Integer status; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/exec/CommandTaskSubmitVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/exec/CommandTaskSubmitVO.java similarity index 96% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/exec/CommandTaskSubmitVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/exec/CommandTaskSubmitVO.java index 046ca656..a4ea0c5d 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/exec/CommandTaskSubmitVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/exec/CommandTaskSubmitVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.exec; +package cn.orionsec.ops.entity.vo.exec; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/history/HistoryValueVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/history/HistoryValueVO.java similarity index 94% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/history/HistoryValueVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/history/HistoryValueVO.java index 20c2f9f2..9a474437 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/history/HistoryValueVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/history/HistoryValueVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.history; +package cn.orionsec.ops.entity.vo.history; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -37,7 +37,7 @@ public class HistoryValueVO { private Long id; /** - * @see com.orion.ops.constant.history.HistoryOperator + * @see cn.orionsec.ops.constant.history.HistoryOperator */ @ApiModelProperty(value = "操作类型 1新增 2修改 3删除") private Integer type; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/home/HomeStatisticsCountVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/home/HomeStatisticsCountVO.java similarity index 96% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/home/HomeStatisticsCountVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/home/HomeStatisticsCountVO.java index 1fbbc356..8ba9c5ec 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/home/HomeStatisticsCountVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/home/HomeStatisticsCountVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.home; +package cn.orionsec.ops.entity.vo.home; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/home/HomeStatisticsVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/home/HomeStatisticsVO.java similarity index 96% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/home/HomeStatisticsVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/home/HomeStatisticsVO.java index 252e9c79..cecf0c3b 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/home/HomeStatisticsVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/home/HomeStatisticsVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.home; +package cn.orionsec.ops.entity.vo.home; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/machine/MachineAlarmConfigVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/machine/MachineAlarmConfigVO.java similarity index 92% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/machine/MachineAlarmConfigVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/machine/MachineAlarmConfigVO.java index d42fe7cf..673c58cc 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/machine/MachineAlarmConfigVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/machine/MachineAlarmConfigVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.machine; +package cn.orionsec.ops.entity.vo.machine; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -32,7 +32,7 @@ import lombok.Data; public class MachineAlarmConfigVO { /** - * @see com.orion.ops.constant.machine.MachineAlarmType + * @see cn.orionsec.ops.constant.machine.MachineAlarmType */ @ApiModelProperty(value = "报警类型 10: cpu使用率 20: 内存使用率") private Integer type; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/machine/MachineAlarmConfigWrapperVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/machine/MachineAlarmConfigWrapperVO.java similarity index 96% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/machine/MachineAlarmConfigWrapperVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/machine/MachineAlarmConfigWrapperVO.java index c56ae065..994a1162 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/machine/MachineAlarmConfigWrapperVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/machine/MachineAlarmConfigWrapperVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.machine; +package cn.orionsec.ops.entity.vo.machine; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/machine/MachineAlarmHistoryVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/machine/MachineAlarmHistoryVO.java similarity index 93% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/machine/MachineAlarmHistoryVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/machine/MachineAlarmHistoryVO.java index 134a1220..60128347 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/machine/MachineAlarmHistoryVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/machine/MachineAlarmHistoryVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.machine; +package cn.orionsec.ops.entity.vo.machine; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -37,7 +37,7 @@ public class MachineAlarmHistoryVO { private Long id; /** - * @see com.orion.ops.constant.machine.MachineAlarmType + * @see cn.orionsec.ops.constant.machine.MachineAlarmType */ @ApiModelProperty(value = "报警类型 10: cpu使用率 20: 内存使用率") private Integer type; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/machine/MachineEnvVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/machine/MachineEnvVO.java similarity index 90% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/machine/MachineEnvVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/machine/MachineEnvVO.java index 80789b29..4b8edea2 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/machine/MachineEnvVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/machine/MachineEnvVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.machine; +package cn.orionsec.ops.entity.vo.machine; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -55,8 +55,8 @@ public class MachineEnvVO { private Date updateTime; /** - * @see com.orion.ops.constant.Const#FORBID_DELETE_CAN - * @see com.orion.ops.constant.Const#FORBID_DELETE_NOT + * @see cn.orionsec.ops.constant.Const#FORBID_DELETE_CAN + * @see cn.orionsec.ops.constant.Const#FORBID_DELETE_NOT */ @ApiModelProperty(value = "是否禁止删除 1可以删除 2禁止删除") private Integer forbidDelete; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/machine/MachineGroupTreeVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/machine/MachineGroupTreeVO.java similarity index 97% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/machine/MachineGroupTreeVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/machine/MachineGroupTreeVO.java index b8e773a3..05b499ee 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/machine/MachineGroupTreeVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/machine/MachineGroupTreeVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.machine; +package cn.orionsec.ops.entity.vo.machine; import com.alibaba.fastjson.annotation.JSONField; import io.swagger.annotations.ApiModel; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/machine/MachineInfoVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/machine/MachineInfoVO.java similarity index 92% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/machine/MachineInfoVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/machine/MachineInfoVO.java index 390527ac..16af70c6 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/machine/MachineInfoVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/machine/MachineInfoVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.machine; +package cn.orionsec.ops.entity.vo.machine; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -74,14 +74,14 @@ public class MachineInfoVO { private String username; /** - * @see com.orion.ops.constant.machine.MachineAuthType + * @see cn.orionsec.ops.constant.machine.MachineAuthType */ @ApiModelProperty(value = "机器认证方式 1: 密码认证 2: 独立密钥") private Integer authType; /** - * @see com.orion.ops.constant.Const#ENABLE - * @see com.orion.ops.constant.Const#DISABLE + * @see cn.orionsec.ops.constant.Const#ENABLE + * @see cn.orionsec.ops.constant.Const#DISABLE */ @ApiModelProperty(value = "机器状态 1有效 2无效") private Integer status; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/machine/MachineMonitorVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/machine/MachineMonitorVO.java similarity index 94% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/machine/MachineMonitorVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/machine/MachineMonitorVO.java index 45ca4687..ab927c21 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/machine/MachineMonitorVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/machine/MachineMonitorVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.machine; +package cn.orionsec.ops.entity.vo.machine; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -44,7 +44,7 @@ public class MachineMonitorVO { private String machineHost; /** - * @see com.orion.ops.constant.monitor.MonitorStatus + * @see cn.orionsec.ops.constant.monitor.MonitorStatus */ @ApiModelProperty(value = "监控状态 1未安装 2安装中 3未运行 4运行中") private Integer status; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/machine/MachineProxyVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/machine/MachineProxyVO.java similarity index 97% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/machine/MachineProxyVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/machine/MachineProxyVO.java index 9ad7032b..864eef64 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/machine/MachineProxyVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/machine/MachineProxyVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.machine; +package cn.orionsec.ops.entity.vo.machine; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/machine/MachineSecretKeyVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/machine/MachineSecretKeyVO.java similarity index 96% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/machine/MachineSecretKeyVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/machine/MachineSecretKeyVO.java index 243c75c6..e4736c90 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/machine/MachineSecretKeyVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/machine/MachineSecretKeyVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.machine; +package cn.orionsec.ops.entity.vo.machine; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/machine/MachineTerminalLogVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/machine/MachineTerminalLogVO.java similarity index 95% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/machine/MachineTerminalLogVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/machine/MachineTerminalLogVO.java index 9c6f4486..b763b386 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/machine/MachineTerminalLogVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/machine/MachineTerminalLogVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.machine; +package cn.orionsec.ops.entity.vo.machine; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -70,7 +70,7 @@ public class MachineTerminalLogVO { private String disconnectedTimeAgo; /** - * @see com.orion.ops.constant.ws.WsCloseCode + * @see cn.orionsec.ops.constant.ws.WsCloseCode */ @ApiModelProperty(value = "close code") private Integer closeCode; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/machine/MachineTerminalManagerVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/machine/MachineTerminalManagerVO.java similarity index 97% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/machine/MachineTerminalManagerVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/machine/MachineTerminalManagerVO.java index a50713e8..b619cb81 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/machine/MachineTerminalManagerVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/machine/MachineTerminalManagerVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.machine; +package cn.orionsec.ops.entity.vo.machine; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/machine/MachineTerminalVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/machine/MachineTerminalVO.java similarity index 81% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/machine/MachineTerminalVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/machine/MachineTerminalVO.java index 0c4d71e3..4f370f68 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/machine/MachineTerminalVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/machine/MachineTerminalVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.machine; +package cn.orionsec.ops.entity.vo.machine; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -46,32 +46,32 @@ public class MachineTerminalVO { private String terminalType; /** - * @see com.orion.ops.constant.terminal.TerminalConst#BACKGROUND_COLOR + * @see cn.orionsec.ops.constant.terminal.TerminalConst#BACKGROUND_COLOR */ @ApiModelProperty(value = "背景色") private String backgroundColor; /** - * @see com.orion.ops.constant.terminal.TerminalConst#FONT_COLOR + * @see cn.orionsec.ops.constant.terminal.TerminalConst#FONT_COLOR */ @ApiModelProperty(value = "字体颜色") private String fontColor; /** - * @see com.orion.ops.constant.terminal.TerminalConst#FONT_SIZE + * @see cn.orionsec.ops.constant.terminal.TerminalConst#FONT_SIZE */ @ApiModelProperty(value = "字体大小") private Integer fontSize; /** - * @see com.orion.ops.constant.terminal.TerminalConst#FONT_FAMILY + * @see cn.orionsec.ops.constant.terminal.TerminalConst#FONT_FAMILY */ @ApiModelProperty(value = "字体名称") private String fontFamily; /** - * @see com.orion.ops.constant.Const#ENABLE - * @see com.orion.ops.constant.Const#DISABLE + * @see cn.orionsec.ops.constant.Const#ENABLE + * @see cn.orionsec.ops.constant.Const#DISABLE */ @ApiModelProperty(value = "是否开启url link 1开启 2关闭") private Integer enableWebLink; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/machine/TerminalAccessVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/machine/TerminalAccessVO.java similarity index 93% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/machine/TerminalAccessVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/machine/TerminalAccessVO.java index c1b242e9..874e12e8 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/machine/TerminalAccessVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/machine/TerminalAccessVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.machine; +package cn.orionsec.ops.entity.vo.machine; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -71,8 +71,8 @@ public class TerminalAccessVO { private String accessToken; /** - * @see com.orion.ops.constant.Const#ENABLE - * @see com.orion.ops.constant.Const#DISABLE + * @see cn.orionsec.ops.constant.Const#ENABLE + * @see cn.orionsec.ops.constant.Const#DISABLE */ @ApiModelProperty(value = "是否开启url link 1开启 2关闭") private Integer enableWebLink; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/machine/TerminalWatcherVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/machine/TerminalWatcherVO.java similarity index 93% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/machine/TerminalWatcherVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/machine/TerminalWatcherVO.java index 630e4f62..99571be2 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/machine/TerminalWatcherVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/machine/TerminalWatcherVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.machine; +package cn.orionsec.ops.entity.vo.machine; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -41,7 +41,7 @@ public class TerminalWatcherVO { private String token; /** - * @see com.orion.ops.constant.Const#ENABLE + * @see cn.orionsec.ops.constant.Const#ENABLE */ @ApiModelProperty(value = "是否只读") private Integer readonly; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/message/WebSideMessagePollVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/message/WebSideMessagePollVO.java similarity index 96% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/message/WebSideMessagePollVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/message/WebSideMessagePollVO.java index 68b7f022..90ad3bca 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/message/WebSideMessagePollVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/message/WebSideMessagePollVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.message; +package cn.orionsec.ops.entity.vo.message; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/message/WebSideMessageVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/message/WebSideMessageVO.java similarity index 89% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/message/WebSideMessageVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/message/WebSideMessageVO.java index c8baa9b7..1ab63fcd 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/message/WebSideMessageVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/message/WebSideMessageVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.message; +package cn.orionsec.ops.entity.vo.message; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -37,19 +37,19 @@ public class WebSideMessageVO { private Long id; /** - * @see com.orion.ops.constant.message.MessageClassify + * @see cn.orionsec.ops.constant.message.MessageClassify */ @ApiModelProperty(value = "消息分类") private Integer classify; /** - * @see com.orion.ops.constant.message.MessageType + * @see cn.orionsec.ops.constant.message.MessageType */ @ApiModelProperty(value = "消息类型") private Integer type; /** - * @see com.orion.ops.constant.message.ReadStatus + * @see cn.orionsec.ops.constant.message.ReadStatus */ @ApiModelProperty(value = "是否已读 1未读 2已读") private Integer status; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/scheduler/CronNextVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/scheduler/CronNextVO.java similarity index 96% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/scheduler/CronNextVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/scheduler/CronNextVO.java index 195fee2d..317bb426 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/scheduler/CronNextVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/scheduler/CronNextVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.scheduler; +package cn.orionsec.ops.entity.vo.scheduler; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/scheduler/SchedulerTaskMachineRecordStatisticsVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/scheduler/SchedulerTaskMachineRecordStatisticsVO.java similarity index 97% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/scheduler/SchedulerTaskMachineRecordStatisticsVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/scheduler/SchedulerTaskMachineRecordStatisticsVO.java index 622daaa4..03d6ecd9 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/scheduler/SchedulerTaskMachineRecordStatisticsVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/scheduler/SchedulerTaskMachineRecordStatisticsVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.scheduler; +package cn.orionsec.ops.entity.vo.scheduler; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/scheduler/SchedulerTaskMachineRecordStatusVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/scheduler/SchedulerTaskMachineRecordStatusVO.java similarity index 93% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/scheduler/SchedulerTaskMachineRecordStatusVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/scheduler/SchedulerTaskMachineRecordStatusVO.java index b4af9ce9..6e4e0aa3 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/scheduler/SchedulerTaskMachineRecordStatusVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/scheduler/SchedulerTaskMachineRecordStatusVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.scheduler; +package cn.orionsec.ops.entity.vo.scheduler; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -40,7 +40,7 @@ public class SchedulerTaskMachineRecordStatusVO { private Long recordId; /** - * @see com.orion.ops.constant.scheduler.SchedulerTaskMachineStatus + * @see cn.orionsec.ops.constant.scheduler.SchedulerTaskMachineStatus */ @ApiModelProperty(value = "执行状态") private Integer status; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/scheduler/SchedulerTaskMachineRecordVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/scheduler/SchedulerTaskMachineRecordVO.java similarity index 94% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/scheduler/SchedulerTaskMachineRecordVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/scheduler/SchedulerTaskMachineRecordVO.java index cabbb7bb..3589bec7 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/scheduler/SchedulerTaskMachineRecordVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/scheduler/SchedulerTaskMachineRecordVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.scheduler; +package cn.orionsec.ops.entity.vo.scheduler; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -55,7 +55,7 @@ public class SchedulerTaskMachineRecordVO { private String command; /** - * @see com.orion.ops.constant.scheduler.SchedulerTaskMachineStatus + * @see cn.orionsec.ops.constant.scheduler.SchedulerTaskMachineStatus */ @ApiModelProperty(value = "执行状态 10待调度 20调度中 30调度成功 40调度失败 50已跳过 60已停止") private Integer status; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/scheduler/SchedulerTaskRecordStatisticsChartVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/scheduler/SchedulerTaskRecordStatisticsChartVO.java similarity index 96% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/scheduler/SchedulerTaskRecordStatisticsChartVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/scheduler/SchedulerTaskRecordStatisticsChartVO.java index 9c2fd3dc..25e0bea4 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/scheduler/SchedulerTaskRecordStatisticsChartVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/scheduler/SchedulerTaskRecordStatisticsChartVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.scheduler; +package cn.orionsec.ops.entity.vo.scheduler; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/scheduler/SchedulerTaskRecordStatisticsVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/scheduler/SchedulerTaskRecordStatisticsVO.java similarity index 97% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/scheduler/SchedulerTaskRecordStatisticsVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/scheduler/SchedulerTaskRecordStatisticsVO.java index c0829c1a..07251c8a 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/scheduler/SchedulerTaskRecordStatisticsVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/scheduler/SchedulerTaskRecordStatisticsVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.scheduler; +package cn.orionsec.ops.entity.vo.scheduler; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/scheduler/SchedulerTaskRecordStatusVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/scheduler/SchedulerTaskRecordStatusVO.java similarity index 94% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/scheduler/SchedulerTaskRecordStatusVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/scheduler/SchedulerTaskRecordStatusVO.java index a9343255..da0473d2 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/scheduler/SchedulerTaskRecordStatusVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/scheduler/SchedulerTaskRecordStatusVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.scheduler; +package cn.orionsec.ops.entity.vo.scheduler; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -38,7 +38,7 @@ public class SchedulerTaskRecordStatusVO { private Long id; /** - * @see com.orion.ops.constant.scheduler.SchedulerTaskStatus + * @see cn.orionsec.ops.constant.scheduler.SchedulerTaskStatus */ @ApiModelProperty(value = "调度状态") private Integer status; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/scheduler/SchedulerTaskRecordVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/scheduler/SchedulerTaskRecordVO.java similarity index 94% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/scheduler/SchedulerTaskRecordVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/scheduler/SchedulerTaskRecordVO.java index 8d5c4568..7e7dad94 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/scheduler/SchedulerTaskRecordVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/scheduler/SchedulerTaskRecordVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.scheduler; +package cn.orionsec.ops.entity.vo.scheduler; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -44,7 +44,7 @@ public class SchedulerTaskRecordVO { private String taskName; /** - * @see com.orion.ops.constant.scheduler.SchedulerTaskStatus + * @see cn.orionsec.ops.constant.scheduler.SchedulerTaskStatus */ @ApiModelProperty(value = "任务状态 10待调度 20调度中 30调度成功 40调度失败 50已停止") private Integer status; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/scheduler/SchedulerTaskVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/scheduler/SchedulerTaskVO.java similarity index 87% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/scheduler/SchedulerTaskVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/scheduler/SchedulerTaskVO.java index 887117b5..6a9cd2e6 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/scheduler/SchedulerTaskVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/scheduler/SchedulerTaskVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.scheduler; +package cn.orionsec.ops.entity.vo.scheduler; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -50,26 +50,26 @@ public class SchedulerTaskVO { private String expression; /** - * @see com.orion.ops.constant.Const#ENABLE - * @see com.orion.ops.constant.Const#DISABLE + * @see cn.orionsec.ops.constant.Const#ENABLE + * @see cn.orionsec.ops.constant.Const#DISABLE */ @ApiModelProperty(value = "启用状态 1启用 2停用") private Integer enableStatus; /** - * @see com.orion.ops.constant.scheduler.SchedulerTaskStatus + * @see cn.orionsec.ops.constant.scheduler.SchedulerTaskStatus */ @ApiModelProperty(value = "最近状态 10待调度 20调度中 30调度成功 40调度失败 50已停止") private Integer latelyStatus; /** - * @see com.orion.ops.constant.common.SerialType + * @see cn.orionsec.ops.constant.common.SerialType */ @ApiModelProperty(value = "调度序列 10串行 20并行") private Integer serializeType; /** - * @see com.orion.ops.constant.common.ExceptionHandlerType + * @see cn.orionsec.ops.constant.common.ExceptionHandlerType */ @ApiModelProperty(value = "异常处理 10跳过所有 20跳过错误") private Integer exceptionHandler; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/sftp/FileDetailVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/sftp/FileDetailVO.java similarity index 97% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/sftp/FileDetailVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/sftp/FileDetailVO.java index 56f8f780..e9f6dc46 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/sftp/FileDetailVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/sftp/FileDetailVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.sftp; +package cn.orionsec.ops.entity.vo.sftp; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/sftp/FileListVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/sftp/FileListVO.java similarity index 96% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/sftp/FileListVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/sftp/FileListVO.java index 0b71589c..11abdec1 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/sftp/FileListVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/sftp/FileListVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.sftp; +package cn.orionsec.ops.entity.vo.sftp; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/sftp/FileOpenVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/sftp/FileOpenVO.java similarity index 96% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/sftp/FileOpenVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/sftp/FileOpenVO.java index f8b6a90a..36ea58f5 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/sftp/FileOpenVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/sftp/FileOpenVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.sftp; +package cn.orionsec.ops.entity.vo.sftp; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/sftp/FileTransferLogVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/sftp/FileTransferLogVO.java similarity index 91% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/sftp/FileTransferLogVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/sftp/FileTransferLogVO.java index 67b0ebac..383ae881 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/sftp/FileTransferLogVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/sftp/FileTransferLogVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.sftp; +package cn.orionsec.ops.entity.vo.sftp; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -41,7 +41,7 @@ public class FileTransferLogVO { private String fileToken; /** - * @see com.orion.ops.constant.sftp.SftpTransferType + * @see cn.orionsec.ops.constant.sftp.SftpTransferType */ @ApiModelProperty(value = "传输类型 10上传 20下载 30传输") private Integer type; @@ -59,7 +59,7 @@ public class FileTransferLogVO { private Double progress; /** - * @see com.orion.ops.constant.sftp.SftpTransferStatus + * @see cn.orionsec.ops.constant.sftp.SftpTransferStatus */ @ApiModelProperty(value = "传输状态 10未开始 20进行中 30已暂停 40已完成 50已取消 60传输异常") private Integer status; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/system/IpListConfigVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/system/IpListConfigVO.java similarity index 97% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/system/IpListConfigVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/system/IpListConfigVO.java index 818b95da..eda24f03 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/system/IpListConfigVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/system/IpListConfigVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.system; +package cn.orionsec.ops.entity.vo.system; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/system/SystemAboutVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/system/SystemAboutVO.java similarity index 96% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/system/SystemAboutVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/system/SystemAboutVO.java index 09eb7681..4e408931 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/system/SystemAboutVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/system/SystemAboutVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.system; +package cn.orionsec.ops.entity.vo.system; import io.swagger.annotations.ApiModel; import lombok.AllArgsConstructor; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/system/SystemAnalysisVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/system/SystemAnalysisVO.java similarity index 98% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/system/SystemAnalysisVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/system/SystemAnalysisVO.java index 1662a509..1c027885 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/system/SystemAnalysisVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/system/SystemAnalysisVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.system; +package cn.orionsec.ops.entity.vo.system; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/system/SystemEnvVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/system/SystemEnvVO.java similarity index 90% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/system/SystemEnvVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/system/SystemEnvVO.java index cfd0d86d..a34c3294 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/system/SystemEnvVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/system/SystemEnvVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.system; +package cn.orionsec.ops.entity.vo.system; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -52,8 +52,8 @@ public class SystemEnvVO { private Date updateTime; /** - * @see com.orion.ops.constant.Const#FORBID_DELETE_CAN - * @see com.orion.ops.constant.Const#FORBID_DELETE_NOT + * @see cn.orionsec.ops.constant.Const#FORBID_DELETE_CAN + * @see cn.orionsec.ops.constant.Const#FORBID_DELETE_NOT */ @ApiModelProperty(value = "是否禁止删除 1可以删除 2禁止删除") private Integer forbidDelete; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/system/SystemOptionVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/system/SystemOptionVO.java similarity index 58% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/system/SystemOptionVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/system/SystemOptionVO.java index 58f32eb5..343bd595 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/system/SystemOptionVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/system/SystemOptionVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.system; +package cn.orionsec.ops.entity.vo.system; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -32,79 +32,79 @@ import lombok.Data; public class SystemOptionVO { /** - * @see com.orion.ops.constant.system.SystemEnvAttr#ENABLE_AUTO_CLEAN_FILE + * @see cn.orionsec.ops.constant.system.SystemEnvAttr#ENABLE_AUTO_CLEAN_FILE */ @ApiModelProperty(value = "是否启用自动清理") private Boolean autoCleanFile; /** - * @see com.orion.ops.constant.system.SystemEnvAttr#FILE_CLEAN_THRESHOLD + * @see cn.orionsec.ops.constant.system.SystemEnvAttr#FILE_CLEAN_THRESHOLD */ @ApiModelProperty(value = "文件清理阈值") private Integer fileCleanThreshold; /** - * @see com.orion.ops.constant.system.SystemEnvAttr#ALLOW_MULTIPLE_LOGIN + * @see cn.orionsec.ops.constant.system.SystemEnvAttr#ALLOW_MULTIPLE_LOGIN */ - @ApiModelProperty(value = "允许多端登陆") + @ApiModelProperty(value = "允许多端登录") private Boolean allowMultipleLogin; /** - * @see com.orion.ops.constant.system.SystemEnvAttr#LOGIN_FAILURE_LOCK + * @see cn.orionsec.ops.constant.system.SystemEnvAttr#LOGIN_FAILURE_LOCK */ - @ApiModelProperty(value = "是否启用登陆失败锁定") + @ApiModelProperty(value = "是否启用登录失败锁定") private Boolean loginFailureLock; /** - * @see com.orion.ops.constant.system.SystemEnvAttr#LOGIN_IP_BIND + * @see cn.orionsec.ops.constant.system.SystemEnvAttr#LOGIN_IP_BIND */ - @ApiModelProperty(value = "是否启用登陆IP绑定") + @ApiModelProperty(value = "是否启用登录IP绑定") private Boolean loginIpBind; /** - * @see com.orion.ops.constant.system.SystemEnvAttr#LOGIN_TOKEN_AUTO_RENEW + * @see cn.orionsec.ops.constant.system.SystemEnvAttr#LOGIN_TOKEN_AUTO_RENEW */ - @ApiModelProperty(value = "是否启用登陆IP绑定") + @ApiModelProperty(value = "是否启用登录IP绑定") private Boolean loginTokenAutoRenew; /** - * @see com.orion.ops.constant.system.SystemEnvAttr#LOGIN_TOKEN_EXPIRE + * @see cn.orionsec.ops.constant.system.SystemEnvAttr#LOGIN_TOKEN_EXPIRE */ - @ApiModelProperty(value = "登陆凭证有效期") + @ApiModelProperty(value = "登录凭证有效期") private Integer loginTokenExpire; /** - * @see com.orion.ops.constant.system.SystemEnvAttr#LOGIN_FAILURE_LOCK_THRESHOLD + * @see cn.orionsec.ops.constant.system.SystemEnvAttr#LOGIN_FAILURE_LOCK_THRESHOLD */ - @ApiModelProperty(value = "登陆失败锁定阈值") + @ApiModelProperty(value = "登录失败锁定阈值") private Integer loginFailureLockThreshold; /** - * @see com.orion.ops.constant.system.SystemEnvAttr#LOGIN_TOKEN_AUTO_RENEW_THRESHOLD + * @see cn.orionsec.ops.constant.system.SystemEnvAttr#LOGIN_TOKEN_AUTO_RENEW_THRESHOLD */ - @ApiModelProperty(value = "登陆自动续签阈值") + @ApiModelProperty(value = "登录自动续签阈值") private Integer loginTokenAutoRenewThreshold; /** - * @see com.orion.ops.constant.system.SystemEnvAttr#RESUME_ENABLE_SCHEDULER_TASK + * @see cn.orionsec.ops.constant.system.SystemEnvAttr#RESUME_ENABLE_SCHEDULER_TASK */ @ApiModelProperty(value = "自动恢复启用的调度任务") private Boolean resumeEnableSchedulerTask; /** - * @see com.orion.ops.constant.system.SystemEnvAttr#TERMINAL_ACTIVE_PUSH_HEARTBEAT + * @see cn.orionsec.ops.constant.system.SystemEnvAttr#TERMINAL_ACTIVE_PUSH_HEARTBEAT */ @ApiModelProperty(value = "终端后台主动推送心跳") private Boolean terminalActivePushHeartbeat; /** - * @see com.orion.ops.constant.system.SystemEnvAttr#SFTP_UPLOAD_THRESHOLD + * @see cn.orionsec.ops.constant.system.SystemEnvAttr#SFTP_UPLOAD_THRESHOLD */ @ApiModelProperty(value = "SFTP 上传文件最大阈值 (MB)") private Integer sftpUploadThreshold; /** - * @see com.orion.ops.constant.system.SystemEnvAttr#STATISTICS_CACHE_EXPIRE + * @see cn.orionsec.ops.constant.system.SystemEnvAttr#STATISTICS_CACHE_EXPIRE */ @ApiModelProperty(value = "统计缓存有效时间 (分)") private Integer statisticsCacheExpire; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/system/ThreadPoolMetricsVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/system/ThreadPoolMetricsVO.java similarity index 92% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/system/ThreadPoolMetricsVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/system/ThreadPoolMetricsVO.java index 875e0a88..d142abd8 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/system/ThreadPoolMetricsVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/system/ThreadPoolMetricsVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.system; +package cn.orionsec.ops.entity.vo.system; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -32,7 +32,7 @@ import lombok.Data; public class ThreadPoolMetricsVO { /** - * @see com.orion.ops.constant.system.ThreadPoolMetricsType + * @see cn.orionsec.ops.constant.system.ThreadPoolMetricsType */ @ApiModelProperty(value = "type") private Integer type; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/tail/FileTailConfigVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/tail/FileTailConfigVO.java similarity index 84% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/tail/FileTailConfigVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/tail/FileTailConfigVO.java index 21a1a8b5..103fc784 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/tail/FileTailConfigVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/tail/FileTailConfigVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.tail; +package cn.orionsec.ops.entity.vo.tail; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -32,19 +32,19 @@ import lombok.Data; public class FileTailConfigVO { /** - * @see com.orion.ops.constant.Const#TAIL_OFFSET_LINE + * @see cn.orionsec.ops.constant.Const#TAIL_OFFSET_LINE */ @ApiModelProperty(value = "偏移量") private Integer offset; /** - * @see com.orion.ops.constant.Const#UTF_8 + * @see cn.orionsec.ops.constant.Const#UTF_8 */ @ApiModelProperty(value = "文件编码") private String charset; /** - * @see com.orion.ops.constant.machine.MachineEnvAttr#TAIL_DEFAULT_COMMAND + * @see cn.orionsec.ops.constant.machine.MachineEnvAttr#TAIL_DEFAULT_COMMAND */ @ApiModelProperty(value = "命令") private String command; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/tail/FileTailVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/tail/FileTailVO.java similarity index 87% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/tail/FileTailVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/tail/FileTailVO.java index 19158c69..a5d47d99 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/tail/FileTailVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/tail/FileTailVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.tail; +package cn.orionsec.ops.entity.vo.tail; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -52,8 +52,8 @@ public class FileTailVO { private String machineHost; /** - * @see com.orion.ops.constant.Const#ENABLE - * @see com.orion.ops.constant.Const#DISABLE + * @see cn.orionsec.ops.constant.Const#ENABLE + * @see cn.orionsec.ops.constant.Const#DISABLE */ @ApiModelProperty(value = "机器状态 1有效 2无效") private Integer machineStatus; @@ -65,13 +65,13 @@ public class FileTailVO { private String fileName; /** - * @see com.orion.ops.constant.Const#TAIL_OFFSET_LINE + * @see cn.orionsec.ops.constant.Const#TAIL_OFFSET_LINE */ @ApiModelProperty(value = "偏移量") private Integer offset; /** - * @see com.orion.ops.constant.Const#UTF_8 + * @see cn.orionsec.ops.constant.Const#UTF_8 */ @ApiModelProperty(value = "编码集") private String charset; @@ -80,7 +80,7 @@ public class FileTailVO { private String command; /** - * @see com.orion.ops.constant.tail.FileTailMode + * @see cn.orionsec.ops.constant.tail.FileTailMode */ @ApiModelProperty(value = "宿主机文件追踪类型 tracker/tail") private String tailMode; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/template/CommandTemplateVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/template/CommandTemplateVO.java similarity index 97% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/template/CommandTemplateVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/template/CommandTemplateVO.java index caeca822..c7e9ba39 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/template/CommandTemplateVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/template/CommandTemplateVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.template; +package cn.orionsec.ops.entity.vo.template; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/upload/BatchUploadCheckFileVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/upload/BatchUploadCheckFileVO.java similarity index 96% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/upload/BatchUploadCheckFileVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/upload/BatchUploadCheckFileVO.java index a5353cc4..b6bb5bf8 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/upload/BatchUploadCheckFileVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/upload/BatchUploadCheckFileVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.upload; +package cn.orionsec.ops.entity.vo.upload; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/upload/BatchUploadCheckMachineVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/upload/BatchUploadCheckMachineVO.java similarity index 96% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/upload/BatchUploadCheckMachineVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/upload/BatchUploadCheckMachineVO.java index ab5996c9..ce2933fe 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/upload/BatchUploadCheckMachineVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/upload/BatchUploadCheckMachineVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.upload; +package cn.orionsec.ops.entity.vo.upload; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/upload/BatchUploadCheckVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/upload/BatchUploadCheckVO.java similarity index 97% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/upload/BatchUploadCheckVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/upload/BatchUploadCheckVO.java index a8e71f6a..409703a0 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/upload/BatchUploadCheckVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/upload/BatchUploadCheckVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.upload; +package cn.orionsec.ops.entity.vo.upload; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/upload/BatchUploadTokenVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/upload/BatchUploadTokenVO.java similarity index 96% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/upload/BatchUploadTokenVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/upload/BatchUploadTokenVO.java index 326cb30b..9868531e 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/upload/BatchUploadTokenVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/upload/BatchUploadTokenVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.upload; +package cn.orionsec.ops.entity.vo.upload; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/user/UserEventLogVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/user/UserEventLogVO.java similarity index 93% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/user/UserEventLogVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/user/UserEventLogVO.java index 0cb61f30..1197ae08 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/user/UserEventLogVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/user/UserEventLogVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.user; +package cn.orionsec.ops.entity.vo.user; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -55,8 +55,8 @@ public class UserEventLogVO { private String params; /** - * @see com.orion.ops.constant.Const#ENABLE - * @see com.orion.ops.constant.Const#DISABLE + * @see cn.orionsec.ops.constant.Const#ENABLE + * @see cn.orionsec.ops.constant.Const#DISABLE */ @ApiModelProperty(value = "是否执行成功 1成功 2失败") private Integer result; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/user/UserInfoVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/user/UserInfoVO.java similarity index 84% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/user/UserInfoVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/user/UserInfoVO.java index 5611cf50..ecef7e61 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/user/UserInfoVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/user/UserInfoVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.user; +package cn.orionsec.ops.entity.vo.user; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -43,21 +43,21 @@ public class UserInfoVO { private String nickname; /** - * @see com.orion.ops.constant.user.RoleType + * @see cn.orionsec.ops.constant.user.RoleType */ @ApiModelProperty(value = "角色类型 10管理员 20开发 30运维") private Integer role; /** - * @see com.orion.ops.constant.Const#ENABLE - * @see com.orion.ops.constant.Const#DISABLE + * @see cn.orionsec.ops.constant.Const#ENABLE + * @see cn.orionsec.ops.constant.Const#DISABLE */ @ApiModelProperty(value = "用户状态 1启用 2停用") private Integer status; /** - * @see com.orion.ops.constant.Const#ENABLE - * @see com.orion.ops.constant.Const#DISABLE + * @see cn.orionsec.ops.constant.Const#ENABLE + * @see cn.orionsec.ops.constant.Const#DISABLE */ @ApiModelProperty(value = "锁定状态 1正常 2锁定") private Integer locked; @@ -68,7 +68,7 @@ public class UserInfoVO { @ApiModelProperty(value = "邮箱") private String email; - @ApiModelProperty(value = "最后一次登陆时间") + @ApiModelProperty(value = "最后一次登录时间") private Date lastLoginTime; @ApiModelProperty(value = "最后登录时间") diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/user/UserLoginVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/user/UserLoginVO.java similarity index 93% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/user/UserLoginVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/user/UserLoginVO.java index 04fdd0a2..d1341fe3 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/user/UserLoginVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/user/UserLoginVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.user; +package cn.orionsec.ops.entity.vo.user; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -44,7 +44,7 @@ public class UserLoginVO { private String nickname; /** - * @see com.orion.ops.constant.user.RoleType + * @see cn.orionsec.ops.constant.user.RoleType */ @ApiModelProperty(value = "角色类型") private Integer roleType; diff --git a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/webhook/WebhookConfigVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/webhook/WebhookConfigVO.java similarity index 92% rename from orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/webhook/WebhookConfigVO.java rename to orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/webhook/WebhookConfigVO.java index a68d0904..958d3f50 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/com/orion/ops/entity/vo/webhook/WebhookConfigVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/webhook/WebhookConfigVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.entity.vo.webhook; +package cn.orionsec.ops.entity.vo.webhook; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -41,7 +41,7 @@ public class WebhookConfigVO { private String url; /** - * @see com.orion.ops.constant.webhook.WebhookType + * @see cn.orionsec.ops.constant.webhook.WebhookType */ @ApiModelProperty(value = "类型 10: 钉钉机器人") private Integer type; diff --git a/orion-ops-api/orion-ops-runner/pom.xml b/orion-ops-api/orion-ops-runner/pom.xml index 6a78159c..ecb40e5b 100644 --- a/orion-ops-api/orion-ops-runner/pom.xml +++ b/orion-ops-api/orion-ops-runner/pom.xml @@ -3,8 +3,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> orion-ops-api - com.orion.ops - 1.2.9 + cn.orionsec.ops + 1.3.0 orion-ops-runner @@ -14,7 +14,7 @@ - com.orion.ops + cn.orionsec.ops orion-ops-service ${project.version} diff --git a/orion-ops-api/orion-ops-runner/src/main/java/com/orion/ops/runner/AppBuildStatusCleanRunner.java b/orion-ops-api/orion-ops-runner/src/main/java/cn/orionsec/ops/runner/AppBuildStatusCleanRunner.java similarity index 87% rename from orion-ops-api/orion-ops-runner/src/main/java/com/orion/ops/runner/AppBuildStatusCleanRunner.java rename to orion-ops-api/orion-ops-runner/src/main/java/cn/orionsec/ops/runner/AppBuildStatusCleanRunner.java index a656be7c..f4b92abe 100644 --- a/orion-ops-api/orion-ops-runner/src/main/java/com/orion/ops/runner/AppBuildStatusCleanRunner.java +++ b/orion-ops-api/orion-ops-runner/src/main/java/cn/orionsec/ops/runner/AppBuildStatusCleanRunner.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.runner; +package cn.orionsec.ops.runner; +import cn.orionsec.ops.constant.app.ActionStatus; +import cn.orionsec.ops.constant.app.BuildStatus; +import cn.orionsec.ops.constant.app.StageType; +import cn.orionsec.ops.dao.ApplicationActionLogDAO; +import cn.orionsec.ops.dao.ApplicationBuildDAO; +import cn.orionsec.ops.entity.domain.ApplicationActionLogDO; +import cn.orionsec.ops.entity.domain.ApplicationBuildDO; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.ops.constant.app.ActionStatus; -import com.orion.ops.constant.app.BuildStatus; -import com.orion.ops.constant.app.StageType; -import com.orion.ops.dao.ApplicationActionLogDAO; -import com.orion.ops.dao.ApplicationBuildDAO; -import com.orion.ops.entity.domain.ApplicationActionLogDO; -import com.orion.ops.entity.domain.ApplicationBuildDO; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.CommandLineRunner; import org.springframework.core.annotation.Order; diff --git a/orion-ops-api/orion-ops-runner/src/main/java/com/orion/ops/runner/AppPipelineTaskRunner.java b/orion-ops-api/orion-ops-runner/src/main/java/cn/orionsec/ops/runner/AppPipelineTaskRunner.java similarity index 89% rename from orion-ops-api/orion-ops-runner/src/main/java/com/orion/ops/runner/AppPipelineTaskRunner.java rename to orion-ops-api/orion-ops-runner/src/main/java/cn/orionsec/ops/runner/AppPipelineTaskRunner.java index 5e843329..3dc8ae5f 100644 --- a/orion-ops-api/orion-ops-runner/src/main/java/com/orion/ops/runner/AppPipelineTaskRunner.java +++ b/orion-ops-api/orion-ops-runner/src/main/java/cn/orionsec/ops/runner/AppPipelineTaskRunner.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.runner; +package cn.orionsec.ops.runner; +import cn.orionsec.ops.constant.app.PipelineDetailStatus; +import cn.orionsec.ops.constant.app.PipelineStatus; +import cn.orionsec.ops.dao.ApplicationPipelineTaskDAO; +import cn.orionsec.ops.dao.ApplicationPipelineTaskDetailDAO; +import cn.orionsec.ops.entity.domain.ApplicationPipelineTaskDO; +import cn.orionsec.ops.entity.domain.ApplicationPipelineTaskDetailDO; +import cn.orionsec.ops.service.api.ApplicationPipelineTaskDetailService; +import cn.orionsec.ops.task.TaskRegister; +import cn.orionsec.ops.task.TaskType; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.ops.constant.app.PipelineDetailStatus; -import com.orion.ops.constant.app.PipelineStatus; -import com.orion.ops.dao.ApplicationPipelineTaskDAO; -import com.orion.ops.dao.ApplicationPipelineTaskDetailDAO; -import com.orion.ops.entity.domain.ApplicationPipelineTaskDO; -import com.orion.ops.entity.domain.ApplicationPipelineTaskDetailDO; -import com.orion.ops.service.api.ApplicationPipelineTaskDetailService; -import com.orion.ops.task.TaskRegister; -import com.orion.ops.task.TaskType; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.CommandLineRunner; import org.springframework.core.annotation.Order; diff --git a/orion-ops-api/orion-ops-runner/src/main/java/com/orion/ops/runner/AppReleaseTimedTaskRestoreRunner.java b/orion-ops-api/orion-ops-runner/src/main/java/cn/orionsec/ops/runner/AppReleaseTimedTaskRestoreRunner.java similarity index 88% rename from orion-ops-api/orion-ops-runner/src/main/java/com/orion/ops/runner/AppReleaseTimedTaskRestoreRunner.java rename to orion-ops-api/orion-ops-runner/src/main/java/cn/orionsec/ops/runner/AppReleaseTimedTaskRestoreRunner.java index 420a2ce7..c754eae6 100644 --- a/orion-ops-api/orion-ops-runner/src/main/java/com/orion/ops/runner/AppReleaseTimedTaskRestoreRunner.java +++ b/orion-ops-api/orion-ops-runner/src/main/java/cn/orionsec/ops/runner/AppReleaseTimedTaskRestoreRunner.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.runner; +package cn.orionsec.ops.runner; +import cn.orionsec.ops.constant.app.ReleaseStatus; +import cn.orionsec.ops.dao.ApplicationReleaseDAO; +import cn.orionsec.ops.entity.domain.ApplicationReleaseDO; +import cn.orionsec.ops.task.TaskRegister; +import cn.orionsec.ops.task.TaskType; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.ops.constant.app.ReleaseStatus; -import com.orion.ops.dao.ApplicationReleaseDAO; -import com.orion.ops.entity.domain.ApplicationReleaseDO; -import com.orion.ops.task.TaskRegister; -import com.orion.ops.task.TaskType; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.CommandLineRunner; import org.springframework.core.annotation.Order; diff --git a/orion-ops-api/orion-ops-runner/src/main/java/com/orion/ops/runner/AppRepositoryStatusCleanRunner.java b/orion-ops-api/orion-ops-runner/src/main/java/cn/orionsec/ops/runner/AppRepositoryStatusCleanRunner.java similarity index 93% rename from orion-ops-api/orion-ops-runner/src/main/java/com/orion/ops/runner/AppRepositoryStatusCleanRunner.java rename to orion-ops-api/orion-ops-runner/src/main/java/cn/orionsec/ops/runner/AppRepositoryStatusCleanRunner.java index 4996a85b..8d36704c 100644 --- a/orion-ops-api/orion-ops-runner/src/main/java/com/orion/ops/runner/AppRepositoryStatusCleanRunner.java +++ b/orion-ops-api/orion-ops-runner/src/main/java/cn/orionsec/ops/runner/AppRepositoryStatusCleanRunner.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.runner; +package cn.orionsec.ops.runner; +import cn.orionsec.ops.constant.app.RepositoryStatus; +import cn.orionsec.ops.dao.ApplicationRepositoryDAO; +import cn.orionsec.ops.entity.domain.ApplicationRepositoryDO; +import cn.orionsec.ops.utils.Utils; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.orion.lang.utils.io.Files1; -import com.orion.ops.constant.app.RepositoryStatus; -import com.orion.ops.dao.ApplicationRepositoryDAO; -import com.orion.ops.entity.domain.ApplicationRepositoryDO; -import com.orion.ops.utils.Utils; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.CommandLineRunner; import org.springframework.core.annotation.Order; diff --git a/orion-ops-api/orion-ops-runner/src/main/java/com/orion/ops/runner/ApplicationStartArgsRunner.java b/orion-ops-api/orion-ops-runner/src/main/java/cn/orionsec/ops/runner/ApplicationStartArgsRunner.java similarity index 92% rename from orion-ops-api/orion-ops-runner/src/main/java/com/orion/ops/runner/ApplicationStartArgsRunner.java rename to orion-ops-api/orion-ops-runner/src/main/java/cn/orionsec/ops/runner/ApplicationStartArgsRunner.java index 46583ef6..39486e72 100644 --- a/orion-ops-api/orion-ops-runner/src/main/java/com/orion/ops/runner/ApplicationStartArgsRunner.java +++ b/orion-ops-api/orion-ops-runner/src/main/java/cn/orionsec/ops/runner/ApplicationStartArgsRunner.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.runner; +package cn.orionsec.ops.runner; -import com.orion.ops.constant.common.EnableType; -import com.orion.ops.constant.system.SystemEnvAttr; -import com.orion.ops.service.api.SystemService; -import com.orion.ops.service.api.UserService; +import cn.orionsec.ops.constant.common.EnableType; +import cn.orionsec.ops.constant.system.SystemEnvAttr; +import cn.orionsec.ops.service.api.SystemService; +import cn.orionsec.ops.service.api.UserService; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.CommandLineRunner; import org.springframework.core.annotation.Order; diff --git a/orion-ops-api/orion-ops-runner/src/main/java/com/orion/ops/runner/CacheKeyCleanRunner.java b/orion-ops-api/orion-ops-runner/src/main/java/cn/orionsec/ops/runner/CacheKeyCleanRunner.java similarity index 95% rename from orion-ops-api/orion-ops-runner/src/main/java/com/orion/ops/runner/CacheKeyCleanRunner.java rename to orion-ops-api/orion-ops-runner/src/main/java/cn/orionsec/ops/runner/CacheKeyCleanRunner.java index 96e867a2..3d65009f 100644 --- a/orion-ops-api/orion-ops-runner/src/main/java/com/orion/ops/runner/CacheKeyCleanRunner.java +++ b/orion-ops-api/orion-ops-runner/src/main/java/cn/orionsec/ops/runner/CacheKeyCleanRunner.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.runner; +package cn.orionsec.ops.runner; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.KeyConst; +import cn.orionsec.ops.utils.RedisUtils; import com.orion.lang.utils.Strings; import com.orion.lang.utils.collect.Lists; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.KeyConst; -import com.orion.ops.utils.RedisUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.CommandLineRunner; import org.springframework.core.annotation.Order; diff --git a/orion-ops-api/orion-ops-runner/src/main/java/com/orion/ops/runner/CommandExecStatusCleanRunner.java b/orion-ops-api/orion-ops-runner/src/main/java/cn/orionsec/ops/runner/CommandExecStatusCleanRunner.java similarity index 91% rename from orion-ops-api/orion-ops-runner/src/main/java/com/orion/ops/runner/CommandExecStatusCleanRunner.java rename to orion-ops-api/orion-ops-runner/src/main/java/cn/orionsec/ops/runner/CommandExecStatusCleanRunner.java index 670a57e0..d0c39537 100644 --- a/orion-ops-api/orion-ops-runner/src/main/java/com/orion/ops/runner/CommandExecStatusCleanRunner.java +++ b/orion-ops-api/orion-ops-runner/src/main/java/cn/orionsec/ops/runner/CommandExecStatusCleanRunner.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.runner; +package cn.orionsec.ops.runner; +import cn.orionsec.ops.constant.command.ExecStatus; +import cn.orionsec.ops.dao.CommandExecDAO; +import cn.orionsec.ops.entity.domain.CommandExecDO; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.ops.constant.command.ExecStatus; -import com.orion.ops.dao.CommandExecDAO; -import com.orion.ops.entity.domain.CommandExecDO; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.CommandLineRunner; import org.springframework.core.annotation.Order; diff --git a/orion-ops-api/orion-ops-runner/src/main/java/com/orion/ops/runner/HostMachineInitializeRunner.java b/orion-ops-api/orion-ops-runner/src/main/java/cn/orionsec/ops/runner/HostMachineInitializeRunner.java similarity index 89% rename from orion-ops-api/orion-ops-runner/src/main/java/com/orion/ops/runner/HostMachineInitializeRunner.java rename to orion-ops-api/orion-ops-runner/src/main/java/cn/orionsec/ops/runner/HostMachineInitializeRunner.java index 2d1c8d4e..82a773c5 100644 --- a/orion-ops-api/orion-ops-runner/src/main/java/com/orion/ops/runner/HostMachineInitializeRunner.java +++ b/orion-ops-api/orion-ops-runner/src/main/java/cn/orionsec/ops/runner/HostMachineInitializeRunner.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.runner; +package cn.orionsec.ops.runner; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.machine.MachineAuthType; +import cn.orionsec.ops.dao.MachineInfoDAO; +import cn.orionsec.ops.entity.domain.MachineInfoDO; +import cn.orionsec.ops.service.api.MachineEnvService; +import cn.orionsec.ops.utils.ValueMix; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.orion.lang.utils.Systems; import com.orion.lang.utils.net.IPs; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.machine.MachineAuthType; -import com.orion.ops.dao.MachineInfoDAO; -import com.orion.ops.entity.domain.MachineInfoDO; -import com.orion.ops.service.api.MachineEnvService; -import com.orion.ops.utils.ValueMix; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.CommandLineRunner; import org.springframework.core.annotation.Order; diff --git a/orion-ops-api/orion-ops-runner/src/main/java/com/orion/ops/runner/LoadIpFilterRunner.java b/orion-ops-api/orion-ops-runner/src/main/java/cn/orionsec/ops/runner/LoadIpFilterRunner.java similarity index 90% rename from orion-ops-api/orion-ops-runner/src/main/java/com/orion/ops/runner/LoadIpFilterRunner.java rename to orion-ops-api/orion-ops-runner/src/main/java/cn/orionsec/ops/runner/LoadIpFilterRunner.java index a4bed3d8..8c1bc921 100644 --- a/orion-ops-api/orion-ops-runner/src/main/java/com/orion/ops/runner/LoadIpFilterRunner.java +++ b/orion-ops-api/orion-ops-runner/src/main/java/cn/orionsec/ops/runner/LoadIpFilterRunner.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.runner; +package cn.orionsec.ops.runner; -import com.orion.ops.constant.common.EnableType; -import com.orion.ops.constant.system.SystemEnvAttr; -import com.orion.ops.interceptor.IpFilterInterceptor; -import com.orion.ops.service.api.SystemEnvService; +import cn.orionsec.ops.constant.common.EnableType; +import cn.orionsec.ops.constant.system.SystemEnvAttr; +import cn.orionsec.ops.interceptor.IpFilterInterceptor; +import cn.orionsec.ops.service.api.SystemEnvService; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.CommandLineRunner; import org.springframework.core.annotation.Order; diff --git a/orion-ops-api/orion-ops-runner/src/main/java/com/orion/ops/runner/MachineMonitorStatusRunner.java b/orion-ops-api/orion-ops-runner/src/main/java/cn/orionsec/ops/runner/MachineMonitorStatusRunner.java similarity index 90% rename from orion-ops-api/orion-ops-runner/src/main/java/com/orion/ops/runner/MachineMonitorStatusRunner.java rename to orion-ops-api/orion-ops-runner/src/main/java/cn/orionsec/ops/runner/MachineMonitorStatusRunner.java index 76ef7d6f..fa0fb6e6 100644 --- a/orion-ops-api/orion-ops-runner/src/main/java/com/orion/ops/runner/MachineMonitorStatusRunner.java +++ b/orion-ops-api/orion-ops-runner/src/main/java/cn/orionsec/ops/runner/MachineMonitorStatusRunner.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.runner; +package cn.orionsec.ops.runner; +import cn.orionsec.ops.constant.monitor.MonitorConst; +import cn.orionsec.ops.constant.monitor.MonitorStatus; +import cn.orionsec.ops.dao.MachineMonitorDAO; +import cn.orionsec.ops.entity.domain.MachineMonitorDO; +import cn.orionsec.ops.entity.dto.MachineMonitorDTO; +import cn.orionsec.ops.entity.query.MachineMonitorQuery; +import cn.orionsec.ops.service.api.MachineMonitorService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.orion.lang.utils.Strings; import com.orion.lang.utils.Threads; -import com.orion.ops.constant.monitor.MonitorConst; -import com.orion.ops.constant.monitor.MonitorStatus; -import com.orion.ops.dao.MachineMonitorDAO; -import com.orion.ops.entity.domain.MachineMonitorDO; -import com.orion.ops.entity.dto.MachineMonitorDTO; -import com.orion.ops.entity.query.MachineMonitorQuery; -import com.orion.ops.service.api.MachineMonitorService; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.CommandLineRunner; import org.springframework.core.annotation.Order; diff --git a/orion-ops-api/orion-ops-runner/src/main/java/com/orion/ops/runner/ReleaseStatusCleanRunner.java b/orion-ops-api/orion-ops-runner/src/main/java/cn/orionsec/ops/runner/ReleaseStatusCleanRunner.java similarity index 88% rename from orion-ops-api/orion-ops-runner/src/main/java/com/orion/ops/runner/ReleaseStatusCleanRunner.java rename to orion-ops-api/orion-ops-runner/src/main/java/cn/orionsec/ops/runner/ReleaseStatusCleanRunner.java index 2291524f..36954992 100644 --- a/orion-ops-api/orion-ops-runner/src/main/java/com/orion/ops/runner/ReleaseStatusCleanRunner.java +++ b/orion-ops-api/orion-ops-runner/src/main/java/cn/orionsec/ops/runner/ReleaseStatusCleanRunner.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.runner; +package cn.orionsec.ops.runner; +import cn.orionsec.ops.constant.app.ActionStatus; +import cn.orionsec.ops.constant.app.ReleaseStatus; +import cn.orionsec.ops.constant.app.StageType; +import cn.orionsec.ops.dao.ApplicationReleaseDAO; +import cn.orionsec.ops.dao.ApplicationReleaseMachineDAO; +import cn.orionsec.ops.entity.domain.ApplicationReleaseDO; +import cn.orionsec.ops.entity.domain.ApplicationReleaseMachineDO; +import cn.orionsec.ops.service.api.ApplicationActionLogService; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.ops.constant.app.ActionStatus; -import com.orion.ops.constant.app.ReleaseStatus; -import com.orion.ops.constant.app.StageType; -import com.orion.ops.dao.ApplicationReleaseDAO; -import com.orion.ops.dao.ApplicationReleaseMachineDAO; -import com.orion.ops.entity.domain.ApplicationReleaseDO; -import com.orion.ops.entity.domain.ApplicationReleaseMachineDO; -import com.orion.ops.service.api.ApplicationActionLogService; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.CommandLineRunner; import org.springframework.core.annotation.Order; diff --git a/orion-ops-api/orion-ops-runner/src/main/java/com/orion/ops/runner/SchedulerTaskRunner.java b/orion-ops-api/orion-ops-runner/src/main/java/cn/orionsec/ops/runner/SchedulerTaskRunner.java similarity index 87% rename from orion-ops-api/orion-ops-runner/src/main/java/com/orion/ops/runner/SchedulerTaskRunner.java rename to orion-ops-api/orion-ops-runner/src/main/java/cn/orionsec/ops/runner/SchedulerTaskRunner.java index f22c9bb9..35f300cc 100644 --- a/orion-ops-api/orion-ops-runner/src/main/java/com/orion/ops/runner/SchedulerTaskRunner.java +++ b/orion-ops-api/orion-ops-runner/src/main/java/cn/orionsec/ops/runner/SchedulerTaskRunner.java @@ -13,23 +13,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.runner; +package cn.orionsec.ops.runner; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.common.EnableType; +import cn.orionsec.ops.constant.scheduler.SchedulerTaskMachineStatus; +import cn.orionsec.ops.constant.scheduler.SchedulerTaskStatus; +import cn.orionsec.ops.constant.system.SystemEnvAttr; +import cn.orionsec.ops.dao.SchedulerTaskDAO; +import cn.orionsec.ops.dao.SchedulerTaskMachineRecordDAO; +import cn.orionsec.ops.dao.SchedulerTaskRecordDAO; +import cn.orionsec.ops.entity.domain.SchedulerTaskDO; +import cn.orionsec.ops.entity.domain.SchedulerTaskMachineRecordDO; +import cn.orionsec.ops.entity.domain.SchedulerTaskRecordDO; +import cn.orionsec.ops.task.TaskRegister; +import cn.orionsec.ops.task.TaskType; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.common.EnableType; -import com.orion.ops.constant.scheduler.SchedulerTaskMachineStatus; -import com.orion.ops.constant.scheduler.SchedulerTaskStatus; -import com.orion.ops.constant.system.SystemEnvAttr; -import com.orion.ops.dao.SchedulerTaskDAO; -import com.orion.ops.dao.SchedulerTaskMachineRecordDAO; -import com.orion.ops.dao.SchedulerTaskRecordDAO; -import com.orion.ops.entity.domain.SchedulerTaskDO; -import com.orion.ops.entity.domain.SchedulerTaskMachineRecordDO; -import com.orion.ops.entity.domain.SchedulerTaskRecordDO; -import com.orion.ops.task.TaskRegister; -import com.orion.ops.task.TaskType; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.CommandLineRunner; import org.springframework.core.annotation.Order; diff --git a/orion-ops-api/orion-ops-runner/src/main/java/com/orion/ops/runner/SftpTransferStatusCleanRunner.java b/orion-ops-api/orion-ops-runner/src/main/java/cn/orionsec/ops/runner/SftpTransferStatusCleanRunner.java similarity index 91% rename from orion-ops-api/orion-ops-runner/src/main/java/com/orion/ops/runner/SftpTransferStatusCleanRunner.java rename to orion-ops-api/orion-ops-runner/src/main/java/cn/orionsec/ops/runner/SftpTransferStatusCleanRunner.java index 97c7aefe..4977b2a4 100644 --- a/orion-ops-api/orion-ops-runner/src/main/java/com/orion/ops/runner/SftpTransferStatusCleanRunner.java +++ b/orion-ops-api/orion-ops-runner/src/main/java/cn/orionsec/ops/runner/SftpTransferStatusCleanRunner.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.runner; +package cn.orionsec.ops.runner; +import cn.orionsec.ops.constant.sftp.SftpTransferStatus; +import cn.orionsec.ops.constant.sftp.SftpTransferType; +import cn.orionsec.ops.dao.FileTransferLogDAO; +import cn.orionsec.ops.entity.domain.FileTransferLogDO; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.ops.constant.sftp.SftpTransferStatus; -import com.orion.ops.constant.sftp.SftpTransferType; -import com.orion.ops.dao.FileTransferLogDAO; -import com.orion.ops.entity.domain.FileTransferLogDO; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.CommandLineRunner; import org.springframework.core.annotation.Order; diff --git a/orion-ops-api/orion-ops-runner/src/main/java/com/orion/ops/runner/SystemEnvInitializeRunner.java b/orion-ops-api/orion-ops-runner/src/main/java/cn/orionsec/ops/runner/SystemEnvInitializeRunner.java similarity index 91% rename from orion-ops-api/orion-ops-runner/src/main/java/com/orion/ops/runner/SystemEnvInitializeRunner.java rename to orion-ops-api/orion-ops-runner/src/main/java/cn/orionsec/ops/runner/SystemEnvInitializeRunner.java index 5f7d6cfa..0932ad0a 100644 --- a/orion-ops-api/orion-ops-runner/src/main/java/com/orion/ops/runner/SystemEnvInitializeRunner.java +++ b/orion-ops-api/orion-ops-runner/src/main/java/cn/orionsec/ops/runner/SystemEnvInitializeRunner.java @@ -13,20 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.runner; +package cn.orionsec.ops.runner; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.common.EnableType; +import cn.orionsec.ops.constant.history.HistoryOperator; +import cn.orionsec.ops.constant.history.HistoryValueType; +import cn.orionsec.ops.constant.system.SystemEnvAttr; +import cn.orionsec.ops.constant.tail.FileTailMode; +import cn.orionsec.ops.dao.SystemEnvDAO; +import cn.orionsec.ops.entity.domain.SystemEnvDO; +import cn.orionsec.ops.service.api.HistoryValueService; +import cn.orionsec.ops.utils.PathBuilders; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.orion.lang.utils.io.Files1; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.common.EnableType; -import com.orion.ops.constant.history.HistoryOperator; -import com.orion.ops.constant.history.HistoryValueType; -import com.orion.ops.constant.system.SystemEnvAttr; -import com.orion.ops.constant.tail.FileTailMode; -import com.orion.ops.dao.SystemEnvDAO; -import com.orion.ops.entity.domain.SystemEnvDO; -import com.orion.ops.service.api.HistoryValueService; -import com.orion.ops.utils.PathBuilders; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.CommandLineRunner; import org.springframework.core.annotation.Order; diff --git a/orion-ops-api/orion-ops-runner/src/main/java/com/orion/ops/runner/SystemSpaceAnalysisRunner.java b/orion-ops-api/orion-ops-runner/src/main/java/cn/orionsec/ops/runner/SystemSpaceAnalysisRunner.java similarity index 95% rename from orion-ops-api/orion-ops-runner/src/main/java/com/orion/ops/runner/SystemSpaceAnalysisRunner.java rename to orion-ops-api/orion-ops-runner/src/main/java/cn/orionsec/ops/runner/SystemSpaceAnalysisRunner.java index a22f494c..b103b1cd 100644 --- a/orion-ops-api/orion-ops-runner/src/main/java/com/orion/ops/runner/SystemSpaceAnalysisRunner.java +++ b/orion-ops-api/orion-ops-runner/src/main/java/cn/orionsec/ops/runner/SystemSpaceAnalysisRunner.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.runner; +package cn.orionsec.ops.runner; +import cn.orionsec.ops.service.api.SystemService; import com.orion.lang.utils.Threads; import com.orion.lang.utils.time.Dates; -import com.orion.ops.service.api.SystemService; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.CommandLineRunner; import org.springframework.core.annotation.Order; diff --git a/orion-ops-api/orion-ops-service/pom.xml b/orion-ops-api/orion-ops-service/pom.xml index 2fa4b05f..d16311da 100644 --- a/orion-ops-api/orion-ops-service/pom.xml +++ b/orion-ops-api/orion-ops-service/pom.xml @@ -2,9 +2,9 @@ - com.orion.ops + cn.orionsec.ops orion-ops-api - 1.2.9 + 1.3.0 ../pom.xml @@ -15,21 +15,21 @@ - com.orion.ops + cn.orionsec.ops orion-ops-common ${project.version} - com.orion.ops + cn.orionsec.ops orion-ops-model ${project.version} - com.orion.ops + cn.orionsec.ops orion-ops-dao ${project.version} diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/config/DataSourceConfig.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/config/DataSourceConfig.java similarity index 97% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/config/DataSourceConfig.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/config/DataSourceConfig.java index 302390c7..ce1b81cd 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/config/DataSourceConfig.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/config/DataSourceConfig.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.config; +package cn.orionsec.ops.config; import com.alibaba.druid.pool.DruidDataSource; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/config/JsonSerializerConfig.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/config/JsonSerializerConfig.java similarity index 98% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/config/JsonSerializerConfig.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/config/JsonSerializerConfig.java index ac6ec8ab..a3cd162e 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/config/JsonSerializerConfig.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/config/JsonSerializerConfig.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.config; +package cn.orionsec.ops.config; import com.alibaba.fastjson.serializer.SerializerFeature; import com.alibaba.fastjson.support.config.FastJsonConfig; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/config/RedisSerializeConfig.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/config/RedisSerializeConfig.java similarity index 98% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/config/RedisSerializeConfig.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/config/RedisSerializeConfig.java index f7e1d666..812638ab 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/config/RedisSerializeConfig.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/config/RedisSerializeConfig.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.config; +package cn.orionsec.ops.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/config/SchedulerConfig.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/config/SchedulerConfig.java similarity index 97% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/config/SchedulerConfig.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/config/SchedulerConfig.java index f1cf8b5c..959c4732 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/config/SchedulerConfig.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/config/SchedulerConfig.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.config; +package cn.orionsec.ops.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/alarm/MachineAlarmContext.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/alarm/MachineAlarmContext.java similarity index 88% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/alarm/MachineAlarmContext.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/alarm/MachineAlarmContext.java index fdfb877e..378ee80e 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/alarm/MachineAlarmContext.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/alarm/MachineAlarmContext.java @@ -13,9 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.alarm; +package cn.orionsec.ops.handler.alarm; -import com.orion.ops.entity.domain.UserInfoDO; +import cn.orionsec.ops.constant.machine.MachineAlarmType; +import cn.orionsec.ops.entity.domain.UserInfoDO; import lombok.Data; import java.util.Date; @@ -49,7 +50,7 @@ public class MachineAlarmContext { /** * 报警类型 * - * @see com.orion.ops.constant.machine.MachineAlarmType + * @see MachineAlarmType */ private Integer alarmType; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/alarm/MachineAlarmExecutor.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/alarm/MachineAlarmExecutor.java similarity index 85% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/alarm/MachineAlarmExecutor.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/alarm/MachineAlarmExecutor.java index 081fd9d3..ca158a15 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/alarm/MachineAlarmExecutor.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/alarm/MachineAlarmExecutor.java @@ -13,23 +13,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.alarm; +package cn.orionsec.ops.handler.alarm; +import cn.orionsec.ops.constant.SchedulerPools; +import cn.orionsec.ops.constant.alarm.AlarmGroupNotifyType; +import cn.orionsec.ops.dao.UserInfoDAO; +import cn.orionsec.ops.entity.domain.AlarmGroupNotifyDO; +import cn.orionsec.ops.entity.domain.AlarmGroupUserDO; +import cn.orionsec.ops.entity.domain.MachineAlarmGroupDO; +import cn.orionsec.ops.entity.domain.UserInfoDO; +import cn.orionsec.ops.handler.alarm.push.AlarmWebSideMessagePusher; +import cn.orionsec.ops.handler.alarm.push.AlarmWebhookPusher; +import cn.orionsec.ops.service.api.AlarmGroupNotifyService; +import cn.orionsec.ops.service.api.AlarmGroupUserService; +import cn.orionsec.ops.service.api.MachineAlarmGroupService; import com.alibaba.fastjson.JSON; import com.orion.lang.able.Executable; import com.orion.lang.utils.Threads; -import com.orion.ops.constant.SchedulerPools; -import com.orion.ops.constant.alarm.AlarmGroupNotifyType; -import com.orion.ops.dao.UserInfoDAO; -import com.orion.ops.entity.domain.AlarmGroupNotifyDO; -import com.orion.ops.entity.domain.AlarmGroupUserDO; -import com.orion.ops.entity.domain.MachineAlarmGroupDO; -import com.orion.ops.entity.domain.UserInfoDO; -import com.orion.ops.handler.alarm.push.AlarmWebSideMessagePusher; -import com.orion.ops.handler.alarm.push.AlarmWebhookPusher; -import com.orion.ops.service.api.AlarmGroupNotifyService; -import com.orion.ops.service.api.AlarmGroupUserService; -import com.orion.ops.service.api.MachineAlarmGroupService; import com.orion.spring.SpringHolder; import lombok.extern.slf4j.Slf4j; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/alarm/push/AlarmWebSideMessagePusher.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/alarm/push/AlarmWebSideMessagePusher.java similarity index 86% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/alarm/push/AlarmWebSideMessagePusher.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/alarm/push/AlarmWebSideMessagePusher.java index 47deac0f..493579fb 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/alarm/push/AlarmWebSideMessagePusher.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/alarm/push/AlarmWebSideMessagePusher.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.alarm.push; +package cn.orionsec.ops.handler.alarm.push; +import cn.orionsec.ops.constant.event.EventKeys; +import cn.orionsec.ops.constant.machine.MachineAlarmType; +import cn.orionsec.ops.constant.message.MessageType; +import cn.orionsec.ops.handler.alarm.MachineAlarmContext; +import cn.orionsec.ops.service.api.WebSideMessageService; import com.orion.lang.utils.collect.Maps; import com.orion.lang.utils.math.Numbers; import com.orion.lang.utils.time.Dates; -import com.orion.ops.constant.event.EventKeys; -import com.orion.ops.constant.machine.MachineAlarmType; -import com.orion.ops.constant.message.MessageType; -import com.orion.ops.handler.alarm.MachineAlarmContext; -import com.orion.ops.service.api.WebSideMessageService; import com.orion.spring.SpringHolder; import java.util.Map; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/alarm/push/AlarmWebhookPusher.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/alarm/push/AlarmWebhookPusher.java similarity index 85% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/alarm/push/AlarmWebhookPusher.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/alarm/push/AlarmWebhookPusher.java index 38c03426..261bca1d 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/alarm/push/AlarmWebhookPusher.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/alarm/push/AlarmWebhookPusher.java @@ -13,21 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.alarm.push; +package cn.orionsec.ops.handler.alarm.push; +import cn.orionsec.ops.constant.event.EventKeys; +import cn.orionsec.ops.constant.machine.MachineAlarmType; +import cn.orionsec.ops.constant.webhook.WebhookType; +import cn.orionsec.ops.dao.WebhookConfigDAO; +import cn.orionsec.ops.entity.domain.UserInfoDO; +import cn.orionsec.ops.entity.domain.WebhookConfigDO; +import cn.orionsec.ops.handler.alarm.MachineAlarmContext; +import cn.orionsec.ops.handler.webhook.DingRobotPusher; +import cn.orionsec.ops.utils.ResourceLoader; import com.orion.lang.utils.Strings; import com.orion.lang.utils.collect.Maps; import com.orion.lang.utils.math.Numbers; import com.orion.lang.utils.time.Dates; -import com.orion.ops.constant.event.EventKeys; -import com.orion.ops.constant.machine.MachineAlarmType; -import com.orion.ops.constant.webhook.WebhookType; -import com.orion.ops.dao.WebhookConfigDAO; -import com.orion.ops.entity.domain.UserInfoDO; -import com.orion.ops.entity.domain.WebhookConfigDO; -import com.orion.ops.handler.alarm.MachineAlarmContext; -import com.orion.ops.handler.webhook.DingRobotPusher; -import com.orion.ops.utils.ResourceLoader; import com.orion.spring.SpringHolder; import java.util.List; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/alarm/push/IAlarmPusher.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/alarm/push/IAlarmPusher.java similarity index 94% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/alarm/push/IAlarmPusher.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/alarm/push/IAlarmPusher.java index 405057ca..bc839796 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/alarm/push/IAlarmPusher.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/alarm/push/IAlarmPusher.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.alarm.push; +package cn.orionsec.ops.handler.alarm.push; /** * 报警推送器 diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/app/action/AbstractActionHandler.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/action/AbstractActionHandler.java similarity index 96% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/app/action/AbstractActionHandler.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/action/AbstractActionHandler.java index ebd35c06..4df53802 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/app/action/AbstractActionHandler.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/action/AbstractActionHandler.java @@ -13,8 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.app.action; +package cn.orionsec.ops.handler.app.action; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.app.ActionStatus; +import cn.orionsec.ops.constant.app.ActionType; +import cn.orionsec.ops.constant.common.StainCode; +import cn.orionsec.ops.constant.system.SystemEnvAttr; +import cn.orionsec.ops.dao.ApplicationActionLogDAO; +import cn.orionsec.ops.entity.domain.ApplicationActionLogDO; +import cn.orionsec.ops.utils.Utils; import com.orion.lang.constant.Letters; import com.orion.lang.define.io.OutputAppender; import com.orion.lang.exception.ExecuteException; @@ -25,14 +33,6 @@ import com.orion.lang.utils.io.Files1; import com.orion.lang.utils.io.Streams; import com.orion.lang.utils.time.Dates; import com.orion.net.remote.ExitCode; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.app.ActionStatus; -import com.orion.ops.constant.app.ActionType; -import com.orion.ops.constant.common.StainCode; -import com.orion.ops.constant.system.SystemEnvAttr; -import com.orion.ops.dao.ApplicationActionLogDAO; -import com.orion.ops.entity.domain.ApplicationActionLogDO; -import com.orion.ops.utils.Utils; import com.orion.spring.SpringHolder; import lombok.Getter; import lombok.SneakyThrows; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/app/action/CheckoutActionHandler.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/action/CheckoutActionHandler.java similarity index 91% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/app/action/CheckoutActionHandler.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/action/CheckoutActionHandler.java index 273befdd..4dd35dd8 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/app/action/CheckoutActionHandler.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/action/CheckoutActionHandler.java @@ -13,17 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.app.action; +package cn.orionsec.ops.handler.app.action; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.MessageConst; +import cn.orionsec.ops.constant.app.ActionType; +import cn.orionsec.ops.constant.common.StainCode; +import cn.orionsec.ops.entity.domain.ApplicationRepositoryDO; +import cn.orionsec.ops.service.api.ApplicationRepositoryService; +import cn.orionsec.ops.utils.Utils; import com.orion.lang.utils.Exceptions; import com.orion.lang.utils.io.Files1; import com.orion.lang.utils.io.Streams; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.MessageConst; -import com.orion.ops.constant.common.StainCode; -import com.orion.ops.entity.domain.ApplicationRepositoryDO; -import com.orion.ops.service.api.ApplicationRepositoryService; -import com.orion.ops.utils.Utils; import com.orion.spring.SpringHolder; import org.eclipse.jgit.api.CloneCommand; import org.eclipse.jgit.api.Git; @@ -37,7 +38,7 @@ import java.io.File; * * @author Jiahang Li * @version 1.0.0 - * @see com.orion.ops.constant.app.ActionType#BUILD_CHECKOUT + * @see ActionType#BUILD_CHECKOUT * @since 2022/2/11 15:57 */ public class CheckoutActionHandler extends AbstractActionHandler { diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/app/action/CommandActionHandler.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/action/CommandActionHandler.java similarity index 90% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/app/action/CommandActionHandler.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/action/CommandActionHandler.java index 70f3fd28..946a7696 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/app/action/CommandActionHandler.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/action/CommandActionHandler.java @@ -13,16 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.app.action; +package cn.orionsec.ops.handler.app.action; +import cn.orionsec.ops.constant.app.ActionType; +import cn.orionsec.ops.constant.common.StainCode; +import cn.orionsec.ops.utils.Utils; import com.orion.lang.utils.Exceptions; import com.orion.lang.utils.Strings; import com.orion.lang.utils.io.Streams; import com.orion.net.remote.CommandExecutors; import com.orion.net.remote.ExitCode; import com.orion.net.remote.channel.ssh.CommandExecutor; -import com.orion.ops.constant.common.StainCode; -import com.orion.ops.utils.Utils; import lombok.Getter; /** @@ -30,8 +31,8 @@ import lombok.Getter; * * @author Jiahang Li * @version 1.0.0 - * @see com.orion.ops.constant.app.ActionType#BUILD_COMMAND - * @see com.orion.ops.constant.app.ActionType#RELEASE_COMMAND + * @see ActionType#BUILD_COMMAND + * @see ActionType#RELEASE_COMMAND * @since 2022/2/11 15:59 */ public class CommandActionHandler extends AbstractActionHandler { diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/app/action/IActionHandler.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/action/IActionHandler.java similarity index 91% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/app/action/IActionHandler.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/action/IActionHandler.java index 83c9d20e..e7837a84 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/app/action/IActionHandler.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/action/IActionHandler.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.app.action; +package cn.orionsec.ops.handler.app.action; +import cn.orionsec.ops.constant.app.ActionStatus; +import cn.orionsec.ops.constant.app.ActionType; +import cn.orionsec.ops.constant.app.TransferMode; +import cn.orionsec.ops.entity.domain.ApplicationActionLogDO; import com.orion.lang.able.Executable; import com.orion.lang.able.SafeCloseable; import com.orion.lang.function.select.Branches; import com.orion.lang.function.select.Selector; -import com.orion.ops.constant.app.ActionStatus; -import com.orion.ops.constant.app.ActionType; -import com.orion.ops.constant.app.TransferMode; -import com.orion.ops.entity.domain.ApplicationActionLogDO; import java.util.List; import java.util.stream.Collectors; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/app/action/MachineActionStore.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/action/MachineActionStore.java similarity index 93% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/app/action/MachineActionStore.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/action/MachineActionStore.java index 6624c09b..cbba4e4c 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/app/action/MachineActionStore.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/action/MachineActionStore.java @@ -13,11 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.app.action; +package cn.orionsec.ops.handler.app.action; +import cn.orionsec.ops.constant.app.TransferMode; +import cn.orionsec.ops.entity.domain.ApplicationActionLogDO; import com.orion.lang.utils.collect.Maps; import com.orion.net.remote.channel.SessionStore; -import com.orion.ops.entity.domain.ApplicationActionLogDO; import lombok.Data; import java.io.OutputStream; @@ -117,7 +118,7 @@ public class MachineActionStore { * * @see SftpTransferActionHandler * @see ScpTransferActionHandler - * @see com.orion.ops.constant.app.TransferMode + * @see TransferMode */ private String transferMode; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/app/action/ScpTransferActionHandler.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/action/ScpTransferActionHandler.java similarity index 88% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/app/action/ScpTransferActionHandler.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/action/ScpTransferActionHandler.java index 3a50d540..7dc35e8a 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/app/action/ScpTransferActionHandler.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/action/ScpTransferActionHandler.java @@ -13,8 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.app.action; +package cn.orionsec.ops.handler.app.action; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.app.ActionType; +import cn.orionsec.ops.constant.app.TransferMode; +import cn.orionsec.ops.constant.command.CommandConst; +import cn.orionsec.ops.constant.common.StainCode; +import cn.orionsec.ops.constant.env.EnvConst; +import cn.orionsec.ops.constant.system.SystemEnvAttr; +import cn.orionsec.ops.service.api.MachineInfoService; +import cn.orionsec.ops.utils.Utils; import com.orion.lang.utils.Exceptions; import com.orion.lang.utils.Strings; import com.orion.lang.utils.collect.Maps; @@ -24,13 +33,6 @@ import com.orion.net.remote.CommandExecutors; import com.orion.net.remote.ExitCode; import com.orion.net.remote.channel.SessionStore; import com.orion.net.remote.channel.ssh.CommandExecutor; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.command.CommandConst; -import com.orion.ops.constant.common.StainCode; -import com.orion.ops.constant.env.EnvConst; -import com.orion.ops.constant.system.SystemEnvAttr; -import com.orion.ops.service.api.MachineInfoService; -import com.orion.ops.utils.Utils; import com.orion.spring.SpringHolder; import lombok.Getter; @@ -42,8 +44,8 @@ import java.util.Map; * * @author Jiahang Li * @version 1.0.0 - * @see com.orion.ops.constant.app.ActionType#RELEASE_TRANSFER - * @see com.orion.ops.constant.app.TransferMode#SCP + * @see ActionType#RELEASE_TRANSFER + * @see TransferMode#SCP * @since 2022/4/26 23:58 */ public class ScpTransferActionHandler extends AbstractActionHandler { diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/app/action/SftpTransferActionHandler.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/action/SftpTransferActionHandler.java similarity index 93% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/app/action/SftpTransferActionHandler.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/action/SftpTransferActionHandler.java index 437e68c3..a3e900af 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/app/action/SftpTransferActionHandler.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/action/SftpTransferActionHandler.java @@ -13,18 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.app.action; +package cn.orionsec.ops.handler.app.action; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.app.ActionType; +import cn.orionsec.ops.constant.app.TransferMode; +import cn.orionsec.ops.constant.common.StainCode; +import cn.orionsec.ops.constant.system.SystemEnvAttr; +import cn.orionsec.ops.service.api.MachineEnvService; +import cn.orionsec.ops.utils.Utils; import com.orion.lang.utils.Exceptions; import com.orion.lang.utils.collect.Maps; import com.orion.lang.utils.io.Files1; import com.orion.lang.utils.io.Streams; import com.orion.net.remote.channel.sftp.SftpExecutor; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.common.StainCode; -import com.orion.ops.constant.system.SystemEnvAttr; -import com.orion.ops.service.api.MachineEnvService; -import com.orion.ops.utils.Utils; import com.orion.spring.SpringHolder; import java.io.File; @@ -36,8 +38,8 @@ import java.util.Map; * * @author Jiahang Li * @version 1.0.0 - * @see com.orion.ops.constant.app.ActionType#RELEASE_TRANSFER - * @see com.orion.ops.constant.app.TransferMode#SFTP + * @see ActionType#RELEASE_TRANSFER + * @see TransferMode#SFTP * @since 2022/4/26 23:57 */ public class SftpTransferActionHandler extends AbstractActionHandler { diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/app/build/BuildSessionHolder.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/build/BuildSessionHolder.java similarity index 93% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/app/build/BuildSessionHolder.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/build/BuildSessionHolder.java index 891df887..c0f9b83c 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/app/build/BuildSessionHolder.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/build/BuildSessionHolder.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.app.build; +package cn.orionsec.ops.handler.app.build; +import cn.orionsec.ops.handler.app.machine.IMachineProcessor; import com.orion.lang.utils.collect.Maps; -import com.orion.ops.handler.app.machine.IMachineProcessor; import org.springframework.stereotype.Component; import java.util.concurrent.ConcurrentHashMap; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/app/machine/AbstractMachineProcessor.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/machine/AbstractMachineProcessor.java similarity index 96% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/app/machine/AbstractMachineProcessor.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/machine/AbstractMachineProcessor.java index 3330beb9..2a7d1cac 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/app/machine/AbstractMachineProcessor.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/machine/AbstractMachineProcessor.java @@ -13,8 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.app.machine; +package cn.orionsec.ops.handler.app.machine; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.app.ActionStatus; +import cn.orionsec.ops.constant.common.StainCode; +import cn.orionsec.ops.constant.system.SystemEnvAttr; +import cn.orionsec.ops.handler.app.action.IActionHandler; +import cn.orionsec.ops.handler.tail.TailSessionHolder; +import cn.orionsec.ops.utils.Utils; import com.orion.lang.constant.Letters; import com.orion.lang.exception.DisabledException; import com.orion.lang.exception.LogException; @@ -24,13 +31,6 @@ import com.orion.lang.utils.collect.Lists; import com.orion.lang.utils.io.Files1; import com.orion.lang.utils.io.Streams; import com.orion.lang.utils.time.Dates; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.app.ActionStatus; -import com.orion.ops.constant.common.StainCode; -import com.orion.ops.constant.system.SystemEnvAttr; -import com.orion.ops.handler.app.action.IActionHandler; -import com.orion.ops.handler.tail.TailSessionHolder; -import com.orion.ops.utils.Utils; import com.orion.spring.SpringHolder; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/app/machine/BuildMachineProcessor.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/machine/BuildMachineProcessor.java similarity index 91% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/app/machine/BuildMachineProcessor.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/machine/BuildMachineProcessor.java index 27048ac7..ad20c5b0 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/app/machine/BuildMachineProcessor.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/machine/BuildMachineProcessor.java @@ -13,8 +13,29 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.app.machine; +package cn.orionsec.ops.handler.app.machine; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.SchedulerPools; +import cn.orionsec.ops.constant.app.ActionType; +import cn.orionsec.ops.constant.app.ApplicationEnvAttr; +import cn.orionsec.ops.constant.app.BuildStatus; +import cn.orionsec.ops.constant.app.StageType; +import cn.orionsec.ops.constant.common.StainCode; +import cn.orionsec.ops.constant.event.EventKeys; +import cn.orionsec.ops.constant.message.MessageType; +import cn.orionsec.ops.constant.system.SystemEnvAttr; +import cn.orionsec.ops.dao.ApplicationBuildDAO; +import cn.orionsec.ops.entity.domain.ApplicationActionLogDO; +import cn.orionsec.ops.entity.domain.ApplicationBuildDO; +import cn.orionsec.ops.handler.app.action.IActionHandler; +import cn.orionsec.ops.handler.app.action.MachineActionStore; +import cn.orionsec.ops.handler.app.build.BuildSessionHolder; +import cn.orionsec.ops.service.api.ApplicationActionLogService; +import cn.orionsec.ops.service.api.ApplicationEnvService; +import cn.orionsec.ops.service.api.MachineInfoService; +import cn.orionsec.ops.service.api.WebSideMessageService; +import cn.orionsec.ops.utils.Utils; import com.alibaba.fastjson.JSON; import com.orion.lang.able.Executable; import com.orion.lang.utils.Exceptions; @@ -27,27 +48,6 @@ import com.orion.lang.utils.io.compress.CompressTypeEnum; import com.orion.lang.utils.io.compress.FileCompressor; import com.orion.lang.utils.time.Dates; import com.orion.net.remote.channel.SessionStore; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.SchedulerPools; -import com.orion.ops.constant.app.ActionType; -import com.orion.ops.constant.app.ApplicationEnvAttr; -import com.orion.ops.constant.app.BuildStatus; -import com.orion.ops.constant.app.StageType; -import com.orion.ops.constant.common.StainCode; -import com.orion.ops.constant.event.EventKeys; -import com.orion.ops.constant.message.MessageType; -import com.orion.ops.constant.system.SystemEnvAttr; -import com.orion.ops.dao.ApplicationBuildDAO; -import com.orion.ops.entity.domain.ApplicationActionLogDO; -import com.orion.ops.entity.domain.ApplicationBuildDO; -import com.orion.ops.handler.app.action.IActionHandler; -import com.orion.ops.handler.app.action.MachineActionStore; -import com.orion.ops.handler.app.build.BuildSessionHolder; -import com.orion.ops.service.api.ApplicationActionLogService; -import com.orion.ops.service.api.ApplicationEnvService; -import com.orion.ops.service.api.MachineInfoService; -import com.orion.ops.service.api.WebSideMessageService; -import com.orion.ops.utils.Utils; import com.orion.spring.SpringHolder; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/app/machine/IMachineProcessor.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/machine/IMachineProcessor.java similarity index 96% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/app/machine/IMachineProcessor.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/machine/IMachineProcessor.java index 8bc48069..20d68cd5 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/app/machine/IMachineProcessor.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/machine/IMachineProcessor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.app.machine; +package cn.orionsec.ops.handler.app.machine; import com.orion.lang.able.SafeCloseable; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/app/machine/MachineProcessorStatus.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/machine/MachineProcessorStatus.java similarity index 95% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/app/machine/MachineProcessorStatus.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/machine/MachineProcessorStatus.java index dd80aa64..cc07323c 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/app/machine/MachineProcessorStatus.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/machine/MachineProcessorStatus.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.app.machine; +package cn.orionsec.ops.handler.app.machine; /** * 机器执行状态 diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/app/machine/ReleaseMachineProcessor.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/machine/ReleaseMachineProcessor.java similarity index 91% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/app/machine/ReleaseMachineProcessor.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/machine/ReleaseMachineProcessor.java index ce528048..f7b3a448 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/app/machine/ReleaseMachineProcessor.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/machine/ReleaseMachineProcessor.java @@ -13,25 +13,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.app.machine; +package cn.orionsec.ops.handler.app.machine; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.app.ActionStatus; +import cn.orionsec.ops.constant.app.StageType; +import cn.orionsec.ops.constant.common.StainCode; +import cn.orionsec.ops.dao.ApplicationMachineDAO; +import cn.orionsec.ops.dao.ApplicationReleaseMachineDAO; +import cn.orionsec.ops.entity.domain.*; +import cn.orionsec.ops.handler.app.action.IActionHandler; +import cn.orionsec.ops.handler.app.action.MachineActionStore; +import cn.orionsec.ops.service.api.ApplicationActionLogService; +import cn.orionsec.ops.service.api.MachineInfoService; +import cn.orionsec.ops.utils.Utils; import com.alibaba.fastjson.JSON; import com.orion.lang.utils.Exceptions; import com.orion.lang.utils.io.Streams; import com.orion.lang.utils.time.Dates; import com.orion.net.remote.channel.SessionStore; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.app.ActionStatus; -import com.orion.ops.constant.app.StageType; -import com.orion.ops.constant.common.StainCode; -import com.orion.ops.dao.ApplicationMachineDAO; -import com.orion.ops.dao.ApplicationReleaseMachineDAO; -import com.orion.ops.entity.domain.*; -import com.orion.ops.handler.app.action.IActionHandler; -import com.orion.ops.handler.app.action.MachineActionStore; -import com.orion.ops.service.api.ApplicationActionLogService; -import com.orion.ops.service.api.MachineInfoService; -import com.orion.ops.utils.Utils; import com.orion.spring.SpringHolder; import lombok.Getter; import lombok.extern.slf4j.Slf4j; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/app/pipeline/IPipelineProcessor.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/pipeline/IPipelineProcessor.java similarity index 96% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/app/pipeline/IPipelineProcessor.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/pipeline/IPipelineProcessor.java index 3665a70b..285320e2 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/app/pipeline/IPipelineProcessor.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/pipeline/IPipelineProcessor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.app.pipeline; +package cn.orionsec.ops.handler.app.pipeline; import com.orion.lang.able.Executable; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/app/pipeline/PipelineProcessor.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/pipeline/PipelineProcessor.java similarity index 91% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/app/pipeline/PipelineProcessor.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/pipeline/PipelineProcessor.java index a1d98d50..9af23419 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/app/pipeline/PipelineProcessor.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/pipeline/PipelineProcessor.java @@ -13,23 +13,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.app.pipeline; +package cn.orionsec.ops.handler.app.pipeline; +import cn.orionsec.ops.constant.MessageConst; +import cn.orionsec.ops.constant.SchedulerPools; +import cn.orionsec.ops.constant.app.PipelineDetailStatus; +import cn.orionsec.ops.constant.app.PipelineStatus; +import cn.orionsec.ops.constant.event.EventKeys; +import cn.orionsec.ops.constant.message.MessageType; +import cn.orionsec.ops.dao.ApplicationPipelineTaskDAO; +import cn.orionsec.ops.entity.domain.ApplicationPipelineTaskDO; +import cn.orionsec.ops.entity.domain.ApplicationPipelineTaskDetailDO; +import cn.orionsec.ops.handler.app.pipeline.stage.IStageHandler; +import cn.orionsec.ops.service.api.ApplicationPipelineTaskDetailService; +import cn.orionsec.ops.service.api.WebSideMessageService; import com.orion.lang.utils.Exceptions; import com.orion.lang.utils.Threads; import com.orion.lang.utils.collect.Maps; -import com.orion.ops.constant.MessageConst; -import com.orion.ops.constant.SchedulerPools; -import com.orion.ops.constant.app.PipelineDetailStatus; -import com.orion.ops.constant.app.PipelineStatus; -import com.orion.ops.constant.event.EventKeys; -import com.orion.ops.constant.message.MessageType; -import com.orion.ops.dao.ApplicationPipelineTaskDAO; -import com.orion.ops.entity.domain.ApplicationPipelineTaskDO; -import com.orion.ops.entity.domain.ApplicationPipelineTaskDetailDO; -import com.orion.ops.handler.app.pipeline.stage.IStageHandler; -import com.orion.ops.service.api.ApplicationPipelineTaskDetailService; -import com.orion.ops.service.api.WebSideMessageService; import com.orion.spring.SpringHolder; import lombok.Getter; import lombok.extern.slf4j.Slf4j; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/app/pipeline/PipelineSessionHolder.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/pipeline/PipelineSessionHolder.java similarity index 97% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/app/pipeline/PipelineSessionHolder.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/pipeline/PipelineSessionHolder.java index 7e79c17c..b4a2b9ea 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/app/pipeline/PipelineSessionHolder.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/pipeline/PipelineSessionHolder.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.app.pipeline; +package cn.orionsec.ops.handler.app.pipeline; import com.orion.lang.utils.collect.Maps; import org.springframework.stereotype.Component; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/app/pipeline/stage/AbstractStageHandler.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/pipeline/stage/AbstractStageHandler.java similarity index 91% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/app/pipeline/stage/AbstractStageHandler.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/pipeline/stage/AbstractStageHandler.java index 2002c81e..fc9bbecd 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/app/pipeline/stage/AbstractStageHandler.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/pipeline/stage/AbstractStageHandler.java @@ -13,22 +13,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.app.pipeline.stage; +package cn.orionsec.ops.handler.app.pipeline.stage; +import cn.orionsec.ops.constant.app.PipelineDetailStatus; +import cn.orionsec.ops.constant.app.PipelineLogStatus; +import cn.orionsec.ops.constant.app.StageType; +import cn.orionsec.ops.constant.user.RoleType; +import cn.orionsec.ops.dao.ApplicationPipelineTaskDetailDAO; +import cn.orionsec.ops.dao.ApplicationPipelineTaskLogDAO; +import cn.orionsec.ops.dao.UserInfoDAO; +import cn.orionsec.ops.entity.domain.ApplicationPipelineTaskDO; +import cn.orionsec.ops.entity.domain.ApplicationPipelineTaskDetailDO; +import cn.orionsec.ops.entity.domain.ApplicationPipelineTaskLogDO; +import cn.orionsec.ops.entity.domain.UserInfoDO; +import cn.orionsec.ops.entity.dto.user.UserDTO; +import cn.orionsec.ops.utils.UserHolder; import com.orion.lang.utils.Exceptions; -import com.orion.ops.constant.app.PipelineDetailStatus; -import com.orion.ops.constant.app.PipelineLogStatus; -import com.orion.ops.constant.app.StageType; -import com.orion.ops.constant.user.RoleType; -import com.orion.ops.utils.UserHolder; -import com.orion.ops.dao.ApplicationPipelineTaskDetailDAO; -import com.orion.ops.dao.ApplicationPipelineTaskLogDAO; -import com.orion.ops.dao.UserInfoDAO; -import com.orion.ops.entity.domain.ApplicationPipelineTaskDO; -import com.orion.ops.entity.domain.ApplicationPipelineTaskDetailDO; -import com.orion.ops.entity.domain.ApplicationPipelineTaskLogDO; -import com.orion.ops.entity.domain.UserInfoDO; -import com.orion.ops.entity.dto.user.UserDTO; import com.orion.spring.SpringHolder; import lombok.Getter; import lombok.extern.slf4j.Slf4j; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/app/pipeline/stage/BuildStageHandler.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/pipeline/stage/BuildStageHandler.java similarity index 80% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/app/pipeline/stage/BuildStageHandler.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/pipeline/stage/BuildStageHandler.java index 20698240..c983545c 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/app/pipeline/stage/BuildStageHandler.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/pipeline/stage/BuildStageHandler.java @@ -13,24 +13,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.app.pipeline.stage; +package cn.orionsec.ops.handler.app.pipeline.stage; +import cn.orionsec.ops.constant.MessageConst; +import cn.orionsec.ops.constant.app.BuildStatus; +import cn.orionsec.ops.constant.app.PipelineLogStatus; +import cn.orionsec.ops.constant.app.StageType; +import cn.orionsec.ops.dao.ApplicationBuildDAO; +import cn.orionsec.ops.entity.domain.ApplicationBuildDO; +import cn.orionsec.ops.entity.domain.ApplicationPipelineTaskDO; +import cn.orionsec.ops.entity.domain.ApplicationPipelineTaskDetailDO; +import cn.orionsec.ops.entity.dto.app.ApplicationPipelineStageConfigDTO; +import cn.orionsec.ops.entity.request.app.ApplicationBuildRequest; +import cn.orionsec.ops.handler.app.build.BuildSessionHolder; +import cn.orionsec.ops.handler.app.machine.BuildMachineProcessor; +import cn.orionsec.ops.handler.app.machine.IMachineProcessor; +import cn.orionsec.ops.service.api.ApplicationBuildService; import com.alibaba.fastjson.JSON; import com.orion.lang.utils.Exceptions; -import com.orion.ops.constant.MessageConst; -import com.orion.ops.constant.app.BuildStatus; -import com.orion.ops.constant.app.PipelineLogStatus; -import com.orion.ops.constant.app.StageType; -import com.orion.ops.dao.ApplicationBuildDAO; -import com.orion.ops.entity.domain.ApplicationBuildDO; -import com.orion.ops.entity.domain.ApplicationPipelineTaskDO; -import com.orion.ops.entity.domain.ApplicationPipelineTaskDetailDO; -import com.orion.ops.entity.dto.app.ApplicationPipelineStageConfigDTO; -import com.orion.ops.entity.request.app.ApplicationBuildRequest; -import com.orion.ops.handler.app.build.BuildSessionHolder; -import com.orion.ops.handler.app.machine.BuildMachineProcessor; -import com.orion.ops.handler.app.machine.IMachineProcessor; -import com.orion.ops.service.api.ApplicationBuildService; import com.orion.spring.SpringHolder; import lombok.extern.slf4j.Slf4j; @@ -48,7 +48,7 @@ public class BuildStageHandler extends AbstractStageHandler { private static final ApplicationBuildService applicationBuildService = SpringHolder.getBean(ApplicationBuildService.class); - private static final ApplicationBuildDAO applicationBuildDAO = SpringHolder.getBean(ApplicationBuildDAO.class); + private static final ApplicationBuildDAO applicationBuildDAO = SpringHolder.getBean(ApplicationBuildDAO.class); private static final BuildSessionHolder buildSessionHolder = SpringHolder.getBean(BuildSessionHolder.class); diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/app/pipeline/stage/IStageHandler.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/pipeline/stage/IStageHandler.java similarity index 85% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/app/pipeline/stage/IStageHandler.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/pipeline/stage/IStageHandler.java index a25c5341..3fee6008 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/app/pipeline/stage/IStageHandler.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/pipeline/stage/IStageHandler.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.app.pipeline.stage; +package cn.orionsec.ops.handler.app.pipeline.stage; +import cn.orionsec.ops.constant.app.PipelineDetailStatus; +import cn.orionsec.ops.constant.app.StageType; +import cn.orionsec.ops.entity.domain.ApplicationPipelineTaskDO; +import cn.orionsec.ops.entity.domain.ApplicationPipelineTaskDetailDO; import com.orion.lang.able.Executable; import com.orion.lang.utils.Exceptions; -import com.orion.ops.constant.app.PipelineDetailStatus; -import com.orion.ops.constant.app.StageType; -import com.orion.ops.entity.domain.ApplicationPipelineTaskDO; -import com.orion.ops.entity.domain.ApplicationPipelineTaskDetailDO; /** * 流水线阶段处理器接口 diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/app/pipeline/stage/ReleaseStageHandler.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/pipeline/stage/ReleaseStageHandler.java similarity index 89% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/app/pipeline/stage/ReleaseStageHandler.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/pipeline/stage/ReleaseStageHandler.java index 66c1103d..dff329b4 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/app/pipeline/stage/ReleaseStageHandler.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/pipeline/stage/ReleaseStageHandler.java @@ -13,27 +13,27 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.app.pipeline.stage; +package cn.orionsec.ops.handler.app.pipeline.stage; +import cn.orionsec.ops.constant.CnConst; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.MessageConst; +import cn.orionsec.ops.constant.app.PipelineLogStatus; +import cn.orionsec.ops.constant.app.ReleaseStatus; +import cn.orionsec.ops.constant.app.StageType; +import cn.orionsec.ops.dao.ApplicationBuildDAO; +import cn.orionsec.ops.dao.ApplicationReleaseDAO; +import cn.orionsec.ops.entity.domain.*; +import cn.orionsec.ops.entity.dto.app.ApplicationPipelineStageConfigDTO; +import cn.orionsec.ops.entity.request.app.ApplicationReleaseRequest; +import cn.orionsec.ops.handler.app.release.IReleaseProcessor; +import cn.orionsec.ops.handler.app.release.ReleaseSessionHolder; +import cn.orionsec.ops.service.api.ApplicationMachineService; +import cn.orionsec.ops.service.api.ApplicationReleaseService; import com.alibaba.fastjson.JSON; import com.orion.lang.utils.Exceptions; import com.orion.lang.utils.Strings; import com.orion.lang.utils.collect.Lists; -import com.orion.ops.constant.CnConst; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.MessageConst; -import com.orion.ops.constant.app.PipelineLogStatus; -import com.orion.ops.constant.app.ReleaseStatus; -import com.orion.ops.constant.app.StageType; -import com.orion.ops.dao.ApplicationBuildDAO; -import com.orion.ops.dao.ApplicationReleaseDAO; -import com.orion.ops.entity.domain.*; -import com.orion.ops.entity.dto.app.ApplicationPipelineStageConfigDTO; -import com.orion.ops.entity.request.app.ApplicationReleaseRequest; -import com.orion.ops.handler.app.release.IReleaseProcessor; -import com.orion.ops.handler.app.release.ReleaseSessionHolder; -import com.orion.ops.service.api.ApplicationMachineService; -import com.orion.ops.service.api.ApplicationReleaseService; import com.orion.spring.SpringHolder; import lombok.extern.slf4j.Slf4j; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/app/release/AbstractReleaseProcessor.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/release/AbstractReleaseProcessor.java similarity index 92% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/app/release/AbstractReleaseProcessor.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/release/AbstractReleaseProcessor.java index 87ddbf6a..39ad853d 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/app/release/AbstractReleaseProcessor.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/release/AbstractReleaseProcessor.java @@ -13,20 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.app.release; +package cn.orionsec.ops.handler.app.release; +import cn.orionsec.ops.constant.SchedulerPools; +import cn.orionsec.ops.constant.app.ReleaseStatus; +import cn.orionsec.ops.constant.event.EventKeys; +import cn.orionsec.ops.constant.message.MessageType; +import cn.orionsec.ops.dao.ApplicationReleaseDAO; +import cn.orionsec.ops.entity.domain.ApplicationReleaseDO; +import cn.orionsec.ops.entity.domain.ApplicationReleaseMachineDO; +import cn.orionsec.ops.handler.app.machine.ReleaseMachineProcessor; +import cn.orionsec.ops.service.api.ApplicationReleaseMachineService; +import cn.orionsec.ops.service.api.WebSideMessageService; import com.orion.lang.utils.Threads; import com.orion.lang.utils.collect.Maps; -import com.orion.ops.constant.SchedulerPools; -import com.orion.ops.constant.app.ReleaseStatus; -import com.orion.ops.constant.event.EventKeys; -import com.orion.ops.constant.message.MessageType; -import com.orion.ops.dao.ApplicationReleaseDAO; -import com.orion.ops.entity.domain.ApplicationReleaseDO; -import com.orion.ops.entity.domain.ApplicationReleaseMachineDO; -import com.orion.ops.handler.app.machine.ReleaseMachineProcessor; -import com.orion.ops.service.api.ApplicationReleaseMachineService; -import com.orion.ops.service.api.WebSideMessageService; import com.orion.spring.SpringHolder; import lombok.Getter; import lombok.extern.slf4j.Slf4j; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/app/release/IReleaseProcessor.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/release/IReleaseProcessor.java similarity index 93% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/app/release/IReleaseProcessor.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/release/IReleaseProcessor.java index d927726f..9acc8e48 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/app/release/IReleaseProcessor.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/release/IReleaseProcessor.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.app.release; +package cn.orionsec.ops.handler.app.release; +import cn.orionsec.ops.constant.common.SerialType; +import cn.orionsec.ops.entity.domain.ApplicationReleaseDO; import com.orion.lang.able.Executable; import com.orion.lang.able.SafeCloseable; import com.orion.lang.function.select.Branches; import com.orion.lang.function.select.Selector; -import com.orion.ops.constant.common.SerialType; -import com.orion.ops.entity.domain.ApplicationReleaseDO; /** * 发布处理器 diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/app/release/ParallelReleaseProcessor.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/release/ParallelReleaseProcessor.java similarity index 89% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/app/release/ParallelReleaseProcessor.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/release/ParallelReleaseProcessor.java index 02b5f774..61b0407f 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/app/release/ParallelReleaseProcessor.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/release/ParallelReleaseProcessor.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.app.release; +package cn.orionsec.ops.handler.app.release; +import cn.orionsec.ops.constant.MessageConst; +import cn.orionsec.ops.constant.SchedulerPools; +import cn.orionsec.ops.constant.app.ActionStatus; +import cn.orionsec.ops.handler.app.machine.ReleaseMachineProcessor; import com.orion.lang.utils.Exceptions; import com.orion.lang.utils.Threads; -import com.orion.ops.constant.MessageConst; -import com.orion.ops.constant.SchedulerPools; -import com.orion.ops.constant.app.ActionStatus; -import com.orion.ops.handler.app.machine.ReleaseMachineProcessor; import java.util.Collection; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/app/release/ReleaseSessionHolder.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/release/ReleaseSessionHolder.java similarity index 97% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/app/release/ReleaseSessionHolder.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/release/ReleaseSessionHolder.java index 753c6e87..5a5442a6 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/app/release/ReleaseSessionHolder.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/release/ReleaseSessionHolder.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.app.release; +package cn.orionsec.ops.handler.app.release; import com.orion.lang.utils.collect.Maps; import org.springframework.stereotype.Component; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/app/release/SerialReleaseProcessor.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/release/SerialReleaseProcessor.java similarity index 89% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/app/release/SerialReleaseProcessor.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/release/SerialReleaseProcessor.java index ca2adb5e..50b5a3cd 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/app/release/SerialReleaseProcessor.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/release/SerialReleaseProcessor.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.app.release; +package cn.orionsec.ops.handler.app.release; -import com.orion.ops.constant.app.ActionStatus; -import com.orion.ops.constant.common.ExceptionHandlerType; -import com.orion.ops.handler.app.machine.IMachineProcessor; -import com.orion.ops.handler.app.machine.ReleaseMachineProcessor; +import cn.orionsec.ops.constant.app.ActionStatus; +import cn.orionsec.ops.constant.common.ExceptionHandlerType; +import cn.orionsec.ops.handler.app.machine.IMachineProcessor; +import cn.orionsec.ops.handler.app.machine.ReleaseMachineProcessor; import java.util.Collection; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/exec/CommandExecHandler.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/exec/CommandExecHandler.java similarity index 94% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/exec/CommandExecHandler.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/exec/CommandExecHandler.java index 0695df3f..f520c72b 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/exec/CommandExecHandler.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/exec/CommandExecHandler.java @@ -13,8 +13,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.exec; +package cn.orionsec.ops.handler.exec; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.SchedulerPools; +import cn.orionsec.ops.constant.command.ExecStatus; +import cn.orionsec.ops.constant.common.StainCode; +import cn.orionsec.ops.constant.event.EventKeys; +import cn.orionsec.ops.constant.message.MessageType; +import cn.orionsec.ops.constant.system.SystemEnvAttr; +import cn.orionsec.ops.dao.CommandExecDAO; +import cn.orionsec.ops.entity.domain.CommandExecDO; +import cn.orionsec.ops.entity.domain.MachineInfoDO; +import cn.orionsec.ops.handler.tail.TailSessionHolder; +import cn.orionsec.ops.service.api.MachineInfoService; +import cn.orionsec.ops.service.api.WebSideMessageService; +import cn.orionsec.ops.utils.Utils; import com.orion.lang.constant.Letters; import com.orion.lang.exception.DisabledException; import com.orion.lang.utils.Exceptions; @@ -28,20 +42,6 @@ import com.orion.net.remote.CommandExecutors; import com.orion.net.remote.ExitCode; import com.orion.net.remote.channel.SessionStore; import com.orion.net.remote.channel.ssh.CommandExecutor; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.SchedulerPools; -import com.orion.ops.constant.command.ExecStatus; -import com.orion.ops.constant.common.StainCode; -import com.orion.ops.constant.event.EventKeys; -import com.orion.ops.constant.message.MessageType; -import com.orion.ops.constant.system.SystemEnvAttr; -import com.orion.ops.dao.CommandExecDAO; -import com.orion.ops.entity.domain.CommandExecDO; -import com.orion.ops.entity.domain.MachineInfoDO; -import com.orion.ops.handler.tail.TailSessionHolder; -import com.orion.ops.service.api.MachineInfoService; -import com.orion.ops.service.api.WebSideMessageService; -import com.orion.ops.utils.Utils; import com.orion.spring.SpringHolder; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/exec/ExecSessionHolder.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/exec/ExecSessionHolder.java similarity index 97% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/exec/ExecSessionHolder.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/exec/ExecSessionHolder.java index 648c9a66..56c4c7be 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/exec/ExecSessionHolder.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/exec/ExecSessionHolder.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.exec; +package cn.orionsec.ops.handler.exec; import com.orion.lang.utils.collect.Maps; import org.springframework.stereotype.Component; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/exec/IExecHandler.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/exec/IExecHandler.java similarity index 97% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/exec/IExecHandler.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/exec/IExecHandler.java index 0744d6c1..c76373d2 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/exec/IExecHandler.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/exec/IExecHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.exec; +package cn.orionsec.ops.handler.exec; import com.orion.lang.able.Executable; import com.orion.lang.able.SafeCloseable; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/http/HttpApiDefined.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/http/HttpApiDefined.java similarity index 96% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/http/HttpApiDefined.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/http/HttpApiDefined.java index 204e71c1..1e747c6e 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/http/HttpApiDefined.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/http/HttpApiDefined.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.http; +package cn.orionsec.ops.handler.http; import com.orion.http.support.HttpMethod; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/http/HttpApiRequest.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/http/HttpApiRequest.java similarity index 98% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/http/HttpApiRequest.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/http/HttpApiRequest.java index 43a227c4..3f31295a 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/http/HttpApiRequest.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/http/HttpApiRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.http; +package cn.orionsec.ops.handler.http; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.TypeReference; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/http/HttpApiRequester.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/http/HttpApiRequester.java similarity index 98% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/http/HttpApiRequester.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/http/HttpApiRequester.java index 6176a924..8c0b6ffe 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/http/HttpApiRequester.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/http/HttpApiRequester.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.http; +package cn.orionsec.ops.handler.http; import com.alibaba.fastjson.TypeReference; import com.orion.http.ok.OkResponse; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/http/MachineMonitorHttpApi.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/http/MachineMonitorHttpApi.java similarity index 98% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/http/MachineMonitorHttpApi.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/http/MachineMonitorHttpApi.java index e3c2bf55..3b404423 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/http/MachineMonitorHttpApi.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/http/MachineMonitorHttpApi.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.http; +package cn.orionsec.ops.handler.http; import com.orion.http.support.HttpMethod; import lombok.AllArgsConstructor; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/http/MachineMonitorHttpApiRequester.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/http/MachineMonitorHttpApiRequester.java similarity index 93% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/http/MachineMonitorHttpApiRequester.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/http/MachineMonitorHttpApiRequester.java index 69400ed2..a65f7d8c 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/http/MachineMonitorHttpApiRequester.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/http/MachineMonitorHttpApiRequester.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.http; +package cn.orionsec.ops.handler.http; -import com.orion.ops.constant.monitor.MonitorConst; +import cn.orionsec.ops.constant.monitor.MonitorConst; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.NoArgsConstructor; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/monitor/MonitorAgentInstallTask.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/monitor/MonitorAgentInstallTask.java similarity index 92% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/monitor/MonitorAgentInstallTask.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/monitor/MonitorAgentInstallTask.java index d6979c75..2a209c86 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/monitor/MonitorAgentInstallTask.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/monitor/MonitorAgentInstallTask.java @@ -13,8 +13,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.monitor; +package cn.orionsec.ops.handler.monitor; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.event.EventKeys; +import cn.orionsec.ops.constant.message.MessageType; +import cn.orionsec.ops.constant.monitor.MonitorConst; +import cn.orionsec.ops.constant.monitor.MonitorStatus; +import cn.orionsec.ops.constant.system.SystemEnvAttr; +import cn.orionsec.ops.entity.domain.MachineInfoDO; +import cn.orionsec.ops.entity.domain.MachineMonitorDO; +import cn.orionsec.ops.entity.dto.user.UserDTO; +import cn.orionsec.ops.service.api.MachineEnvService; +import cn.orionsec.ops.service.api.MachineInfoService; +import cn.orionsec.ops.service.api.MachineMonitorService; +import cn.orionsec.ops.service.api.WebSideMessageService; +import cn.orionsec.ops.utils.PathBuilders; import com.orion.lang.constant.Letters; import com.orion.lang.utils.Arrays1; import com.orion.lang.utils.Exceptions; @@ -29,20 +43,6 @@ import com.orion.net.remote.ExitCode; import com.orion.net.remote.channel.SessionStore; import com.orion.net.remote.channel.sftp.SftpExecutor; import com.orion.net.remote.channel.ssh.CommandExecutor; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.event.EventKeys; -import com.orion.ops.constant.message.MessageType; -import com.orion.ops.constant.monitor.MonitorConst; -import com.orion.ops.constant.monitor.MonitorStatus; -import com.orion.ops.constant.system.SystemEnvAttr; -import com.orion.ops.entity.domain.MachineInfoDO; -import com.orion.ops.entity.domain.MachineMonitorDO; -import com.orion.ops.entity.dto.user.UserDTO; -import com.orion.ops.service.api.MachineEnvService; -import com.orion.ops.service.api.MachineInfoService; -import com.orion.ops.service.api.MachineMonitorService; -import com.orion.ops.service.api.WebSideMessageService; -import com.orion.ops.utils.PathBuilders; import com.orion.spring.SpringHolder; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/scheduler/AbstractTaskProcessor.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/scheduler/AbstractTaskProcessor.java similarity index 91% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/scheduler/AbstractTaskProcessor.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/scheduler/AbstractTaskProcessor.java index 00a881e3..2681f2ff 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/scheduler/AbstractTaskProcessor.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/scheduler/AbstractTaskProcessor.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.scheduler; +package cn.orionsec.ops.handler.scheduler; +import cn.orionsec.ops.constant.scheduler.SchedulerTaskStatus; +import cn.orionsec.ops.dao.SchedulerTaskDAO; +import cn.orionsec.ops.dao.SchedulerTaskRecordDAO; +import cn.orionsec.ops.entity.domain.SchedulerTaskDO; +import cn.orionsec.ops.entity.domain.SchedulerTaskMachineRecordDO; +import cn.orionsec.ops.entity.domain.SchedulerTaskRecordDO; +import cn.orionsec.ops.handler.scheduler.machine.ITaskMachineHandler; +import cn.orionsec.ops.handler.scheduler.machine.TaskMachineHandler; +import cn.orionsec.ops.service.api.SchedulerTaskMachineRecordService; import com.orion.lang.utils.collect.Maps; -import com.orion.ops.constant.scheduler.SchedulerTaskStatus; -import com.orion.ops.dao.SchedulerTaskDAO; -import com.orion.ops.dao.SchedulerTaskRecordDAO; -import com.orion.ops.entity.domain.SchedulerTaskDO; -import com.orion.ops.entity.domain.SchedulerTaskMachineRecordDO; -import com.orion.ops.entity.domain.SchedulerTaskRecordDO; -import com.orion.ops.handler.scheduler.machine.ITaskMachineHandler; -import com.orion.ops.handler.scheduler.machine.TaskMachineHandler; -import com.orion.ops.service.api.SchedulerTaskMachineRecordService; import com.orion.spring.SpringHolder; import lombok.extern.slf4j.Slf4j; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/scheduler/ITaskProcessor.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/scheduler/ITaskProcessor.java similarity index 95% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/scheduler/ITaskProcessor.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/scheduler/ITaskProcessor.java index e1f95c7e..5c2930c5 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/scheduler/ITaskProcessor.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/scheduler/ITaskProcessor.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.scheduler; +package cn.orionsec.ops.handler.scheduler; +import cn.orionsec.ops.constant.common.SerialType; import com.orion.lang.able.SafeCloseable; import com.orion.lang.function.select.Branches; import com.orion.lang.function.select.Selector; -import com.orion.ops.constant.common.SerialType; /** * 任务处理器基类 diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/scheduler/ParallelTaskProcessor.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/scheduler/ParallelTaskProcessor.java similarity index 88% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/scheduler/ParallelTaskProcessor.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/scheduler/ParallelTaskProcessor.java index 17725de4..8080b33c 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/scheduler/ParallelTaskProcessor.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/scheduler/ParallelTaskProcessor.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.scheduler; +package cn.orionsec.ops.handler.scheduler; +import cn.orionsec.ops.constant.MessageConst; +import cn.orionsec.ops.constant.SchedulerPools; +import cn.orionsec.ops.constant.scheduler.SchedulerTaskMachineStatus; +import cn.orionsec.ops.handler.scheduler.machine.ITaskMachineHandler; import com.orion.lang.utils.Exceptions; import com.orion.lang.utils.Threads; -import com.orion.ops.constant.MessageConst; -import com.orion.ops.constant.SchedulerPools; -import com.orion.ops.constant.scheduler.SchedulerTaskMachineStatus; -import com.orion.ops.handler.scheduler.machine.ITaskMachineHandler; import java.util.Collection; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/scheduler/SerialTaskProcessor.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/scheduler/SerialTaskProcessor.java similarity index 91% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/scheduler/SerialTaskProcessor.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/scheduler/SerialTaskProcessor.java index 4f4fa62a..49383f2b 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/scheduler/SerialTaskProcessor.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/scheduler/SerialTaskProcessor.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.scheduler; +package cn.orionsec.ops.handler.scheduler; -import com.orion.ops.constant.common.ExceptionHandlerType; -import com.orion.ops.constant.scheduler.SchedulerTaskMachineStatus; -import com.orion.ops.handler.scheduler.machine.ITaskMachineHandler; +import cn.orionsec.ops.constant.common.ExceptionHandlerType; +import cn.orionsec.ops.constant.scheduler.SchedulerTaskMachineStatus; +import cn.orionsec.ops.handler.scheduler.machine.ITaskMachineHandler; import java.util.Collection; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/scheduler/TaskSessionHolder.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/scheduler/TaskSessionHolder.java similarity index 97% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/scheduler/TaskSessionHolder.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/scheduler/TaskSessionHolder.java index f26bc11d..2d7db24d 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/scheduler/TaskSessionHolder.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/scheduler/TaskSessionHolder.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.scheduler; +package cn.orionsec.ops.handler.scheduler; import com.orion.lang.utils.collect.Maps; import org.springframework.stereotype.Component; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/scheduler/machine/ITaskMachineHandler.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/scheduler/machine/ITaskMachineHandler.java similarity index 90% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/scheduler/machine/ITaskMachineHandler.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/scheduler/machine/ITaskMachineHandler.java index 085d40bc..f04c38cf 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/scheduler/machine/ITaskMachineHandler.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/scheduler/machine/ITaskMachineHandler.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.scheduler.machine; +package cn.orionsec.ops.handler.scheduler.machine; +import cn.orionsec.ops.constant.scheduler.SchedulerTaskMachineStatus; import com.orion.lang.able.SafeCloseable; -import com.orion.ops.constant.scheduler.SchedulerTaskMachineStatus; /** * 机器处理器 diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/scheduler/machine/TaskMachineHandler.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/scheduler/machine/TaskMachineHandler.java similarity index 95% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/scheduler/machine/TaskMachineHandler.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/scheduler/machine/TaskMachineHandler.java index deba1c1d..947b588c 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/scheduler/machine/TaskMachineHandler.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/scheduler/machine/TaskMachineHandler.java @@ -13,8 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.scheduler.machine; +package cn.orionsec.ops.handler.scheduler.machine; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.common.StainCode; +import cn.orionsec.ops.constant.scheduler.SchedulerTaskMachineStatus; +import cn.orionsec.ops.constant.system.SystemEnvAttr; +import cn.orionsec.ops.dao.SchedulerTaskMachineRecordDAO; +import cn.orionsec.ops.entity.domain.SchedulerTaskMachineRecordDO; +import cn.orionsec.ops.handler.tail.TailSessionHolder; +import cn.orionsec.ops.service.api.MachineInfoService; +import cn.orionsec.ops.utils.Utils; import com.orion.lang.constant.Letters; import com.orion.lang.exception.DisabledException; import com.orion.lang.utils.Exceptions; @@ -26,15 +35,6 @@ import com.orion.net.remote.CommandExecutors; import com.orion.net.remote.ExitCode; import com.orion.net.remote.channel.SessionStore; import com.orion.net.remote.channel.ssh.CommandExecutor; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.common.StainCode; -import com.orion.ops.constant.scheduler.SchedulerTaskMachineStatus; -import com.orion.ops.constant.system.SystemEnvAttr; -import com.orion.ops.dao.SchedulerTaskMachineRecordDAO; -import com.orion.ops.entity.domain.SchedulerTaskMachineRecordDO; -import com.orion.ops.handler.tail.TailSessionHolder; -import com.orion.ops.service.api.MachineInfoService; -import com.orion.ops.utils.Utils; import com.orion.spring.SpringHolder; import lombok.Getter; import lombok.SneakyThrows; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/sftp/FileTransferProcessor.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/sftp/FileTransferProcessor.java similarity index 95% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/sftp/FileTransferProcessor.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/sftp/FileTransferProcessor.java index 3492ff38..fe20d986 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/sftp/FileTransferProcessor.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/sftp/FileTransferProcessor.java @@ -13,21 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.sftp; +package cn.orionsec.ops.handler.sftp; +import cn.orionsec.ops.constant.SchedulerPools; +import cn.orionsec.ops.constant.sftp.SftpTransferStatus; +import cn.orionsec.ops.dao.FileTransferLogDAO; +import cn.orionsec.ops.entity.domain.FileTransferLogDO; +import cn.orionsec.ops.entity.dto.sftp.FileTransferNotifyProgressDTO; +import cn.orionsec.ops.service.api.MachineEnvService; +import cn.orionsec.ops.service.api.MachineInfoService; import com.orion.lang.support.progress.ByteTransferRateProgress; import com.orion.lang.utils.Exceptions; import com.orion.lang.utils.io.Files1; import com.orion.lang.utils.math.Numbers; import com.orion.net.remote.channel.SessionStore; import com.orion.net.remote.channel.sftp.SftpExecutor; -import com.orion.ops.constant.SchedulerPools; -import com.orion.ops.constant.sftp.SftpTransferStatus; -import com.orion.ops.dao.FileTransferLogDAO; -import com.orion.ops.entity.domain.FileTransferLogDO; -import com.orion.ops.entity.dto.sftp.FileTransferNotifyProgressDTO; -import com.orion.ops.service.api.MachineEnvService; -import com.orion.ops.service.api.MachineInfoService; import com.orion.spring.SpringHolder; import lombok.extern.slf4j.Slf4j; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/sftp/IFileTransferProcessor.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/sftp/IFileTransferProcessor.java similarity index 79% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/sftp/IFileTransferProcessor.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/sftp/IFileTransferProcessor.java index 8d19f3c4..eba1a90c 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/sftp/IFileTransferProcessor.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/sftp/IFileTransferProcessor.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.sftp; +package cn.orionsec.ops.handler.sftp; +import cn.orionsec.ops.constant.sftp.SftpTransferType; +import cn.orionsec.ops.entity.domain.FileTransferLogDO; +import cn.orionsec.ops.handler.sftp.hint.FilePackageHint; +import cn.orionsec.ops.handler.sftp.hint.FileTransferHint; +import cn.orionsec.ops.handler.sftp.impl.DownloadFileProcessor; +import cn.orionsec.ops.handler.sftp.impl.PackageFileProcessor; +import cn.orionsec.ops.handler.sftp.impl.UploadFileProcessor; import com.orion.lang.able.Executable; import com.orion.lang.able.Stoppable; import com.orion.lang.function.select.Branches; import com.orion.lang.function.select.Selector; -import com.orion.ops.constant.sftp.SftpTransferType; -import com.orion.ops.entity.domain.FileTransferLogDO; -import com.orion.ops.handler.sftp.hint.FilePackageHint; -import com.orion.ops.handler.sftp.hint.FileTransferHint; -import com.orion.ops.handler.sftp.impl.DownloadFileProcessor; -import com.orion.ops.handler.sftp.impl.PackageFileProcessor; -import com.orion.ops.handler.sftp.impl.UploadFileProcessor; /** * sftp 传输接口 diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/sftp/SftpBasicExecutorHolder.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/sftp/SftpBasicExecutorHolder.java similarity index 92% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/sftp/SftpBasicExecutorHolder.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/sftp/SftpBasicExecutorHolder.java index dcf788b4..cef17a07 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/sftp/SftpBasicExecutorHolder.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/sftp/SftpBasicExecutorHolder.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.sftp; +package cn.orionsec.ops.handler.sftp; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.event.EventKeys; +import cn.orionsec.ops.entity.domain.MachineInfoDO; +import cn.orionsec.ops.service.api.MachineEnvService; +import cn.orionsec.ops.service.api.MachineInfoService; +import cn.orionsec.ops.service.api.SftpService; +import cn.orionsec.ops.utils.EventParamsHolder; import com.orion.lang.utils.collect.Maps; import com.orion.net.remote.channel.SessionStore; import com.orion.net.remote.channel.sftp.SftpExecutor; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.event.EventKeys; -import com.orion.ops.utils.EventParamsHolder; -import com.orion.ops.entity.domain.MachineInfoDO; -import com.orion.ops.service.api.MachineEnvService; -import com.orion.ops.service.api.MachineInfoService; -import com.orion.ops.service.api.SftpService; import lombok.extern.slf4j.Slf4j; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/sftp/SftpSupport.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/sftp/SftpSupport.java similarity index 93% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/sftp/SftpSupport.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/sftp/SftpSupport.java index c91c76c2..3955ff22 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/sftp/SftpSupport.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/sftp/SftpSupport.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.sftp; +package cn.orionsec.ops.handler.sftp; +import cn.orionsec.ops.constant.sftp.SftpTransferStatus; +import cn.orionsec.ops.constant.system.SystemEnvAttr; +import cn.orionsec.ops.handler.sftp.impl.UploadFileProcessor; import com.orion.lang.id.UUIds; import com.orion.lang.utils.Exceptions; import com.orion.lang.utils.io.Files1; import com.orion.net.remote.channel.sftp.SftpExecutor; -import com.orion.ops.constant.sftp.SftpTransferStatus; -import com.orion.ops.constant.system.SystemEnvAttr; -import com.orion.ops.handler.sftp.impl.UploadFileProcessor; import lombok.extern.slf4j.Slf4j; import java.io.File; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/sftp/TransferProcessorManager.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/sftp/TransferProcessorManager.java similarity index 95% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/sftp/TransferProcessorManager.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/sftp/TransferProcessorManager.java index ea95162d..33c2608b 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/sftp/TransferProcessorManager.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/sftp/TransferProcessorManager.java @@ -13,20 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.sftp; +package cn.orionsec.ops.handler.sftp; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.sftp.SftpNotifyType; +import cn.orionsec.ops.entity.domain.FileTransferLogDO; +import cn.orionsec.ops.entity.dto.sftp.FileTransferNotifyDTO; +import cn.orionsec.ops.entity.dto.sftp.FileTransferNotifyProgressDTO; +import cn.orionsec.ops.entity.vo.sftp.FileTransferLogVO; import com.orion.lang.utils.Exceptions; import com.orion.lang.utils.Threads; import com.orion.lang.utils.collect.Lists; import com.orion.lang.utils.collect.Maps; import com.orion.lang.utils.convert.Converts; import com.orion.lang.utils.json.Jsons; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.sftp.SftpNotifyType; -import com.orion.ops.entity.domain.FileTransferLogDO; -import com.orion.ops.entity.dto.sftp.FileTransferNotifyDTO; -import com.orion.ops.entity.dto.sftp.FileTransferNotifyProgressDTO; -import com.orion.ops.entity.vo.sftp.FileTransferLogVO; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; import org.springframework.web.socket.TextMessage; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/sftp/direct/DirectDownloader.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/sftp/direct/DirectDownloader.java similarity index 93% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/sftp/direct/DirectDownloader.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/sftp/direct/DirectDownloader.java index b9b50bc3..b2a4d3e5 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/sftp/direct/DirectDownloader.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/sftp/direct/DirectDownloader.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.sftp.direct; +package cn.orionsec.ops.handler.sftp.direct; +import cn.orionsec.ops.constant.MessageConst; +import cn.orionsec.ops.handler.sftp.SftpSupport; +import cn.orionsec.ops.service.api.MachineEnvService; +import cn.orionsec.ops.service.api.MachineInfoService; import com.orion.lang.able.SafeCloseable; import com.orion.lang.utils.Valid; import com.orion.lang.utils.io.Files1; import com.orion.lang.utils.io.Streams; import com.orion.net.remote.channel.SessionStore; import com.orion.net.remote.channel.sftp.SftpExecutor; -import com.orion.ops.constant.MessageConst; -import com.orion.ops.handler.sftp.SftpSupport; -import com.orion.ops.service.api.MachineEnvService; -import com.orion.ops.service.api.MachineInfoService; import com.orion.spring.SpringHolder; import lombok.extern.slf4j.Slf4j; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/sftp/hint/FilePackageHint.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/sftp/hint/FilePackageHint.java similarity index 92% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/sftp/hint/FilePackageHint.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/sftp/hint/FilePackageHint.java index 2102ff90..e5f538fb 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/sftp/hint/FilePackageHint.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/sftp/hint/FilePackageHint.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.sftp.hint; +package cn.orionsec.ops.handler.sftp.hint; -import com.orion.ops.entity.domain.FileTransferLogDO; +import cn.orionsec.ops.entity.domain.FileTransferLogDO; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/sftp/hint/FileTransferHint.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/sftp/hint/FileTransferHint.java similarity index 91% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/sftp/hint/FileTransferHint.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/sftp/hint/FileTransferHint.java index c0594cf1..e27a9727 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/sftp/hint/FileTransferHint.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/sftp/hint/FileTransferHint.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.sftp.hint; +package cn.orionsec.ops.handler.sftp.hint; -import com.orion.ops.constant.sftp.SftpTransferType; -import com.orion.ops.entity.domain.FileTransferLogDO; +import cn.orionsec.ops.constant.sftp.SftpTransferType; +import cn.orionsec.ops.entity.domain.FileTransferLogDO; import lombok.Data; import java.util.List; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/sftp/impl/DownloadFileProcessor.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/sftp/impl/DownloadFileProcessor.java similarity index 89% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/sftp/impl/DownloadFileProcessor.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/sftp/impl/DownloadFileProcessor.java index d774261c..ed674eee 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/sftp/impl/DownloadFileProcessor.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/sftp/impl/DownloadFileProcessor.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.sftp.impl; +package cn.orionsec.ops.handler.sftp.impl; +import cn.orionsec.ops.constant.SchedulerPools; +import cn.orionsec.ops.constant.system.SystemEnvAttr; +import cn.orionsec.ops.entity.domain.FileTransferLogDO; +import cn.orionsec.ops.handler.sftp.FileTransferProcessor; import com.alibaba.fastjson.JSON; import com.orion.lang.utils.Threads; import com.orion.lang.utils.io.Files1; import com.orion.net.remote.channel.sftp.SftpDownloader; -import com.orion.ops.constant.SchedulerPools; -import com.orion.ops.constant.system.SystemEnvAttr; -import com.orion.ops.entity.domain.FileTransferLogDO; -import com.orion.ops.handler.sftp.FileTransferProcessor; import lombok.extern.slf4j.Slf4j; /** diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/sftp/impl/PackageFileProcessor.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/sftp/impl/PackageFileProcessor.java similarity index 94% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/sftp/impl/PackageFileProcessor.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/sftp/impl/PackageFileProcessor.java index 9c05b0d1..bb9126bf 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/sftp/impl/PackageFileProcessor.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/sftp/impl/PackageFileProcessor.java @@ -13,8 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.sftp.impl; +package cn.orionsec.ops.handler.sftp.impl; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.SchedulerPools; +import cn.orionsec.ops.constant.sftp.SftpTransferStatus; +import cn.orionsec.ops.constant.sftp.SftpTransferType; +import cn.orionsec.ops.constant.system.SystemEnvAttr; +import cn.orionsec.ops.dao.FileTransferLogDAO; +import cn.orionsec.ops.entity.domain.FileTransferLogDO; +import cn.orionsec.ops.entity.dto.sftp.FileTransferNotifyProgressDTO; +import cn.orionsec.ops.handler.sftp.IFileTransferProcessor; +import cn.orionsec.ops.handler.sftp.TransferProcessorManager; import com.alibaba.fastjson.JSON; import com.orion.lang.utils.Strings; import com.orion.lang.utils.Threads; @@ -25,16 +35,6 @@ import com.orion.lang.utils.io.Streams; import com.orion.lang.utils.io.compress.CompressTypeEnum; import com.orion.lang.utils.io.compress.FileCompressor; import com.orion.lang.utils.math.Numbers; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.SchedulerPools; -import com.orion.ops.constant.sftp.SftpTransferStatus; -import com.orion.ops.constant.sftp.SftpTransferType; -import com.orion.ops.constant.system.SystemEnvAttr; -import com.orion.ops.dao.FileTransferLogDAO; -import com.orion.ops.entity.domain.FileTransferLogDO; -import com.orion.ops.entity.dto.sftp.FileTransferNotifyProgressDTO; -import com.orion.ops.handler.sftp.IFileTransferProcessor; -import com.orion.ops.handler.sftp.TransferProcessorManager; import com.orion.spring.SpringHolder; import lombok.extern.slf4j.Slf4j; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/sftp/impl/UploadFileProcessor.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/sftp/impl/UploadFileProcessor.java similarity index 89% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/sftp/impl/UploadFileProcessor.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/sftp/impl/UploadFileProcessor.java index 0476a77b..1f3626ed 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/sftp/impl/UploadFileProcessor.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/sftp/impl/UploadFileProcessor.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.sftp.impl; +package cn.orionsec.ops.handler.sftp.impl; +import cn.orionsec.ops.constant.SchedulerPools; +import cn.orionsec.ops.constant.system.SystemEnvAttr; +import cn.orionsec.ops.entity.domain.FileTransferLogDO; +import cn.orionsec.ops.handler.sftp.FileTransferProcessor; import com.alibaba.fastjson.JSON; import com.orion.lang.utils.Threads; import com.orion.lang.utils.io.Files1; import com.orion.net.remote.channel.sftp.SftpUploader; -import com.orion.ops.constant.SchedulerPools; -import com.orion.ops.constant.system.SystemEnvAttr; -import com.orion.ops.entity.domain.FileTransferLogDO; -import com.orion.ops.handler.sftp.FileTransferProcessor; import lombok.extern.slf4j.Slf4j; /** diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/sftp/notify/FileTransferNotifyHandler.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/sftp/notify/FileTransferNotifyHandler.java similarity index 91% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/sftp/notify/FileTransferNotifyHandler.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/sftp/notify/FileTransferNotifyHandler.java index 64c0f235..bf925631 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/sftp/notify/FileTransferNotifyHandler.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/sftp/notify/FileTransferNotifyHandler.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.sftp.notify; +package cn.orionsec.ops.handler.sftp.notify; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.ws.WsCloseCode; +import cn.orionsec.ops.entity.dto.sftp.SftpSessionTokenDTO; +import cn.orionsec.ops.entity.dto.user.UserDTO; +import cn.orionsec.ops.handler.sftp.TransferProcessorManager; +import cn.orionsec.ops.service.api.PassportService; +import cn.orionsec.ops.service.api.SftpService; +import cn.orionsec.ops.utils.WebSockets; import com.orion.lang.utils.Strings; import com.orion.lang.utils.collect.Lists; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.ws.WsCloseCode; -import com.orion.ops.entity.dto.sftp.SftpSessionTokenDTO; -import com.orion.ops.entity.dto.user.UserDTO; -import com.orion.ops.handler.sftp.TransferProcessorManager; -import com.orion.ops.service.api.PassportService; -import com.orion.ops.service.api.SftpService; -import com.orion.ops.utils.WebSockets; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; import org.springframework.web.socket.*; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/tail/ITailHandler.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/tail/ITailHandler.java similarity index 90% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/tail/ITailHandler.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/tail/ITailHandler.java index 31e1f53c..0a7b31f6 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/tail/ITailHandler.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/tail/ITailHandler.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.tail; +package cn.orionsec.ops.handler.tail; +import cn.orionsec.ops.constant.tail.FileTailMode; +import cn.orionsec.ops.handler.tail.impl.ExecTailFileHandler; +import cn.orionsec.ops.handler.tail.impl.TrackerTailFileHandler; import com.orion.lang.able.SafeCloseable; import com.orion.lang.function.select.Branches; import com.orion.lang.function.select.Selector; -import com.orion.ops.constant.tail.FileTailMode; -import com.orion.ops.handler.tail.impl.ExecTailFileHandler; -import com.orion.ops.handler.tail.impl.TrackerTailFileHandler; import org.springframework.web.socket.WebSocketSession; /** diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/tail/TailFileHandler.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/tail/TailFileHandler.java similarity index 93% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/tail/TailFileHandler.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/tail/TailFileHandler.java index 37893da4..9272ea14 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/tail/TailFileHandler.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/tail/TailFileHandler.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.tail; +package cn.orionsec.ops.handler.tail; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.system.SystemEnvAttr; +import cn.orionsec.ops.constant.tail.FileTailMode; +import cn.orionsec.ops.entity.dto.file.FileTailDTO; +import cn.orionsec.ops.utils.WebSockets; import com.alibaba.fastjson.JSON; import com.orion.lang.utils.Strings; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.system.SystemEnvAttr; -import com.orion.ops.constant.tail.FileTailMode; -import com.orion.ops.entity.dto.file.FileTailDTO; -import com.orion.ops.utils.WebSockets; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; import org.springframework.web.socket.CloseStatus; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/tail/TailFileHint.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/tail/TailFileHint.java similarity index 97% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/tail/TailFileHint.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/tail/TailFileHint.java index 7b322ddc..723a7a71 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/tail/TailFileHint.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/tail/TailFileHint.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.tail; +package cn.orionsec.ops.handler.tail; import lombok.Data; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/tail/TailSessionHolder.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/tail/TailSessionHolder.java similarity index 97% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/tail/TailSessionHolder.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/tail/TailSessionHolder.java index 1d0e02de..d83d4e5b 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/tail/TailSessionHolder.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/tail/TailSessionHolder.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.tail; +package cn.orionsec.ops.handler.tail; +import cn.orionsec.ops.constant.Const; import com.orion.lang.utils.Threads; import com.orion.lang.utils.collect.Lists; import com.orion.lang.utils.collect.Maps; -import com.orion.ops.constant.Const; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/tail/impl/ExecTailFileHandler.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/tail/impl/ExecTailFileHandler.java similarity index 93% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/tail/impl/ExecTailFileHandler.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/tail/impl/ExecTailFileHandler.java index ef858f76..c6a58f78 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/tail/impl/ExecTailFileHandler.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/tail/impl/ExecTailFileHandler.java @@ -13,20 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.tail.impl; +package cn.orionsec.ops.handler.tail.impl; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.SchedulerPools; +import cn.orionsec.ops.constant.ws.WsCloseCode; +import cn.orionsec.ops.handler.tail.ITailHandler; +import cn.orionsec.ops.handler.tail.TailFileHint; +import cn.orionsec.ops.service.api.MachineInfoService; +import cn.orionsec.ops.utils.WebSockets; import com.alibaba.fastjson.JSON; import com.orion.lang.utils.Strings; import com.orion.lang.utils.io.Streams; import com.orion.net.remote.channel.SessionStore; import com.orion.net.remote.channel.ssh.CommandExecutor; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.SchedulerPools; -import com.orion.ops.constant.ws.WsCloseCode; -import com.orion.ops.handler.tail.ITailHandler; -import com.orion.ops.handler.tail.TailFileHint; -import com.orion.ops.service.api.MachineInfoService; -import com.orion.ops.utils.WebSockets; import com.orion.spring.SpringHolder; import lombok.Getter; import lombok.SneakyThrows; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/tail/impl/TrackerTailFileHandler.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/tail/impl/TrackerTailFileHandler.java similarity index 91% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/tail/impl/TrackerTailFileHandler.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/tail/impl/TrackerTailFileHandler.java index e35ed96f..f43c7ed3 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/tail/impl/TrackerTailFileHandler.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/tail/impl/TrackerTailFileHandler.java @@ -13,8 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.tail.impl; +package cn.orionsec.ops.handler.tail.impl; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.SchedulerPools; +import cn.orionsec.ops.constant.ws.WsCloseCode; +import cn.orionsec.ops.handler.tail.ITailHandler; +import cn.orionsec.ops.handler.tail.TailFileHint; +import cn.orionsec.ops.utils.WebSockets; import com.alibaba.fastjson.JSON; import com.orion.ext.tail.Tracker; import com.orion.ext.tail.delay.DelayTrackerListener; @@ -23,12 +29,6 @@ import com.orion.ext.tail.mode.FileNotFoundMode; import com.orion.ext.tail.mode.FileOffsetMode; import com.orion.lang.define.thread.HookRunnable; import com.orion.lang.utils.Threads; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.SchedulerPools; -import com.orion.ops.constant.ws.WsCloseCode; -import com.orion.ops.handler.tail.ITailHandler; -import com.orion.ops.handler.tail.TailFileHint; -import com.orion.ops.utils.WebSockets; import lombok.Getter; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/terminal/IOperateHandler.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/terminal/IOperateHandler.java similarity index 83% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/terminal/IOperateHandler.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/terminal/IOperateHandler.java index 1968cf73..58b38cf2 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/terminal/IOperateHandler.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/terminal/IOperateHandler.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.terminal; +package cn.orionsec.ops.handler.terminal; +import cn.orionsec.ops.constant.terminal.TerminalClientOperate; +import cn.orionsec.ops.entity.config.TerminalConnectConfig; +import cn.orionsec.ops.handler.terminal.manager.TerminalManagementHandler; +import cn.orionsec.ops.handler.terminal.watcher.ITerminalWatcherProcessor; import com.orion.lang.able.SafeCloseable; -import com.orion.ops.constant.terminal.TerminalClientOperate; -import com.orion.ops.entity.config.TerminalConnectConfig; -import com.orion.ops.handler.terminal.manager.TerminalManagementHandler; -import com.orion.ops.handler.terminal.watcher.ITerminalWatcherProcessor; /** * 操作处理器 diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/terminal/TerminalMessageHandler.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/terminal/TerminalMessageHandler.java similarity index 90% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/terminal/TerminalMessageHandler.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/terminal/TerminalMessageHandler.java index 38465c58..874382f9 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/terminal/TerminalMessageHandler.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/terminal/TerminalMessageHandler.java @@ -13,23 +13,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.terminal; +package cn.orionsec.ops.handler.terminal; +import cn.orionsec.ops.constant.terminal.TerminalClientOperate; +import cn.orionsec.ops.constant.ws.WsCloseCode; +import cn.orionsec.ops.constant.ws.WsProtocol; +import cn.orionsec.ops.entity.config.TerminalConnectConfig; +import cn.orionsec.ops.entity.domain.MachineInfoDO; +import cn.orionsec.ops.entity.domain.MachineTerminalLogDO; +import cn.orionsec.ops.entity.dto.terminal.TerminalConnectDTO; +import cn.orionsec.ops.entity.dto.user.UserDTO; +import cn.orionsec.ops.handler.terminal.manager.TerminalSessionManager; +import cn.orionsec.ops.service.api.MachineInfoService; +import cn.orionsec.ops.service.api.MachineTerminalService; +import cn.orionsec.ops.service.api.PassportService; +import cn.orionsec.ops.utils.WebSockets; import com.orion.lang.define.wrapper.Tuple; import com.orion.net.remote.channel.SessionStore; -import com.orion.ops.constant.terminal.TerminalClientOperate; -import com.orion.ops.constant.ws.WsCloseCode; -import com.orion.ops.constant.ws.WsProtocol; -import com.orion.ops.entity.config.TerminalConnectConfig; -import com.orion.ops.entity.domain.MachineInfoDO; -import com.orion.ops.entity.domain.MachineTerminalLogDO; -import com.orion.ops.entity.dto.terminal.TerminalConnectDTO; -import com.orion.ops.entity.dto.user.UserDTO; -import com.orion.ops.handler.terminal.manager.TerminalSessionManager; -import com.orion.ops.service.api.MachineInfoService; -import com.orion.ops.service.api.MachineTerminalService; -import com.orion.ops.service.api.PassportService; -import com.orion.ops.utils.WebSockets; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; import org.springframework.web.socket.*; @@ -156,7 +156,7 @@ public class TerminalMessageHandler implements WebSocketHandler { Long userId = (Long) session.getAttributes().get(WebSockets.UID); Long machineId = (Long) session.getAttributes().get(WebSockets.MID); - // 获取登陆用户 + // 获取登录用户 UserDTO userDTO = passportService.getUserByToken(connectInfo.getLoginToken(), null); if (userDTO == null || !userId.equals(userDTO.getId())) { log.info("terminal 建立连接拒绝-用户认证失败 token: {}", token); diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/terminal/TerminalOperateHandler.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/terminal/TerminalOperateHandler.java similarity index 90% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/terminal/TerminalOperateHandler.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/terminal/TerminalOperateHandler.java index 675db643..0cc12f6a 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/terminal/TerminalOperateHandler.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/terminal/TerminalOperateHandler.java @@ -13,8 +13,26 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.terminal; +package cn.orionsec.ops.handler.terminal; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.SchedulerPools; +import cn.orionsec.ops.constant.system.SystemEnvAttr; +import cn.orionsec.ops.constant.terminal.TerminalClientOperate; +import cn.orionsec.ops.constant.terminal.TerminalConst; +import cn.orionsec.ops.constant.ws.WsCloseCode; +import cn.orionsec.ops.constant.ws.WsProtocol; +import cn.orionsec.ops.entity.config.TerminalConnectConfig; +import cn.orionsec.ops.entity.domain.MachineTerminalLogDO; +import cn.orionsec.ops.entity.dto.terminal.TerminalSizeDTO; +import cn.orionsec.ops.handler.terminal.screen.TerminalScreenEnv; +import cn.orionsec.ops.handler.terminal.screen.TerminalScreenHeader; +import cn.orionsec.ops.handler.terminal.watcher.ITerminalWatcherProcessor; +import cn.orionsec.ops.handler.terminal.watcher.TerminalWatcherProcessor; +import cn.orionsec.ops.service.api.MachineTerminalService; +import cn.orionsec.ops.utils.PathBuilders; +import cn.orionsec.ops.utils.Utils; +import cn.orionsec.ops.utils.WebSockets; import com.alibaba.fastjson.JSON; import com.orion.lang.constant.Letters; import com.orion.lang.utils.Strings; @@ -23,24 +41,6 @@ import com.orion.lang.utils.io.Streams; import com.orion.lang.utils.time.Dates; import com.orion.net.remote.channel.SessionStore; import com.orion.net.remote.channel.ssh.ShellExecutor; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.SchedulerPools; -import com.orion.ops.constant.system.SystemEnvAttr; -import com.orion.ops.constant.terminal.TerminalClientOperate; -import com.orion.ops.constant.terminal.TerminalConst; -import com.orion.ops.constant.ws.WsCloseCode; -import com.orion.ops.constant.ws.WsProtocol; -import com.orion.ops.entity.config.TerminalConnectConfig; -import com.orion.ops.entity.domain.MachineTerminalLogDO; -import com.orion.ops.entity.dto.terminal.TerminalSizeDTO; -import com.orion.ops.handler.terminal.screen.TerminalScreenEnv; -import com.orion.ops.handler.terminal.screen.TerminalScreenHeader; -import com.orion.ops.handler.terminal.watcher.ITerminalWatcherProcessor; -import com.orion.ops.handler.terminal.watcher.TerminalWatcherProcessor; -import com.orion.ops.service.api.MachineTerminalService; -import com.orion.ops.utils.PathBuilders; -import com.orion.ops.utils.Utils; -import com.orion.ops.utils.WebSockets; import com.orion.spring.SpringHolder; import lombok.Getter; import lombok.SneakyThrows; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/terminal/TerminalUtils.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/terminal/TerminalUtils.java similarity index 92% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/terminal/TerminalUtils.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/terminal/TerminalUtils.java index c32825e2..e6da3e2b 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/terminal/TerminalUtils.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/terminal/TerminalUtils.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.terminal; +package cn.orionsec.ops.handler.terminal; +import cn.orionsec.ops.entity.dto.terminal.TerminalConnectDTO; +import cn.orionsec.ops.entity.dto.terminal.TerminalSizeDTO; import com.orion.lang.utils.Strings; -import com.orion.ops.entity.dto.terminal.TerminalConnectDTO; -import com.orion.ops.entity.dto.terminal.TerminalSizeDTO; /** * 终端工具类 diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/terminal/manager/TerminalManagementHandler.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/terminal/manager/TerminalManagementHandler.java similarity index 95% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/terminal/manager/TerminalManagementHandler.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/terminal/manager/TerminalManagementHandler.java index 26601e52..58b06221 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/terminal/manager/TerminalManagementHandler.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/terminal/manager/TerminalManagementHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.terminal.manager; +package cn.orionsec.ops.handler.terminal.manager; /** * 管理handler diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/terminal/manager/TerminalSessionManager.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/terminal/manager/TerminalSessionManager.java similarity index 90% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/terminal/manager/TerminalSessionManager.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/terminal/manager/TerminalSessionManager.java index c0e76509..d286b39b 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/terminal/manager/TerminalSessionManager.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/terminal/manager/TerminalSessionManager.java @@ -13,8 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.terminal.manager; +package cn.orionsec.ops.handler.terminal.manager; +import cn.orionsec.ops.constant.KeyConst; +import cn.orionsec.ops.constant.MessageConst; +import cn.orionsec.ops.constant.event.EventKeys; +import cn.orionsec.ops.entity.config.TerminalConnectConfig; +import cn.orionsec.ops.entity.dto.terminal.TerminalWatcherDTO; +import cn.orionsec.ops.entity.request.machine.MachineTerminalManagerRequest; +import cn.orionsec.ops.entity.vo.machine.MachineTerminalManagerVO; +import cn.orionsec.ops.entity.vo.machine.TerminalWatcherVO; +import cn.orionsec.ops.handler.terminal.IOperateHandler; +import cn.orionsec.ops.utils.Currents; +import cn.orionsec.ops.utils.EventParamsHolder; import com.alibaba.fastjson.JSON; import com.orion.lang.define.wrapper.DataGrid; import com.orion.lang.id.UUIds; @@ -25,17 +36,6 @@ import com.orion.lang.utils.collect.Lists; import com.orion.lang.utils.collect.Maps; import com.orion.lang.utils.convert.Converts; import com.orion.lang.utils.time.DateRanges; -import com.orion.ops.constant.KeyConst; -import com.orion.ops.constant.MessageConst; -import com.orion.ops.constant.event.EventKeys; -import com.orion.ops.utils.EventParamsHolder; -import com.orion.ops.entity.dto.terminal.TerminalWatcherDTO; -import com.orion.ops.entity.request.machine.MachineTerminalManagerRequest; -import com.orion.ops.entity.vo.machine.MachineTerminalManagerVO; -import com.orion.ops.entity.vo.machine.TerminalWatcherVO; -import com.orion.ops.handler.terminal.IOperateHandler; -import com.orion.ops.entity.config.TerminalConnectConfig; -import com.orion.ops.utils.Currents; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Component; @@ -156,7 +156,7 @@ public class TerminalSessionManager { .token(token) .readonly(readonly) .build(); - String key = Strings.format(KeyConst.TERMINAL_WATCHER_TOKEN,watcherToken); + String key = Strings.format(KeyConst.TERMINAL_WATCHER_TOKEN, watcherToken); redisTemplate.opsForValue().set(key, JSON.toJSONString(cache), KeyConst.TERMINAL_WATCHER_TOKEN_EXPIRE, TimeUnit.SECONDS); // 设置返回 diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/terminal/screen/TerminalScreenEnv.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/terminal/screen/TerminalScreenEnv.java similarity index 94% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/terminal/screen/TerminalScreenEnv.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/terminal/screen/TerminalScreenEnv.java index 69c4947d..3c9ee23d 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/terminal/screen/TerminalScreenEnv.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/terminal/screen/TerminalScreenEnv.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.terminal.screen; +package cn.orionsec.ops.handler.terminal.screen; +import cn.orionsec.ops.constant.Const; import com.alibaba.fastjson.annotation.JSONField; import com.orion.net.remote.TerminalType; -import com.orion.ops.constant.Const; import lombok.Data; /** diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/terminal/screen/TerminalScreenHeader.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/terminal/screen/TerminalScreenHeader.java similarity index 96% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/terminal/screen/TerminalScreenHeader.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/terminal/screen/TerminalScreenHeader.java index ea9a7bf5..e7a22650 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/terminal/screen/TerminalScreenHeader.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/terminal/screen/TerminalScreenHeader.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.terminal.screen; +package cn.orionsec.ops.handler.terminal.screen; import com.alibaba.fastjson.annotation.JSONField; import lombok.Data; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/terminal/watcher/ITerminalWatcherProcessor.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/terminal/watcher/ITerminalWatcherProcessor.java similarity index 96% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/terminal/watcher/ITerminalWatcherProcessor.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/terminal/watcher/ITerminalWatcherProcessor.java index 2d666aac..499dc788 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/terminal/watcher/ITerminalWatcherProcessor.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/terminal/watcher/ITerminalWatcherProcessor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.terminal.watcher; +package cn.orionsec.ops.handler.terminal.watcher; import com.orion.lang.able.SafeCloseable; import com.orion.lang.able.Watchable; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/terminal/watcher/TerminalWatcherHandler.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/terminal/watcher/TerminalWatcherHandler.java similarity index 90% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/terminal/watcher/TerminalWatcherHandler.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/terminal/watcher/TerminalWatcherHandler.java index b52ff87e..fae4ab55 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/terminal/watcher/TerminalWatcherHandler.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/terminal/watcher/TerminalWatcherHandler.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.terminal.watcher; +package cn.orionsec.ops.handler.terminal.watcher; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.terminal.TerminalClientOperate; +import cn.orionsec.ops.constant.ws.WsCloseCode; +import cn.orionsec.ops.constant.ws.WsProtocol; +import cn.orionsec.ops.entity.dto.user.UserDTO; +import cn.orionsec.ops.handler.terminal.IOperateHandler; +import cn.orionsec.ops.handler.terminal.manager.TerminalSessionManager; +import cn.orionsec.ops.service.api.PassportService; +import cn.orionsec.ops.utils.WebSockets; import com.orion.lang.define.wrapper.Tuple; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.terminal.TerminalClientOperate; -import com.orion.ops.constant.ws.WsCloseCode; -import com.orion.ops.constant.ws.WsProtocol; -import com.orion.ops.entity.dto.user.UserDTO; -import com.orion.ops.handler.terminal.IOperateHandler; -import com.orion.ops.handler.terminal.manager.TerminalSessionManager; -import com.orion.ops.service.api.PassportService; -import com.orion.ops.utils.WebSockets; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; import org.springframework.web.socket.*; @@ -136,7 +136,7 @@ public class TerminalWatcherHandler implements WebSocketHandler { private void auth(WebSocketSession session, String loginToken) { // 检查参数 Long userId = (Long) session.getAttributes().get(WebSockets.UID); - // 获取登陆用户 + // 获取登录用户 UserDTO userDTO = passportService.getUserByToken(loginToken, null); if (userDTO == null || !userId.equals(userDTO.getId())) { WebSockets.close(session, WsCloseCode.IDENTITY_MISMATCH); diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/terminal/watcher/TerminalWatcherProcessor.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/terminal/watcher/TerminalWatcherProcessor.java similarity index 91% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/terminal/watcher/TerminalWatcherProcessor.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/terminal/watcher/TerminalWatcherProcessor.java index 2bea59c6..8d17fcf9 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/terminal/watcher/TerminalWatcherProcessor.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/terminal/watcher/TerminalWatcherProcessor.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.terminal.watcher; +package cn.orionsec.ops.handler.terminal.watcher; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.SchedulerPools; +import cn.orionsec.ops.constant.ws.WsCloseCode; +import cn.orionsec.ops.utils.WebSockets; import com.orion.lang.utils.Threads; import com.orion.lang.utils.collect.Maps; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.SchedulerPools; -import com.orion.ops.constant.ws.WsCloseCode; -import com.orion.ops.utils.WebSockets; import lombok.SneakyThrows; import org.springframework.web.socket.WebSocketSession; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/webhook/DingRobotPusher.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/webhook/DingRobotPusher.java similarity index 98% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/webhook/DingRobotPusher.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/webhook/DingRobotPusher.java index 4e3f1906..48bfbdef 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/webhook/DingRobotPusher.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/webhook/DingRobotPusher.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.webhook; +package cn.orionsec.ops.handler.webhook; import com.dingtalk.api.DefaultDingTalkClient; import com.dingtalk.api.DingTalkClient; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/webhook/IWebhookPusher.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/webhook/IWebhookPusher.java similarity index 95% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/webhook/IWebhookPusher.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/webhook/IWebhookPusher.java index 9d4928fb..c409d0ec 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/handler/webhook/IWebhookPusher.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/webhook/IWebhookPusher.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.handler.webhook; +package cn.orionsec.ops.handler.webhook; /** * webhook 推送器 diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/interceptor/AuthenticateInterceptor.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/interceptor/AuthenticateInterceptor.java similarity index 86% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/interceptor/AuthenticateInterceptor.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/interceptor/AuthenticateInterceptor.java index a8c00ded..c0d0b96a 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/interceptor/AuthenticateInterceptor.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/interceptor/AuthenticateInterceptor.java @@ -13,20 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.interceptor; +package cn.orionsec.ops.interceptor; +import cn.orionsec.ops.annotation.IgnoreAuth; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.ResultCode; +import cn.orionsec.ops.constant.common.EnableType; +import cn.orionsec.ops.constant.system.SystemEnvAttr; +import cn.orionsec.ops.entity.dto.user.UserDTO; +import cn.orionsec.ops.service.api.PassportService; +import cn.orionsec.ops.utils.Currents; +import cn.orionsec.ops.utils.UserHolder; import com.orion.lang.constant.StandardContentType; import com.orion.lang.define.wrapper.HttpWrapper; import com.orion.lang.utils.Strings; -import com.orion.ops.annotation.IgnoreAuth; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.ResultCode; -import com.orion.ops.constant.common.EnableType; -import com.orion.ops.constant.system.SystemEnvAttr; -import com.orion.ops.entity.dto.user.UserDTO; -import com.orion.ops.service.api.PassportService; -import com.orion.ops.utils.Currents; -import com.orion.ops.utils.UserHolder; import com.orion.web.servlet.web.Servlets; import org.springframework.stereotype.Component; import org.springframework.web.method.HandlerMethod; @@ -65,7 +65,7 @@ public class AuthenticateInterceptor implements HandlerInterceptor { if (EnableType.of(SystemEnvAttr.LOGIN_IP_BIND.getValue()).getValue()) { ip = Servlets.getRemoteAddr(request); } - // 获取用户登陆信息 + // 获取用户登录信息 UserDTO user = passportService.getUserByToken(loginToken, ip); if (user != null) { if (Const.DISABLE.equals(user.getUserStatus())) { diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/interceptor/DemoDisableApiAspect.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/interceptor/DemoDisableApiAspect.java similarity index 91% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/interceptor/DemoDisableApiAspect.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/interceptor/DemoDisableApiAspect.java index 854697db..c680db5b 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/interceptor/DemoDisableApiAspect.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/interceptor/DemoDisableApiAspect.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.interceptor; +package cn.orionsec.ops.interceptor; +import cn.orionsec.ops.annotation.DemoDisableApi; +import cn.orionsec.ops.constant.ResultCode; import com.orion.lang.define.wrapper.HttpWrapper; import com.orion.lang.utils.Exceptions; -import com.orion.ops.annotation.DemoDisableApi; -import com.orion.ops.constant.ResultCode; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Before; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/interceptor/ExposeApiHeaderInterceptor.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/interceptor/ExposeApiHeaderInterceptor.java similarity index 94% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/interceptor/ExposeApiHeaderInterceptor.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/interceptor/ExposeApiHeaderInterceptor.java index 9f479682..556a4b6f 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/interceptor/ExposeApiHeaderInterceptor.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/interceptor/ExposeApiHeaderInterceptor.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.interceptor; +package cn.orionsec.ops.interceptor; +import cn.orionsec.ops.annotation.IgnoreCheck; +import cn.orionsec.ops.constant.ResultCode; import com.orion.lang.constant.StandardContentType; import com.orion.lang.define.wrapper.HttpWrapper; -import com.orion.ops.annotation.IgnoreCheck; -import com.orion.ops.constant.ResultCode; import com.orion.web.servlet.web.Servlets; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/interceptor/FileTransferNotifyInterceptor.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/interceptor/FileTransferNotifyInterceptor.java similarity index 92% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/interceptor/FileTransferNotifyInterceptor.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/interceptor/FileTransferNotifyInterceptor.java index 26980e93..c3d58bff 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/interceptor/FileTransferNotifyInterceptor.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/interceptor/FileTransferNotifyInterceptor.java @@ -13,11 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.interceptor; +package cn.orionsec.ops.interceptor; +import cn.orionsec.ops.constant.KeyConst; +import cn.orionsec.ops.utils.WebSockets; import com.orion.lang.utils.Booleans; import com.orion.lang.utils.Strings; -import com.orion.ops.constant.KeyConst; import lombok.extern.slf4j.Slf4j; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.http.server.ServerHttpRequest; @@ -29,8 +30,6 @@ import org.springframework.web.socket.server.HandshakeInterceptor; import javax.annotation.Resource; import java.util.Map; -import static com.orion.ops.utils.WebSockets.getToken; - /** * sftp通知拦截器 * @@ -47,7 +46,7 @@ public class FileTransferNotifyInterceptor implements HandshakeInterceptor { @Override public boolean beforeHandshake(ServerHttpRequest request, ServerHttpResponse response, WebSocketHandler wsHandler, Map attributes) throws Exception { - String token = getToken(request); + String token = WebSockets.getToken(request); String tokenKey = Strings.format(KeyConst.SFTP_SESSION_TOKEN, token); boolean access = Booleans.isTrue(redisTemplate.hasKey(tokenKey)); log.info("sftp通知 尝试建立ws连接开始 token: {}, 结果: {}", token, access); diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/interceptor/IpFilterInterceptor.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/interceptor/IpFilterInterceptor.java similarity index 95% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/interceptor/IpFilterInterceptor.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/interceptor/IpFilterInterceptor.java index 72d2e044..8f2b58dc 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/interceptor/IpFilterInterceptor.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/interceptor/IpFilterInterceptor.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.interceptor; +package cn.orionsec.ops.interceptor; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.ResultCode; +import cn.orionsec.ops.utils.Utils; import com.orion.lang.constant.StandardContentType; import com.orion.lang.define.wrapper.HttpWrapper; import com.orion.lang.utils.Strings; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.ResultCode; -import com.orion.ops.utils.Utils; import com.orion.web.servlet.web.Servlets; import org.springframework.stereotype.Component; import org.springframework.web.method.HandlerMethod; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/interceptor/LogPrintInterceptor.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/interceptor/LogPrintInterceptor.java similarity index 97% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/interceptor/LogPrintInterceptor.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/interceptor/LogPrintInterceptor.java index 7cbdf2e3..71dcfd41 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/interceptor/LogPrintInterceptor.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/interceptor/LogPrintInterceptor.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.interceptor; +package cn.orionsec.ops.interceptor; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.utils.UserHolder; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.serializer.PropertyFilter; import com.orion.lang.id.UUIds; import com.orion.lang.utils.Arrays1; import com.orion.lang.utils.Exceptions; import com.orion.lang.utils.time.Dates; -import com.orion.ops.constant.Const; -import com.orion.ops.utils.UserHolder; import com.orion.web.servlet.web.Servlets; import lombok.extern.slf4j.Slf4j; import org.aopalliance.intercept.MethodInterceptor; @@ -90,7 +90,7 @@ public class LogPrintInterceptor implements MethodInterceptor { */ public void beforeLogPrint(MethodInvocation invocation) { StringBuilder requestLog = new StringBuilder("\napi请求-开始-seq: ").append(SEQ_HOLDER.get()).append('\n'); - // 登陆用户 + // 登录用户 requestLog.append("\t当前用户: ").append(JSON.toJSONString(UserHolder.get())).append('\n'); // http请求信息 Optional.ofNullable(RequestContextHolder.getRequestAttributes()) diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/interceptor/RoleInterceptor.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/interceptor/RoleInterceptor.java similarity index 90% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/interceptor/RoleInterceptor.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/interceptor/RoleInterceptor.java index 4418d5bb..d161ddc6 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/interceptor/RoleInterceptor.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/interceptor/RoleInterceptor.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.interceptor; +package cn.orionsec.ops.interceptor; +import cn.orionsec.ops.annotation.RequireRole; +import cn.orionsec.ops.constant.ResultCode; +import cn.orionsec.ops.constant.user.RoleType; +import cn.orionsec.ops.entity.dto.user.UserDTO; +import cn.orionsec.ops.utils.UserHolder; import com.orion.lang.constant.StandardContentType; import com.orion.lang.define.wrapper.HttpWrapper; import com.orion.lang.utils.Arrays1; -import com.orion.ops.annotation.RequireRole; -import com.orion.ops.constant.ResultCode; -import com.orion.ops.constant.user.RoleType; -import com.orion.ops.utils.UserHolder; -import com.orion.ops.entity.dto.user.UserDTO; import com.orion.web.servlet.web.Servlets; import org.springframework.stereotype.Component; import org.springframework.web.method.HandlerMethod; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/interceptor/TailFileInterceptor.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/interceptor/TailFileInterceptor.java similarity index 90% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/interceptor/TailFileInterceptor.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/interceptor/TailFileInterceptor.java index 1dc57701..be11551c 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/interceptor/TailFileInterceptor.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/interceptor/TailFileInterceptor.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.interceptor; +package cn.orionsec.ops.interceptor; +import cn.orionsec.ops.constant.KeyConst; +import cn.orionsec.ops.entity.dto.file.FileTailDTO; +import cn.orionsec.ops.utils.WebSockets; import com.alibaba.fastjson.JSON; import com.orion.lang.utils.Strings; -import com.orion.ops.constant.KeyConst; -import com.orion.ops.entity.dto.file.FileTailDTO; -import com.orion.ops.utils.WebSockets; import lombok.extern.slf4j.Slf4j; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.http.server.ServerHttpRequest; @@ -31,8 +31,6 @@ import org.springframework.web.socket.server.HandshakeInterceptor; import javax.annotation.Resource; import java.util.Map; -import static com.orion.ops.utils.WebSockets.getToken; - /** * tail 文件拦截器 * @@ -49,7 +47,7 @@ public class TailFileInterceptor implements HandshakeInterceptor { @Override public boolean beforeHandshake(ServerHttpRequest request, ServerHttpResponse response, WebSocketHandler wsHandler, Map attributes) { - String token = getToken(request); + String token = WebSockets.getToken(request); String tokenKey = Strings.format(KeyConst.FILE_TAIL_ACCESS_TOKEN, token); String tokenValue = redisTemplate.opsForValue().get(tokenKey); boolean access = false; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/interceptor/TerminalAccessInterceptor.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/interceptor/TerminalAccessInterceptor.java similarity index 91% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/interceptor/TerminalAccessInterceptor.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/interceptor/TerminalAccessInterceptor.java index af0adcfd..a6da98b8 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/interceptor/TerminalAccessInterceptor.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/interceptor/TerminalAccessInterceptor.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.interceptor; +package cn.orionsec.ops.interceptor; +import cn.orionsec.ops.constant.KeyConst; +import cn.orionsec.ops.utils.WebSockets; import com.orion.lang.utils.Strings; -import com.orion.ops.constant.KeyConst; -import com.orion.ops.utils.WebSockets; import lombok.extern.slf4j.Slf4j; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.http.server.ServerHttpRequest; @@ -29,8 +29,6 @@ import org.springframework.web.socket.server.HandshakeInterceptor; import javax.annotation.Resource; import java.util.Map; -import static com.orion.ops.utils.WebSockets.getToken; - /** * terminal 访问拦截器 * @@ -48,7 +46,7 @@ public class TerminalAccessInterceptor implements HandshakeInterceptor { @Override public boolean beforeHandshake(ServerHttpRequest request, ServerHttpResponse response, WebSocketHandler wsHandler, Map attributes) { // 获取 token - String token = getToken(request); + String token = WebSockets.getToken(request); String tokenKey = Strings.format(KeyConst.TERMINAL_ACCESS_TOKEN, token); String tokenValue = redisTemplate.opsForValue().get(tokenKey); boolean access = false; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/interceptor/TerminalWatcherInterceptor.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/interceptor/TerminalWatcherInterceptor.java similarity index 90% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/interceptor/TerminalWatcherInterceptor.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/interceptor/TerminalWatcherInterceptor.java index b0ec1819..4dd60d1f 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/interceptor/TerminalWatcherInterceptor.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/interceptor/TerminalWatcherInterceptor.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.interceptor; +package cn.orionsec.ops.interceptor; +import cn.orionsec.ops.constant.KeyConst; +import cn.orionsec.ops.entity.dto.terminal.TerminalWatcherDTO; +import cn.orionsec.ops.utils.WebSockets; import com.alibaba.fastjson.JSON; import com.orion.lang.utils.Strings; -import com.orion.ops.constant.KeyConst; -import com.orion.ops.entity.dto.terminal.TerminalWatcherDTO; -import com.orion.ops.utils.WebSockets; import lombok.extern.slf4j.Slf4j; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.http.server.ServerHttpRequest; @@ -31,8 +31,6 @@ import org.springframework.web.socket.server.HandshakeInterceptor; import javax.annotation.Resource; import java.util.Map; -import static com.orion.ops.utils.WebSockets.getToken; - /** * terminal 监视拦截器 * @@ -50,7 +48,7 @@ public class TerminalWatcherInterceptor implements HandshakeInterceptor { @Override public boolean beforeHandshake(ServerHttpRequest request, ServerHttpResponse response, WebSocketHandler wsHandler, Map attributes) { // 获取 token - String token = getToken(request); + String token = WebSockets.getToken(request); String tokenKey = Strings.format(KeyConst.TERMINAL_WATCHER_TOKEN, token); String tokenValue = redisTemplate.opsForValue().get(tokenKey); boolean access = false; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/interceptor/UserActiveInterceptor.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/interceptor/UserActiveInterceptor.java similarity index 83% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/interceptor/UserActiveInterceptor.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/interceptor/UserActiveInterceptor.java index 7473e676..1523e066 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/interceptor/UserActiveInterceptor.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/interceptor/UserActiveInterceptor.java @@ -13,21 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.interceptor; +package cn.orionsec.ops.interceptor; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.KeyConst; +import cn.orionsec.ops.constant.common.EnableType; +import cn.orionsec.ops.constant.event.EventKeys; +import cn.orionsec.ops.constant.event.EventType; +import cn.orionsec.ops.constant.system.SystemEnvAttr; +import cn.orionsec.ops.dao.UserInfoDAO; +import cn.orionsec.ops.entity.dto.user.UserDTO; +import cn.orionsec.ops.service.api.UserEventLogService; +import cn.orionsec.ops.utils.Currents; +import cn.orionsec.ops.utils.EventParamsHolder; import com.orion.lang.utils.Strings; import com.orion.lang.utils.collect.Maps; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.KeyConst; -import com.orion.ops.constant.common.EnableType; -import com.orion.ops.constant.event.EventKeys; -import com.orion.ops.constant.event.EventType; -import com.orion.ops.constant.system.SystemEnvAttr; -import com.orion.ops.dao.UserInfoDAO; -import com.orion.ops.entity.dto.user.UserDTO; -import com.orion.ops.service.api.UserEventLogService; -import com.orion.ops.utils.Currents; -import com.orion.ops.utils.EventParamsHolder; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Component; import org.springframework.web.servlet.HandlerInterceptor; @@ -81,7 +81,7 @@ public class UserActiveInterceptor implements HandlerInterceptor { long now = System.currentTimeMillis(); Long before = activeUsers.put(user.getId(), now); if (before == null) { - // 应用启动/多端登陆(单端登出) token有效 + // 应用启动/多端登录(单端登出) token有效 this.refreshActive(user); return; } @@ -101,13 +101,13 @@ public class UserActiveInterceptor implements HandlerInterceptor { */ private void refreshActive(UserDTO user) { Long userId = user.getId(); - // 刷新登陆时间 + // 刷新登录时间 userInfoDAO.updateLastLoginTime(userId); // 记录日志 EventParamsHolder.addParam(EventKeys.REFRESH_LOGIN, Const.ENABLE); EventParamsHolder.setDefaultEventParams(); userEventLogService.recordLog(EventType.LOGIN, true); - // 如果开启自动续签 刷新登陆token 绑定token + // 如果开启自动续签 刷新登录token 绑定token if (EnableType.of(SystemEnvAttr.LOGIN_TOKEN_AUTO_RENEW.getValue()).getValue()) { long expire = Long.parseLong(SystemEnvAttr.LOGIN_TOKEN_EXPIRE.getValue()); String loginKey = Strings.format(KeyConst.LOGIN_TOKEN_KEY, userId); @@ -121,7 +121,7 @@ public class UserActiveInterceptor implements HandlerInterceptor { * 设置活跃时间 * * @param id id - * @param time 登陆时间 + * @param time 登录时间 */ public void setActiveTime(Long id, Long time) { activeUsers.put(id, time); diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/interceptor/UserEventLogAspect.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/interceptor/UserEventLogAspect.java similarity index 90% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/interceptor/UserEventLogAspect.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/interceptor/UserEventLogAspect.java index f1cee0d7..0527c6e6 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/interceptor/UserEventLogAspect.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/interceptor/UserEventLogAspect.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.interceptor; +package cn.orionsec.ops.interceptor; -import com.orion.ops.annotation.EventLog; -import com.orion.ops.utils.EventParamsHolder; -import com.orion.ops.service.api.UserEventLogService; +import cn.orionsec.ops.annotation.EventLog; +import cn.orionsec.ops.service.api.UserEventLogService; +import cn.orionsec.ops.utils.EventParamsHolder; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.annotation.*; import org.springframework.core.annotation.Order; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/AlarmGroupNotifyService.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/AlarmGroupNotifyService.java similarity index 94% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/AlarmGroupNotifyService.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/AlarmGroupNotifyService.java index a05aba65..ebdc38c3 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/AlarmGroupNotifyService.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/AlarmGroupNotifyService.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.api; +package cn.orionsec.ops.service.api; -import com.orion.ops.entity.domain.AlarmGroupNotifyDO; +import cn.orionsec.ops.entity.domain.AlarmGroupNotifyDO; import java.util.List; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/AlarmGroupService.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/AlarmGroupService.java similarity index 91% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/AlarmGroupService.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/AlarmGroupService.java index 6197269c..88db58f8 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/AlarmGroupService.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/AlarmGroupService.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.api; +package cn.orionsec.ops.service.api; +import cn.orionsec.ops.entity.request.alarm.AlarmGroupRequest; +import cn.orionsec.ops.entity.vo.alarm.AlarmGroupVO; import com.orion.lang.define.wrapper.DataGrid; -import com.orion.ops.entity.request.alarm.AlarmGroupRequest; -import com.orion.ops.entity.vo.alarm.AlarmGroupVO; /** * 报警组服务 diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/AlarmGroupUserService.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/AlarmGroupUserService.java similarity index 94% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/AlarmGroupUserService.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/AlarmGroupUserService.java index b8201718..201b128c 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/AlarmGroupUserService.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/AlarmGroupUserService.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.api; +package cn.orionsec.ops.service.api; -import com.orion.ops.entity.domain.AlarmGroupUserDO; +import cn.orionsec.ops.entity.domain.AlarmGroupUserDO; import java.util.List; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/ApplicationActionLogService.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/ApplicationActionLogService.java similarity index 92% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/ApplicationActionLogService.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/ApplicationActionLogService.java index 94ed7f14..3340105d 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/ApplicationActionLogService.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/ApplicationActionLogService.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.api; +package cn.orionsec.ops.service.api; -import com.orion.ops.constant.app.StageType; -import com.orion.ops.entity.domain.ApplicationActionLogDO; -import com.orion.ops.entity.vo.app.ApplicationActionLogVO; +import cn.orionsec.ops.constant.app.StageType; +import cn.orionsec.ops.entity.domain.ApplicationActionLogDO; +import cn.orionsec.ops.entity.vo.app.ApplicationActionLogVO; import java.util.List; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/ApplicationActionService.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/ApplicationActionService.java similarity index 93% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/ApplicationActionService.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/ApplicationActionService.java index e411322c..89a29787 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/ApplicationActionService.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/ApplicationActionService.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.api; +package cn.orionsec.ops.service.api; -import com.orion.ops.entity.domain.ApplicationActionDO; -import com.orion.ops.entity.request.app.ApplicationConfigRequest; +import cn.orionsec.ops.entity.domain.ApplicationActionDO; +import cn.orionsec.ops.entity.request.app.ApplicationConfigRequest; import java.util.List; import java.util.Map; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/ApplicationBuildService.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/ApplicationBuildService.java similarity index 89% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/ApplicationBuildService.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/ApplicationBuildService.java index bbc2a023..189c0bae 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/ApplicationBuildService.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/ApplicationBuildService.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.api; +package cn.orionsec.ops.service.api; +import cn.orionsec.ops.entity.domain.ApplicationBuildDO; +import cn.orionsec.ops.entity.request.app.ApplicationBuildRequest; +import cn.orionsec.ops.entity.vo.app.ApplicationBuildReleaseListVO; +import cn.orionsec.ops.entity.vo.app.ApplicationBuildStatusVO; +import cn.orionsec.ops.entity.vo.app.ApplicationBuildVO; import com.orion.lang.define.wrapper.DataGrid; -import com.orion.ops.entity.domain.ApplicationBuildDO; -import com.orion.ops.entity.request.app.ApplicationBuildRequest; -import com.orion.ops.entity.vo.app.ApplicationBuildReleaseListVO; -import com.orion.ops.entity.vo.app.ApplicationBuildStatusVO; -import com.orion.ops.entity.vo.app.ApplicationBuildVO; import java.util.List; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/ApplicationEnvService.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/ApplicationEnvService.java similarity index 93% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/ApplicationEnvService.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/ApplicationEnvService.java index 4f8842c6..86e17ab5 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/ApplicationEnvService.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/ApplicationEnvService.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.api; +package cn.orionsec.ops.service.api; +import cn.orionsec.ops.entity.domain.ApplicationEnvDO; +import cn.orionsec.ops.entity.request.app.ApplicationConfigRequest; +import cn.orionsec.ops.entity.request.app.ApplicationEnvRequest; +import cn.orionsec.ops.entity.vo.app.ApplicationEnvVO; import com.orion.lang.define.collect.MutableLinkedHashMap; import com.orion.lang.define.wrapper.DataGrid; -import com.orion.ops.entity.domain.ApplicationEnvDO; -import com.orion.ops.entity.request.app.ApplicationConfigRequest; -import com.orion.ops.entity.request.app.ApplicationEnvRequest; -import com.orion.ops.entity.vo.app.ApplicationEnvVO; import java.util.List; import java.util.Map; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/ApplicationInfoService.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/ApplicationInfoService.java similarity index 89% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/ApplicationInfoService.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/ApplicationInfoService.java index b87d1edd..118e8909 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/ApplicationInfoService.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/ApplicationInfoService.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.api; +package cn.orionsec.ops.service.api; +import cn.orionsec.ops.entity.request.app.ApplicationConfigRequest; +import cn.orionsec.ops.entity.request.app.ApplicationInfoRequest; +import cn.orionsec.ops.entity.vo.app.ApplicationDetailVO; +import cn.orionsec.ops.entity.vo.app.ApplicationInfoVO; +import cn.orionsec.ops.entity.vo.app.ApplicationMachineVO; import com.orion.lang.define.wrapper.DataGrid; -import com.orion.ops.entity.request.app.ApplicationConfigRequest; -import com.orion.ops.entity.request.app.ApplicationInfoRequest; -import com.orion.ops.entity.vo.app.ApplicationDetailVO; -import com.orion.ops.entity.vo.app.ApplicationInfoVO; -import com.orion.ops.entity.vo.app.ApplicationMachineVO; import java.util.List; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/ApplicationMachineService.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/ApplicationMachineService.java similarity index 94% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/ApplicationMachineService.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/ApplicationMachineService.java index 1d324a52..5510a83b 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/ApplicationMachineService.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/ApplicationMachineService.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.api; +package cn.orionsec.ops.service.api; -import com.orion.ops.entity.domain.ApplicationMachineDO; -import com.orion.ops.entity.request.app.ApplicationConfigRequest; -import com.orion.ops.entity.vo.app.ApplicationMachineVO; +import cn.orionsec.ops.entity.domain.ApplicationMachineDO; +import cn.orionsec.ops.entity.request.app.ApplicationConfigRequest; +import cn.orionsec.ops.entity.vo.app.ApplicationMachineVO; import java.util.List; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/ApplicationPipelineDetailService.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/ApplicationPipelineDetailService.java similarity index 92% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/ApplicationPipelineDetailService.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/ApplicationPipelineDetailService.java index 1ca5b92b..eb4c8f16 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/ApplicationPipelineDetailService.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/ApplicationPipelineDetailService.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.api; +package cn.orionsec.ops.service.api; -import com.orion.ops.entity.domain.ApplicationPipelineDetailDO; -import com.orion.ops.entity.vo.app.ApplicationPipelineDetailVO; +import cn.orionsec.ops.entity.domain.ApplicationPipelineDetailDO; +import cn.orionsec.ops.entity.vo.app.ApplicationPipelineDetailVO; import java.util.List; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/ApplicationPipelineService.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/ApplicationPipelineService.java similarity index 91% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/ApplicationPipelineService.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/ApplicationPipelineService.java index bf09dd21..7f826f0a 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/ApplicationPipelineService.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/ApplicationPipelineService.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.api; +package cn.orionsec.ops.service.api; +import cn.orionsec.ops.entity.request.app.ApplicationPipelineRequest; +import cn.orionsec.ops.entity.vo.app.ApplicationPipelineVO; import com.orion.lang.define.wrapper.DataGrid; -import com.orion.ops.entity.request.app.ApplicationPipelineRequest; -import com.orion.ops.entity.vo.app.ApplicationPipelineVO; import java.util.List; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/ApplicationPipelineTaskDetailService.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/ApplicationPipelineTaskDetailService.java similarity index 90% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/ApplicationPipelineTaskDetailService.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/ApplicationPipelineTaskDetailService.java index af2ef8c2..b196b899 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/ApplicationPipelineTaskDetailService.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/ApplicationPipelineTaskDetailService.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.api; +package cn.orionsec.ops.service.api; -import com.orion.ops.entity.domain.ApplicationPipelineTaskDetailDO; -import com.orion.ops.entity.vo.app.ApplicationPipelineTaskDetailVO; +import cn.orionsec.ops.entity.domain.ApplicationPipelineTaskDetailDO; +import cn.orionsec.ops.entity.vo.app.ApplicationPipelineTaskDetailVO; import java.util.List; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/ApplicationPipelineTaskLogService.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/ApplicationPipelineTaskLogService.java similarity index 91% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/ApplicationPipelineTaskLogService.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/ApplicationPipelineTaskLogService.java index e952bc41..0cdbc055 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/ApplicationPipelineTaskLogService.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/ApplicationPipelineTaskLogService.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.api; +package cn.orionsec.ops.service.api; -import com.orion.ops.entity.vo.app.ApplicationPipelineTaskLogVO; +import cn.orionsec.ops.entity.vo.app.ApplicationPipelineTaskLogVO; import java.util.List; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/ApplicationPipelineTaskService.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/ApplicationPipelineTaskService.java similarity index 91% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/ApplicationPipelineTaskService.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/ApplicationPipelineTaskService.java index 103ddd45..f01e53d7 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/ApplicationPipelineTaskService.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/ApplicationPipelineTaskService.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.api; +package cn.orionsec.ops.service.api; +import cn.orionsec.ops.entity.request.app.ApplicationPipelineTaskRequest; +import cn.orionsec.ops.entity.vo.app.ApplicationPipelineTaskListVO; +import cn.orionsec.ops.entity.vo.app.ApplicationPipelineTaskStatusVO; +import cn.orionsec.ops.entity.vo.app.ApplicationPipelineTaskVO; import com.orion.lang.define.wrapper.DataGrid; -import com.orion.ops.entity.request.app.ApplicationPipelineTaskRequest; -import com.orion.ops.entity.vo.app.ApplicationPipelineTaskListVO; -import com.orion.ops.entity.vo.app.ApplicationPipelineTaskStatusVO; -import com.orion.ops.entity.vo.app.ApplicationPipelineTaskVO; import java.util.Date; import java.util.List; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/ApplicationProfileService.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/ApplicationProfileService.java similarity index 88% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/ApplicationProfileService.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/ApplicationProfileService.java index abc45c9f..f31c588c 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/ApplicationProfileService.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/ApplicationProfileService.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.api; +package cn.orionsec.ops.service.api; +import cn.orionsec.ops.entity.request.app.ApplicationProfileRequest; +import cn.orionsec.ops.entity.vo.app.ApplicationProfileFastVO; +import cn.orionsec.ops.entity.vo.app.ApplicationProfileVO; import com.orion.lang.define.wrapper.DataGrid; -import com.orion.ops.entity.request.app.ApplicationProfileRequest; -import com.orion.ops.entity.vo.app.ApplicationProfileFastVO; -import com.orion.ops.entity.vo.app.ApplicationProfileVO; import java.util.List; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/ApplicationReleaseMachineService.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/ApplicationReleaseMachineService.java similarity index 94% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/ApplicationReleaseMachineService.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/ApplicationReleaseMachineService.java index e3f9529f..24c153c1 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/ApplicationReleaseMachineService.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/ApplicationReleaseMachineService.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.api; +package cn.orionsec.ops.service.api; -import com.orion.ops.entity.domain.ApplicationReleaseMachineDO; +import cn.orionsec.ops.entity.domain.ApplicationReleaseMachineDO; import java.util.List; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/ApplicationReleaseService.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/ApplicationReleaseService.java similarity index 95% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/ApplicationReleaseService.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/ApplicationReleaseService.java index 0ce4db2f..1970110b 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/ApplicationReleaseService.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/ApplicationReleaseService.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.api; +package cn.orionsec.ops.service.api; +import cn.orionsec.ops.entity.request.app.ApplicationReleaseAuditRequest; +import cn.orionsec.ops.entity.request.app.ApplicationReleaseRequest; +import cn.orionsec.ops.entity.vo.app.*; import com.orion.lang.define.wrapper.DataGrid; -import com.orion.ops.entity.request.app.ApplicationReleaseAuditRequest; -import com.orion.ops.entity.request.app.ApplicationReleaseRequest; -import com.orion.ops.entity.vo.app.*; import java.util.Date; import java.util.List; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/ApplicationRepositoryService.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/ApplicationRepositoryService.java similarity index 88% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/ApplicationRepositoryService.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/ApplicationRepositoryService.java index d5b4884d..883285b5 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/ApplicationRepositoryService.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/ApplicationRepositoryService.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.api; +package cn.orionsec.ops.service.api; +import cn.orionsec.ops.entity.domain.ApplicationRepositoryDO; +import cn.orionsec.ops.entity.request.app.ApplicationRepositoryRequest; +import cn.orionsec.ops.entity.vo.app.ApplicationRepositoryBranchVO; +import cn.orionsec.ops.entity.vo.app.ApplicationRepositoryCommitVO; +import cn.orionsec.ops.entity.vo.app.ApplicationRepositoryInfoVO; +import cn.orionsec.ops.entity.vo.app.ApplicationRepositoryVO; import com.orion.ext.vcs.git.Gits; import com.orion.lang.define.wrapper.DataGrid; -import com.orion.ops.entity.domain.ApplicationRepositoryDO; -import com.orion.ops.entity.request.app.ApplicationRepositoryRequest; -import com.orion.ops.entity.vo.app.ApplicationRepositoryBranchVO; -import com.orion.ops.entity.vo.app.ApplicationRepositoryCommitVO; -import com.orion.ops.entity.vo.app.ApplicationRepositoryInfoVO; -import com.orion.ops.entity.vo.app.ApplicationRepositoryVO; import java.util.List; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/BatchUploadService.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/BatchUploadService.java similarity index 82% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/BatchUploadService.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/BatchUploadService.java index 6f94f4dc..25780e4d 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/BatchUploadService.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/BatchUploadService.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.api; +package cn.orionsec.ops.service.api; -import com.orion.ops.entity.request.upload.BatchUploadRequest; -import com.orion.ops.entity.request.sftp.FileUploadRequest; -import com.orion.ops.entity.vo.upload.BatchUploadCheckVO; -import com.orion.ops.entity.vo.upload.BatchUploadTokenVO; +import cn.orionsec.ops.entity.request.sftp.FileUploadRequest; +import cn.orionsec.ops.entity.request.upload.BatchUploadRequest; +import cn.orionsec.ops.entity.vo.upload.BatchUploadCheckVO; +import cn.orionsec.ops.entity.vo.upload.BatchUploadTokenVO; import java.util.List; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/CommandExecService.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/CommandExecService.java similarity index 87% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/CommandExecService.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/CommandExecService.java index f63f961f..e9f51b0b 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/CommandExecService.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/CommandExecService.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.api; +package cn.orionsec.ops.service.api; +import cn.orionsec.ops.entity.domain.CommandExecDO; +import cn.orionsec.ops.entity.request.exec.CommandExecRequest; +import cn.orionsec.ops.entity.vo.exec.CommandExecStatusVO; +import cn.orionsec.ops.entity.vo.exec.CommandExecVO; +import cn.orionsec.ops.entity.vo.exec.CommandTaskSubmitVO; import com.orion.lang.define.wrapper.DataGrid; -import com.orion.ops.entity.domain.CommandExecDO; -import com.orion.ops.entity.request.exec.CommandExecRequest; -import com.orion.ops.entity.vo.exec.CommandExecStatusVO; -import com.orion.ops.entity.vo.exec.CommandExecVO; -import com.orion.ops.entity.vo.exec.CommandTaskSubmitVO; import org.springframework.web.bind.annotation.RequestBody; import java.util.List; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/CommandTemplateService.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/CommandTemplateService.java similarity index 90% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/CommandTemplateService.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/CommandTemplateService.java index 2a061d7e..afd55ac5 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/CommandTemplateService.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/CommandTemplateService.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.api; +package cn.orionsec.ops.service.api; +import cn.orionsec.ops.entity.request.template.CommandTemplateRequest; +import cn.orionsec.ops.entity.vo.template.CommandTemplateVO; import com.orion.lang.define.wrapper.DataGrid; -import com.orion.ops.entity.request.template.CommandTemplateRequest; -import com.orion.ops.entity.vo.template.CommandTemplateVO; import java.util.List; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/CommonService.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/CommonService.java similarity index 95% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/CommonService.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/CommonService.java index 43d8bc3a..953504d3 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/CommonService.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/CommonService.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.api; +package cn.orionsec.ops.service.api; /** * 公共service diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/FileDownloadService.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/FileDownloadService.java similarity index 90% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/FileDownloadService.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/FileDownloadService.java index 5f5a8fb7..b4a55969 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/FileDownloadService.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/FileDownloadService.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.api; +package cn.orionsec.ops.service.api; -import com.orion.ops.constant.download.FileDownloadType; -import com.orion.ops.entity.dto.file.FileDownloadDTO; +import cn.orionsec.ops.constant.download.FileDownloadType; +import cn.orionsec.ops.entity.dto.file.FileDownloadDTO; import javax.servlet.http.HttpServletResponse; import java.io.IOException; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/FileTailService.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/FileTailService.java similarity index 90% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/FileTailService.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/FileTailService.java index c3992436..5b63ef18 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/FileTailService.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/FileTailService.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.api; +package cn.orionsec.ops.service.api; +import cn.orionsec.ops.constant.tail.FileTailType; +import cn.orionsec.ops.entity.request.file.FileTailRequest; +import cn.orionsec.ops.entity.vo.tail.FileTailConfigVO; +import cn.orionsec.ops.entity.vo.tail.FileTailVO; import com.orion.lang.define.wrapper.DataGrid; -import com.orion.ops.constant.tail.FileTailType; -import com.orion.ops.entity.request.file.FileTailRequest; -import com.orion.ops.entity.vo.tail.FileTailConfigVO; -import com.orion.ops.entity.vo.tail.FileTailVO; import java.util.List; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/HistoryValueService.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/HistoryValueService.java similarity index 83% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/HistoryValueService.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/HistoryValueService.java index cdcd6ceb..a349ccf4 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/HistoryValueService.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/HistoryValueService.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.api; +package cn.orionsec.ops.service.api; +import cn.orionsec.ops.constant.history.HistoryOperator; +import cn.orionsec.ops.constant.history.HistoryValueType; +import cn.orionsec.ops.entity.request.history.HistoryValueRequest; +import cn.orionsec.ops.entity.vo.history.HistoryValueVO; import com.orion.lang.define.wrapper.DataGrid; -import com.orion.ops.constant.history.HistoryOperator; -import com.orion.ops.constant.history.HistoryValueType; -import com.orion.ops.entity.request.history.HistoryValueRequest; -import com.orion.ops.entity.vo.history.HistoryValueVO; /** * 历史值 api diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/MachineAlarmConfigService.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/MachineAlarmConfigService.java similarity index 87% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/MachineAlarmConfigService.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/MachineAlarmConfigService.java index b95a597a..0f36474c 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/MachineAlarmConfigService.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/MachineAlarmConfigService.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.api; +package cn.orionsec.ops.service.api; -import com.orion.ops.entity.domain.MachineAlarmConfigDO; -import com.orion.ops.entity.request.machine.MachineAlarmConfigRequest; -import com.orion.ops.entity.vo.machine.MachineAlarmConfigVO; -import com.orion.ops.entity.vo.machine.MachineAlarmConfigWrapperVO; +import cn.orionsec.ops.entity.domain.MachineAlarmConfigDO; +import cn.orionsec.ops.entity.request.machine.MachineAlarmConfigRequest; +import cn.orionsec.ops.entity.vo.machine.MachineAlarmConfigVO; +import cn.orionsec.ops.entity.vo.machine.MachineAlarmConfigWrapperVO; import java.util.List; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/MachineAlarmGroupService.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/MachineAlarmGroupService.java similarity index 93% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/MachineAlarmGroupService.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/MachineAlarmGroupService.java index 49ddccfa..56e0ce8f 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/MachineAlarmGroupService.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/MachineAlarmGroupService.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.api; +package cn.orionsec.ops.service.api; -import com.orion.ops.entity.domain.MachineAlarmGroupDO; +import cn.orionsec.ops.entity.domain.MachineAlarmGroupDO; import java.util.List; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/MachineAlarmHistoryService.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/MachineAlarmHistoryService.java similarity index 85% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/MachineAlarmHistoryService.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/MachineAlarmHistoryService.java index ebca7b92..a5852e9e 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/MachineAlarmHistoryService.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/MachineAlarmHistoryService.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.api; +package cn.orionsec.ops.service.api; +import cn.orionsec.ops.entity.request.machine.MachineAlarmHistoryRequest; +import cn.orionsec.ops.entity.vo.machine.MachineAlarmHistoryVO; import com.orion.lang.define.wrapper.DataGrid; -import com.orion.ops.entity.request.machine.MachineAlarmHistoryRequest; -import com.orion.ops.entity.vo.machine.MachineAlarmHistoryVO; /** * 机器报警历史服务 diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/MachineAlarmService.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/MachineAlarmService.java similarity index 91% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/MachineAlarmService.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/MachineAlarmService.java index bc447b7e..b4ac9e9e 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/MachineAlarmService.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/MachineAlarmService.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.api; +package cn.orionsec.ops.service.api; -import com.orion.ops.entity.request.machine.MachineAlarmRequest; +import cn.orionsec.ops.entity.request.machine.MachineAlarmRequest; /** * 机器报警服务 diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/MachineEnvService.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/MachineEnvService.java similarity index 95% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/MachineEnvService.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/MachineEnvService.java index 1837f428..48f1b19f 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/MachineEnvService.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/MachineEnvService.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.api; +package cn.orionsec.ops.service.api; +import cn.orionsec.ops.entity.domain.MachineEnvDO; +import cn.orionsec.ops.entity.request.machine.MachineEnvRequest; +import cn.orionsec.ops.entity.vo.machine.MachineEnvVO; import com.orion.lang.define.collect.MutableLinkedHashMap; import com.orion.lang.define.wrapper.DataGrid; -import com.orion.ops.entity.domain.MachineEnvDO; -import com.orion.ops.entity.request.machine.MachineEnvRequest; -import com.orion.ops.entity.vo.machine.MachineEnvVO; import java.util.List; import java.util.Map; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/MachineGroupRelService.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/MachineGroupRelService.java similarity index 98% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/MachineGroupRelService.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/MachineGroupRelService.java index 4c470480..f97fd209 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/MachineGroupRelService.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/MachineGroupRelService.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.api; +package cn.orionsec.ops.service.api; import java.util.List; import java.util.Map; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/MachineGroupService.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/MachineGroupService.java similarity index 89% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/MachineGroupService.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/MachineGroupService.java index f7462286..c4f99ef9 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/MachineGroupService.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/MachineGroupService.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.api; +package cn.orionsec.ops.service.api; -import com.orion.ops.entity.request.machine.MachineGroupRequest; -import com.orion.ops.entity.vo.machine.MachineGroupTreeVO; +import cn.orionsec.ops.entity.request.machine.MachineGroupRequest; +import cn.orionsec.ops.entity.vo.machine.MachineGroupTreeVO; import java.util.List; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/MachineInfoService.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/MachineInfoService.java similarity index 93% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/MachineInfoService.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/MachineInfoService.java index 2835a019..23603be1 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/MachineInfoService.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/MachineInfoService.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.api; +package cn.orionsec.ops.service.api; +import cn.orionsec.ops.entity.domain.MachineInfoDO; +import cn.orionsec.ops.entity.request.machine.MachineInfoRequest; +import cn.orionsec.ops.entity.vo.machine.MachineInfoVO; import com.orion.lang.define.wrapper.DataGrid; import com.orion.net.remote.channel.SessionStore; -import com.orion.ops.entity.domain.MachineInfoDO; -import com.orion.ops.entity.request.machine.MachineInfoRequest; -import com.orion.ops.entity.vo.machine.MachineInfoVO; import java.util.List; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/MachineKeyService.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/MachineKeyService.java similarity index 88% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/MachineKeyService.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/MachineKeyService.java index 2cb4d9a1..e6245af8 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/MachineKeyService.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/MachineKeyService.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.api; +package cn.orionsec.ops.service.api; +import cn.orionsec.ops.constant.system.SystemEnvAttr; +import cn.orionsec.ops.entity.domain.MachineSecretKeyDO; +import cn.orionsec.ops.entity.request.machine.MachineKeyRequest; +import cn.orionsec.ops.entity.vo.machine.MachineSecretKeyVO; import com.orion.lang.define.wrapper.DataGrid; import com.orion.lang.utils.io.Files1; -import com.orion.ops.constant.system.SystemEnvAttr; -import com.orion.ops.entity.domain.MachineSecretKeyDO; -import com.orion.ops.entity.request.machine.MachineKeyRequest; -import com.orion.ops.entity.vo.machine.MachineSecretKeyVO; import java.util.List; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/MachineMonitorEndpointService.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/MachineMonitorEndpointService.java similarity index 95% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/MachineMonitorEndpointService.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/MachineMonitorEndpointService.java index 9cceb3c2..75e6628e 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/MachineMonitorEndpointService.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/MachineMonitorEndpointService.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.api; +package cn.orionsec.ops.service.api; +import cn.orionsec.ops.entity.request.machine.MachineMonitorEndpointRequest; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.orion.ops.entity.request.machine.MachineMonitorEndpointRequest; /** * 机器监控端点服务 diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/MachineMonitorService.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/MachineMonitorService.java similarity index 92% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/MachineMonitorService.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/MachineMonitorService.java index 29833797..050a875d 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/MachineMonitorService.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/MachineMonitorService.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.api; +package cn.orionsec.ops.service.api; +import cn.orionsec.ops.entity.domain.MachineMonitorDO; +import cn.orionsec.ops.entity.request.machine.MachineMonitorRequest; +import cn.orionsec.ops.entity.vo.machine.MachineMonitorVO; import com.orion.lang.define.wrapper.DataGrid; -import com.orion.ops.entity.domain.MachineMonitorDO; -import com.orion.ops.entity.request.machine.MachineMonitorRequest; -import com.orion.ops.entity.vo.machine.MachineMonitorVO; import java.util.List; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/MachineProxyService.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/MachineProxyService.java similarity index 90% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/MachineProxyService.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/MachineProxyService.java index 54706843..b38a860f 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/MachineProxyService.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/MachineProxyService.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.api; +package cn.orionsec.ops.service.api; +import cn.orionsec.ops.entity.request.machine.MachineProxyRequest; +import cn.orionsec.ops.entity.vo.machine.MachineProxyVO; import com.orion.lang.define.wrapper.DataGrid; -import com.orion.ops.entity.request.machine.MachineProxyRequest; -import com.orion.ops.entity.vo.machine.MachineProxyVO; import java.util.List; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/MachineTerminalService.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/MachineTerminalService.java similarity index 84% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/MachineTerminalService.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/MachineTerminalService.java index a2bc37af..dde2bbd6 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/MachineTerminalService.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/MachineTerminalService.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.api; +package cn.orionsec.ops.service.api; +import cn.orionsec.ops.entity.domain.MachineTerminalLogDO; +import cn.orionsec.ops.entity.request.machine.MachineTerminalLogRequest; +import cn.orionsec.ops.entity.request.machine.MachineTerminalRequest; +import cn.orionsec.ops.entity.vo.machine.MachineTerminalLogVO; +import cn.orionsec.ops.entity.vo.machine.MachineTerminalVO; +import cn.orionsec.ops.entity.vo.machine.TerminalAccessVO; import com.orion.lang.define.wrapper.DataGrid; -import com.orion.ops.entity.domain.MachineTerminalLogDO; -import com.orion.ops.entity.request.machine.MachineTerminalLogRequest; -import com.orion.ops.entity.request.machine.MachineTerminalRequest; -import com.orion.ops.entity.vo.machine.MachineTerminalLogVO; -import com.orion.ops.entity.vo.machine.MachineTerminalVO; -import com.orion.ops.entity.vo.machine.TerminalAccessVO; import java.util.List; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/PassportService.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/PassportService.java similarity index 84% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/PassportService.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/PassportService.java index 1c694239..900437e3 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/PassportService.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/PassportService.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.api; +package cn.orionsec.ops.service.api; -import com.orion.ops.entity.dto.user.UserDTO; -import com.orion.ops.entity.request.user.UserLoginRequest; -import com.orion.ops.entity.request.user.UserResetRequest; -import com.orion.ops.entity.vo.user.UserLoginVO; +import cn.orionsec.ops.entity.dto.user.UserDTO; +import cn.orionsec.ops.entity.request.user.UserLoginRequest; +import cn.orionsec.ops.entity.request.user.UserResetRequest; +import cn.orionsec.ops.entity.vo.user.UserLoginVO; /** * 认证服务类 diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/SchedulerTaskMachineRecordService.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/SchedulerTaskMachineRecordService.java similarity index 92% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/SchedulerTaskMachineRecordService.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/SchedulerTaskMachineRecordService.java index 84898fe4..4b299a54 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/SchedulerTaskMachineRecordService.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/SchedulerTaskMachineRecordService.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.api; +package cn.orionsec.ops.service.api; -import com.orion.ops.entity.domain.SchedulerTaskMachineRecordDO; +import cn.orionsec.ops.entity.domain.SchedulerTaskMachineRecordDO; import java.util.List; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/SchedulerTaskMachineService.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/SchedulerTaskMachineService.java similarity index 93% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/SchedulerTaskMachineService.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/SchedulerTaskMachineService.java index 2a3540f9..71885703 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/SchedulerTaskMachineService.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/SchedulerTaskMachineService.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.api; +package cn.orionsec.ops.service.api; -import com.orion.ops.entity.domain.SchedulerTaskMachineDO; +import cn.orionsec.ops.entity.domain.SchedulerTaskMachineDO; import java.util.List; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/SchedulerTaskRecordService.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/SchedulerTaskRecordService.java similarity index 87% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/SchedulerTaskRecordService.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/SchedulerTaskRecordService.java index 84ea28e1..44c21e9f 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/SchedulerTaskRecordService.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/SchedulerTaskRecordService.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.api; +package cn.orionsec.ops.service.api; +import cn.orionsec.ops.entity.request.scheduler.SchedulerTaskRecordRequest; +import cn.orionsec.ops.entity.vo.scheduler.SchedulerTaskMachineRecordStatusVO; +import cn.orionsec.ops.entity.vo.scheduler.SchedulerTaskMachineRecordVO; +import cn.orionsec.ops.entity.vo.scheduler.SchedulerTaskRecordStatusVO; +import cn.orionsec.ops.entity.vo.scheduler.SchedulerTaskRecordVO; import com.orion.lang.define.wrapper.DataGrid; -import com.orion.ops.entity.request.scheduler.SchedulerTaskRecordRequest; -import com.orion.ops.entity.vo.scheduler.SchedulerTaskMachineRecordStatusVO; -import com.orion.ops.entity.vo.scheduler.SchedulerTaskMachineRecordVO; -import com.orion.ops.entity.vo.scheduler.SchedulerTaskRecordStatusVO; -import com.orion.ops.entity.vo.scheduler.SchedulerTaskRecordVO; import java.util.List; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/SchedulerTaskService.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/SchedulerTaskService.java similarity index 91% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/SchedulerTaskService.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/SchedulerTaskService.java index 5dc9a7d2..7437705f 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/SchedulerTaskService.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/SchedulerTaskService.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.api; +package cn.orionsec.ops.service.api; +import cn.orionsec.ops.entity.request.scheduler.SchedulerTaskRequest; +import cn.orionsec.ops.entity.vo.scheduler.SchedulerTaskVO; import com.orion.lang.define.wrapper.DataGrid; -import com.orion.ops.entity.request.scheduler.SchedulerTaskRequest; -import com.orion.ops.entity.vo.scheduler.SchedulerTaskVO; /** *

diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/SftpService.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/SftpService.java similarity index 92% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/SftpService.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/SftpService.java index 5db729fc..2827fcb6 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/SftpService.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/SftpService.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.api; +package cn.orionsec.ops.service.api; -import com.orion.ops.constant.sftp.SftpPackageType; -import com.orion.ops.entity.domain.FileTransferLogDO; -import com.orion.ops.entity.dto.sftp.SftpSessionTokenDTO; -import com.orion.ops.entity.dto.sftp.SftpUploadInfoDTO; -import com.orion.ops.entity.request.sftp.*; -import com.orion.ops.entity.vo.sftp.FileTransferLogVO; -import com.orion.ops.entity.vo.sftp.FileListVO; -import com.orion.ops.entity.vo.sftp.FileOpenVO; +import cn.orionsec.ops.constant.sftp.SftpPackageType; +import cn.orionsec.ops.entity.domain.FileTransferLogDO; +import cn.orionsec.ops.entity.dto.sftp.SftpSessionTokenDTO; +import cn.orionsec.ops.entity.dto.sftp.SftpUploadInfoDTO; +import cn.orionsec.ops.entity.request.sftp.*; +import cn.orionsec.ops.entity.vo.sftp.FileListVO; +import cn.orionsec.ops.entity.vo.sftp.FileOpenVO; +import cn.orionsec.ops.entity.vo.sftp.FileTransferLogVO; import java.util.List; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/StatisticsService.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/StatisticsService.java similarity index 92% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/StatisticsService.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/StatisticsService.java index f436b4a3..733731d5 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/StatisticsService.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/StatisticsService.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.api; +package cn.orionsec.ops.service.api; -import com.orion.ops.entity.request.home.HomeStatisticsRequest; -import com.orion.ops.entity.vo.app.*; -import com.orion.ops.entity.vo.home.HomeStatisticsVO; -import com.orion.ops.entity.vo.scheduler.SchedulerTaskRecordStatisticsVO; +import cn.orionsec.ops.entity.request.home.HomeStatisticsRequest; +import cn.orionsec.ops.entity.vo.app.*; +import cn.orionsec.ops.entity.vo.home.HomeStatisticsVO; +import cn.orionsec.ops.entity.vo.scheduler.SchedulerTaskRecordStatisticsVO; import java.util.List; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/SystemEnvService.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/SystemEnvService.java similarity index 92% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/SystemEnvService.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/SystemEnvService.java index 28ebb466..f3cd9cee 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/SystemEnvService.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/SystemEnvService.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.api; +package cn.orionsec.ops.service.api; +import cn.orionsec.ops.entity.domain.SystemEnvDO; +import cn.orionsec.ops.entity.request.system.SystemEnvRequest; +import cn.orionsec.ops.entity.vo.system.SystemEnvVO; import com.orion.lang.define.collect.MutableLinkedHashMap; import com.orion.lang.define.wrapper.DataGrid; -import com.orion.ops.entity.domain.SystemEnvDO; -import com.orion.ops.entity.request.system.SystemEnvRequest; -import com.orion.ops.entity.vo.system.SystemEnvVO; import java.util.List; import java.util.Map; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/SystemService.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/SystemService.java similarity index 80% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/SystemService.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/SystemService.java index e4ead79e..d358e034 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/SystemService.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/SystemService.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.api; +package cn.orionsec.ops.service.api; -import com.orion.ops.constant.system.SystemCleanType; -import com.orion.ops.constant.system.SystemEnvAttr; -import com.orion.ops.entity.request.system.ConfigIpListRequest; -import com.orion.ops.entity.vo.system.IpListConfigVO; -import com.orion.ops.entity.vo.system.SystemAnalysisVO; -import com.orion.ops.entity.vo.system.SystemOptionVO; -import com.orion.ops.entity.vo.system.ThreadPoolMetricsVO; +import cn.orionsec.ops.constant.system.SystemCleanType; +import cn.orionsec.ops.constant.system.SystemEnvAttr; +import cn.orionsec.ops.entity.request.system.ConfigIpListRequest; +import cn.orionsec.ops.entity.vo.system.IpListConfigVO; +import cn.orionsec.ops.entity.vo.system.SystemAnalysisVO; +import cn.orionsec.ops.entity.vo.system.SystemOptionVO; +import cn.orionsec.ops.entity.vo.system.ThreadPoolMetricsVO; import java.util.List; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/UserEventLogService.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/UserEventLogService.java similarity index 85% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/UserEventLogService.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/UserEventLogService.java index ca498bc2..235a4c8a 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/UserEventLogService.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/UserEventLogService.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.api; +package cn.orionsec.ops.service.api; +import cn.orionsec.ops.constant.event.EventType; +import cn.orionsec.ops.entity.request.user.EventLogRequest; +import cn.orionsec.ops.entity.vo.user.UserEventLogVO; import com.orion.lang.define.wrapper.DataGrid; -import com.orion.ops.constant.event.EventType; -import com.orion.ops.entity.request.user.EventLogRequest; -import com.orion.ops.entity.vo.user.UserEventLogVO; /** * 用户操作日志服务 diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/UserService.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/UserService.java similarity index 93% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/UserService.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/UserService.java index 2a065c10..95385fed 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/UserService.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/UserService.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.api; +package cn.orionsec.ops.service.api; +import cn.orionsec.ops.entity.request.user.UserInfoRequest; +import cn.orionsec.ops.entity.vo.user.UserInfoVO; import com.orion.lang.define.wrapper.DataGrid; -import com.orion.ops.entity.request.user.UserInfoRequest; -import com.orion.ops.entity.vo.user.UserInfoVO; /** * 用户服务 diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/WebSideMessageService.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/WebSideMessageService.java similarity index 91% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/WebSideMessageService.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/WebSideMessageService.java index 27da76a6..9f82fe2d 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/WebSideMessageService.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/WebSideMessageService.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.api; +package cn.orionsec.ops.service.api; +import cn.orionsec.ops.constant.message.MessageType; +import cn.orionsec.ops.entity.request.message.WebSideMessageRequest; +import cn.orionsec.ops.entity.vo.message.WebSideMessagePollVO; +import cn.orionsec.ops.entity.vo.message.WebSideMessageVO; import com.orion.lang.define.wrapper.DataGrid; -import com.orion.ops.constant.message.MessageType; -import com.orion.ops.entity.request.message.WebSideMessageRequest; -import com.orion.ops.entity.vo.message.WebSideMessagePollVO; -import com.orion.ops.entity.vo.message.WebSideMessageVO; import java.util.List; import java.util.Map; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/WebhookConfigService.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/WebhookConfigService.java similarity index 90% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/WebhookConfigService.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/WebhookConfigService.java index 4f79384a..1c1f1afd 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/api/WebhookConfigService.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/WebhookConfigService.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.api; +package cn.orionsec.ops.service.api; +import cn.orionsec.ops.entity.request.webhook.WebhookConfigRequest; +import cn.orionsec.ops.entity.vo.webhook.WebhookConfigVO; import com.orion.lang.define.wrapper.DataGrid; -import com.orion.ops.entity.request.webhook.WebhookConfigRequest; -import com.orion.ops.entity.vo.webhook.WebhookConfigVO; /** * webhook 配置服务 diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/AlarmGroupNotifyServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/AlarmGroupNotifyServiceImpl.java similarity index 90% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/AlarmGroupNotifyServiceImpl.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/AlarmGroupNotifyServiceImpl.java index c52a491a..6db321ca 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/AlarmGroupNotifyServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/AlarmGroupNotifyServiceImpl.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.impl; +package cn.orionsec.ops.service.impl; +import cn.orionsec.ops.constant.alarm.AlarmGroupNotifyType; +import cn.orionsec.ops.dao.AlarmGroupNotifyDAO; +import cn.orionsec.ops.entity.domain.AlarmGroupNotifyDO; +import cn.orionsec.ops.service.api.AlarmGroupNotifyService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.ops.constant.alarm.AlarmGroupNotifyType; -import com.orion.ops.dao.AlarmGroupNotifyDAO; -import com.orion.ops.entity.domain.AlarmGroupNotifyDO; -import com.orion.ops.service.api.AlarmGroupNotifyService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/AlarmGroupServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/AlarmGroupServiceImpl.java similarity index 92% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/AlarmGroupServiceImpl.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/AlarmGroupServiceImpl.java index 4a19962a..7cca44cd 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/AlarmGroupServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/AlarmGroupServiceImpl.java @@ -13,27 +13,27 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.impl; +package cn.orionsec.ops.service.impl; +import cn.orionsec.ops.constant.MessageConst; +import cn.orionsec.ops.constant.alarm.AlarmGroupNotifyType; +import cn.orionsec.ops.constant.event.EventKeys; +import cn.orionsec.ops.dao.*; +import cn.orionsec.ops.entity.domain.*; +import cn.orionsec.ops.entity.request.alarm.AlarmGroupRequest; +import cn.orionsec.ops.entity.vo.alarm.AlarmGroupUserVO; +import cn.orionsec.ops.entity.vo.alarm.AlarmGroupVO; +import cn.orionsec.ops.service.api.AlarmGroupNotifyService; +import cn.orionsec.ops.service.api.AlarmGroupService; +import cn.orionsec.ops.service.api.AlarmGroupUserService; +import cn.orionsec.ops.service.api.MachineAlarmGroupService; +import cn.orionsec.ops.utils.DataQuery; +import cn.orionsec.ops.utils.EventParamsHolder; +import cn.orionsec.ops.utils.Valid; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.orion.lang.define.wrapper.DataGrid; import com.orion.lang.utils.Strings; import com.orion.lang.utils.convert.Converts; -import com.orion.ops.constant.MessageConst; -import com.orion.ops.constant.alarm.AlarmGroupNotifyType; -import com.orion.ops.constant.event.EventKeys; -import com.orion.ops.dao.*; -import com.orion.ops.entity.domain.*; -import com.orion.ops.entity.request.alarm.AlarmGroupRequest; -import com.orion.ops.entity.vo.alarm.AlarmGroupUserVO; -import com.orion.ops.entity.vo.alarm.AlarmGroupVO; -import com.orion.ops.service.api.AlarmGroupNotifyService; -import com.orion.ops.service.api.AlarmGroupService; -import com.orion.ops.service.api.AlarmGroupUserService; -import com.orion.ops.service.api.MachineAlarmGroupService; -import com.orion.ops.utils.DataQuery; -import com.orion.ops.utils.EventParamsHolder; -import com.orion.ops.utils.Valid; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/AlarmGroupUserServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/AlarmGroupUserServiceImpl.java similarity index 92% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/AlarmGroupUserServiceImpl.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/AlarmGroupUserServiceImpl.java index 02c538b8..543733af 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/AlarmGroupUserServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/AlarmGroupUserServiceImpl.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.impl; +package cn.orionsec.ops.service.impl; +import cn.orionsec.ops.dao.AlarmGroupUserDAO; +import cn.orionsec.ops.entity.domain.AlarmGroupUserDO; +import cn.orionsec.ops.service.api.AlarmGroupUserService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.ops.dao.AlarmGroupUserDAO; -import com.orion.ops.entity.domain.AlarmGroupUserDO; -import com.orion.ops.service.api.AlarmGroupUserService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/ApplicationActionLogServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationActionLogServiceImpl.java similarity index 92% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/ApplicationActionLogServiceImpl.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationActionLogServiceImpl.java index 8f6b03dc..56ac0311 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/ApplicationActionLogServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationActionLogServiceImpl.java @@ -13,20 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.impl; +package cn.orionsec.ops.service.impl; +import cn.orionsec.ops.constant.app.ActionStatus; +import cn.orionsec.ops.constant.app.StageType; +import cn.orionsec.ops.constant.system.SystemEnvAttr; +import cn.orionsec.ops.dao.ApplicationActionLogDAO; +import cn.orionsec.ops.entity.domain.ApplicationActionLogDO; +import cn.orionsec.ops.entity.vo.app.ApplicationActionLogVO; +import cn.orionsec.ops.service.api.ApplicationActionLogService; +import cn.orionsec.ops.utils.DataQuery; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.orion.lang.utils.Strings; import com.orion.lang.utils.convert.Converts; import com.orion.lang.utils.io.Files1; -import com.orion.ops.constant.app.ActionStatus; -import com.orion.ops.constant.app.StageType; -import com.orion.ops.constant.system.SystemEnvAttr; -import com.orion.ops.dao.ApplicationActionLogDAO; -import com.orion.ops.entity.domain.ApplicationActionLogDO; -import com.orion.ops.entity.vo.app.ApplicationActionLogVO; -import com.orion.ops.service.api.ApplicationActionLogService; -import com.orion.ops.utils.DataQuery; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/ApplicationActionServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationActionServiceImpl.java similarity index 93% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/ApplicationActionServiceImpl.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationActionServiceImpl.java index 57da1a34..1595b46b 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/ApplicationActionServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationActionServiceImpl.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.impl; +package cn.orionsec.ops.service.impl; +import cn.orionsec.ops.constant.app.StageType; +import cn.orionsec.ops.dao.ApplicationActionDAO; +import cn.orionsec.ops.entity.domain.ApplicationActionDO; +import cn.orionsec.ops.entity.dto.ApplicationActionConfigDTO; +import cn.orionsec.ops.entity.request.app.ApplicationConfigActionRequest; +import cn.orionsec.ops.entity.request.app.ApplicationConfigRequest; +import cn.orionsec.ops.service.api.ApplicationActionService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.orion.lang.utils.Exceptions; import com.orion.lang.utils.collect.Maps; -import com.orion.ops.constant.app.StageType; -import com.orion.ops.dao.ApplicationActionDAO; -import com.orion.ops.entity.domain.ApplicationActionDO; -import com.orion.ops.entity.dto.ApplicationActionConfigDTO; -import com.orion.ops.entity.request.app.ApplicationConfigActionRequest; -import com.orion.ops.entity.request.app.ApplicationConfigRequest; -import com.orion.ops.service.api.ApplicationActionService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/ApplicationBuildServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationBuildServiceImpl.java similarity index 95% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/ApplicationBuildServiceImpl.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationBuildServiceImpl.java index e3267005..029074b1 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/ApplicationBuildServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationBuildServiceImpl.java @@ -13,8 +13,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.impl; +package cn.orionsec.ops.service.impl; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.MessageConst; +import cn.orionsec.ops.constant.app.*; +import cn.orionsec.ops.constant.env.EnvConst; +import cn.orionsec.ops.constant.event.EventKeys; +import cn.orionsec.ops.constant.system.SystemEnvAttr; +import cn.orionsec.ops.dao.*; +import cn.orionsec.ops.entity.domain.*; +import cn.orionsec.ops.entity.dto.user.UserDTO; +import cn.orionsec.ops.entity.request.app.ApplicationBuildRequest; +import cn.orionsec.ops.entity.vo.app.*; +import cn.orionsec.ops.handler.app.build.BuildSessionHolder; +import cn.orionsec.ops.handler.app.machine.BuildMachineProcessor; +import cn.orionsec.ops.handler.app.machine.IMachineProcessor; +import cn.orionsec.ops.service.api.*; +import cn.orionsec.ops.utils.*; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.orion.lang.define.collect.MutableLinkedHashMap; import com.orion.lang.define.wrapper.DataGrid; @@ -22,22 +38,6 @@ import com.orion.lang.utils.Strings; import com.orion.lang.utils.collect.Maps; import com.orion.lang.utils.convert.Converts; import com.orion.lang.utils.io.Files1; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.MessageConst; -import com.orion.ops.constant.app.*; -import com.orion.ops.constant.env.EnvConst; -import com.orion.ops.constant.event.EventKeys; -import com.orion.ops.constant.system.SystemEnvAttr; -import com.orion.ops.dao.*; -import com.orion.ops.entity.domain.*; -import com.orion.ops.entity.dto.user.UserDTO; -import com.orion.ops.entity.request.app.ApplicationBuildRequest; -import com.orion.ops.entity.vo.app.*; -import com.orion.ops.handler.app.build.BuildSessionHolder; -import com.orion.ops.handler.app.machine.BuildMachineProcessor; -import com.orion.ops.handler.app.machine.IMachineProcessor; -import com.orion.ops.service.api.*; -import com.orion.ops.utils.*; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/ApplicationEnvServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationEnvServiceImpl.java similarity index 93% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/ApplicationEnvServiceImpl.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationEnvServiceImpl.java index 0d9ccb92..4af6baf6 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/ApplicationEnvServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationEnvServiceImpl.java @@ -13,8 +13,35 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.impl; +package cn.orionsec.ops.service.impl; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.MessageConst; +import cn.orionsec.ops.constant.app.ApplicationEnvAttr; +import cn.orionsec.ops.constant.app.StageType; +import cn.orionsec.ops.constant.app.TransferFileType; +import cn.orionsec.ops.constant.app.TransferMode; +import cn.orionsec.ops.constant.common.ExceptionHandlerType; +import cn.orionsec.ops.constant.common.SerialType; +import cn.orionsec.ops.constant.env.EnvConst; +import cn.orionsec.ops.constant.event.EventKeys; +import cn.orionsec.ops.constant.history.HistoryOperator; +import cn.orionsec.ops.constant.history.HistoryValueType; +import cn.orionsec.ops.dao.ApplicationEnvDAO; +import cn.orionsec.ops.dao.ApplicationInfoDAO; +import cn.orionsec.ops.dao.ApplicationProfileDAO; +import cn.orionsec.ops.entity.domain.ApplicationEnvDO; +import cn.orionsec.ops.entity.domain.ApplicationInfoDO; +import cn.orionsec.ops.entity.domain.ApplicationProfileDO; +import cn.orionsec.ops.entity.request.app.ApplicationConfigEnvRequest; +import cn.orionsec.ops.entity.request.app.ApplicationConfigRequest; +import cn.orionsec.ops.entity.request.app.ApplicationEnvRequest; +import cn.orionsec.ops.entity.vo.app.ApplicationEnvVO; +import cn.orionsec.ops.service.api.ApplicationEnvService; +import cn.orionsec.ops.service.api.HistoryValueService; +import cn.orionsec.ops.utils.DataQuery; +import cn.orionsec.ops.utils.EventParamsHolder; +import cn.orionsec.ops.utils.Valid; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.orion.lang.define.collect.MutableLinkedHashMap; import com.orion.lang.define.wrapper.DataGrid; @@ -22,33 +49,6 @@ import com.orion.lang.utils.Strings; import com.orion.lang.utils.collect.Lists; import com.orion.lang.utils.collect.Maps; import com.orion.lang.utils.convert.Converts; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.MessageConst; -import com.orion.ops.constant.app.ApplicationEnvAttr; -import com.orion.ops.constant.app.StageType; -import com.orion.ops.constant.app.TransferFileType; -import com.orion.ops.constant.app.TransferMode; -import com.orion.ops.constant.common.ExceptionHandlerType; -import com.orion.ops.constant.common.SerialType; -import com.orion.ops.constant.env.EnvConst; -import com.orion.ops.constant.event.EventKeys; -import com.orion.ops.constant.history.HistoryOperator; -import com.orion.ops.constant.history.HistoryValueType; -import com.orion.ops.dao.ApplicationEnvDAO; -import com.orion.ops.dao.ApplicationInfoDAO; -import com.orion.ops.dao.ApplicationProfileDAO; -import com.orion.ops.entity.domain.ApplicationEnvDO; -import com.orion.ops.entity.domain.ApplicationInfoDO; -import com.orion.ops.entity.domain.ApplicationProfileDO; -import com.orion.ops.entity.request.app.ApplicationConfigEnvRequest; -import com.orion.ops.entity.request.app.ApplicationConfigRequest; -import com.orion.ops.entity.request.app.ApplicationEnvRequest; -import com.orion.ops.entity.vo.app.ApplicationEnvVO; -import com.orion.ops.service.api.ApplicationEnvService; -import com.orion.ops.service.api.HistoryValueService; -import com.orion.ops.utils.DataQuery; -import com.orion.ops.utils.EventParamsHolder; -import com.orion.ops.utils.Valid; import com.orion.spring.SpringHolder; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/ApplicationInfoServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationInfoServiceImpl.java similarity index 95% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/ApplicationInfoServiceImpl.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationInfoServiceImpl.java index 740fb98b..5dc1f83d 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/ApplicationInfoServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationInfoServiceImpl.java @@ -13,8 +13,26 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.impl; +package cn.orionsec.ops.service.impl; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.MessageConst; +import cn.orionsec.ops.constant.app.*; +import cn.orionsec.ops.constant.common.ExceptionHandlerType; +import cn.orionsec.ops.constant.common.SerialType; +import cn.orionsec.ops.constant.event.EventKeys; +import cn.orionsec.ops.dao.ApplicationInfoDAO; +import cn.orionsec.ops.dao.ApplicationProfileDAO; +import cn.orionsec.ops.dao.ApplicationRepositoryDAO; +import cn.orionsec.ops.entity.domain.*; +import cn.orionsec.ops.entity.request.app.ApplicationConfigRequest; +import cn.orionsec.ops.entity.request.app.ApplicationInfoRequest; +import cn.orionsec.ops.entity.vo.app.*; +import cn.orionsec.ops.service.api.*; +import cn.orionsec.ops.utils.DataQuery; +import cn.orionsec.ops.utils.EventParamsHolder; +import cn.orionsec.ops.utils.Utils; +import cn.orionsec.ops.utils.Valid; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.orion.lang.define.wrapper.DataGrid; @@ -22,24 +40,6 @@ import com.orion.lang.utils.Strings; import com.orion.lang.utils.collect.Lists; import com.orion.lang.utils.collect.Maps; import com.orion.lang.utils.convert.Converts; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.MessageConst; -import com.orion.ops.constant.app.*; -import com.orion.ops.constant.common.ExceptionHandlerType; -import com.orion.ops.constant.common.SerialType; -import com.orion.ops.constant.event.EventKeys; -import com.orion.ops.dao.ApplicationInfoDAO; -import com.orion.ops.dao.ApplicationProfileDAO; -import com.orion.ops.dao.ApplicationRepositoryDAO; -import com.orion.ops.entity.domain.*; -import com.orion.ops.entity.request.app.ApplicationConfigRequest; -import com.orion.ops.entity.request.app.ApplicationInfoRequest; -import com.orion.ops.entity.vo.app.*; -import com.orion.ops.service.api.*; -import com.orion.ops.utils.DataQuery; -import com.orion.ops.utils.EventParamsHolder; -import com.orion.ops.utils.Utils; -import com.orion.ops.utils.Valid; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/ApplicationMachineServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationMachineServiceImpl.java similarity index 94% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/ApplicationMachineServiceImpl.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationMachineServiceImpl.java index bb90089e..710f268e 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/ApplicationMachineServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationMachineServiceImpl.java @@ -13,20 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.impl; +package cn.orionsec.ops.service.impl; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.MessageConst; +import cn.orionsec.ops.dao.ApplicationMachineDAO; +import cn.orionsec.ops.dao.MachineInfoDAO; +import cn.orionsec.ops.entity.domain.ApplicationMachineDO; +import cn.orionsec.ops.entity.domain.MachineInfoDO; +import cn.orionsec.ops.entity.request.app.ApplicationConfigRequest; +import cn.orionsec.ops.entity.vo.app.ApplicationMachineVO; +import cn.orionsec.ops.service.api.ApplicationMachineService; +import cn.orionsec.ops.utils.DataQuery; +import cn.orionsec.ops.utils.Valid; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.MessageConst; -import com.orion.ops.dao.ApplicationMachineDAO; -import com.orion.ops.dao.MachineInfoDAO; -import com.orion.ops.entity.domain.ApplicationMachineDO; -import com.orion.ops.entity.domain.MachineInfoDO; -import com.orion.ops.entity.request.app.ApplicationConfigRequest; -import com.orion.ops.entity.vo.app.ApplicationMachineVO; -import com.orion.ops.service.api.ApplicationMachineService; -import com.orion.ops.utils.DataQuery; -import com.orion.ops.utils.Valid; import com.orion.spring.SpringHolder; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/ApplicationPipelineDetailServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationPipelineDetailServiceImpl.java similarity index 92% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/ApplicationPipelineDetailServiceImpl.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationPipelineDetailServiceImpl.java index 46ee31ce..888279e5 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/ApplicationPipelineDetailServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationPipelineDetailServiceImpl.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.impl; +package cn.orionsec.ops.service.impl; +import cn.orionsec.ops.dao.ApplicationInfoDAO; +import cn.orionsec.ops.dao.ApplicationPipelineDetailDAO; +import cn.orionsec.ops.entity.domain.ApplicationInfoDO; +import cn.orionsec.ops.entity.domain.ApplicationPipelineDetailDO; +import cn.orionsec.ops.entity.vo.app.ApplicationPipelineDetailVO; +import cn.orionsec.ops.service.api.ApplicationPipelineDetailService; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.orion.lang.utils.convert.Converts; -import com.orion.ops.dao.ApplicationInfoDAO; -import com.orion.ops.dao.ApplicationPipelineDetailDAO; -import com.orion.ops.entity.domain.ApplicationInfoDO; -import com.orion.ops.entity.domain.ApplicationPipelineDetailDO; -import com.orion.ops.entity.vo.app.ApplicationPipelineDetailVO; -import com.orion.ops.service.api.ApplicationPipelineDetailService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/ApplicationPipelineServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationPipelineServiceImpl.java similarity index 91% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/ApplicationPipelineServiceImpl.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationPipelineServiceImpl.java index c8d21949..2c0c2dee 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/ApplicationPipelineServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationPipelineServiceImpl.java @@ -13,29 +13,29 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.impl; +package cn.orionsec.ops.service.impl; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.MessageConst; +import cn.orionsec.ops.constant.event.EventKeys; +import cn.orionsec.ops.dao.ApplicationInfoDAO; +import cn.orionsec.ops.dao.ApplicationPipelineDAO; +import cn.orionsec.ops.dao.ApplicationPipelineDetailDAO; +import cn.orionsec.ops.entity.domain.ApplicationInfoDO; +import cn.orionsec.ops.entity.domain.ApplicationPipelineDO; +import cn.orionsec.ops.entity.domain.ApplicationPipelineDetailDO; +import cn.orionsec.ops.entity.request.app.ApplicationPipelineRequest; +import cn.orionsec.ops.entity.vo.app.ApplicationPipelineDetailVO; +import cn.orionsec.ops.entity.vo.app.ApplicationPipelineVO; +import cn.orionsec.ops.service.api.ApplicationPipelineDetailService; +import cn.orionsec.ops.service.api.ApplicationPipelineService; +import cn.orionsec.ops.utils.DataQuery; +import cn.orionsec.ops.utils.EventParamsHolder; +import cn.orionsec.ops.utils.Valid; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.orion.lang.define.wrapper.DataGrid; import com.orion.lang.utils.Strings; import com.orion.lang.utils.convert.Converts; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.MessageConst; -import com.orion.ops.constant.event.EventKeys; -import com.orion.ops.utils.EventParamsHolder; -import com.orion.ops.dao.ApplicationInfoDAO; -import com.orion.ops.dao.ApplicationPipelineDAO; -import com.orion.ops.dao.ApplicationPipelineDetailDAO; -import com.orion.ops.entity.domain.ApplicationInfoDO; -import com.orion.ops.entity.domain.ApplicationPipelineDO; -import com.orion.ops.entity.domain.ApplicationPipelineDetailDO; -import com.orion.ops.entity.request.app.ApplicationPipelineRequest; -import com.orion.ops.entity.vo.app.ApplicationPipelineDetailVO; -import com.orion.ops.entity.vo.app.ApplicationPipelineVO; -import com.orion.ops.service.api.ApplicationPipelineDetailService; -import com.orion.ops.service.api.ApplicationPipelineService; -import com.orion.ops.utils.DataQuery; -import com.orion.ops.utils.Valid; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/ApplicationPipelineTaskDetailServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationPipelineTaskDetailServiceImpl.java similarity index 89% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/ApplicationPipelineTaskDetailServiceImpl.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationPipelineTaskDetailServiceImpl.java index f8ba96e2..799fb3fa 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/ApplicationPipelineTaskDetailServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationPipelineTaskDetailServiceImpl.java @@ -13,23 +13,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.impl; +package cn.orionsec.ops.service.impl; +import cn.orionsec.ops.dao.ApplicationBuildDAO; +import cn.orionsec.ops.dao.ApplicationPipelineTaskDetailDAO; +import cn.orionsec.ops.dao.MachineInfoDAO; +import cn.orionsec.ops.entity.domain.ApplicationBuildDO; +import cn.orionsec.ops.entity.domain.ApplicationPipelineTaskDetailDO; +import cn.orionsec.ops.entity.domain.MachineInfoDO; +import cn.orionsec.ops.entity.vo.app.ApplicationPipelineStageConfigVO; +import cn.orionsec.ops.entity.vo.app.ApplicationPipelineTaskDetailVO; +import cn.orionsec.ops.entity.vo.machine.MachineInfoVO; +import cn.orionsec.ops.service.api.ApplicationPipelineTaskDetailService; +import cn.orionsec.ops.utils.DataQuery; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.orion.lang.utils.collect.Lists; import com.orion.lang.utils.convert.Converts; -import com.orion.ops.dao.ApplicationBuildDAO; -import com.orion.ops.dao.ApplicationPipelineTaskDetailDAO; -import com.orion.ops.dao.MachineInfoDAO; -import com.orion.ops.entity.domain.ApplicationBuildDO; -import com.orion.ops.entity.domain.ApplicationPipelineTaskDetailDO; -import com.orion.ops.entity.domain.MachineInfoDO; -import com.orion.ops.entity.vo.app.ApplicationPipelineStageConfigVO; -import com.orion.ops.entity.vo.app.ApplicationPipelineTaskDetailVO; -import com.orion.ops.entity.vo.machine.MachineInfoVO; -import com.orion.ops.service.api.ApplicationPipelineTaskDetailService; -import com.orion.ops.utils.DataQuery; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/ApplicationPipelineTaskLogServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationPipelineTaskLogServiceImpl.java similarity index 85% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/ApplicationPipelineTaskLogServiceImpl.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationPipelineTaskLogServiceImpl.java index a43a94d0..fd20f6b1 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/ApplicationPipelineTaskLogServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationPipelineTaskLogServiceImpl.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.impl; +package cn.orionsec.ops.service.impl; +import cn.orionsec.ops.dao.ApplicationPipelineTaskLogDAO; +import cn.orionsec.ops.entity.domain.ApplicationPipelineTaskLogDO; +import cn.orionsec.ops.entity.vo.app.ApplicationPipelineTaskLogVO; +import cn.orionsec.ops.service.api.ApplicationPipelineTaskLogService; +import cn.orionsec.ops.utils.DataQuery; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.ops.dao.ApplicationPipelineTaskLogDAO; -import com.orion.ops.entity.domain.ApplicationPipelineTaskLogDO; -import com.orion.ops.entity.vo.app.ApplicationPipelineTaskLogVO; -import com.orion.ops.service.api.ApplicationPipelineTaskLogService; -import com.orion.ops.utils.DataQuery; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/ApplicationPipelineTaskServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationPipelineTaskServiceImpl.java similarity index 95% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/ApplicationPipelineTaskServiceImpl.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationPipelineTaskServiceImpl.java index 621bf62f..5675237e 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/ApplicationPipelineTaskServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationPipelineTaskServiceImpl.java @@ -13,8 +13,36 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.impl; +package cn.orionsec.ops.service.impl; +import cn.orionsec.ops.constant.CnConst; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.MessageConst; +import cn.orionsec.ops.constant.app.PipelineDetailStatus; +import cn.orionsec.ops.constant.app.PipelineStatus; +import cn.orionsec.ops.constant.app.StageType; +import cn.orionsec.ops.constant.app.TimedType; +import cn.orionsec.ops.constant.common.AuditStatus; +import cn.orionsec.ops.constant.event.EventKeys; +import cn.orionsec.ops.constant.message.MessageType; +import cn.orionsec.ops.constant.user.RoleType; +import cn.orionsec.ops.dao.*; +import cn.orionsec.ops.entity.domain.*; +import cn.orionsec.ops.entity.dto.app.ApplicationPipelineStageConfigDTO; +import cn.orionsec.ops.entity.dto.user.UserDTO; +import cn.orionsec.ops.entity.request.app.ApplicationPipelineTaskDetailRequest; +import cn.orionsec.ops.entity.request.app.ApplicationPipelineTaskRequest; +import cn.orionsec.ops.entity.vo.app.*; +import cn.orionsec.ops.handler.app.pipeline.IPipelineProcessor; +import cn.orionsec.ops.handler.app.pipeline.PipelineProcessor; +import cn.orionsec.ops.handler.app.pipeline.PipelineSessionHolder; +import cn.orionsec.ops.service.api.*; +import cn.orionsec.ops.task.TaskRegister; +import cn.orionsec.ops.task.TaskType; +import cn.orionsec.ops.utils.Currents; +import cn.orionsec.ops.utils.DataQuery; +import cn.orionsec.ops.utils.EventParamsHolder; +import cn.orionsec.ops.utils.Valid; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.orion.lang.constant.Letters; @@ -26,34 +54,6 @@ import com.orion.lang.utils.collect.Maps; import com.orion.lang.utils.collect.Sets; import com.orion.lang.utils.convert.Converts; import com.orion.lang.utils.time.Dates; -import com.orion.ops.constant.CnConst; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.MessageConst; -import com.orion.ops.constant.app.PipelineDetailStatus; -import com.orion.ops.constant.app.PipelineStatus; -import com.orion.ops.constant.app.StageType; -import com.orion.ops.constant.app.TimedType; -import com.orion.ops.constant.common.AuditStatus; -import com.orion.ops.constant.event.EventKeys; -import com.orion.ops.constant.message.MessageType; -import com.orion.ops.constant.user.RoleType; -import com.orion.ops.dao.*; -import com.orion.ops.entity.domain.*; -import com.orion.ops.entity.dto.app.ApplicationPipelineStageConfigDTO; -import com.orion.ops.entity.dto.user.UserDTO; -import com.orion.ops.entity.request.app.ApplicationPipelineTaskDetailRequest; -import com.orion.ops.entity.request.app.ApplicationPipelineTaskRequest; -import com.orion.ops.entity.vo.app.*; -import com.orion.ops.handler.app.pipeline.IPipelineProcessor; -import com.orion.ops.handler.app.pipeline.PipelineProcessor; -import com.orion.ops.handler.app.pipeline.PipelineSessionHolder; -import com.orion.ops.service.api.*; -import com.orion.ops.task.TaskRegister; -import com.orion.ops.task.TaskType; -import com.orion.ops.utils.Currents; -import com.orion.ops.utils.DataQuery; -import com.orion.ops.utils.EventParamsHolder; -import com.orion.ops.utils.Valid; import com.orion.spring.SpringHolder; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/ApplicationProfileServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationProfileServiceImpl.java similarity index 93% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/ApplicationProfileServiceImpl.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationProfileServiceImpl.java index c6956b11..37dd0e77 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/ApplicationProfileServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationProfileServiceImpl.java @@ -13,27 +13,27 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.impl; +package cn.orionsec.ops.service.impl; +import cn.orionsec.ops.constant.KeyConst; +import cn.orionsec.ops.constant.MessageConst; +import cn.orionsec.ops.constant.event.EventKeys; +import cn.orionsec.ops.dao.ApplicationProfileDAO; +import cn.orionsec.ops.entity.domain.ApplicationProfileDO; +import cn.orionsec.ops.entity.dto.app.ApplicationProfileDTO; +import cn.orionsec.ops.entity.request.app.ApplicationProfileRequest; +import cn.orionsec.ops.entity.vo.app.ApplicationProfileFastVO; +import cn.orionsec.ops.entity.vo.app.ApplicationProfileVO; +import cn.orionsec.ops.service.api.*; +import cn.orionsec.ops.utils.DataQuery; +import cn.orionsec.ops.utils.EventParamsHolder; +import cn.orionsec.ops.utils.Valid; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.orion.lang.define.wrapper.DataGrid; import com.orion.lang.utils.Strings; import com.orion.lang.utils.collect.Lists; import com.orion.lang.utils.convert.Converts; -import com.orion.ops.constant.KeyConst; -import com.orion.ops.constant.MessageConst; -import com.orion.ops.constant.event.EventKeys; -import com.orion.ops.utils.EventParamsHolder; -import com.orion.ops.dao.ApplicationProfileDAO; -import com.orion.ops.entity.domain.ApplicationProfileDO; -import com.orion.ops.entity.dto.app.ApplicationProfileDTO; -import com.orion.ops.entity.request.app.ApplicationProfileRequest; -import com.orion.ops.entity.vo.app.ApplicationProfileFastVO; -import com.orion.ops.entity.vo.app.ApplicationProfileVO; -import com.orion.ops.service.api.*; -import com.orion.ops.utils.DataQuery; -import com.orion.ops.utils.Valid; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/ApplicationReleaseMachineServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationReleaseMachineServiceImpl.java similarity index 92% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/ApplicationReleaseMachineServiceImpl.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationReleaseMachineServiceImpl.java index ad7664d1..b6d0bb02 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/ApplicationReleaseMachineServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationReleaseMachineServiceImpl.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.impl; +package cn.orionsec.ops.service.impl; +import cn.orionsec.ops.constant.system.SystemEnvAttr; +import cn.orionsec.ops.dao.ApplicationReleaseMachineDAO; +import cn.orionsec.ops.entity.domain.ApplicationReleaseMachineDO; +import cn.orionsec.ops.service.api.ApplicationReleaseMachineService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.orion.lang.utils.Strings; import com.orion.lang.utils.io.Files1; -import com.orion.ops.constant.system.SystemEnvAttr; -import com.orion.ops.dao.ApplicationReleaseMachineDAO; -import com.orion.ops.entity.domain.ApplicationReleaseMachineDO; -import com.orion.ops.service.api.ApplicationReleaseMachineService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/ApplicationReleaseServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationReleaseServiceImpl.java similarity index 97% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/ApplicationReleaseServiceImpl.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationReleaseServiceImpl.java index 1c13e6da..44282351 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/ApplicationReleaseServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationReleaseServiceImpl.java @@ -13,8 +13,32 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.impl; +package cn.orionsec.ops.service.impl; +import cn.orionsec.ops.constant.CnConst; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.MessageConst; +import cn.orionsec.ops.constant.app.*; +import cn.orionsec.ops.constant.common.AuditStatus; +import cn.orionsec.ops.constant.common.ExceptionHandlerType; +import cn.orionsec.ops.constant.common.SerialType; +import cn.orionsec.ops.constant.env.EnvConst; +import cn.orionsec.ops.constant.event.EventKeys; +import cn.orionsec.ops.constant.message.MessageType; +import cn.orionsec.ops.constant.system.SystemEnvAttr; +import cn.orionsec.ops.constant.user.RoleType; +import cn.orionsec.ops.dao.*; +import cn.orionsec.ops.entity.domain.*; +import cn.orionsec.ops.entity.dto.user.UserDTO; +import cn.orionsec.ops.entity.request.app.ApplicationReleaseAuditRequest; +import cn.orionsec.ops.entity.request.app.ApplicationReleaseRequest; +import cn.orionsec.ops.entity.vo.app.*; +import cn.orionsec.ops.handler.app.release.IReleaseProcessor; +import cn.orionsec.ops.handler.app.release.ReleaseSessionHolder; +import cn.orionsec.ops.service.api.*; +import cn.orionsec.ops.task.TaskRegister; +import cn.orionsec.ops.task.TaskType; +import cn.orionsec.ops.utils.*; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.orion.lang.define.collect.MutableLinkedHashMap; @@ -26,30 +50,6 @@ import com.orion.lang.utils.collect.Maps; import com.orion.lang.utils.convert.Converts; import com.orion.lang.utils.io.Files1; import com.orion.lang.utils.time.Dates; -import com.orion.ops.constant.CnConst; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.MessageConst; -import com.orion.ops.constant.app.*; -import com.orion.ops.constant.common.AuditStatus; -import com.orion.ops.constant.common.ExceptionHandlerType; -import com.orion.ops.constant.common.SerialType; -import com.orion.ops.constant.env.EnvConst; -import com.orion.ops.constant.event.EventKeys; -import com.orion.ops.constant.message.MessageType; -import com.orion.ops.constant.system.SystemEnvAttr; -import com.orion.ops.constant.user.RoleType; -import com.orion.ops.dao.*; -import com.orion.ops.entity.domain.*; -import com.orion.ops.entity.dto.user.UserDTO; -import com.orion.ops.entity.request.app.ApplicationReleaseAuditRequest; -import com.orion.ops.entity.request.app.ApplicationReleaseRequest; -import com.orion.ops.entity.vo.app.*; -import com.orion.ops.handler.app.release.IReleaseProcessor; -import com.orion.ops.handler.app.release.ReleaseSessionHolder; -import com.orion.ops.service.api.*; -import com.orion.ops.task.TaskRegister; -import com.orion.ops.task.TaskType; -import com.orion.ops.utils.*; import com.orion.spring.SpringHolder; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/ApplicationRepositoryServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationRepositoryServiceImpl.java similarity index 93% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/ApplicationRepositoryServiceImpl.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationRepositoryServiceImpl.java index da15e8fc..5c08809f 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/ApplicationRepositoryServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationRepositoryServiceImpl.java @@ -13,8 +13,30 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.impl; +package cn.orionsec.ops.service.impl; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.MessageConst; +import cn.orionsec.ops.constant.app.RepositoryAuthType; +import cn.orionsec.ops.constant.app.RepositoryStatus; +import cn.orionsec.ops.constant.app.RepositoryTokenType; +import cn.orionsec.ops.constant.app.RepositoryType; +import cn.orionsec.ops.constant.event.EventKeys; +import cn.orionsec.ops.constant.message.MessageType; +import cn.orionsec.ops.constant.system.SystemEnvAttr; +import cn.orionsec.ops.dao.ApplicationBuildDAO; +import cn.orionsec.ops.dao.ApplicationInfoDAO; +import cn.orionsec.ops.dao.ApplicationRepositoryDAO; +import cn.orionsec.ops.entity.domain.ApplicationRepositoryDO; +import cn.orionsec.ops.entity.dto.user.UserDTO; +import cn.orionsec.ops.entity.request.app.ApplicationRepositoryRequest; +import cn.orionsec.ops.entity.vo.app.ApplicationRepositoryBranchVO; +import cn.orionsec.ops.entity.vo.app.ApplicationRepositoryCommitVO; +import cn.orionsec.ops.entity.vo.app.ApplicationRepositoryInfoVO; +import cn.orionsec.ops.entity.vo.app.ApplicationRepositoryVO; +import cn.orionsec.ops.service.api.ApplicationRepositoryService; +import cn.orionsec.ops.service.api.WebSideMessageService; +import cn.orionsec.ops.utils.*; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.orion.ext.vcs.git.Gits; import com.orion.ext.vcs.git.info.BranchInfo; @@ -28,28 +50,6 @@ import com.orion.lang.utils.collect.Maps; import com.orion.lang.utils.convert.Converts; import com.orion.lang.utils.io.Files1; import com.orion.lang.utils.io.Streams; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.MessageConst; -import com.orion.ops.constant.app.RepositoryAuthType; -import com.orion.ops.constant.app.RepositoryStatus; -import com.orion.ops.constant.app.RepositoryTokenType; -import com.orion.ops.constant.app.RepositoryType; -import com.orion.ops.constant.event.EventKeys; -import com.orion.ops.constant.message.MessageType; -import com.orion.ops.constant.system.SystemEnvAttr; -import com.orion.ops.dao.ApplicationBuildDAO; -import com.orion.ops.dao.ApplicationInfoDAO; -import com.orion.ops.dao.ApplicationRepositoryDAO; -import com.orion.ops.entity.domain.ApplicationRepositoryDO; -import com.orion.ops.entity.dto.user.UserDTO; -import com.orion.ops.entity.request.app.ApplicationRepositoryRequest; -import com.orion.ops.entity.vo.app.ApplicationRepositoryBranchVO; -import com.orion.ops.entity.vo.app.ApplicationRepositoryCommitVO; -import com.orion.ops.entity.vo.app.ApplicationRepositoryInfoVO; -import com.orion.ops.entity.vo.app.ApplicationRepositoryVO; -import com.orion.ops.service.api.ApplicationRepositoryService; -import com.orion.ops.service.api.WebSideMessageService; -import com.orion.ops.utils.*; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/BatchUploadServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/BatchUploadServiceImpl.java similarity index 85% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/BatchUploadServiceImpl.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/BatchUploadServiceImpl.java index 8212d50b..aee19f93 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/BatchUploadServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/BatchUploadServiceImpl.java @@ -13,8 +13,32 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.impl; +package cn.orionsec.ops.service.impl; +import cn.orionsec.ops.constant.KeyConst; +import cn.orionsec.ops.constant.event.EventKeys; +import cn.orionsec.ops.constant.sftp.SftpTransferStatus; +import cn.orionsec.ops.constant.sftp.SftpTransferType; +import cn.orionsec.ops.dao.FileTransferLogDAO; +import cn.orionsec.ops.entity.domain.FileTransferLogDO; +import cn.orionsec.ops.entity.domain.MachineInfoDO; +import cn.orionsec.ops.entity.dto.sftp.SftpSessionTokenDTO; +import cn.orionsec.ops.entity.dto.sftp.SftpUploadInfoDTO; +import cn.orionsec.ops.entity.dto.user.UserDTO; +import cn.orionsec.ops.entity.request.sftp.FileUploadRequest; +import cn.orionsec.ops.entity.request.upload.BatchUploadRequest; +import cn.orionsec.ops.entity.vo.upload.BatchUploadCheckFileVO; +import cn.orionsec.ops.entity.vo.upload.BatchUploadCheckMachineVO; +import cn.orionsec.ops.entity.vo.upload.BatchUploadCheckVO; +import cn.orionsec.ops.entity.vo.upload.BatchUploadTokenVO; +import cn.orionsec.ops.handler.sftp.IFileTransferProcessor; +import cn.orionsec.ops.handler.sftp.SftpBasicExecutorHolder; +import cn.orionsec.ops.handler.sftp.TransferProcessorManager; +import cn.orionsec.ops.handler.sftp.hint.FileTransferHint; +import cn.orionsec.ops.service.api.BatchUploadService; +import cn.orionsec.ops.service.api.MachineInfoService; +import cn.orionsec.ops.utils.Currents; +import cn.orionsec.ops.utils.EventParamsHolder; import com.alibaba.fastjson.JSON; import com.orion.lang.id.UUIds; import com.orion.lang.utils.Strings; @@ -23,30 +47,6 @@ import com.orion.lang.utils.collect.Maps; import com.orion.lang.utils.convert.Converts; import com.orion.lang.utils.io.Files1; import com.orion.net.remote.channel.sftp.SftpExecutor; -import com.orion.ops.constant.KeyConst; -import com.orion.ops.constant.event.EventKeys; -import com.orion.ops.constant.sftp.SftpTransferStatus; -import com.orion.ops.constant.sftp.SftpTransferType; -import com.orion.ops.dao.FileTransferLogDAO; -import com.orion.ops.entity.domain.FileTransferLogDO; -import com.orion.ops.entity.domain.MachineInfoDO; -import com.orion.ops.entity.dto.sftp.SftpSessionTokenDTO; -import com.orion.ops.entity.dto.sftp.SftpUploadInfoDTO; -import com.orion.ops.entity.dto.user.UserDTO; -import com.orion.ops.entity.request.sftp.FileUploadRequest; -import com.orion.ops.entity.request.upload.BatchUploadRequest; -import com.orion.ops.entity.vo.upload.BatchUploadCheckFileVO; -import com.orion.ops.entity.vo.upload.BatchUploadCheckMachineVO; -import com.orion.ops.entity.vo.upload.BatchUploadCheckVO; -import com.orion.ops.entity.vo.upload.BatchUploadTokenVO; -import com.orion.ops.handler.sftp.IFileTransferProcessor; -import com.orion.ops.handler.sftp.SftpBasicExecutorHolder; -import com.orion.ops.handler.sftp.TransferProcessorManager; -import com.orion.ops.handler.sftp.hint.FileTransferHint; -import com.orion.ops.service.api.BatchUploadService; -import com.orion.ops.service.api.MachineInfoService; -import com.orion.ops.utils.Currents; -import com.orion.ops.utils.EventParamsHolder; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/CommandExecServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/CommandExecServiceImpl.java similarity index 89% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/CommandExecServiceImpl.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/CommandExecServiceImpl.java index 7541e51e..bd452e08 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/CommandExecServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/CommandExecServiceImpl.java @@ -13,8 +13,31 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.impl; +package cn.orionsec.ops.service.impl; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.MessageConst; +import cn.orionsec.ops.constant.command.ExecStatus; +import cn.orionsec.ops.constant.command.ExecType; +import cn.orionsec.ops.constant.env.EnvConst; +import cn.orionsec.ops.constant.event.EventKeys; +import cn.orionsec.ops.constant.system.SystemEnvAttr; +import cn.orionsec.ops.dao.CommandExecDAO; +import cn.orionsec.ops.dao.MachineInfoDAO; +import cn.orionsec.ops.entity.domain.CommandExecDO; +import cn.orionsec.ops.entity.domain.MachineInfoDO; +import cn.orionsec.ops.entity.dto.user.UserDTO; +import cn.orionsec.ops.entity.request.exec.CommandExecRequest; +import cn.orionsec.ops.entity.vo.exec.CommandExecStatusVO; +import cn.orionsec.ops.entity.vo.exec.CommandExecVO; +import cn.orionsec.ops.entity.vo.exec.CommandTaskSubmitVO; +import cn.orionsec.ops.handler.exec.ExecSessionHolder; +import cn.orionsec.ops.handler.exec.IExecHandler; +import cn.orionsec.ops.service.api.CommandExecService; +import cn.orionsec.ops.service.api.MachineEnvService; +import cn.orionsec.ops.service.api.MachineInfoService; +import cn.orionsec.ops.service.api.SystemEnvService; +import cn.orionsec.ops.utils.*; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.orion.lang.define.wrapper.DataGrid; @@ -23,33 +46,6 @@ import com.orion.lang.utils.collect.Lists; import com.orion.lang.utils.collect.Maps; import com.orion.lang.utils.convert.Converts; import com.orion.lang.utils.io.Files1; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.MessageConst; -import com.orion.ops.constant.command.ExecStatus; -import com.orion.ops.constant.command.ExecType; -import com.orion.ops.constant.env.EnvConst; -import com.orion.ops.constant.event.EventKeys; -import com.orion.ops.utils.EventParamsHolder; -import com.orion.ops.constant.system.SystemEnvAttr; -import com.orion.ops.dao.CommandExecDAO; -import com.orion.ops.dao.MachineInfoDAO; -import com.orion.ops.entity.domain.CommandExecDO; -import com.orion.ops.entity.domain.MachineInfoDO; -import com.orion.ops.entity.dto.user.UserDTO; -import com.orion.ops.entity.request.exec.CommandExecRequest; -import com.orion.ops.entity.vo.exec.CommandExecStatusVO; -import com.orion.ops.entity.vo.exec.CommandExecVO; -import com.orion.ops.entity.vo.exec.CommandTaskSubmitVO; -import com.orion.ops.handler.exec.ExecSessionHolder; -import com.orion.ops.handler.exec.IExecHandler; -import com.orion.ops.service.api.CommandExecService; -import com.orion.ops.service.api.MachineEnvService; -import com.orion.ops.service.api.MachineInfoService; -import com.orion.ops.service.api.SystemEnvService; -import com.orion.ops.utils.Currents; -import com.orion.ops.utils.DataQuery; -import com.orion.ops.utils.PathBuilders; -import com.orion.ops.utils.Valid; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/CommandTemplateServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/CommandTemplateServiceImpl.java similarity index 89% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/CommandTemplateServiceImpl.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/CommandTemplateServiceImpl.java index dd48da8b..29f61383 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/CommandTemplateServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/CommandTemplateServiceImpl.java @@ -13,25 +13,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.impl; +package cn.orionsec.ops.service.impl; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.MessageConst; +import cn.orionsec.ops.constant.event.EventKeys; +import cn.orionsec.ops.dao.CommandTemplateDAO; +import cn.orionsec.ops.entity.domain.CommandTemplateDO; +import cn.orionsec.ops.entity.dto.user.UserDTO; +import cn.orionsec.ops.entity.request.template.CommandTemplateRequest; +import cn.orionsec.ops.entity.vo.template.CommandTemplateVO; +import cn.orionsec.ops.service.api.CommandTemplateService; +import cn.orionsec.ops.utils.Currents; +import cn.orionsec.ops.utils.DataQuery; +import cn.orionsec.ops.utils.EventParamsHolder; +import cn.orionsec.ops.utils.Valid; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.orion.lang.define.wrapper.DataGrid; import com.orion.lang.utils.Strings; import com.orion.lang.utils.convert.Converts; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.MessageConst; -import com.orion.ops.constant.event.EventKeys; -import com.orion.ops.utils.EventParamsHolder; -import com.orion.ops.dao.CommandTemplateDAO; -import com.orion.ops.entity.domain.CommandTemplateDO; -import com.orion.ops.entity.dto.user.UserDTO; -import com.orion.ops.entity.request.template.CommandTemplateRequest; -import com.orion.ops.entity.vo.template.CommandTemplateVO; -import com.orion.ops.service.api.CommandTemplateService; -import com.orion.ops.utils.Currents; -import com.orion.ops.utils.DataQuery; -import com.orion.ops.utils.Valid; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/CommonServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/CommonServiceImpl.java similarity index 90% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/CommonServiceImpl.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/CommonServiceImpl.java index 42a3378b..9ae0feab 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/CommonServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/CommonServiceImpl.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.impl; +package cn.orionsec.ops.service.impl; -import com.orion.ops.service.api.CommonService; +import cn.orionsec.ops.service.api.CommonService; import org.springframework.stereotype.Service; /** diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/FileDownloadServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/FileDownloadServiceImpl.java similarity index 92% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/FileDownloadServiceImpl.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/FileDownloadServiceImpl.java index 4bdf2f7d..36ab1d2b 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/FileDownloadServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/FileDownloadServiceImpl.java @@ -13,8 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.impl; +package cn.orionsec.ops.service.impl; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.KeyConst; +import cn.orionsec.ops.constant.ResultCode; +import cn.orionsec.ops.constant.download.FileDownloadType; +import cn.orionsec.ops.dao.FileTailListDAO; +import cn.orionsec.ops.dao.MachineSecretKeyDAO; +import cn.orionsec.ops.entity.domain.FileTailListDO; +import cn.orionsec.ops.entity.domain.FileTransferLogDO; +import cn.orionsec.ops.entity.domain.MachineSecretKeyDO; +import cn.orionsec.ops.entity.dto.file.FileDownloadDTO; +import cn.orionsec.ops.handler.sftp.direct.DirectDownloader; +import cn.orionsec.ops.service.api.*; +import cn.orionsec.ops.utils.Currents; import com.alibaba.fastjson.JSON; import com.orion.lang.define.wrapper.HttpWrapper; import com.orion.lang.id.UUIds; @@ -22,19 +35,6 @@ import com.orion.lang.utils.Exceptions; import com.orion.lang.utils.Strings; import com.orion.lang.utils.io.Files1; import com.orion.lang.utils.io.Streams; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.KeyConst; -import com.orion.ops.constant.ResultCode; -import com.orion.ops.constant.download.FileDownloadType; -import com.orion.ops.dao.FileTailListDAO; -import com.orion.ops.dao.MachineSecretKeyDAO; -import com.orion.ops.entity.domain.FileTailListDO; -import com.orion.ops.entity.domain.FileTransferLogDO; -import com.orion.ops.entity.domain.MachineSecretKeyDO; -import com.orion.ops.entity.dto.file.FileDownloadDTO; -import com.orion.ops.handler.sftp.direct.DirectDownloader; -import com.orion.ops.service.api.*; -import com.orion.ops.utils.Currents; import com.orion.web.servlet.web.Servlets; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/FileTailServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/FileTailServiceImpl.java similarity index 92% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/FileTailServiceImpl.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/FileTailServiceImpl.java index 3f6ddabb..bab27bde 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/FileTailServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/FileTailServiceImpl.java @@ -13,8 +13,27 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.impl; +package cn.orionsec.ops.service.impl; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.KeyConst; +import cn.orionsec.ops.constant.MessageConst; +import cn.orionsec.ops.constant.ResultCode; +import cn.orionsec.ops.constant.env.EnvConst; +import cn.orionsec.ops.constant.event.EventKeys; +import cn.orionsec.ops.constant.tail.FileTailMode; +import cn.orionsec.ops.constant.tail.FileTailType; +import cn.orionsec.ops.dao.FileTailListDAO; +import cn.orionsec.ops.entity.domain.FileTailListDO; +import cn.orionsec.ops.entity.domain.MachineInfoDO; +import cn.orionsec.ops.entity.dto.file.FileTailDTO; +import cn.orionsec.ops.entity.request.file.FileTailRequest; +import cn.orionsec.ops.entity.vo.tail.FileTailConfigVO; +import cn.orionsec.ops.entity.vo.tail.FileTailVO; +import cn.orionsec.ops.handler.tail.ITailHandler; +import cn.orionsec.ops.handler.tail.TailSessionHolder; +import cn.orionsec.ops.service.api.*; +import cn.orionsec.ops.utils.*; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.orion.lang.define.wrapper.DataGrid; @@ -26,29 +45,6 @@ import com.orion.lang.utils.collect.Lists; import com.orion.lang.utils.collect.Maps; import com.orion.lang.utils.convert.Converts; import com.orion.lang.utils.io.Files1; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.KeyConst; -import com.orion.ops.constant.MessageConst; -import com.orion.ops.constant.ResultCode; -import com.orion.ops.constant.env.EnvConst; -import com.orion.ops.constant.event.EventKeys; -import com.orion.ops.utils.EventParamsHolder; -import com.orion.ops.constant.tail.FileTailMode; -import com.orion.ops.constant.tail.FileTailType; -import com.orion.ops.dao.FileTailListDAO; -import com.orion.ops.entity.domain.FileTailListDO; -import com.orion.ops.entity.domain.MachineInfoDO; -import com.orion.ops.entity.dto.file.FileTailDTO; -import com.orion.ops.entity.request.file.FileTailRequest; -import com.orion.ops.entity.vo.tail.FileTailConfigVO; -import com.orion.ops.entity.vo.tail.FileTailVO; -import com.orion.ops.handler.tail.ITailHandler; -import com.orion.ops.handler.tail.TailSessionHolder; -import com.orion.ops.service.api.*; -import com.orion.ops.utils.Currents; -import com.orion.ops.utils.DataQuery; -import com.orion.ops.utils.Utils; -import com.orion.ops.utils.Valid; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/HistoryValueServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/HistoryValueServiceImpl.java similarity index 81% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/HistoryValueServiceImpl.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/HistoryValueServiceImpl.java index 1d75211e..9a3e28e8 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/HistoryValueServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/HistoryValueServiceImpl.java @@ -13,28 +13,28 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.impl; +package cn.orionsec.ops.service.impl; +import cn.orionsec.ops.constant.MessageConst; +import cn.orionsec.ops.constant.history.HistoryOperator; +import cn.orionsec.ops.constant.history.HistoryValueType; +import cn.orionsec.ops.dao.HistoryValueSnapshotDAO; +import cn.orionsec.ops.entity.domain.HistoryValueSnapshotDO; +import cn.orionsec.ops.entity.dto.user.UserDTO; +import cn.orionsec.ops.entity.request.app.ApplicationEnvRequest; +import cn.orionsec.ops.entity.request.history.HistoryValueRequest; +import cn.orionsec.ops.entity.request.machine.MachineEnvRequest; +import cn.orionsec.ops.entity.request.system.SystemEnvRequest; +import cn.orionsec.ops.entity.vo.history.HistoryValueVO; +import cn.orionsec.ops.service.api.ApplicationEnvService; +import cn.orionsec.ops.service.api.HistoryValueService; +import cn.orionsec.ops.service.api.MachineEnvService; +import cn.orionsec.ops.service.api.SystemEnvService; +import cn.orionsec.ops.utils.Currents; +import cn.orionsec.ops.utils.DataQuery; +import cn.orionsec.ops.utils.Valid; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.orion.lang.define.wrapper.DataGrid; -import com.orion.ops.constant.MessageConst; -import com.orion.ops.constant.history.HistoryOperator; -import com.orion.ops.constant.history.HistoryValueType; -import com.orion.ops.dao.HistoryValueSnapshotDAO; -import com.orion.ops.entity.domain.HistoryValueSnapshotDO; -import com.orion.ops.entity.dto.user.UserDTO; -import com.orion.ops.entity.request.app.ApplicationEnvRequest; -import com.orion.ops.entity.request.history.HistoryValueRequest; -import com.orion.ops.entity.request.machine.MachineEnvRequest; -import com.orion.ops.entity.request.system.SystemEnvRequest; -import com.orion.ops.entity.vo.history.HistoryValueVO; -import com.orion.ops.service.api.ApplicationEnvService; -import com.orion.ops.service.api.HistoryValueService; -import com.orion.ops.service.api.MachineEnvService; -import com.orion.ops.service.api.SystemEnvService; -import com.orion.ops.utils.Currents; -import com.orion.ops.utils.DataQuery; -import com.orion.ops.utils.Valid; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/MachineAlarmConfigServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/MachineAlarmConfigServiceImpl.java similarity index 86% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/MachineAlarmConfigServiceImpl.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/MachineAlarmConfigServiceImpl.java index 1f19925e..5e69fd79 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/MachineAlarmConfigServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/MachineAlarmConfigServiceImpl.java @@ -13,28 +13,28 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.impl; +package cn.orionsec.ops.service.impl; +import cn.orionsec.ops.constant.MessageConst; +import cn.orionsec.ops.constant.event.EventKeys; +import cn.orionsec.ops.constant.machine.MachineAlarmType; +import cn.orionsec.ops.dao.MachineAlarmConfigDAO; +import cn.orionsec.ops.dao.MachineAlarmGroupDAO; +import cn.orionsec.ops.entity.domain.MachineAlarmConfigDO; +import cn.orionsec.ops.entity.domain.MachineAlarmGroupDO; +import cn.orionsec.ops.entity.domain.MachineInfoDO; +import cn.orionsec.ops.entity.domain.MachineMonitorDO; +import cn.orionsec.ops.entity.request.machine.MachineAlarmConfigRequest; +import cn.orionsec.ops.entity.vo.machine.MachineAlarmConfigVO; +import cn.orionsec.ops.entity.vo.machine.MachineAlarmConfigWrapperVO; +import cn.orionsec.ops.service.api.MachineAlarmConfigService; +import cn.orionsec.ops.service.api.MachineAlarmGroupService; +import cn.orionsec.ops.service.api.MachineInfoService; +import cn.orionsec.ops.service.api.MachineMonitorService; +import cn.orionsec.ops.utils.EventParamsHolder; +import cn.orionsec.ops.utils.Valid; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.orion.lang.utils.convert.Converts; -import com.orion.ops.constant.MessageConst; -import com.orion.ops.constant.event.EventKeys; -import com.orion.ops.constant.machine.MachineAlarmType; -import com.orion.ops.dao.MachineAlarmConfigDAO; -import com.orion.ops.dao.MachineAlarmGroupDAO; -import com.orion.ops.entity.domain.MachineAlarmConfigDO; -import com.orion.ops.entity.domain.MachineAlarmGroupDO; -import com.orion.ops.entity.domain.MachineInfoDO; -import com.orion.ops.entity.domain.MachineMonitorDO; -import com.orion.ops.entity.request.machine.MachineAlarmConfigRequest; -import com.orion.ops.entity.vo.machine.MachineAlarmConfigVO; -import com.orion.ops.entity.vo.machine.MachineAlarmConfigWrapperVO; -import com.orion.ops.service.api.MachineAlarmConfigService; -import com.orion.ops.service.api.MachineAlarmGroupService; -import com.orion.ops.service.api.MachineInfoService; -import com.orion.ops.service.api.MachineMonitorService; -import com.orion.ops.utils.EventParamsHolder; -import com.orion.ops.utils.Valid; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/MachineAlarmGroupServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/MachineAlarmGroupServiceImpl.java similarity index 91% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/MachineAlarmGroupServiceImpl.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/MachineAlarmGroupServiceImpl.java index d8bb38ad..cf192b16 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/MachineAlarmGroupServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/MachineAlarmGroupServiceImpl.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.impl; +package cn.orionsec.ops.service.impl; +import cn.orionsec.ops.dao.MachineAlarmGroupDAO; +import cn.orionsec.ops.entity.domain.MachineAlarmGroupDO; +import cn.orionsec.ops.service.api.MachineAlarmGroupService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.ops.dao.MachineAlarmGroupDAO; -import com.orion.ops.entity.domain.MachineAlarmGroupDO; -import com.orion.ops.service.api.MachineAlarmGroupService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/MachineAlarmHistoryServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/MachineAlarmHistoryServiceImpl.java similarity index 85% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/MachineAlarmHistoryServiceImpl.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/MachineAlarmHistoryServiceImpl.java index 3ad50061..76c292ed 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/MachineAlarmHistoryServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/MachineAlarmHistoryServiceImpl.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.impl; +package cn.orionsec.ops.service.impl; +import cn.orionsec.ops.dao.MachineAlarmHistoryDAO; +import cn.orionsec.ops.entity.domain.MachineAlarmHistoryDO; +import cn.orionsec.ops.entity.request.machine.MachineAlarmHistoryRequest; +import cn.orionsec.ops.entity.vo.machine.MachineAlarmHistoryVO; +import cn.orionsec.ops.service.api.MachineAlarmHistoryService; +import cn.orionsec.ops.utils.DataQuery; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.orion.lang.define.wrapper.DataGrid; import com.orion.lang.utils.Objects1; -import com.orion.ops.dao.MachineAlarmHistoryDAO; -import com.orion.ops.entity.domain.MachineAlarmHistoryDO; -import com.orion.ops.entity.request.machine.MachineAlarmHistoryRequest; -import com.orion.ops.entity.vo.machine.MachineAlarmHistoryVO; -import com.orion.ops.service.api.MachineAlarmHistoryService; -import com.orion.ops.utils.DataQuery; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/MachineAlarmServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/MachineAlarmServiceImpl.java similarity index 83% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/MachineAlarmServiceImpl.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/MachineAlarmServiceImpl.java index 6d4d3cdc..1994e492 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/MachineAlarmServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/MachineAlarmServiceImpl.java @@ -13,20 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.impl; +package cn.orionsec.ops.service.impl; -import com.orion.ops.constant.MessageConst; -import com.orion.ops.constant.event.EventKeys; -import com.orion.ops.dao.MachineAlarmHistoryDAO; -import com.orion.ops.dao.MachineInfoDAO; -import com.orion.ops.entity.domain.MachineAlarmHistoryDO; -import com.orion.ops.entity.domain.MachineInfoDO; -import com.orion.ops.entity.request.machine.MachineAlarmRequest; -import com.orion.ops.handler.alarm.MachineAlarmContext; -import com.orion.ops.handler.alarm.MachineAlarmExecutor; -import com.orion.ops.service.api.MachineAlarmService; -import com.orion.ops.utils.EventParamsHolder; -import com.orion.ops.utils.Valid; +import cn.orionsec.ops.constant.MessageConst; +import cn.orionsec.ops.constant.event.EventKeys; +import cn.orionsec.ops.dao.MachineAlarmHistoryDAO; +import cn.orionsec.ops.dao.MachineInfoDAO; +import cn.orionsec.ops.entity.domain.MachineAlarmHistoryDO; +import cn.orionsec.ops.entity.domain.MachineInfoDO; +import cn.orionsec.ops.entity.request.machine.MachineAlarmRequest; +import cn.orionsec.ops.handler.alarm.MachineAlarmContext; +import cn.orionsec.ops.handler.alarm.MachineAlarmExecutor; +import cn.orionsec.ops.service.api.MachineAlarmService; +import cn.orionsec.ops.utils.EventParamsHolder; +import cn.orionsec.ops.utils.Valid; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/MachineEnvServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/MachineEnvServiceImpl.java similarity index 93% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/MachineEnvServiceImpl.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/MachineEnvServiceImpl.java index 32916129..d63531e6 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/MachineEnvServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/MachineEnvServiceImpl.java @@ -13,8 +13,28 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.impl; +package cn.orionsec.ops.service.impl; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.MessageConst; +import cn.orionsec.ops.constant.command.CommandConst; +import cn.orionsec.ops.constant.env.EnvConst; +import cn.orionsec.ops.constant.event.EventKeys; +import cn.orionsec.ops.constant.history.HistoryOperator; +import cn.orionsec.ops.constant.history.HistoryValueType; +import cn.orionsec.ops.constant.machine.MachineConst; +import cn.orionsec.ops.constant.machine.MachineEnvAttr; +import cn.orionsec.ops.dao.MachineEnvDAO; +import cn.orionsec.ops.dao.MachineInfoDAO; +import cn.orionsec.ops.entity.domain.MachineEnvDO; +import cn.orionsec.ops.entity.domain.MachineInfoDO; +import cn.orionsec.ops.entity.request.machine.MachineEnvRequest; +import cn.orionsec.ops.entity.vo.machine.MachineEnvVO; +import cn.orionsec.ops.service.api.HistoryValueService; +import cn.orionsec.ops.service.api.MachineEnvService; +import cn.orionsec.ops.utils.DataQuery; +import cn.orionsec.ops.utils.EventParamsHolder; +import cn.orionsec.ops.utils.Valid; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.orion.lang.define.collect.MutableLinkedHashMap; import com.orion.lang.define.wrapper.DataGrid; @@ -23,26 +43,6 @@ import com.orion.lang.utils.Strings; import com.orion.lang.utils.collect.Lists; import com.orion.lang.utils.collect.Maps; import com.orion.lang.utils.convert.Converts; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.MessageConst; -import com.orion.ops.constant.command.CommandConst; -import com.orion.ops.constant.env.EnvConst; -import com.orion.ops.constant.event.EventKeys; -import com.orion.ops.utils.EventParamsHolder; -import com.orion.ops.constant.history.HistoryOperator; -import com.orion.ops.constant.history.HistoryValueType; -import com.orion.ops.constant.machine.MachineConst; -import com.orion.ops.constant.machine.MachineEnvAttr; -import com.orion.ops.dao.MachineEnvDAO; -import com.orion.ops.dao.MachineInfoDAO; -import com.orion.ops.entity.domain.MachineEnvDO; -import com.orion.ops.entity.domain.MachineInfoDO; -import com.orion.ops.entity.request.machine.MachineEnvRequest; -import com.orion.ops.entity.vo.machine.MachineEnvVO; -import com.orion.ops.service.api.HistoryValueService; -import com.orion.ops.service.api.MachineEnvService; -import com.orion.ops.utils.DataQuery; -import com.orion.ops.utils.Valid; import com.orion.spring.SpringHolder; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/MachineGroupRelServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/MachineGroupRelServiceImpl.java similarity index 95% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/MachineGroupRelServiceImpl.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/MachineGroupRelServiceImpl.java index c5ef9e1b..f597e936 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/MachineGroupRelServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/MachineGroupRelServiceImpl.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.impl; +package cn.orionsec.ops.service.impl; +import cn.orionsec.ops.constant.KeyConst; +import cn.orionsec.ops.dao.MachineGroupRelDAO; +import cn.orionsec.ops.entity.domain.MachineGroupRelDO; +import cn.orionsec.ops.service.api.MachineGroupRelService; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.orion.ops.constant.KeyConst; -import com.orion.ops.dao.MachineGroupRelDAO; -import com.orion.ops.entity.domain.MachineGroupRelDO; -import com.orion.ops.service.api.MachineGroupRelService; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/MachineGroupServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/MachineGroupServiceImpl.java similarity index 93% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/MachineGroupServiceImpl.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/MachineGroupServiceImpl.java index 85ee1073..23d49ec9 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/MachineGroupServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/MachineGroupServiceImpl.java @@ -13,23 +13,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.impl; +package cn.orionsec.ops.service.impl; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.KeyConst; +import cn.orionsec.ops.constant.MessageConst; +import cn.orionsec.ops.constant.common.TreeMoveType; +import cn.orionsec.ops.dao.MachineGroupDAO; +import cn.orionsec.ops.entity.domain.MachineGroupDO; +import cn.orionsec.ops.entity.request.machine.MachineGroupRequest; +import cn.orionsec.ops.entity.vo.machine.MachineGroupTreeVO; +import cn.orionsec.ops.service.api.MachineGroupRelService; +import cn.orionsec.ops.service.api.MachineGroupService; +import cn.orionsec.ops.utils.DataQuery; +import cn.orionsec.ops.utils.Valid; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.orion.lang.utils.Objects1; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.KeyConst; -import com.orion.ops.constant.MessageConst; -import com.orion.ops.constant.common.TreeMoveType; -import com.orion.ops.dao.MachineGroupDAO; -import com.orion.ops.entity.domain.MachineGroupDO; -import com.orion.ops.entity.request.machine.MachineGroupRequest; -import com.orion.ops.entity.vo.machine.MachineGroupTreeVO; -import com.orion.ops.service.api.MachineGroupRelService; -import com.orion.ops.service.api.MachineGroupService; -import com.orion.ops.utils.DataQuery; -import com.orion.ops.utils.Valid; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/MachineInfoServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/MachineInfoServiceImpl.java similarity index 94% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/MachineInfoServiceImpl.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/MachineInfoServiceImpl.java index 67a591f2..ca4307f9 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/MachineInfoServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/MachineInfoServiceImpl.java @@ -13,8 +13,32 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.impl; +package cn.orionsec.ops.service.impl; +import cn.orionsec.ops.constant.CnConst; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.MessageConst; +import cn.orionsec.ops.constant.event.EventKeys; +import cn.orionsec.ops.constant.history.HistoryOperator; +import cn.orionsec.ops.constant.history.HistoryValueType; +import cn.orionsec.ops.constant.machine.MachineAuthType; +import cn.orionsec.ops.constant.machine.MachineConst; +import cn.orionsec.ops.constant.machine.ProxyType; +import cn.orionsec.ops.dao.MachineEnvDAO; +import cn.orionsec.ops.dao.MachineInfoDAO; +import cn.orionsec.ops.dao.MachineProxyDAO; +import cn.orionsec.ops.dao.MachineSecretKeyDAO; +import cn.orionsec.ops.entity.domain.MachineEnvDO; +import cn.orionsec.ops.entity.domain.MachineInfoDO; +import cn.orionsec.ops.entity.domain.MachineProxyDO; +import cn.orionsec.ops.entity.domain.MachineSecretKeyDO; +import cn.orionsec.ops.entity.request.machine.MachineInfoRequest; +import cn.orionsec.ops.entity.vo.machine.MachineInfoVO; +import cn.orionsec.ops.service.api.*; +import cn.orionsec.ops.utils.DataQuery; +import cn.orionsec.ops.utils.EventParamsHolder; +import cn.orionsec.ops.utils.Utils; +import cn.orionsec.ops.utils.ValueMix; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.orion.ext.process.Processes; import com.orion.lang.define.wrapper.DataGrid; @@ -32,30 +56,6 @@ import com.orion.net.remote.CommandExecutors; import com.orion.net.remote.channel.SessionHolder; import com.orion.net.remote.channel.SessionStore; import com.orion.net.remote.channel.ssh.CommandExecutor; -import com.orion.ops.constant.CnConst; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.MessageConst; -import com.orion.ops.constant.event.EventKeys; -import com.orion.ops.constant.history.HistoryOperator; -import com.orion.ops.constant.history.HistoryValueType; -import com.orion.ops.constant.machine.MachineAuthType; -import com.orion.ops.constant.machine.MachineConst; -import com.orion.ops.constant.machine.ProxyType; -import com.orion.ops.dao.MachineEnvDAO; -import com.orion.ops.dao.MachineInfoDAO; -import com.orion.ops.dao.MachineProxyDAO; -import com.orion.ops.dao.MachineSecretKeyDAO; -import com.orion.ops.entity.domain.MachineEnvDO; -import com.orion.ops.entity.domain.MachineInfoDO; -import com.orion.ops.entity.domain.MachineProxyDO; -import com.orion.ops.entity.domain.MachineSecretKeyDO; -import com.orion.ops.entity.request.machine.MachineInfoRequest; -import com.orion.ops.entity.vo.machine.MachineInfoVO; -import com.orion.ops.service.api.*; -import com.orion.ops.utils.DataQuery; -import com.orion.ops.utils.EventParamsHolder; -import com.orion.ops.utils.Utils; -import com.orion.ops.utils.ValueMix; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -604,7 +604,7 @@ public class MachineInfoServiceImpl implements MachineInfoService { .ne(id != null, MachineInfoDO::getId, id) .eq(MachineInfoDO::getMachineTag, tag); boolean present = DataQuery.of(machineInfoDAO).wrapper(presentWrapper).present(); - com.orion.ops.utils.Valid.isTrue(!present, MessageConst.TAG_PRESENT); + cn.orionsec.ops.utils.Valid.isTrue(!present, MessageConst.TAG_PRESENT); } } diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/MachineKeyServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/MachineKeyServiceImpl.java similarity index 92% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/MachineKeyServiceImpl.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/MachineKeyServiceImpl.java index 869baca3..aec909fb 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/MachineKeyServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/MachineKeyServiceImpl.java @@ -13,8 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.impl; +package cn.orionsec.ops.service.impl; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.MessageConst; +import cn.orionsec.ops.constant.event.EventKeys; +import cn.orionsec.ops.dao.MachineInfoDAO; +import cn.orionsec.ops.dao.MachineSecretKeyDAO; +import cn.orionsec.ops.entity.domain.MachineInfoDO; +import cn.orionsec.ops.entity.domain.MachineSecretKeyDO; +import cn.orionsec.ops.entity.request.machine.MachineKeyRequest; +import cn.orionsec.ops.entity.vo.machine.MachineSecretKeyVO; +import cn.orionsec.ops.service.api.MachineKeyService; +import cn.orionsec.ops.utils.*; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.orion.lang.define.wrapper.DataGrid; @@ -25,17 +36,6 @@ import com.orion.lang.utils.convert.Converts; import com.orion.lang.utils.io.FileWriters; import com.orion.lang.utils.io.Files1; import com.orion.net.remote.channel.SessionHolder; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.MessageConst; -import com.orion.ops.constant.event.EventKeys; -import com.orion.ops.dao.MachineInfoDAO; -import com.orion.ops.dao.MachineSecretKeyDAO; -import com.orion.ops.entity.domain.MachineInfoDO; -import com.orion.ops.entity.domain.MachineSecretKeyDO; -import com.orion.ops.entity.request.machine.MachineKeyRequest; -import com.orion.ops.entity.vo.machine.MachineSecretKeyVO; -import com.orion.ops.service.api.MachineKeyService; -import com.orion.ops.utils.*; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/MachineMonitorEndpointServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/MachineMonitorEndpointServiceImpl.java similarity index 86% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/MachineMonitorEndpointServiceImpl.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/MachineMonitorEndpointServiceImpl.java index 46c07cb5..9d47f868 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/MachineMonitorEndpointServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/MachineMonitorEndpointServiceImpl.java @@ -13,23 +13,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.impl; +package cn.orionsec.ops.service.impl; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.MessageConst; +import cn.orionsec.ops.constant.ParamConst; +import cn.orionsec.ops.entity.domain.MachineMonitorDO; +import cn.orionsec.ops.entity.request.machine.MachineMonitorEndpointRequest; +import cn.orionsec.ops.handler.http.HttpApiRequest; +import cn.orionsec.ops.handler.http.HttpApiRequester; +import cn.orionsec.ops.handler.http.MachineMonitorHttpApi; +import cn.orionsec.ops.handler.http.MachineMonitorHttpApiRequester; +import cn.orionsec.ops.service.api.MachineMonitorEndpointService; +import cn.orionsec.ops.service.api.MachineMonitorService; +import cn.orionsec.ops.utils.Valid; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.orion.lang.define.wrapper.HttpWrapper; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.MessageConst; -import com.orion.ops.constant.ParamConst; -import com.orion.ops.entity.domain.MachineMonitorDO; -import com.orion.ops.entity.request.machine.MachineMonitorEndpointRequest; -import com.orion.ops.handler.http.HttpApiRequest; -import com.orion.ops.handler.http.HttpApiRequester; -import com.orion.ops.handler.http.MachineMonitorHttpApi; -import com.orion.ops.handler.http.MachineMonitorHttpApiRequester; -import com.orion.ops.service.api.MachineMonitorEndpointService; -import com.orion.ops.service.api.MachineMonitorService; -import com.orion.ops.utils.Valid; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/MachineMonitorServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/MachineMonitorServiceImpl.java similarity index 89% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/MachineMonitorServiceImpl.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/MachineMonitorServiceImpl.java index 8a63c1f7..f43063bf 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/MachineMonitorServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/MachineMonitorServiceImpl.java @@ -13,8 +13,32 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.impl; +package cn.orionsec.ops.service.impl; +import cn.orionsec.ops.constant.CnConst; +import cn.orionsec.ops.constant.MessageConst; +import cn.orionsec.ops.constant.SchedulerPools; +import cn.orionsec.ops.constant.event.EventKeys; +import cn.orionsec.ops.constant.monitor.MonitorConst; +import cn.orionsec.ops.constant.monitor.MonitorStatus; +import cn.orionsec.ops.constant.system.SystemEnvAttr; +import cn.orionsec.ops.dao.MachineInfoDAO; +import cn.orionsec.ops.dao.MachineMonitorDAO; +import cn.orionsec.ops.entity.domain.MachineInfoDO; +import cn.orionsec.ops.entity.domain.MachineMonitorDO; +import cn.orionsec.ops.entity.dto.MachineMonitorDTO; +import cn.orionsec.ops.entity.query.MachineMonitorQuery; +import cn.orionsec.ops.entity.request.machine.MachineMonitorRequest; +import cn.orionsec.ops.entity.request.machine.MachineMonitorSyncRequest; +import cn.orionsec.ops.entity.vo.machine.MachineMonitorVO; +import cn.orionsec.ops.handler.http.MachineMonitorHttpApi; +import cn.orionsec.ops.handler.http.MachineMonitorHttpApiRequester; +import cn.orionsec.ops.handler.monitor.MonitorAgentInstallTask; +import cn.orionsec.ops.service.api.MachineAlarmConfigService; +import cn.orionsec.ops.service.api.MachineMonitorService; +import cn.orionsec.ops.utils.Currents; +import cn.orionsec.ops.utils.EventParamsHolder; +import cn.orionsec.ops.utils.Valid; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.orion.lang.define.wrapper.DataGrid; import com.orion.lang.define.wrapper.Pager; @@ -23,30 +47,6 @@ import com.orion.lang.utils.Threads; import com.orion.lang.utils.collect.Lists; import com.orion.lang.utils.convert.Converts; import com.orion.lang.utils.io.Files1; -import com.orion.ops.constant.CnConst; -import com.orion.ops.constant.MessageConst; -import com.orion.ops.constant.SchedulerPools; -import com.orion.ops.constant.event.EventKeys; -import com.orion.ops.constant.monitor.MonitorConst; -import com.orion.ops.constant.monitor.MonitorStatus; -import com.orion.ops.constant.system.SystemEnvAttr; -import com.orion.ops.dao.MachineInfoDAO; -import com.orion.ops.dao.MachineMonitorDAO; -import com.orion.ops.entity.domain.MachineInfoDO; -import com.orion.ops.entity.domain.MachineMonitorDO; -import com.orion.ops.entity.dto.MachineMonitorDTO; -import com.orion.ops.entity.query.MachineMonitorQuery; -import com.orion.ops.entity.request.machine.MachineMonitorRequest; -import com.orion.ops.entity.request.machine.MachineMonitorSyncRequest; -import com.orion.ops.entity.vo.machine.MachineMonitorVO; -import com.orion.ops.handler.http.MachineMonitorHttpApi; -import com.orion.ops.handler.http.MachineMonitorHttpApiRequester; -import com.orion.ops.handler.monitor.MonitorAgentInstallTask; -import com.orion.ops.service.api.MachineAlarmConfigService; -import com.orion.ops.service.api.MachineMonitorService; -import com.orion.ops.utils.Currents; -import com.orion.ops.utils.EventParamsHolder; -import com.orion.ops.utils.Valid; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/MachineProxyServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/MachineProxyServiceImpl.java similarity index 88% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/MachineProxyServiceImpl.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/MachineProxyServiceImpl.java index f4af93f6..cb0a46cc 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/MachineProxyServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/MachineProxyServiceImpl.java @@ -13,24 +13,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.impl; +package cn.orionsec.ops.service.impl; +import cn.orionsec.ops.constant.MessageConst; +import cn.orionsec.ops.constant.event.EventKeys; +import cn.orionsec.ops.dao.MachineInfoDAO; +import cn.orionsec.ops.dao.MachineProxyDAO; +import cn.orionsec.ops.entity.domain.MachineProxyDO; +import cn.orionsec.ops.entity.request.machine.MachineProxyRequest; +import cn.orionsec.ops.entity.vo.machine.MachineProxyVO; +import cn.orionsec.ops.service.api.MachineProxyService; +import cn.orionsec.ops.utils.DataQuery; +import cn.orionsec.ops.utils.EventParamsHolder; +import cn.orionsec.ops.utils.Valid; +import cn.orionsec.ops.utils.ValueMix; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.orion.lang.define.wrapper.DataGrid; import com.orion.lang.utils.Strings; import com.orion.lang.utils.convert.Converts; -import com.orion.ops.constant.MessageConst; -import com.orion.ops.constant.event.EventKeys; -import com.orion.ops.utils.EventParamsHolder; -import com.orion.ops.dao.MachineInfoDAO; -import com.orion.ops.dao.MachineProxyDAO; -import com.orion.ops.entity.domain.MachineProxyDO; -import com.orion.ops.entity.request.machine.MachineProxyRequest; -import com.orion.ops.entity.vo.machine.MachineProxyVO; -import com.orion.ops.service.api.MachineProxyService; -import com.orion.ops.utils.DataQuery; -import com.orion.ops.utils.Valid; -import com.orion.ops.utils.ValueMix; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/MachineTerminalServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/MachineTerminalServiceImpl.java similarity index 89% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/MachineTerminalServiceImpl.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/MachineTerminalServiceImpl.java index ef3d586b..2289d207 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/MachineTerminalServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/MachineTerminalServiceImpl.java @@ -13,8 +13,30 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.impl; +package cn.orionsec.ops.service.impl; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.KeyConst; +import cn.orionsec.ops.constant.MessageConst; +import cn.orionsec.ops.constant.event.EventKeys; +import cn.orionsec.ops.constant.system.SystemEnvAttr; +import cn.orionsec.ops.constant.terminal.TerminalConst; +import cn.orionsec.ops.dao.MachineTerminalDAO; +import cn.orionsec.ops.dao.MachineTerminalLogDAO; +import cn.orionsec.ops.entity.domain.MachineInfoDO; +import cn.orionsec.ops.entity.domain.MachineTerminalDO; +import cn.orionsec.ops.entity.domain.MachineTerminalLogDO; +import cn.orionsec.ops.entity.request.machine.MachineTerminalLogRequest; +import cn.orionsec.ops.entity.request.machine.MachineTerminalRequest; +import cn.orionsec.ops.entity.vo.machine.MachineTerminalLogVO; +import cn.orionsec.ops.entity.vo.machine.MachineTerminalVO; +import cn.orionsec.ops.entity.vo.machine.TerminalAccessVO; +import cn.orionsec.ops.service.api.MachineInfoService; +import cn.orionsec.ops.service.api.MachineTerminalService; +import cn.orionsec.ops.utils.Currents; +import cn.orionsec.ops.utils.DataQuery; +import cn.orionsec.ops.utils.EventParamsHolder; +import cn.orionsec.ops.utils.Valid; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.orion.lang.define.wrapper.DataGrid; import com.orion.lang.id.UUIds; @@ -23,28 +45,6 @@ import com.orion.lang.utils.Strings; import com.orion.lang.utils.convert.Converts; import com.orion.lang.utils.io.Files1; import com.orion.net.remote.TerminalType; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.KeyConst; -import com.orion.ops.constant.MessageConst; -import com.orion.ops.constant.event.EventKeys; -import com.orion.ops.utils.EventParamsHolder; -import com.orion.ops.constant.system.SystemEnvAttr; -import com.orion.ops.constant.terminal.TerminalConst; -import com.orion.ops.dao.MachineTerminalDAO; -import com.orion.ops.dao.MachineTerminalLogDAO; -import com.orion.ops.entity.domain.MachineInfoDO; -import com.orion.ops.entity.domain.MachineTerminalDO; -import com.orion.ops.entity.domain.MachineTerminalLogDO; -import com.orion.ops.entity.request.machine.MachineTerminalLogRequest; -import com.orion.ops.entity.request.machine.MachineTerminalRequest; -import com.orion.ops.entity.vo.machine.MachineTerminalLogVO; -import com.orion.ops.entity.vo.machine.MachineTerminalVO; -import com.orion.ops.entity.vo.machine.TerminalAccessVO; -import com.orion.ops.service.api.MachineInfoService; -import com.orion.ops.service.api.MachineTerminalService; -import com.orion.ops.utils.Currents; -import com.orion.ops.utils.DataQuery; -import com.orion.ops.utils.Valid; import lombok.extern.slf4j.Slf4j; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/PassportServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/PassportServiceImpl.java similarity index 88% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/PassportServiceImpl.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/PassportServiceImpl.java index 7e9bd9fa..f5e059df 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/PassportServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/PassportServiceImpl.java @@ -13,30 +13,30 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.impl; +package cn.orionsec.ops.service.impl; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.KeyConst; +import cn.orionsec.ops.constant.MessageConst; +import cn.orionsec.ops.constant.ResultCode; +import cn.orionsec.ops.constant.common.EnableType; +import cn.orionsec.ops.constant.event.EventKeys; +import cn.orionsec.ops.constant.system.SystemEnvAttr; +import cn.orionsec.ops.dao.UserInfoDAO; +import cn.orionsec.ops.entity.domain.UserInfoDO; +import cn.orionsec.ops.entity.dto.user.LoginBindDTO; +import cn.orionsec.ops.entity.dto.user.UserDTO; +import cn.orionsec.ops.entity.request.user.UserLoginRequest; +import cn.orionsec.ops.entity.request.user.UserResetRequest; +import cn.orionsec.ops.entity.vo.user.UserLoginVO; +import cn.orionsec.ops.interceptor.UserActiveInterceptor; +import cn.orionsec.ops.service.api.PassportService; +import cn.orionsec.ops.utils.*; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.orion.lang.define.wrapper.HttpWrapper; import com.orion.lang.utils.Exceptions; import com.orion.lang.utils.Strings; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.KeyConst; -import com.orion.ops.constant.MessageConst; -import com.orion.ops.constant.ResultCode; -import com.orion.ops.constant.common.EnableType; -import com.orion.ops.constant.event.EventKeys; -import com.orion.ops.constant.system.SystemEnvAttr; -import com.orion.ops.dao.UserInfoDAO; -import com.orion.ops.entity.domain.UserInfoDO; -import com.orion.ops.entity.dto.user.LoginBindDTO; -import com.orion.ops.entity.dto.user.UserDTO; -import com.orion.ops.entity.request.user.UserLoginRequest; -import com.orion.ops.entity.request.user.UserResetRequest; -import com.orion.ops.entity.vo.user.UserLoginVO; -import com.orion.ops.interceptor.UserActiveInterceptor; -import com.orion.ops.service.api.PassportService; -import com.orion.ops.utils.*; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; @@ -77,7 +77,7 @@ public class PassportServiceImpl implements PassportService { if (validPassword) { Valid.isTrue(Const.ENABLE.equals(userInfo.getUserStatus()), MessageConst.USER_DISABLED); } else { - // 开启登陆失败锁定 + // 开启登录失败锁定 if (EnableType.of(SystemEnvAttr.LOGIN_FAILURE_LOCK.getValue()).getValue()) { // 修改登录失败次数 UserInfoDO updateUser = new UserInfoDO(); @@ -102,7 +102,7 @@ public class PassportServiceImpl implements PassportService { updateUser.setUpdateTime(new Date()); updateUser.setLastLoginTime(new Date()); userInfoDAO.updateById(updateUser); - // 设置登陆信息 + // 设置登录信息 long timestamp = System.currentTimeMillis(); String loginToken = ValueMix.createLoginToken(userId, timestamp); UserDTO userCache = new UserDTO(); @@ -116,7 +116,7 @@ public class PassportServiceImpl implements PassportService { LoginBindDTO bind = new LoginBindDTO(); bind.setTimestamp(timestamp); bind.setLoginIp(ip); - // 设置登陆缓存 + // 设置登录缓存 long expire = Long.parseLong(SystemEnvAttr.LOGIN_TOKEN_EXPIRE.getValue()); String userInfoKey = Strings.format(KeyConst.LOGIN_TOKEN_KEY, userId); redisTemplate.opsForValue().set(userInfoKey, JSON.toJSONString(userCache), expire, TimeUnit.HOURS); @@ -210,20 +210,20 @@ public class PassportServiceImpl implements PassportService { if (Strings.isBlank(bindCache)) { return null; } - // 获取用户登陆信息 + // 获取用户登录信息 String userCache = redisTemplate.opsForValue().get(Strings.format(KeyConst.LOGIN_TOKEN_KEY, userId)); if (Strings.isBlank(userCache)) { return null; } LoginBindDTO bind = JSON.parseObject(bindCache, LoginBindDTO.class); UserDTO user = JSON.parseObject(userCache, UserDTO.class); - // 检查 ip 是否为登陆时的ip + // 检查 ip 是否为登录时的ip if (checkIp != null && !checkIp.equals(bind.getLoginIp())) { return null; } - // 检查多端登陆 + // 检查多端登录 if (!EnableType.of(SystemEnvAttr.ALLOW_MULTIPLE_LOGIN.getValue()).getValue()) { - // 不是登陆的时间戳则证明后续有人登陆 + // 不是登录的时间戳则证明后续有人登录 if (!timestamp.equals(user.getTimestamp())) { return null; } diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/SchedulerTaskMachineRecordServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/SchedulerTaskMachineRecordServiceImpl.java similarity index 89% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/SchedulerTaskMachineRecordServiceImpl.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/SchedulerTaskMachineRecordServiceImpl.java index 503a0032..1c5bd798 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/SchedulerTaskMachineRecordServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/SchedulerTaskMachineRecordServiceImpl.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.impl; +package cn.orionsec.ops.service.impl; +import cn.orionsec.ops.constant.system.SystemEnvAttr; +import cn.orionsec.ops.dao.SchedulerTaskMachineRecordDAO; +import cn.orionsec.ops.entity.domain.SchedulerTaskMachineRecordDO; +import cn.orionsec.ops.service.api.SchedulerTaskMachineRecordService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.orion.lang.utils.Strings; import com.orion.lang.utils.io.Files1; -import com.orion.ops.constant.system.SystemEnvAttr; -import com.orion.ops.dao.SchedulerTaskMachineRecordDAO; -import com.orion.ops.entity.domain.SchedulerTaskMachineRecordDO; -import com.orion.ops.service.api.SchedulerTaskMachineRecordService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/SchedulerTaskMachineServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/SchedulerTaskMachineServiceImpl.java similarity index 90% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/SchedulerTaskMachineServiceImpl.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/SchedulerTaskMachineServiceImpl.java index 259578fd..617aa995 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/SchedulerTaskMachineServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/SchedulerTaskMachineServiceImpl.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.impl; +package cn.orionsec.ops.service.impl; +import cn.orionsec.ops.dao.SchedulerTaskMachineDAO; +import cn.orionsec.ops.entity.domain.SchedulerTaskMachineDO; +import cn.orionsec.ops.service.api.SchedulerTaskMachineService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.ops.dao.SchedulerTaskMachineDAO; -import com.orion.ops.entity.domain.SchedulerTaskMachineDO; -import com.orion.ops.service.api.SchedulerTaskMachineService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/SchedulerTaskRecordServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/SchedulerTaskRecordServiceImpl.java similarity index 91% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/SchedulerTaskRecordServiceImpl.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/SchedulerTaskRecordServiceImpl.java index 5fa69c80..9d7285a9 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/SchedulerTaskRecordServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/SchedulerTaskRecordServiceImpl.java @@ -13,35 +13,35 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.impl; +package cn.orionsec.ops.service.impl; +import cn.orionsec.ops.constant.MessageConst; +import cn.orionsec.ops.constant.env.EnvConst; +import cn.orionsec.ops.constant.event.EventKeys; +import cn.orionsec.ops.constant.scheduler.SchedulerTaskMachineStatus; +import cn.orionsec.ops.constant.scheduler.SchedulerTaskStatus; +import cn.orionsec.ops.dao.SchedulerTaskDAO; +import cn.orionsec.ops.dao.SchedulerTaskMachineRecordDAO; +import cn.orionsec.ops.dao.SchedulerTaskRecordDAO; +import cn.orionsec.ops.entity.domain.*; +import cn.orionsec.ops.entity.request.scheduler.SchedulerTaskRecordRequest; +import cn.orionsec.ops.entity.vo.scheduler.SchedulerTaskMachineRecordStatusVO; +import cn.orionsec.ops.entity.vo.scheduler.SchedulerTaskMachineRecordVO; +import cn.orionsec.ops.entity.vo.scheduler.SchedulerTaskRecordStatusVO; +import cn.orionsec.ops.entity.vo.scheduler.SchedulerTaskRecordVO; +import cn.orionsec.ops.handler.scheduler.ITaskProcessor; +import cn.orionsec.ops.handler.scheduler.TaskSessionHolder; +import cn.orionsec.ops.service.api.*; +import cn.orionsec.ops.utils.DataQuery; +import cn.orionsec.ops.utils.EventParamsHolder; +import cn.orionsec.ops.utils.PathBuilders; +import cn.orionsec.ops.utils.Valid; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.orion.lang.define.collect.MutableLinkedHashMap; import com.orion.lang.define.wrapper.DataGrid; import com.orion.lang.utils.Strings; import com.orion.lang.utils.collect.Lists; import com.orion.lang.utils.convert.Converts; -import com.orion.ops.constant.MessageConst; -import com.orion.ops.constant.env.EnvConst; -import com.orion.ops.constant.event.EventKeys; -import com.orion.ops.utils.EventParamsHolder; -import com.orion.ops.constant.scheduler.SchedulerTaskMachineStatus; -import com.orion.ops.constant.scheduler.SchedulerTaskStatus; -import com.orion.ops.dao.SchedulerTaskDAO; -import com.orion.ops.dao.SchedulerTaskMachineRecordDAO; -import com.orion.ops.dao.SchedulerTaskRecordDAO; -import com.orion.ops.entity.domain.*; -import com.orion.ops.entity.request.scheduler.SchedulerTaskRecordRequest; -import com.orion.ops.entity.vo.scheduler.SchedulerTaskMachineRecordStatusVO; -import com.orion.ops.entity.vo.scheduler.SchedulerTaskMachineRecordVO; -import com.orion.ops.entity.vo.scheduler.SchedulerTaskRecordStatusVO; -import com.orion.ops.entity.vo.scheduler.SchedulerTaskRecordVO; -import com.orion.ops.handler.scheduler.ITaskProcessor; -import com.orion.ops.handler.scheduler.TaskSessionHolder; -import com.orion.ops.service.api.*; -import com.orion.ops.utils.DataQuery; -import com.orion.ops.utils.PathBuilders; -import com.orion.ops.utils.Valid; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/SchedulerTaskServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/SchedulerTaskServiceImpl.java similarity index 89% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/SchedulerTaskServiceImpl.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/SchedulerTaskServiceImpl.java index 688e93f1..35e32903 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/SchedulerTaskServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/SchedulerTaskServiceImpl.java @@ -13,33 +13,33 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.impl; +package cn.orionsec.ops.service.impl; +import cn.orionsec.ops.constant.CnConst; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.MessageConst; +import cn.orionsec.ops.constant.event.EventKeys; +import cn.orionsec.ops.constant.scheduler.SchedulerTaskStatus; +import cn.orionsec.ops.dao.SchedulerTaskDAO; +import cn.orionsec.ops.dao.SchedulerTaskMachineDAO; +import cn.orionsec.ops.entity.domain.SchedulerTaskDO; +import cn.orionsec.ops.entity.domain.SchedulerTaskMachineDO; +import cn.orionsec.ops.entity.request.scheduler.SchedulerTaskRequest; +import cn.orionsec.ops.entity.vo.scheduler.SchedulerTaskVO; +import cn.orionsec.ops.service.api.SchedulerTaskMachineRecordService; +import cn.orionsec.ops.service.api.SchedulerTaskMachineService; +import cn.orionsec.ops.service.api.SchedulerTaskRecordService; +import cn.orionsec.ops.service.api.SchedulerTaskService; +import cn.orionsec.ops.task.TaskRegister; +import cn.orionsec.ops.task.TaskType; +import cn.orionsec.ops.task.impl.SchedulerTaskImpl; +import cn.orionsec.ops.utils.DataQuery; +import cn.orionsec.ops.utils.EventParamsHolder; +import cn.orionsec.ops.utils.Valid; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.orion.lang.define.wrapper.DataGrid; import com.orion.lang.utils.Strings; import com.orion.lang.utils.convert.Converts; -import com.orion.ops.constant.CnConst; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.MessageConst; -import com.orion.ops.constant.event.EventKeys; -import com.orion.ops.utils.EventParamsHolder; -import com.orion.ops.constant.scheduler.SchedulerTaskStatus; -import com.orion.ops.dao.SchedulerTaskDAO; -import com.orion.ops.dao.SchedulerTaskMachineDAO; -import com.orion.ops.entity.domain.SchedulerTaskDO; -import com.orion.ops.entity.domain.SchedulerTaskMachineDO; -import com.orion.ops.entity.request.scheduler.SchedulerTaskRequest; -import com.orion.ops.entity.vo.scheduler.SchedulerTaskVO; -import com.orion.ops.service.api.SchedulerTaskMachineRecordService; -import com.orion.ops.service.api.SchedulerTaskMachineService; -import com.orion.ops.service.api.SchedulerTaskRecordService; -import com.orion.ops.service.api.SchedulerTaskService; -import com.orion.ops.task.TaskRegister; -import com.orion.ops.task.TaskType; -import com.orion.ops.task.impl.SchedulerTaskImpl; -import com.orion.ops.utils.DataQuery; -import com.orion.ops.utils.Valid; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/SftpServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/SftpServiceImpl.java similarity index 95% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/SftpServiceImpl.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/SftpServiceImpl.java index 188b2895..67ead3bb 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/SftpServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/SftpServiceImpl.java @@ -13,8 +13,35 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.impl; +package cn.orionsec.ops.service.impl; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.KeyConst; +import cn.orionsec.ops.constant.MessageConst; +import cn.orionsec.ops.constant.event.EventKeys; +import cn.orionsec.ops.constant.sftp.SftpPackageType; +import cn.orionsec.ops.constant.sftp.SftpTransferStatus; +import cn.orionsec.ops.constant.sftp.SftpTransferType; +import cn.orionsec.ops.constant.system.SystemEnvAttr; +import cn.orionsec.ops.dao.FileTransferLogDAO; +import cn.orionsec.ops.entity.domain.FileTransferLogDO; +import cn.orionsec.ops.entity.domain.MachineInfoDO; +import cn.orionsec.ops.entity.dto.sftp.FileTransferNotifyProgressDTO; +import cn.orionsec.ops.entity.dto.sftp.SftpSessionTokenDTO; +import cn.orionsec.ops.entity.dto.sftp.SftpUploadInfoDTO; +import cn.orionsec.ops.entity.dto.user.UserDTO; +import cn.orionsec.ops.entity.request.sftp.*; +import cn.orionsec.ops.entity.vo.sftp.FileDetailVO; +import cn.orionsec.ops.entity.vo.sftp.FileListVO; +import cn.orionsec.ops.entity.vo.sftp.FileOpenVO; +import cn.orionsec.ops.entity.vo.sftp.FileTransferLogVO; +import cn.orionsec.ops.handler.sftp.IFileTransferProcessor; +import cn.orionsec.ops.handler.sftp.SftpBasicExecutorHolder; +import cn.orionsec.ops.handler.sftp.TransferProcessorManager; +import cn.orionsec.ops.handler.sftp.hint.FileTransferHint; +import cn.orionsec.ops.service.api.MachineInfoService; +import cn.orionsec.ops.service.api.SftpService; +import cn.orionsec.ops.utils.*; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.orion.lang.define.io.IgnoreOutputStream; @@ -30,33 +57,6 @@ import com.orion.net.remote.CommandExecutors; import com.orion.net.remote.channel.SessionStore; import com.orion.net.remote.channel.sftp.SftpExecutor; import com.orion.net.remote.channel.ssh.CommandExecutor; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.KeyConst; -import com.orion.ops.constant.MessageConst; -import com.orion.ops.constant.event.EventKeys; -import com.orion.ops.constant.sftp.SftpPackageType; -import com.orion.ops.constant.sftp.SftpTransferStatus; -import com.orion.ops.constant.sftp.SftpTransferType; -import com.orion.ops.constant.system.SystemEnvAttr; -import com.orion.ops.dao.FileTransferLogDAO; -import com.orion.ops.entity.domain.FileTransferLogDO; -import com.orion.ops.entity.domain.MachineInfoDO; -import com.orion.ops.entity.dto.sftp.FileTransferNotifyProgressDTO; -import com.orion.ops.entity.dto.sftp.SftpSessionTokenDTO; -import com.orion.ops.entity.dto.sftp.SftpUploadInfoDTO; -import com.orion.ops.entity.dto.user.UserDTO; -import com.orion.ops.entity.request.sftp.*; -import com.orion.ops.entity.vo.sftp.FileDetailVO; -import com.orion.ops.entity.vo.sftp.FileListVO; -import com.orion.ops.entity.vo.sftp.FileOpenVO; -import com.orion.ops.entity.vo.sftp.FileTransferLogVO; -import com.orion.ops.handler.sftp.IFileTransferProcessor; -import com.orion.ops.handler.sftp.SftpBasicExecutorHolder; -import com.orion.ops.handler.sftp.TransferProcessorManager; -import com.orion.ops.handler.sftp.hint.FileTransferHint; -import com.orion.ops.service.api.MachineInfoService; -import com.orion.ops.service.api.SftpService; -import com.orion.ops.utils.*; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/StatisticsServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/StatisticsServiceImpl.java similarity index 96% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/StatisticsServiceImpl.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/StatisticsServiceImpl.java index c5c0fa11..5505000b 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/StatisticsServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/StatisticsServiceImpl.java @@ -13,8 +13,26 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.impl; +package cn.orionsec.ops.service.impl; +import cn.orionsec.ops.constant.KeyConst; +import cn.orionsec.ops.constant.app.*; +import cn.orionsec.ops.constant.system.SystemEnvAttr; +import cn.orionsec.ops.dao.*; +import cn.orionsec.ops.entity.domain.*; +import cn.orionsec.ops.entity.dto.ApplicationBuildStatisticsDTO; +import cn.orionsec.ops.entity.dto.ApplicationPipelineTaskStatisticsDTO; +import cn.orionsec.ops.entity.dto.ApplicationReleaseStatisticsDTO; +import cn.orionsec.ops.entity.dto.SchedulerTaskRecordStatisticsDTO; +import cn.orionsec.ops.entity.dto.statistic.StatisticsCountDTO; +import cn.orionsec.ops.entity.request.home.HomeStatisticsRequest; +import cn.orionsec.ops.entity.vo.app.*; +import cn.orionsec.ops.entity.vo.home.HomeStatisticsCountVO; +import cn.orionsec.ops.entity.vo.home.HomeStatisticsVO; +import cn.orionsec.ops.entity.vo.scheduler.SchedulerTaskRecordStatisticsChartVO; +import cn.orionsec.ops.entity.vo.scheduler.SchedulerTaskRecordStatisticsVO; +import cn.orionsec.ops.service.api.*; +import cn.orionsec.ops.utils.Utils; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.orion.lang.utils.Arrays1; @@ -22,21 +40,6 @@ import com.orion.lang.utils.Strings; import com.orion.lang.utils.collect.Lists; import com.orion.lang.utils.convert.Converts; import com.orion.lang.utils.time.Dates; -import com.orion.ops.constant.KeyConst; -import com.orion.ops.constant.app.*; -import com.orion.ops.constant.system.SystemEnvAttr; -import com.orion.ops.dao.*; -import com.orion.ops.entity.domain.*; -import com.orion.ops.entity.dto.*; -import com.orion.ops.entity.dto.statistic.StatisticsCountDTO; -import com.orion.ops.entity.request.home.HomeStatisticsRequest; -import com.orion.ops.entity.vo.app.*; -import com.orion.ops.entity.vo.home.HomeStatisticsCountVO; -import com.orion.ops.entity.vo.home.HomeStatisticsVO; -import com.orion.ops.entity.vo.scheduler.SchedulerTaskRecordStatisticsChartVO; -import com.orion.ops.entity.vo.scheduler.SchedulerTaskRecordStatisticsVO; -import com.orion.ops.service.api.*; -import com.orion.ops.utils.Utils; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/SystemEnvServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/SystemEnvServiceImpl.java similarity index 91% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/SystemEnvServiceImpl.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/SystemEnvServiceImpl.java index 555ba3aa..5c2184db 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/SystemEnvServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/SystemEnvServiceImpl.java @@ -13,8 +13,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.impl; +package cn.orionsec.ops.service.impl; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.MessageConst; +import cn.orionsec.ops.constant.env.EnvConst; +import cn.orionsec.ops.constant.event.EventKeys; +import cn.orionsec.ops.constant.history.HistoryOperator; +import cn.orionsec.ops.constant.history.HistoryValueType; +import cn.orionsec.ops.constant.system.SystemEnvAttr; +import cn.orionsec.ops.dao.SystemEnvDAO; +import cn.orionsec.ops.entity.domain.SystemEnvDO; +import cn.orionsec.ops.entity.request.system.SystemEnvRequest; +import cn.orionsec.ops.entity.vo.system.SystemEnvVO; +import cn.orionsec.ops.service.api.ApplicationRepositoryService; +import cn.orionsec.ops.service.api.HistoryValueService; +import cn.orionsec.ops.service.api.SystemEnvService; +import cn.orionsec.ops.utils.DataQuery; +import cn.orionsec.ops.utils.EventParamsHolder; +import cn.orionsec.ops.utils.Valid; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.orion.lang.define.collect.MutableLinkedHashMap; import com.orion.lang.define.wrapper.DataGrid; @@ -22,23 +39,6 @@ import com.orion.lang.utils.Strings; import com.orion.lang.utils.collect.Lists; import com.orion.lang.utils.collect.Maps; import com.orion.lang.utils.convert.Converts; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.MessageConst; -import com.orion.ops.constant.env.EnvConst; -import com.orion.ops.constant.event.EventKeys; -import com.orion.ops.utils.EventParamsHolder; -import com.orion.ops.constant.history.HistoryOperator; -import com.orion.ops.constant.history.HistoryValueType; -import com.orion.ops.constant.system.SystemEnvAttr; -import com.orion.ops.dao.SystemEnvDAO; -import com.orion.ops.entity.domain.SystemEnvDO; -import com.orion.ops.entity.request.system.SystemEnvRequest; -import com.orion.ops.entity.vo.system.SystemEnvVO; -import com.orion.ops.service.api.ApplicationRepositoryService; -import com.orion.ops.service.api.HistoryValueService; -import com.orion.ops.service.api.SystemEnvService; -import com.orion.ops.utils.DataQuery; -import com.orion.ops.utils.Valid; import com.orion.spring.SpringHolder; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/SystemServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/SystemServiceImpl.java similarity index 91% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/SystemServiceImpl.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/SystemServiceImpl.java index 38e0db8a..2b29d8ca 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/SystemServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/SystemServiceImpl.java @@ -13,35 +13,35 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.impl; +package cn.orionsec.ops.service.impl; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.MessageConst; +import cn.orionsec.ops.constant.common.EnableType; +import cn.orionsec.ops.constant.event.EventKeys; +import cn.orionsec.ops.constant.system.SystemCleanType; +import cn.orionsec.ops.constant.system.SystemEnvAttr; +import cn.orionsec.ops.constant.system.ThreadPoolMetricsType; +import cn.orionsec.ops.entity.domain.SystemEnvDO; +import cn.orionsec.ops.entity.dto.system.SystemSpaceAnalysisDTO; +import cn.orionsec.ops.entity.request.system.ConfigIpListRequest; +import cn.orionsec.ops.entity.request.system.SystemEnvRequest; +import cn.orionsec.ops.entity.vo.system.IpListConfigVO; +import cn.orionsec.ops.entity.vo.system.SystemAnalysisVO; +import cn.orionsec.ops.entity.vo.system.SystemOptionVO; +import cn.orionsec.ops.entity.vo.system.ThreadPoolMetricsVO; +import cn.orionsec.ops.interceptor.IpFilterInterceptor; +import cn.orionsec.ops.service.api.SystemEnvService; +import cn.orionsec.ops.service.api.SystemService; +import cn.orionsec.ops.utils.EventParamsHolder; +import cn.orionsec.ops.utils.FileCleaner; +import cn.orionsec.ops.utils.Utils; import com.alibaba.fastjson.JSON; import com.orion.lang.utils.Strings; import com.orion.lang.utils.Threads; import com.orion.lang.utils.Valid; import com.orion.lang.utils.convert.Converts; import com.orion.lang.utils.io.Files1; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.MessageConst; -import com.orion.ops.constant.common.EnableType; -import com.orion.ops.constant.event.EventKeys; -import com.orion.ops.constant.system.SystemCleanType; -import com.orion.ops.constant.system.SystemEnvAttr; -import com.orion.ops.constant.system.ThreadPoolMetricsType; -import com.orion.ops.entity.domain.SystemEnvDO; -import com.orion.ops.entity.dto.system.SystemSpaceAnalysisDTO; -import com.orion.ops.entity.request.system.ConfigIpListRequest; -import com.orion.ops.entity.request.system.SystemEnvRequest; -import com.orion.ops.entity.vo.system.IpListConfigVO; -import com.orion.ops.entity.vo.system.SystemAnalysisVO; -import com.orion.ops.entity.vo.system.SystemOptionVO; -import com.orion.ops.entity.vo.system.ThreadPoolMetricsVO; -import com.orion.ops.interceptor.IpFilterInterceptor; -import com.orion.ops.service.api.SystemEnvService; -import com.orion.ops.service.api.SystemService; -import com.orion.ops.utils.EventParamsHolder; -import com.orion.ops.utils.FileCleaner; -import com.orion.ops.utils.Utils; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/UserEventLogServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/UserEventLogServiceImpl.java similarity index 88% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/UserEventLogServiceImpl.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/UserEventLogServiceImpl.java index 9267d76e..3e6c7b3f 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/UserEventLogServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/UserEventLogServiceImpl.java @@ -13,8 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.impl; +package cn.orionsec.ops.service.impl; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.ResultCode; +import cn.orionsec.ops.constant.event.EventKeys; +import cn.orionsec.ops.constant.event.EventType; +import cn.orionsec.ops.dao.UserEventLogDAO; +import cn.orionsec.ops.entity.domain.UserEventLogDO; +import cn.orionsec.ops.entity.request.user.EventLogRequest; +import cn.orionsec.ops.entity.vo.user.UserEventLogVO; +import cn.orionsec.ops.service.api.UserEventLogService; +import cn.orionsec.ops.utils.*; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.orion.lang.define.collect.MutableMap; @@ -23,20 +33,6 @@ import com.orion.lang.define.wrapper.HttpWrapper; import com.orion.lang.utils.Exceptions; import com.orion.lang.utils.Objects1; import com.orion.lang.utils.Strings; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.ResultCode; -import com.orion.ops.constant.event.EventKeys; -import com.orion.ops.utils.EventParamsHolder; -import com.orion.ops.constant.event.EventType; -import com.orion.ops.dao.UserEventLogDAO; -import com.orion.ops.entity.domain.UserEventLogDO; -import com.orion.ops.entity.request.user.EventLogRequest; -import com.orion.ops.entity.vo.user.UserEventLogVO; -import com.orion.ops.service.api.UserEventLogService; -import com.orion.ops.utils.Currents; -import com.orion.ops.utils.DataQuery; -import com.orion.ops.utils.EventLogUtils; -import com.orion.ops.utils.Utils; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/UserServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/UserServiceImpl.java similarity index 94% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/UserServiceImpl.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/UserServiceImpl.java index 24aae743..918a4f9e 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/UserServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/UserServiceImpl.java @@ -13,8 +13,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.impl; +package cn.orionsec.ops.service.impl; +import cn.orionsec.ops.constant.CnConst; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.KeyConst; +import cn.orionsec.ops.constant.MessageConst; +import cn.orionsec.ops.constant.event.EventKeys; +import cn.orionsec.ops.constant.system.SystemEnvAttr; +import cn.orionsec.ops.constant.user.RoleType; +import cn.orionsec.ops.dao.UserInfoDAO; +import cn.orionsec.ops.entity.domain.UserInfoDO; +import cn.orionsec.ops.entity.dto.user.UserDTO; +import cn.orionsec.ops.entity.request.user.UserInfoRequest; +import cn.orionsec.ops.entity.vo.user.UserInfoVO; +import cn.orionsec.ops.interceptor.UserActiveInterceptor; +import cn.orionsec.ops.service.api.AlarmGroupUserService; +import cn.orionsec.ops.service.api.UserService; +import cn.orionsec.ops.utils.*; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.orion.lang.define.wrapper.DataGrid; @@ -27,22 +43,6 @@ import com.orion.lang.utils.codec.Base64s; import com.orion.lang.utils.convert.Converts; import com.orion.lang.utils.crypto.Signatures; import com.orion.lang.utils.io.FileWriters; -import com.orion.ops.constant.CnConst; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.KeyConst; -import com.orion.ops.constant.MessageConst; -import com.orion.ops.constant.event.EventKeys; -import com.orion.ops.constant.system.SystemEnvAttr; -import com.orion.ops.constant.user.RoleType; -import com.orion.ops.dao.UserInfoDAO; -import com.orion.ops.entity.domain.UserInfoDO; -import com.orion.ops.entity.dto.user.UserDTO; -import com.orion.ops.entity.request.user.UserInfoRequest; -import com.orion.ops.entity.vo.user.UserInfoVO; -import com.orion.ops.interceptor.UserActiveInterceptor; -import com.orion.ops.service.api.AlarmGroupUserService; -import com.orion.ops.service.api.UserService; -import com.orion.ops.utils.*; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/WebSideMessageServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/WebSideMessageServiceImpl.java similarity index 92% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/WebSideMessageServiceImpl.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/WebSideMessageServiceImpl.java index e90982bd..b511c368 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/WebSideMessageServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/WebSideMessageServiceImpl.java @@ -13,28 +13,28 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.impl; +package cn.orionsec.ops.service.impl; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.MessageConst; +import cn.orionsec.ops.constant.message.MessageType; +import cn.orionsec.ops.constant.message.ReadStatus; +import cn.orionsec.ops.dao.WebSideMessageDAO; +import cn.orionsec.ops.entity.domain.WebSideMessageDO; +import cn.orionsec.ops.entity.dto.user.UserDTO; +import cn.orionsec.ops.entity.request.message.WebSideMessageRequest; +import cn.orionsec.ops.entity.vo.message.WebSideMessagePollVO; +import cn.orionsec.ops.entity.vo.message.WebSideMessageVO; +import cn.orionsec.ops.service.api.WebSideMessageService; +import cn.orionsec.ops.utils.Currents; +import cn.orionsec.ops.utils.DataQuery; +import cn.orionsec.ops.utils.Valid; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.orion.lang.define.wrapper.DataGrid; import com.orion.lang.utils.Objects1; import com.orion.lang.utils.Strings; import com.orion.lang.utils.collect.Lists; import com.orion.lang.utils.convert.Converts; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.MessageConst; -import com.orion.ops.constant.message.MessageType; -import com.orion.ops.constant.message.ReadStatus; -import com.orion.ops.dao.WebSideMessageDAO; -import com.orion.ops.entity.domain.WebSideMessageDO; -import com.orion.ops.entity.dto.user.UserDTO; -import com.orion.ops.entity.request.message.WebSideMessageRequest; -import com.orion.ops.entity.vo.message.WebSideMessagePollVO; -import com.orion.ops.entity.vo.message.WebSideMessageVO; -import com.orion.ops.service.api.WebSideMessageService; -import com.orion.ops.utils.Currents; -import com.orion.ops.utils.DataQuery; -import com.orion.ops.utils.Valid; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/WebhookConfigServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/WebhookConfigServiceImpl.java similarity index 89% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/WebhookConfigServiceImpl.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/WebhookConfigServiceImpl.java index 6b2931a6..84705d4a 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/service/impl/WebhookConfigServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/WebhookConfigServiceImpl.java @@ -13,23 +13,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.service.impl; +package cn.orionsec.ops.service.impl; +import cn.orionsec.ops.constant.MessageConst; +import cn.orionsec.ops.constant.event.EventKeys; +import cn.orionsec.ops.dao.WebhookConfigDAO; +import cn.orionsec.ops.entity.domain.WebhookConfigDO; +import cn.orionsec.ops.entity.request.webhook.WebhookConfigRequest; +import cn.orionsec.ops.entity.vo.webhook.WebhookConfigVO; +import cn.orionsec.ops.service.api.AlarmGroupNotifyService; +import cn.orionsec.ops.service.api.WebhookConfigService; +import cn.orionsec.ops.utils.DataQuery; +import cn.orionsec.ops.utils.EventParamsHolder; +import cn.orionsec.ops.utils.Valid; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.orion.lang.define.wrapper.DataGrid; import com.orion.lang.utils.Strings; import com.orion.lang.utils.convert.Converts; -import com.orion.ops.constant.MessageConst; -import com.orion.ops.constant.event.EventKeys; -import com.orion.ops.dao.WebhookConfigDAO; -import com.orion.ops.entity.domain.WebhookConfigDO; -import com.orion.ops.entity.request.webhook.WebhookConfigRequest; -import com.orion.ops.entity.vo.webhook.WebhookConfigVO; -import com.orion.ops.service.api.AlarmGroupNotifyService; -import com.orion.ops.service.api.WebhookConfigService; -import com.orion.ops.utils.DataQuery; -import com.orion.ops.utils.EventParamsHolder; -import com.orion.ops.utils.Valid; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/task/TaskRegister.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/task/TaskRegister.java similarity index 97% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/task/TaskRegister.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/task/TaskRegister.java index 1c8b40bd..094d1e02 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/task/TaskRegister.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/task/TaskRegister.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.task; +package cn.orionsec.ops.task; +import cn.orionsec.ops.constant.MessageConst; import com.orion.lang.utils.Exceptions; import com.orion.lang.utils.collect.Maps; -import com.orion.ops.constant.MessageConst; import org.springframework.beans.factory.DisposableBean; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.scheduling.TaskScheduler; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/task/TaskType.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/task/TaskType.java similarity index 89% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/task/TaskType.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/task/TaskType.java index 26c59864..393c1e15 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/task/TaskType.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/task/TaskType.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.task; +package cn.orionsec.ops.task; -import com.orion.ops.constant.Const; -import com.orion.ops.task.impl.PipelineTaskImpl; -import com.orion.ops.task.impl.ReleaseTaskImpl; -import com.orion.ops.task.impl.SchedulerTaskImpl; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.task.impl.PipelineTaskImpl; +import cn.orionsec.ops.task.impl.ReleaseTaskImpl; +import cn.orionsec.ops.task.impl.SchedulerTaskImpl; import lombok.AllArgsConstructor; import java.util.function.Function; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/task/TimedTask.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/task/TimedTask.java similarity index 98% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/task/TimedTask.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/task/TimedTask.java index a4be0ef3..99ce5ec2 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/task/TimedTask.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/task/TimedTask.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.task; +package cn.orionsec.ops.task; import org.springframework.scheduling.TaskScheduler; import org.springframework.scheduling.Trigger; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/task/fixed/AutoCleanFileTask.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/task/fixed/AutoCleanFileTask.java similarity index 88% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/task/fixed/AutoCleanFileTask.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/task/fixed/AutoCleanFileTask.java index 1a6a76d7..6aec9a93 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/task/fixed/AutoCleanFileTask.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/task/fixed/AutoCleanFileTask.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.task.fixed; +package cn.orionsec.ops.task.fixed; +import cn.orionsec.ops.constant.common.EnableType; +import cn.orionsec.ops.constant.system.SystemEnvAttr; +import cn.orionsec.ops.utils.FileCleaner; import com.orion.lang.utils.time.Dates; -import com.orion.ops.constant.common.EnableType; -import com.orion.ops.constant.system.SystemEnvAttr; -import com.orion.ops.utils.FileCleaner; import lombok.extern.slf4j.Slf4j; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/task/fixed/SystemSpaceAnalysisTask.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/task/fixed/SystemSpaceAnalysisTask.java similarity index 94% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/task/fixed/SystemSpaceAnalysisTask.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/task/fixed/SystemSpaceAnalysisTask.java index ef18ccc1..e5fc0d47 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/task/fixed/SystemSpaceAnalysisTask.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/task/fixed/SystemSpaceAnalysisTask.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.task.fixed; +package cn.orionsec.ops.task.fixed; +import cn.orionsec.ops.service.api.SystemService; import com.orion.lang.utils.time.Dates; -import com.orion.ops.service.api.SystemService; import lombok.extern.slf4j.Slf4j; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/task/fixed/TerminalHeartbeatDownChecker.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/task/fixed/TerminalHeartbeatDownChecker.java similarity index 93% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/task/fixed/TerminalHeartbeatDownChecker.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/task/fixed/TerminalHeartbeatDownChecker.java index 90fc9676..8244938d 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/task/fixed/TerminalHeartbeatDownChecker.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/task/fixed/TerminalHeartbeatDownChecker.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.task.fixed; +package cn.orionsec.ops.task.fixed; -import com.orion.ops.handler.terminal.manager.TerminalSessionManager; +import cn.orionsec.ops.handler.terminal.manager.TerminalSessionManager; import lombok.extern.slf4j.Slf4j; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/task/fixed/TerminalHeartbeatPusher.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/task/fixed/TerminalHeartbeatPusher.java similarity index 88% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/task/fixed/TerminalHeartbeatPusher.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/task/fixed/TerminalHeartbeatPusher.java index c0d631b6..764184ac 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/task/fixed/TerminalHeartbeatPusher.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/task/fixed/TerminalHeartbeatPusher.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.task.fixed; +package cn.orionsec.ops.task.fixed; -import com.orion.ops.constant.common.EnableType; -import com.orion.ops.constant.system.SystemEnvAttr; -import com.orion.ops.handler.terminal.manager.TerminalSessionManager; +import cn.orionsec.ops.constant.common.EnableType; +import cn.orionsec.ops.constant.system.SystemEnvAttr; +import cn.orionsec.ops.handler.terminal.manager.TerminalSessionManager; import lombok.extern.slf4j.Slf4j; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/task/impl/PipelineTaskImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/task/impl/PipelineTaskImpl.java similarity index 93% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/task/impl/PipelineTaskImpl.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/task/impl/PipelineTaskImpl.java index b5d06b72..4f41017e 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/task/impl/PipelineTaskImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/task/impl/PipelineTaskImpl.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.task.impl; +package cn.orionsec.ops.task.impl; +import cn.orionsec.ops.service.api.ApplicationPipelineTaskService; import com.orion.lang.utils.time.Dates; -import com.orion.ops.service.api.ApplicationPipelineTaskService; import com.orion.spring.SpringHolder; import lombok.extern.slf4j.Slf4j; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/task/impl/ReleaseTaskImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/task/impl/ReleaseTaskImpl.java similarity index 93% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/task/impl/ReleaseTaskImpl.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/task/impl/ReleaseTaskImpl.java index 8d6c1874..68399174 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/task/impl/ReleaseTaskImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/task/impl/ReleaseTaskImpl.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.task.impl; +package cn.orionsec.ops.task.impl; +import cn.orionsec.ops.service.api.ApplicationReleaseService; import com.orion.lang.utils.time.Dates; -import com.orion.ops.service.api.ApplicationReleaseService; import com.orion.spring.SpringHolder; import lombok.extern.slf4j.Slf4j; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/task/impl/SchedulerTaskImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/task/impl/SchedulerTaskImpl.java similarity index 83% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/task/impl/SchedulerTaskImpl.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/task/impl/SchedulerTaskImpl.java index ca2ae6bb..3ee40aac 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/task/impl/SchedulerTaskImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/task/impl/SchedulerTaskImpl.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.task.impl; +package cn.orionsec.ops.task.impl; +import cn.orionsec.ops.constant.SchedulerPools; +import cn.orionsec.ops.constant.common.SerialType; +import cn.orionsec.ops.dao.SchedulerTaskDAO; +import cn.orionsec.ops.entity.domain.SchedulerTaskDO; +import cn.orionsec.ops.handler.scheduler.ITaskProcessor; +import cn.orionsec.ops.service.api.SchedulerTaskRecordService; import com.orion.lang.utils.Valid; import com.orion.lang.utils.time.Dates; -import com.orion.ops.constant.SchedulerPools; -import com.orion.ops.constant.common.SerialType; -import com.orion.ops.dao.SchedulerTaskDAO; -import com.orion.ops.entity.domain.SchedulerTaskDO; -import com.orion.ops.handler.scheduler.ITaskProcessor; -import com.orion.ops.service.api.SchedulerTaskRecordService; import com.orion.spring.SpringHolder; import lombok.extern.slf4j.Slf4j; diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/utils/Currents.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/utils/Currents.java similarity index 90% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/utils/Currents.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/utils/Currents.java index 4cb6d328..86820dee 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/utils/Currents.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/utils/Currents.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.utils; +package cn.orionsec.ops.utils; +import cn.orionsec.ops.constant.PropertiesConst; +import cn.orionsec.ops.constant.ResultCode; +import cn.orionsec.ops.constant.user.RoleType; +import cn.orionsec.ops.entity.dto.user.UserDTO; import com.orion.lang.define.wrapper.HttpWrapper; import com.orion.lang.utils.Exceptions; -import com.orion.ops.constant.PropertiesConst; -import com.orion.ops.constant.ResultCode; -import com.orion.ops.constant.user.RoleType; -import com.orion.ops.entity.dto.user.UserDTO; import javax.servlet.http.HttpServletRequest; import java.util.Optional; @@ -61,7 +61,7 @@ public class Currents { /** * 获取当前登录用户 *

- * 可以匿名登陆的接口并且用户未登录获取的是null + * 可以匿名登录的接口并且用户未登录获取的是null * * @return 用户 */ diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/utils/EventParamsHolder.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/utils/EventParamsHolder.java similarity index 93% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/utils/EventParamsHolder.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/utils/EventParamsHolder.java index 0246e007..9f92d5a8 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/utils/EventParamsHolder.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/utils/EventParamsHolder.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.utils; +package cn.orionsec.ops.utils; +import cn.orionsec.ops.constant.event.EventKeys; +import cn.orionsec.ops.entity.dto.user.UserDTO; +import cn.orionsec.ops.interceptor.LogPrintInterceptor; import com.orion.lang.define.collect.MutableMap; import com.orion.lang.utils.collect.Maps; import com.orion.lang.utils.reflect.BeanMap; import com.orion.lang.utils.time.Dates; -import com.orion.ops.constant.event.EventKeys; -import com.orion.ops.entity.dto.user.UserDTO; -import com.orion.ops.interceptor.LogPrintInterceptor; import com.orion.web.servlet.web.Servlets; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; @@ -91,7 +91,7 @@ public class EventParamsHolder { public static void setDefaultEventParams() { // 请求时间 EventParamsHolder.addParam(EventKeys.INNER_REQUEST_TIME, Dates.current()); - // 登陆接口为空 + // 登录接口为空 UserDTO user = Currents.getUser(); if (user != null) { EventParamsHolder.addParam(EventKeys.INNER_USER_ID, user.getId()); diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/utils/RedisUtils.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/utils/RedisUtils.java similarity index 94% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/utils/RedisUtils.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/utils/RedisUtils.java index 7bd7a7cf..60aa7a29 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/utils/RedisUtils.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/utils/RedisUtils.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.utils; +package cn.orionsec.ops.utils; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.KeyConst; import com.orion.lang.utils.Strings; import com.orion.lang.utils.collect.Lists; import com.orion.lang.utils.io.Streams; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.KeyConst; import org.springframework.data.redis.core.Cursor; import org.springframework.data.redis.core.RedisCallback; import org.springframework.data.redis.core.RedisTemplate; @@ -75,12 +75,12 @@ public class RedisUtils { } /** - * 删除用户登陆&绑定 token + * 删除用户登录&绑定 token * * @param userId userId */ public static void deleteLoginToken(RedisTemplate redisTemplate, Long userId) { - // 删除登陆 token + // 删除登录 token redisTemplate.delete(Strings.format(KeyConst.LOGIN_TOKEN_KEY, userId)); // 删除绑定 token String scanMatches = Strings.format(KeyConst.LOGIN_TOKEN_BIND_KEY, userId, "*"); diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/utils/UserHolder.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/utils/UserHolder.java similarity index 93% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/utils/UserHolder.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/utils/UserHolder.java index be80a6df..13cd8def 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/utils/UserHolder.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/utils/UserHolder.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.utils; +package cn.orionsec.ops.utils; -import com.orion.ops.entity.dto.user.UserDTO; +import cn.orionsec.ops.entity.dto.user.UserDTO; /** * 用户信息 diff --git a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/utils/WebSockets.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/utils/WebSockets.java similarity index 97% rename from orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/utils/WebSockets.java rename to orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/utils/WebSockets.java index e7cb79ea..81e69b15 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/com/orion/ops/utils/WebSockets.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/utils/WebSockets.java @@ -13,8 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.utils; +package cn.orionsec.ops.utils; +import cn.orionsec.ops.constant.terminal.TerminalClientOperate; +import cn.orionsec.ops.constant.ws.WsCloseCode; import com.orion.lang.define.wrapper.Tuple; import com.orion.lang.exception.AuthenticationException; import com.orion.lang.exception.ConnectionRuntimeException; @@ -22,8 +24,6 @@ import com.orion.lang.exception.DisabledException; import com.orion.lang.exception.TimeoutException; import com.orion.lang.utils.Exceptions; import com.orion.lang.utils.Urls; -import com.orion.ops.constant.terminal.TerminalClientOperate; -import com.orion.ops.constant.ws.WsCloseCode; import lombok.extern.slf4j.Slf4j; import org.springframework.http.server.ServerHttpRequest; import org.springframework.web.socket.CloseStatus; diff --git a/orion-ops-api/orion-ops-web/pom.xml b/orion-ops-api/orion-ops-web/pom.xml index a2c354b6..ecd4007e 100644 --- a/orion-ops-api/orion-ops-web/pom.xml +++ b/orion-ops-api/orion-ops-web/pom.xml @@ -2,9 +2,9 @@ - com.orion.ops + cn.orionsec.ops orion-ops-api - 1.2.9 + 1.3.0 ../pom.xml @@ -15,28 +15,28 @@ - com.orion.ops + cn.orionsec.ops orion-ops-service ${project.version} - com.orion.ops + cn.orionsec.ops orion-ops-data ${project.version} - com.orion.ops + cn.orionsec.ops orion-ops-mapping ${project.version} - com.orion.ops + cn.orionsec.ops orion-ops-runner ${project.version} @@ -99,7 +99,7 @@ - + diff --git a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/OrionApplication.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/OrionApplication.java similarity index 95% rename from orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/OrionApplication.java rename to orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/OrionApplication.java index 5f67e191..e4225256 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/OrionApplication.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/OrionApplication.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops; +package cn.orionsec.ops; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; @@ -25,7 +25,7 @@ import org.springframework.context.annotation.ImportResource; */ @SpringBootApplication @ImportResource(locations = {"classpath:config/spring-*.xml"}) -@MapperScan("com.orion.ops.dao") +@MapperScan("cn.orionsec.ops.dao") public class OrionApplication { public static void main(String[] args) { diff --git a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/config/LogPrintConfig.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/config/LogPrintConfig.java similarity index 95% rename from orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/config/LogPrintConfig.java rename to orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/config/LogPrintConfig.java index 3faa9600..f31234c0 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/config/LogPrintConfig.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/config/LogPrintConfig.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.config; +package cn.orionsec.ops.config; -import com.orion.ops.interceptor.LogPrintInterceptor; +import cn.orionsec.ops.interceptor.LogPrintInterceptor; import org.springframework.aop.aspectj.AspectJExpressionPointcutAdvisor; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; diff --git a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/config/SwaggerConfig.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/config/SwaggerConfig.java similarity index 93% rename from orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/config/SwaggerConfig.java rename to orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/config/SwaggerConfig.java index 0c5a17a4..c4749edf 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/config/SwaggerConfig.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/config/SwaggerConfig.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.config; +package cn.orionsec.ops.config; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.PropertiesConst; import com.github.xiaoymin.knife4j.spring.annotations.EnableKnife4j; import com.orion.lang.utils.collect.Lists; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.PropertiesConst; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -62,7 +62,7 @@ public class SwaggerConfig { .securitySchemes(this.getSecuritySchemes()) .enable(true) .select() - .apis(RequestHandlerSelectors.basePackage("com.orion.ops")) + .apis(RequestHandlerSelectors.basePackage("cn.orionsec.ops")) .paths(PathSelectors.any()) .build(); } diff --git a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/config/WebMvcConfig.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/config/WebMvcConfig.java similarity index 99% rename from orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/config/WebMvcConfig.java rename to orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/config/WebMvcConfig.java index e13ca472..02844613 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/config/WebMvcConfig.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/config/WebMvcConfig.java @@ -13,8 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.config; +package cn.orionsec.ops.config; +import cn.orionsec.ops.constant.MessageConst; +import cn.orionsec.ops.interceptor.*; import com.orion.lang.define.wrapper.HttpWrapper; import com.orion.lang.exception.*; import com.orion.lang.exception.argument.CodeArgumentException; @@ -22,8 +24,6 @@ import com.orion.lang.exception.argument.HttpWrapperException; import com.orion.lang.exception.argument.InvalidArgumentException; import com.orion.lang.exception.argument.RpcWrapperException; import com.orion.lang.utils.Exceptions; -import com.orion.ops.constant.MessageConst; -import com.orion.ops.interceptor.*; import lombok.extern.slf4j.Slf4j; import org.apache.poi.EncryptedDocumentException; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/config/WebSocketConfig.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/config/WebSocketConfig.java similarity index 86% rename from orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/config/WebSocketConfig.java rename to orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/config/WebSocketConfig.java index 476f6ded..49319965 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/config/WebSocketConfig.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/config/WebSocketConfig.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.config; +package cn.orionsec.ops.config; -import com.orion.ops.handler.sftp.notify.FileTransferNotifyHandler; -import com.orion.ops.handler.tail.TailFileHandler; -import com.orion.ops.handler.terminal.TerminalMessageHandler; -import com.orion.ops.handler.terminal.watcher.TerminalWatcherHandler; -import com.orion.ops.interceptor.FileTransferNotifyInterceptor; -import com.orion.ops.interceptor.TailFileInterceptor; -import com.orion.ops.interceptor.TerminalAccessInterceptor; -import com.orion.ops.interceptor.TerminalWatcherInterceptor; +import cn.orionsec.ops.handler.sftp.notify.FileTransferNotifyHandler; +import cn.orionsec.ops.handler.tail.TailFileHandler; +import cn.orionsec.ops.handler.terminal.TerminalMessageHandler; +import cn.orionsec.ops.handler.terminal.watcher.TerminalWatcherHandler; +import cn.orionsec.ops.interceptor.FileTransferNotifyInterceptor; +import cn.orionsec.ops.interceptor.TailFileInterceptor; +import cn.orionsec.ops.interceptor.TerminalAccessInterceptor; +import cn.orionsec.ops.interceptor.TerminalWatcherInterceptor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.web.socket.config.annotation.EnableWebSocket; diff --git a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/config/WrapperResultConfig.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/config/WrapperResultConfig.java similarity index 96% rename from orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/config/WrapperResultConfig.java rename to orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/config/WrapperResultConfig.java index ca5e9b5f..767bc60d 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/config/WrapperResultConfig.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/config/WrapperResultConfig.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.config; +package cn.orionsec.ops.config; +import cn.orionsec.ops.annotation.IgnoreWrapper; +import cn.orionsec.ops.annotation.RestWrapper; import com.orion.lang.constant.StandardContentType; import com.orion.lang.define.wrapper.HttpWrapper; import com.orion.lang.define.wrapper.RpcWrapper; import com.orion.lang.utils.collect.Lists; -import com.orion.ops.annotation.IgnoreWrapper; -import com.orion.ops.annotation.RestWrapper; import com.orion.web.servlet.web.Servlets; import org.springframework.context.annotation.Configuration; import org.springframework.core.MethodParameter; diff --git a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/AlarmGroupController.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/AlarmGroupController.java similarity index 88% rename from orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/AlarmGroupController.java rename to orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/AlarmGroupController.java index 751db575..58bbc54d 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/AlarmGroupController.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/AlarmGroupController.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.controller; +package cn.orionsec.ops.controller; +import cn.orionsec.ops.annotation.EventLog; +import cn.orionsec.ops.annotation.RestWrapper; +import cn.orionsec.ops.constant.event.EventType; +import cn.orionsec.ops.entity.request.alarm.AlarmGroupRequest; +import cn.orionsec.ops.entity.vo.alarm.AlarmGroupVO; +import cn.orionsec.ops.service.api.AlarmGroupService; +import cn.orionsec.ops.utils.Valid; import com.orion.lang.define.wrapper.DataGrid; -import com.orion.ops.annotation.EventLog; -import com.orion.ops.annotation.RestWrapper; -import com.orion.ops.constant.event.EventType; -import com.orion.ops.entity.request.alarm.AlarmGroupRequest; -import com.orion.ops.entity.vo.alarm.AlarmGroupVO; -import com.orion.ops.service.api.AlarmGroupService; -import com.orion.ops.utils.Valid; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.PostMapping; diff --git a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/ApplicationActionLogController.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/ApplicationActionLogController.java similarity index 84% rename from orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/ApplicationActionLogController.java rename to orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/ApplicationActionLogController.java index d89f4f4a..d07f77c5 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/ApplicationActionLogController.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/ApplicationActionLogController.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.controller; +package cn.orionsec.ops.controller; -import com.orion.ops.annotation.IgnoreLog; -import com.orion.ops.annotation.RestWrapper; -import com.orion.ops.entity.request.app.ApplicationActionLogRequest; -import com.orion.ops.entity.vo.app.ApplicationActionLogVO; -import com.orion.ops.service.api.ApplicationActionLogService; -import com.orion.ops.utils.Valid; +import cn.orionsec.ops.annotation.IgnoreLog; +import cn.orionsec.ops.annotation.RestWrapper; +import cn.orionsec.ops.entity.request.app.ApplicationActionLogRequest; +import cn.orionsec.ops.entity.vo.app.ApplicationActionLogVO; +import cn.orionsec.ops.service.api.ApplicationActionLogService; +import cn.orionsec.ops.utils.Valid; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.PostMapping; diff --git a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/ApplicationBuildController.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/ApplicationBuildController.java similarity index 89% rename from orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/ApplicationBuildController.java rename to orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/ApplicationBuildController.java index 3054f0b7..70dc40de 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/ApplicationBuildController.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/ApplicationBuildController.java @@ -13,20 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.controller; +package cn.orionsec.ops.controller; +import cn.orionsec.ops.annotation.EventLog; +import cn.orionsec.ops.annotation.IgnoreLog; +import cn.orionsec.ops.annotation.RestWrapper; +import cn.orionsec.ops.constant.event.EventType; +import cn.orionsec.ops.entity.request.app.ApplicationBuildRequest; +import cn.orionsec.ops.entity.vo.app.ApplicationBuildReleaseListVO; +import cn.orionsec.ops.entity.vo.app.ApplicationBuildStatusVO; +import cn.orionsec.ops.entity.vo.app.ApplicationBuildVO; +import cn.orionsec.ops.service.api.ApplicationBuildService; +import cn.orionsec.ops.utils.Valid; import com.orion.lang.define.wrapper.DataGrid; import com.orion.lang.define.wrapper.HttpWrapper; -import com.orion.ops.annotation.EventLog; -import com.orion.ops.annotation.IgnoreLog; -import com.orion.ops.annotation.RestWrapper; -import com.orion.ops.constant.event.EventType; -import com.orion.ops.entity.request.app.ApplicationBuildRequest; -import com.orion.ops.entity.vo.app.ApplicationBuildReleaseListVO; -import com.orion.ops.entity.vo.app.ApplicationBuildStatusVO; -import com.orion.ops.entity.vo.app.ApplicationBuildVO; -import com.orion.ops.service.api.ApplicationBuildService; -import com.orion.ops.utils.Valid; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.PostMapping; diff --git a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/ApplicationEnvController.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/ApplicationEnvController.java similarity index 90% rename from orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/ApplicationEnvController.java rename to orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/ApplicationEnvController.java index 51daf246..dbc61ccf 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/ApplicationEnvController.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/ApplicationEnvController.java @@ -13,24 +13,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.controller; +package cn.orionsec.ops.controller; +import cn.orionsec.ops.annotation.DemoDisableApi; +import cn.orionsec.ops.annotation.EventLog; +import cn.orionsec.ops.annotation.RestWrapper; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.MessageConst; +import cn.orionsec.ops.constant.env.EnvViewType; +import cn.orionsec.ops.constant.event.EventType; +import cn.orionsec.ops.entity.request.app.ApplicationEnvRequest; +import cn.orionsec.ops.entity.vo.app.ApplicationEnvVO; +import cn.orionsec.ops.service.api.ApplicationEnvService; +import cn.orionsec.ops.utils.Valid; import com.orion.lang.define.collect.MutableLinkedHashMap; import com.orion.lang.define.wrapper.DataGrid; import com.orion.lang.define.wrapper.HttpWrapper; import com.orion.lang.utils.Exceptions; import com.orion.lang.utils.collect.Maps; -import com.orion.ops.annotation.DemoDisableApi; -import com.orion.ops.annotation.EventLog; -import com.orion.ops.annotation.RestWrapper; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.MessageConst; -import com.orion.ops.constant.env.EnvViewType; -import com.orion.ops.constant.event.EventType; -import com.orion.ops.entity.request.app.ApplicationEnvRequest; -import com.orion.ops.entity.vo.app.ApplicationEnvVO; -import com.orion.ops.service.api.ApplicationEnvService; -import com.orion.ops.utils.Valid; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.PostMapping; diff --git a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/ApplicationInfoController.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/ApplicationInfoController.java similarity index 91% rename from orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/ApplicationInfoController.java rename to orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/ApplicationInfoController.java index 944998ce..32544af5 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/ApplicationInfoController.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/ApplicationInfoController.java @@ -13,27 +13,27 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.controller; +package cn.orionsec.ops.controller; +import cn.orionsec.ops.annotation.DemoDisableApi; +import cn.orionsec.ops.annotation.EventLog; +import cn.orionsec.ops.annotation.RestWrapper; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.MessageConst; +import cn.orionsec.ops.constant.app.ActionType; +import cn.orionsec.ops.constant.app.StageType; +import cn.orionsec.ops.constant.app.TransferMode; +import cn.orionsec.ops.constant.event.EventType; +import cn.orionsec.ops.entity.request.app.*; +import cn.orionsec.ops.entity.vo.app.ApplicationDetailVO; +import cn.orionsec.ops.entity.vo.app.ApplicationInfoVO; +import cn.orionsec.ops.entity.vo.app.ApplicationMachineVO; +import cn.orionsec.ops.service.api.ApplicationInfoService; +import cn.orionsec.ops.service.api.ApplicationMachineService; +import cn.orionsec.ops.utils.Valid; import com.orion.lang.define.wrapper.DataGrid; import com.orion.lang.define.wrapper.HttpWrapper; import com.orion.lang.utils.Exceptions; -import com.orion.ops.annotation.DemoDisableApi; -import com.orion.ops.annotation.EventLog; -import com.orion.ops.annotation.RestWrapper; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.MessageConst; -import com.orion.ops.constant.app.ActionType; -import com.orion.ops.constant.app.StageType; -import com.orion.ops.constant.app.TransferMode; -import com.orion.ops.constant.event.EventType; -import com.orion.ops.entity.request.app.*; -import com.orion.ops.entity.vo.app.ApplicationDetailVO; -import com.orion.ops.entity.vo.app.ApplicationInfoVO; -import com.orion.ops.entity.vo.app.ApplicationMachineVO; -import com.orion.ops.service.api.ApplicationInfoService; -import com.orion.ops.service.api.ApplicationMachineService; -import com.orion.ops.utils.Valid; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.PostMapping; diff --git a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/ApplicationPipelineController.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/ApplicationPipelineController.java similarity index 86% rename from orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/ApplicationPipelineController.java rename to orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/ApplicationPipelineController.java index 0bcf2fd9..f4433a97 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/ApplicationPipelineController.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/ApplicationPipelineController.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.controller; +package cn.orionsec.ops.controller; +import cn.orionsec.ops.annotation.DemoDisableApi; +import cn.orionsec.ops.annotation.EventLog; +import cn.orionsec.ops.annotation.RestWrapper; +import cn.orionsec.ops.constant.app.StageType; +import cn.orionsec.ops.constant.event.EventType; +import cn.orionsec.ops.entity.request.app.ApplicationPipelineDetailRequest; +import cn.orionsec.ops.entity.request.app.ApplicationPipelineRequest; +import cn.orionsec.ops.entity.vo.app.ApplicationPipelineVO; +import cn.orionsec.ops.service.api.ApplicationPipelineService; +import cn.orionsec.ops.utils.Valid; import com.orion.lang.define.wrapper.DataGrid; -import com.orion.ops.annotation.DemoDisableApi; -import com.orion.ops.annotation.EventLog; -import com.orion.ops.annotation.RestWrapper; -import com.orion.ops.constant.app.StageType; -import com.orion.ops.constant.event.EventType; -import com.orion.ops.entity.request.app.ApplicationPipelineDetailRequest; -import com.orion.ops.entity.request.app.ApplicationPipelineRequest; -import com.orion.ops.entity.vo.app.ApplicationPipelineVO; -import com.orion.ops.service.api.ApplicationPipelineService; -import com.orion.ops.utils.Valid; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.PostMapping; diff --git a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/ApplicationPipelineTaskController.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/ApplicationPipelineTaskController.java similarity index 89% rename from orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/ApplicationPipelineTaskController.java rename to orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/ApplicationPipelineTaskController.java index 38c4223b..85047d2d 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/ApplicationPipelineTaskController.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/ApplicationPipelineTaskController.java @@ -13,29 +13,29 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.controller; +package cn.orionsec.ops.controller; +import cn.orionsec.ops.annotation.EventLog; +import cn.orionsec.ops.annotation.IgnoreLog; +import cn.orionsec.ops.annotation.RequireRole; +import cn.orionsec.ops.annotation.RestWrapper; +import cn.orionsec.ops.constant.MessageConst; +import cn.orionsec.ops.constant.app.PipelineStatus; +import cn.orionsec.ops.constant.app.TimedType; +import cn.orionsec.ops.constant.common.AuditStatus; +import cn.orionsec.ops.constant.event.EventType; +import cn.orionsec.ops.constant.user.RoleType; +import cn.orionsec.ops.entity.request.app.ApplicationPipelineTaskDetailRequest; +import cn.orionsec.ops.entity.request.app.ApplicationPipelineTaskRequest; +import cn.orionsec.ops.entity.vo.app.*; +import cn.orionsec.ops.service.api.ApplicationPipelineTaskDetailService; +import cn.orionsec.ops.service.api.ApplicationPipelineTaskLogService; +import cn.orionsec.ops.service.api.ApplicationPipelineTaskService; +import cn.orionsec.ops.task.TaskRegister; +import cn.orionsec.ops.task.TaskType; +import cn.orionsec.ops.utils.Valid; import com.orion.lang.define.wrapper.DataGrid; import com.orion.lang.define.wrapper.HttpWrapper; -import com.orion.ops.annotation.EventLog; -import com.orion.ops.annotation.IgnoreLog; -import com.orion.ops.annotation.RequireRole; -import com.orion.ops.annotation.RestWrapper; -import com.orion.ops.constant.MessageConst; -import com.orion.ops.constant.app.PipelineStatus; -import com.orion.ops.constant.app.TimedType; -import com.orion.ops.constant.common.AuditStatus; -import com.orion.ops.constant.event.EventType; -import com.orion.ops.constant.user.RoleType; -import com.orion.ops.entity.request.app.ApplicationPipelineTaskDetailRequest; -import com.orion.ops.entity.request.app.ApplicationPipelineTaskRequest; -import com.orion.ops.entity.vo.app.*; -import com.orion.ops.service.api.ApplicationPipelineTaskDetailService; -import com.orion.ops.service.api.ApplicationPipelineTaskLogService; -import com.orion.ops.service.api.ApplicationPipelineTaskService; -import com.orion.ops.task.TaskRegister; -import com.orion.ops.task.TaskType; -import com.orion.ops.utils.Valid; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.PostMapping; diff --git a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/ApplicationProfileController.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/ApplicationProfileController.java similarity index 83% rename from orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/ApplicationProfileController.java rename to orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/ApplicationProfileController.java index 6bac324e..7b04bfae 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/ApplicationProfileController.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/ApplicationProfileController.java @@ -13,21 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.controller; +package cn.orionsec.ops.controller; +import cn.orionsec.ops.annotation.DemoDisableApi; +import cn.orionsec.ops.annotation.EventLog; +import cn.orionsec.ops.annotation.RequireRole; +import cn.orionsec.ops.annotation.RestWrapper; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.event.EventType; +import cn.orionsec.ops.constant.user.RoleType; +import cn.orionsec.ops.entity.request.app.ApplicationProfileRequest; +import cn.orionsec.ops.entity.vo.app.ApplicationProfileFastVO; +import cn.orionsec.ops.entity.vo.app.ApplicationProfileVO; +import cn.orionsec.ops.service.api.ApplicationProfileService; +import cn.orionsec.ops.utils.Valid; import com.orion.lang.define.wrapper.DataGrid; -import com.orion.ops.annotation.DemoDisableApi; -import com.orion.ops.annotation.EventLog; -import com.orion.ops.annotation.RequireRole; -import com.orion.ops.annotation.RestWrapper; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.event.EventType; -import com.orion.ops.constant.user.RoleType; -import com.orion.ops.entity.request.app.ApplicationProfileRequest; -import com.orion.ops.entity.vo.app.ApplicationProfileFastVO; -import com.orion.ops.entity.vo.app.ApplicationProfileVO; -import com.orion.ops.service.api.ApplicationProfileService; -import com.orion.ops.utils.Valid; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; diff --git a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/ApplicationReleaseController.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/ApplicationReleaseController.java similarity index 91% rename from orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/ApplicationReleaseController.java rename to orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/ApplicationReleaseController.java index 79d38e16..8b181974 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/ApplicationReleaseController.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/ApplicationReleaseController.java @@ -13,27 +13,27 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.controller; +package cn.orionsec.ops.controller; +import cn.orionsec.ops.annotation.EventLog; +import cn.orionsec.ops.annotation.IgnoreLog; +import cn.orionsec.ops.annotation.RequireRole; +import cn.orionsec.ops.annotation.RestWrapper; +import cn.orionsec.ops.constant.MessageConst; +import cn.orionsec.ops.constant.app.ReleaseStatus; +import cn.orionsec.ops.constant.app.TimedType; +import cn.orionsec.ops.constant.common.AuditStatus; +import cn.orionsec.ops.constant.event.EventType; +import cn.orionsec.ops.constant.user.RoleType; +import cn.orionsec.ops.entity.request.app.ApplicationReleaseAuditRequest; +import cn.orionsec.ops.entity.request.app.ApplicationReleaseRequest; +import cn.orionsec.ops.entity.vo.app.*; +import cn.orionsec.ops.service.api.ApplicationReleaseService; +import cn.orionsec.ops.task.TaskRegister; +import cn.orionsec.ops.task.TaskType; +import cn.orionsec.ops.utils.Valid; import com.orion.lang.define.wrapper.DataGrid; import com.orion.lang.define.wrapper.HttpWrapper; -import com.orion.ops.annotation.EventLog; -import com.orion.ops.annotation.IgnoreLog; -import com.orion.ops.annotation.RequireRole; -import com.orion.ops.annotation.RestWrapper; -import com.orion.ops.constant.MessageConst; -import com.orion.ops.constant.app.ReleaseStatus; -import com.orion.ops.constant.app.TimedType; -import com.orion.ops.constant.common.AuditStatus; -import com.orion.ops.constant.event.EventType; -import com.orion.ops.constant.user.RoleType; -import com.orion.ops.entity.request.app.ApplicationReleaseAuditRequest; -import com.orion.ops.entity.request.app.ApplicationReleaseRequest; -import com.orion.ops.entity.vo.app.*; -import com.orion.ops.service.api.ApplicationReleaseService; -import com.orion.ops.task.TaskRegister; -import com.orion.ops.task.TaskType; -import com.orion.ops.utils.Valid; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.PostMapping; diff --git a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/ApplicationRepositoryController.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/ApplicationRepositoryController.java similarity index 87% rename from orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/ApplicationRepositoryController.java rename to orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/ApplicationRepositoryController.java index 2bbced35..70c4a03c 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/ApplicationRepositoryController.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/ApplicationRepositoryController.java @@ -13,23 +13,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.controller; +package cn.orionsec.ops.controller; +import cn.orionsec.ops.annotation.DemoDisableApi; +import cn.orionsec.ops.annotation.EventLog; +import cn.orionsec.ops.annotation.RestWrapper; +import cn.orionsec.ops.constant.app.RepositoryAuthType; +import cn.orionsec.ops.constant.app.RepositoryTokenType; +import cn.orionsec.ops.constant.event.EventType; +import cn.orionsec.ops.entity.request.app.ApplicationRepositoryRequest; +import cn.orionsec.ops.entity.vo.app.ApplicationRepositoryBranchVO; +import cn.orionsec.ops.entity.vo.app.ApplicationRepositoryCommitVO; +import cn.orionsec.ops.entity.vo.app.ApplicationRepositoryInfoVO; +import cn.orionsec.ops.entity.vo.app.ApplicationRepositoryVO; +import cn.orionsec.ops.service.api.ApplicationRepositoryService; +import cn.orionsec.ops.utils.Valid; import com.orion.lang.define.wrapper.DataGrid; import com.orion.lang.define.wrapper.HttpWrapper; -import com.orion.ops.annotation.DemoDisableApi; -import com.orion.ops.annotation.EventLog; -import com.orion.ops.annotation.RestWrapper; -import com.orion.ops.constant.app.RepositoryAuthType; -import com.orion.ops.constant.app.RepositoryTokenType; -import com.orion.ops.constant.event.EventType; -import com.orion.ops.entity.request.app.ApplicationRepositoryRequest; -import com.orion.ops.entity.vo.app.ApplicationRepositoryBranchVO; -import com.orion.ops.entity.vo.app.ApplicationRepositoryCommitVO; -import com.orion.ops.entity.vo.app.ApplicationRepositoryInfoVO; -import com.orion.ops.entity.vo.app.ApplicationRepositoryVO; -import com.orion.ops.service.api.ApplicationRepositoryService; -import com.orion.ops.utils.Valid; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.PostMapping; diff --git a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/AuthenticateController.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/AuthenticateController.java similarity index 81% rename from orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/AuthenticateController.java rename to orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/AuthenticateController.java index 5f987b40..aae8b535 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/AuthenticateController.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/AuthenticateController.java @@ -13,23 +13,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.controller; +package cn.orionsec.ops.controller; +import cn.orionsec.ops.annotation.DemoDisableApi; +import cn.orionsec.ops.annotation.EventLog; +import cn.orionsec.ops.annotation.IgnoreAuth; +import cn.orionsec.ops.annotation.RestWrapper; +import cn.orionsec.ops.constant.event.EventType; +import cn.orionsec.ops.entity.request.user.UserLoginRequest; +import cn.orionsec.ops.entity.request.user.UserResetRequest; +import cn.orionsec.ops.entity.vo.user.UserInfoVO; +import cn.orionsec.ops.entity.vo.user.UserLoginVO; +import cn.orionsec.ops.service.api.PassportService; +import cn.orionsec.ops.utils.Currents; +import cn.orionsec.ops.utils.Valid; import com.orion.lang.define.wrapper.HttpWrapper; import com.orion.lang.utils.Objects1; import com.orion.lang.utils.convert.Converts; -import com.orion.ops.annotation.DemoDisableApi; -import com.orion.ops.annotation.EventLog; -import com.orion.ops.annotation.IgnoreAuth; -import com.orion.ops.annotation.RestWrapper; -import com.orion.ops.constant.event.EventType; -import com.orion.ops.entity.request.user.UserLoginRequest; -import com.orion.ops.entity.request.user.UserResetRequest; -import com.orion.ops.entity.vo.user.UserInfoVO; -import com.orion.ops.entity.vo.user.UserLoginVO; -import com.orion.ops.service.api.PassportService; -import com.orion.ops.utils.Currents; -import com.orion.ops.utils.Valid; import com.orion.web.servlet.web.Servlets; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/BatchExecCommandController.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/BatchExecCommandController.java similarity index 86% rename from orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/BatchExecCommandController.java rename to orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/BatchExecCommandController.java index 59c62c41..06124bf0 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/BatchExecCommandController.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/BatchExecCommandController.java @@ -13,20 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.controller; +package cn.orionsec.ops.controller; +import cn.orionsec.ops.annotation.EventLog; +import cn.orionsec.ops.annotation.IgnoreLog; +import cn.orionsec.ops.annotation.RestWrapper; +import cn.orionsec.ops.constant.event.EventType; +import cn.orionsec.ops.entity.request.exec.CommandExecRequest; +import cn.orionsec.ops.entity.vo.exec.CommandExecStatusVO; +import cn.orionsec.ops.entity.vo.exec.CommandExecVO; +import cn.orionsec.ops.entity.vo.exec.CommandTaskSubmitVO; +import cn.orionsec.ops.service.api.CommandExecService; +import cn.orionsec.ops.utils.Valid; import com.orion.lang.define.wrapper.DataGrid; import com.orion.lang.define.wrapper.HttpWrapper; -import com.orion.ops.annotation.EventLog; -import com.orion.ops.annotation.IgnoreLog; -import com.orion.ops.annotation.RestWrapper; -import com.orion.ops.constant.event.EventType; -import com.orion.ops.entity.request.exec.CommandExecRequest; -import com.orion.ops.entity.vo.exec.CommandExecStatusVO; -import com.orion.ops.entity.vo.exec.CommandExecVO; -import com.orion.ops.entity.vo.exec.CommandTaskSubmitVO; -import com.orion.ops.service.api.CommandExecService; -import com.orion.ops.utils.Valid; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.PostMapping; diff --git a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/BatchUploadController.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/BatchUploadController.java similarity index 84% rename from orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/BatchUploadController.java rename to orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/BatchUploadController.java index c2d72e07..4a29c7a8 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/BatchUploadController.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/BatchUploadController.java @@ -13,24 +13,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.controller; +package cn.orionsec.ops.controller; +import cn.orionsec.ops.annotation.EventLog; +import cn.orionsec.ops.annotation.RestWrapper; +import cn.orionsec.ops.constant.event.EventType; +import cn.orionsec.ops.constant.system.SystemEnvAttr; +import cn.orionsec.ops.entity.dto.sftp.SftpUploadInfoDTO; +import cn.orionsec.ops.entity.request.sftp.FileUploadRequest; +import cn.orionsec.ops.entity.request.upload.BatchUploadRequest; +import cn.orionsec.ops.entity.vo.upload.BatchUploadCheckVO; +import cn.orionsec.ops.entity.vo.upload.BatchUploadTokenVO; +import cn.orionsec.ops.service.api.BatchUploadService; +import cn.orionsec.ops.service.api.SftpService; +import cn.orionsec.ops.utils.PathBuilders; +import cn.orionsec.ops.utils.Valid; import com.orion.lang.id.ObjectIds; import com.orion.lang.utils.collect.Lists; import com.orion.lang.utils.io.Files1; -import com.orion.ops.annotation.EventLog; -import com.orion.ops.annotation.RestWrapper; -import com.orion.ops.constant.event.EventType; -import com.orion.ops.constant.system.SystemEnvAttr; -import com.orion.ops.entity.dto.sftp.SftpUploadInfoDTO; -import com.orion.ops.entity.request.upload.BatchUploadRequest; -import com.orion.ops.entity.request.sftp.FileUploadRequest; -import com.orion.ops.entity.vo.upload.BatchUploadCheckVO; -import com.orion.ops.entity.vo.upload.BatchUploadTokenVO; -import com.orion.ops.service.api.BatchUploadService; -import com.orion.ops.service.api.SftpService; -import com.orion.ops.utils.PathBuilders; -import com.orion.ops.utils.Valid; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; diff --git a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/CommandTemplateController.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/CommandTemplateController.java similarity index 86% rename from orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/CommandTemplateController.java rename to orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/CommandTemplateController.java index 61bf7fb3..d91e64de 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/CommandTemplateController.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/CommandTemplateController.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.controller; +package cn.orionsec.ops.controller; +import cn.orionsec.ops.annotation.DemoDisableApi; +import cn.orionsec.ops.annotation.EventLog; +import cn.orionsec.ops.annotation.RestWrapper; +import cn.orionsec.ops.constant.event.EventType; +import cn.orionsec.ops.entity.request.template.CommandTemplateRequest; +import cn.orionsec.ops.entity.vo.template.CommandTemplateVO; +import cn.orionsec.ops.service.api.CommandTemplateService; +import cn.orionsec.ops.utils.Valid; import com.orion.lang.define.wrapper.DataGrid; -import com.orion.ops.annotation.DemoDisableApi; -import com.orion.ops.annotation.EventLog; -import com.orion.ops.annotation.RestWrapper; -import com.orion.ops.constant.event.EventType; -import com.orion.ops.entity.request.template.CommandTemplateRequest; -import com.orion.ops.entity.vo.template.CommandTemplateVO; -import com.orion.ops.service.api.CommandTemplateService; -import com.orion.ops.utils.Valid; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.PostMapping; diff --git a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/CommonController.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/CommonController.java similarity index 86% rename from orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/CommonController.java rename to orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/CommonController.java index 869ac376..0bf0eab0 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/CommonController.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/CommonController.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.controller; +package cn.orionsec.ops.controller; +import cn.orionsec.ops.OrionApplication; +import cn.orionsec.ops.annotation.RestWrapper; +import cn.orionsec.ops.constant.user.RoleType; +import cn.orionsec.ops.entity.dto.user.UserDTO; +import cn.orionsec.ops.service.api.CommonService; +import cn.orionsec.ops.utils.Currents; import com.alibaba.fastjson.JSON; import com.orion.lang.utils.collect.Lists; import com.orion.lang.utils.io.StreamReaders; -import com.orion.ops.OrionApplication; -import com.orion.ops.annotation.RestWrapper; -import com.orion.ops.constant.user.RoleType; -import com.orion.ops.entity.dto.user.UserDTO; -import com.orion.ops.service.api.CommonService; -import com.orion.ops.utils.Currents; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.GetMapping; diff --git a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/DataClearController.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/DataClearController.java similarity index 87% rename from orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/DataClearController.java rename to orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/DataClearController.java index bb21829a..1fa4ce45 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/DataClearController.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/DataClearController.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.controller; +package cn.orionsec.ops.controller; +import cn.orionsec.ops.annotation.EventLog; +import cn.orionsec.ops.annotation.RestWrapper; +import cn.orionsec.ops.constant.DataClearRange; +import cn.orionsec.ops.constant.DataClearType; +import cn.orionsec.ops.constant.event.EventKeys; +import cn.orionsec.ops.constant.event.EventType; +import cn.orionsec.ops.entity.request.data.DataClearRequest; +import cn.orionsec.ops.service.api.DataClearService; +import cn.orionsec.ops.utils.EventParamsHolder; +import cn.orionsec.ops.utils.Valid; import com.orion.lang.utils.Exceptions; -import com.orion.ops.annotation.EventLog; -import com.orion.ops.annotation.RestWrapper; -import com.orion.ops.constant.DataClearRange; -import com.orion.ops.constant.DataClearType; -import com.orion.ops.constant.event.EventKeys; -import com.orion.ops.constant.event.EventType; -import com.orion.ops.entity.request.data.DataClearRequest; -import com.orion.ops.service.api.DataClearService; -import com.orion.ops.utils.EventParamsHolder; -import com.orion.ops.utils.Valid; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.PostMapping; @@ -34,7 +34,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import java.util.Objects; /** * 数据清理 api diff --git a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/DataExportController.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/DataExportController.java similarity index 81% rename from orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/DataExportController.java rename to orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/DataExportController.java index 1f0a2bd9..a5402af1 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/DataExportController.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/DataExportController.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.controller; +package cn.orionsec.ops.controller; -import com.orion.ops.annotation.DemoDisableApi; -import com.orion.ops.annotation.EventLog; -import com.orion.ops.constant.ExportType; -import com.orion.ops.constant.event.EventType; -import com.orion.ops.entity.request.data.DataExportRequest; -import com.orion.ops.handler.exporter.IDataExporter; -import com.orion.ops.utils.Valid; +import cn.orionsec.ops.annotation.DemoDisableApi; +import cn.orionsec.ops.annotation.EventLog; +import cn.orionsec.ops.constant.ExportType; +import cn.orionsec.ops.constant.event.EventType; +import cn.orionsec.ops.entity.request.data.DataExportRequest; +import cn.orionsec.ops.handler.exporter.IDataExporter; +import cn.orionsec.ops.utils.Valid; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.PostMapping; diff --git a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/DataImportController.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/DataImportController.java similarity index 85% rename from orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/DataImportController.java rename to orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/DataImportController.java index a89c7e85..f3e10766 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/DataImportController.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/DataImportController.java @@ -13,26 +13,26 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.controller; +package cn.orionsec.ops.controller; +import cn.orionsec.ops.OrionApplication; +import cn.orionsec.ops.annotation.*; +import cn.orionsec.ops.constant.ImportType; +import cn.orionsec.ops.constant.MessageConst; +import cn.orionsec.ops.constant.event.EventKeys; +import cn.orionsec.ops.constant.event.EventType; +import cn.orionsec.ops.entity.importer.DataImportDTO; +import cn.orionsec.ops.entity.request.data.DataImportRequest; +import cn.orionsec.ops.entity.vo.data.DataImportCheckVO; +import cn.orionsec.ops.handler.importer.checker.IDataChecker; +import cn.orionsec.ops.handler.importer.impl.IDataImporter; +import cn.orionsec.ops.service.api.DataImportService; +import cn.orionsec.ops.utils.EventParamsHolder; +import cn.orionsec.ops.utils.Valid; import com.orion.lang.define.wrapper.HttpWrapper; import com.orion.lang.utils.Strings; import com.orion.lang.utils.io.Streams; import com.orion.office.excel.Excels; -import com.orion.ops.OrionApplication; -import com.orion.ops.annotation.*; -import com.orion.ops.constant.ImportType; -import com.orion.ops.constant.MessageConst; -import com.orion.ops.constant.event.EventKeys; -import com.orion.ops.constant.event.EventType; -import com.orion.ops.entity.importer.DataImportDTO; -import com.orion.ops.entity.request.data.DataImportRequest; -import com.orion.ops.entity.vo.data.DataImportCheckVO; -import com.orion.ops.handler.importer.checker.IDataChecker; -import com.orion.ops.handler.importer.impl.IDataImporter; -import com.orion.ops.service.api.DataImportService; -import com.orion.ops.utils.EventParamsHolder; -import com.orion.ops.utils.Valid; import com.orion.web.servlet.web.Servlets; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/EventLogController.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/EventLogController.java similarity index 86% rename from orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/EventLogController.java rename to orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/EventLogController.java index f7dd396e..3f75c817 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/EventLogController.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/EventLogController.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.controller; +package cn.orionsec.ops.controller; +import cn.orionsec.ops.annotation.RestWrapper; +import cn.orionsec.ops.entity.request.user.EventLogRequest; +import cn.orionsec.ops.entity.vo.user.UserEventLogVO; +import cn.orionsec.ops.service.api.UserEventLogService; import com.orion.lang.define.wrapper.DataGrid; -import com.orion.ops.annotation.RestWrapper; -import com.orion.ops.entity.request.user.EventLogRequest; -import com.orion.ops.entity.vo.user.UserEventLogVO; -import com.orion.ops.service.api.UserEventLogService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.PostMapping; diff --git a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/FileDownloadController.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/FileDownloadController.java similarity index 83% rename from orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/FileDownloadController.java rename to orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/FileDownloadController.java index d238e99c..6b251c39 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/FileDownloadController.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/FileDownloadController.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.controller; +package cn.orionsec.ops.controller; +import cn.orionsec.ops.annotation.IgnoreAuth; +import cn.orionsec.ops.annotation.IgnoreWrapper; +import cn.orionsec.ops.annotation.RestWrapper; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.download.FileDownloadType; +import cn.orionsec.ops.entity.request.file.FileDownloadRequest; +import cn.orionsec.ops.service.api.FileDownloadService; +import cn.orionsec.ops.utils.Valid; import com.orion.lang.exception.NotFoundException; -import com.orion.ops.annotation.IgnoreAuth; -import com.orion.ops.annotation.IgnoreWrapper; -import com.orion.ops.annotation.RestWrapper; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.download.FileDownloadType; -import com.orion.ops.entity.request.file.FileDownloadRequest; -import com.orion.ops.service.api.FileDownloadService; -import com.orion.ops.utils.Valid; import com.orion.web.servlet.web.Servlets; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/FileTailController.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/FileTailController.java similarity index 91% rename from orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/FileTailController.java rename to orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/FileTailController.java index 85bd20ba..fcce4c78 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/FileTailController.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/FileTailController.java @@ -13,8 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.controller; +package cn.orionsec.ops.controller; +import cn.orionsec.ops.annotation.DemoDisableApi; +import cn.orionsec.ops.annotation.EventLog; +import cn.orionsec.ops.annotation.RestWrapper; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.event.EventType; +import cn.orionsec.ops.constant.system.SystemEnvAttr; +import cn.orionsec.ops.constant.tail.FileTailType; +import cn.orionsec.ops.entity.request.file.FileTailRequest; +import cn.orionsec.ops.entity.vo.tail.FileTailConfigVO; +import cn.orionsec.ops.entity.vo.tail.FileTailVO; +import cn.orionsec.ops.service.api.FileTailService; +import cn.orionsec.ops.utils.Utils; +import cn.orionsec.ops.utils.Valid; import com.orion.lang.define.wrapper.DataGrid; import com.orion.lang.define.wrapper.HttpWrapper; import com.orion.lang.utils.Charsets; @@ -22,19 +35,6 @@ import com.orion.lang.utils.Strings; import com.orion.lang.utils.collect.Lists; import com.orion.lang.utils.io.Files1; import com.orion.lang.utils.io.Streams; -import com.orion.ops.annotation.DemoDisableApi; -import com.orion.ops.annotation.EventLog; -import com.orion.ops.annotation.RestWrapper; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.event.EventType; -import com.orion.ops.constant.system.SystemEnvAttr; -import com.orion.ops.constant.tail.FileTailType; -import com.orion.ops.entity.request.file.FileTailRequest; -import com.orion.ops.entity.vo.tail.FileTailConfigVO; -import com.orion.ops.entity.vo.tail.FileTailVO; -import com.orion.ops.service.api.FileTailService; -import com.orion.ops.utils.Utils; -import com.orion.ops.utils.Valid; import com.orion.web.servlet.web.Servlets; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/HistoryValueController.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/HistoryValueController.java similarity index 83% rename from orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/HistoryValueController.java rename to orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/HistoryValueController.java index fe30b6ee..3a77b90f 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/HistoryValueController.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/HistoryValueController.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.controller; +package cn.orionsec.ops.controller; +import cn.orionsec.ops.annotation.DemoDisableApi; +import cn.orionsec.ops.annotation.RestWrapper; +import cn.orionsec.ops.constant.history.HistoryValueType; +import cn.orionsec.ops.entity.request.history.HistoryValueRequest; +import cn.orionsec.ops.entity.vo.history.HistoryValueVO; +import cn.orionsec.ops.service.api.HistoryValueService; +import cn.orionsec.ops.utils.Valid; import com.orion.lang.define.wrapper.DataGrid; import com.orion.lang.define.wrapper.HttpWrapper; -import com.orion.ops.annotation.DemoDisableApi; -import com.orion.ops.annotation.RestWrapper; -import com.orion.ops.constant.history.HistoryValueType; -import com.orion.ops.entity.request.history.HistoryValueRequest; -import com.orion.ops.entity.vo.history.HistoryValueVO; -import com.orion.ops.service.api.HistoryValueService; -import com.orion.ops.utils.Valid; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.PostMapping; diff --git a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/MachineAlarmConfigController.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/MachineAlarmConfigController.java similarity index 82% rename from orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/MachineAlarmConfigController.java rename to orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/MachineAlarmConfigController.java index e2aae14c..b680b375 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/MachineAlarmConfigController.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/MachineAlarmConfigController.java @@ -13,22 +13,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.controller; +package cn.orionsec.ops.controller; +import cn.orionsec.ops.annotation.EventLog; +import cn.orionsec.ops.annotation.RestWrapper; +import cn.orionsec.ops.constant.MessageConst; +import cn.orionsec.ops.constant.event.EventType; +import cn.orionsec.ops.entity.request.machine.MachineAlarmConfigRequest; +import cn.orionsec.ops.entity.request.machine.MachineAlarmHistoryRequest; +import cn.orionsec.ops.entity.vo.machine.MachineAlarmConfigWrapperVO; +import cn.orionsec.ops.entity.vo.machine.MachineAlarmHistoryVO; +import cn.orionsec.ops.service.api.MachineAlarmConfigService; +import cn.orionsec.ops.service.api.MachineAlarmHistoryService; +import cn.orionsec.ops.service.api.MachineAlarmService; +import cn.orionsec.ops.utils.Valid; import com.orion.lang.define.wrapper.DataGrid; import com.orion.lang.define.wrapper.HttpWrapper; -import com.orion.ops.annotation.EventLog; -import com.orion.ops.annotation.RestWrapper; -import com.orion.ops.constant.MessageConst; -import com.orion.ops.constant.event.EventType; -import com.orion.ops.entity.request.machine.MachineAlarmConfigRequest; -import com.orion.ops.entity.request.machine.MachineAlarmHistoryRequest; -import com.orion.ops.entity.vo.machine.MachineAlarmConfigWrapperVO; -import com.orion.ops.entity.vo.machine.MachineAlarmHistoryVO; -import com.orion.ops.service.api.MachineAlarmConfigService; -import com.orion.ops.service.api.MachineAlarmHistoryService; -import com.orion.ops.service.api.MachineAlarmService; -import com.orion.ops.utils.Valid; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; diff --git a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/MachineEnvController.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/MachineEnvController.java similarity index 89% rename from orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/MachineEnvController.java rename to orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/MachineEnvController.java index b78b6aaa..79b2d268 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/MachineEnvController.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/MachineEnvController.java @@ -13,24 +13,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.controller; +package cn.orionsec.ops.controller; +import cn.orionsec.ops.annotation.DemoDisableApi; +import cn.orionsec.ops.annotation.EventLog; +import cn.orionsec.ops.annotation.RestWrapper; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.MessageConst; +import cn.orionsec.ops.constant.env.EnvViewType; +import cn.orionsec.ops.constant.event.EventType; +import cn.orionsec.ops.entity.request.machine.MachineEnvRequest; +import cn.orionsec.ops.entity.vo.machine.MachineEnvVO; +import cn.orionsec.ops.service.api.MachineEnvService; +import cn.orionsec.ops.utils.Valid; import com.orion.lang.define.collect.MutableLinkedHashMap; import com.orion.lang.define.wrapper.DataGrid; import com.orion.lang.define.wrapper.HttpWrapper; import com.orion.lang.utils.Exceptions; import com.orion.lang.utils.collect.Maps; -import com.orion.ops.annotation.DemoDisableApi; -import com.orion.ops.annotation.EventLog; -import com.orion.ops.annotation.RestWrapper; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.MessageConst; -import com.orion.ops.constant.env.EnvViewType; -import com.orion.ops.constant.event.EventType; -import com.orion.ops.entity.request.machine.MachineEnvRequest; -import com.orion.ops.entity.vo.machine.MachineEnvVO; -import com.orion.ops.service.api.MachineEnvService; -import com.orion.ops.utils.Valid; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.PostMapping; diff --git a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/MachineGroupController.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/MachineGroupController.java similarity index 87% rename from orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/MachineGroupController.java rename to orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/MachineGroupController.java index cbfa9622..17aa3126 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/MachineGroupController.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/MachineGroupController.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.controller; +package cn.orionsec.ops.controller; +import cn.orionsec.ops.annotation.RestWrapper; +import cn.orionsec.ops.constant.common.TreeMoveType; +import cn.orionsec.ops.entity.request.machine.MachineGroupRelRequest; +import cn.orionsec.ops.entity.request.machine.MachineGroupRequest; +import cn.orionsec.ops.entity.vo.machine.MachineGroupTreeVO; +import cn.orionsec.ops.service.api.MachineGroupRelService; +import cn.orionsec.ops.service.api.MachineGroupService; +import cn.orionsec.ops.utils.Valid; import com.orion.lang.define.wrapper.HttpWrapper; -import com.orion.ops.annotation.RestWrapper; -import com.orion.ops.constant.common.TreeMoveType; -import com.orion.ops.entity.request.machine.MachineGroupRelRequest; -import com.orion.ops.entity.request.machine.MachineGroupRequest; -import com.orion.ops.entity.vo.machine.MachineGroupTreeVO; -import com.orion.ops.service.api.MachineGroupRelService; -import com.orion.ops.service.api.MachineGroupService; -import com.orion.ops.utils.Valid; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; diff --git a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/MachineInfoController.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/MachineInfoController.java similarity index 91% rename from orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/MachineInfoController.java rename to orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/MachineInfoController.java index dd4ecd5f..4ad5e54e 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/MachineInfoController.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/MachineInfoController.java @@ -13,21 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.controller; +package cn.orionsec.ops.controller; +import cn.orionsec.ops.annotation.DemoDisableApi; +import cn.orionsec.ops.annotation.EventLog; +import cn.orionsec.ops.annotation.RestWrapper; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.MessageConst; +import cn.orionsec.ops.constant.event.EventType; +import cn.orionsec.ops.constant.machine.MachineAuthType; +import cn.orionsec.ops.entity.request.machine.MachineInfoRequest; +import cn.orionsec.ops.entity.vo.machine.MachineInfoVO; +import cn.orionsec.ops.service.api.MachineInfoService; +import cn.orionsec.ops.utils.Valid; import com.orion.lang.define.wrapper.DataGrid; import com.orion.lang.define.wrapper.HttpWrapper; -import com.orion.ops.annotation.DemoDisableApi; -import com.orion.ops.annotation.EventLog; -import com.orion.ops.annotation.RestWrapper; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.MessageConst; -import com.orion.ops.constant.event.EventType; -import com.orion.ops.constant.machine.MachineAuthType; -import com.orion.ops.entity.request.machine.MachineInfoRequest; -import com.orion.ops.entity.vo.machine.MachineInfoVO; -import com.orion.ops.service.api.MachineInfoService; -import com.orion.ops.utils.Valid; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.PostMapping; diff --git a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/MachineKeyController.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/MachineKeyController.java similarity index 88% rename from orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/MachineKeyController.java rename to orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/MachineKeyController.java index 1945531c..f15769c9 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/MachineKeyController.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/MachineKeyController.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.controller; +package cn.orionsec.ops.controller; +import cn.orionsec.ops.annotation.DemoDisableApi; +import cn.orionsec.ops.annotation.EventLog; +import cn.orionsec.ops.annotation.RestWrapper; +import cn.orionsec.ops.constant.event.EventType; +import cn.orionsec.ops.entity.request.machine.MachineKeyRequest; +import cn.orionsec.ops.entity.vo.machine.MachineSecretKeyVO; +import cn.orionsec.ops.service.api.MachineKeyService; +import cn.orionsec.ops.utils.Valid; import com.orion.lang.define.wrapper.DataGrid; import com.orion.lang.define.wrapper.HttpWrapper; -import com.orion.ops.annotation.DemoDisableApi; -import com.orion.ops.annotation.EventLog; -import com.orion.ops.annotation.RestWrapper; -import com.orion.ops.constant.event.EventType; -import com.orion.ops.entity.request.machine.MachineKeyRequest; -import com.orion.ops.entity.vo.machine.MachineSecretKeyVO; -import com.orion.ops.service.api.MachineKeyService; -import com.orion.ops.utils.Valid; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.PostMapping; diff --git a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/MachineMonitorController.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/MachineMonitorController.java similarity index 87% rename from orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/MachineMonitorController.java rename to orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/MachineMonitorController.java index 71f22ded..c6f97490 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/MachineMonitorController.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/MachineMonitorController.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.controller; +package cn.orionsec.ops.controller; +import cn.orionsec.ops.annotation.DemoDisableApi; +import cn.orionsec.ops.annotation.EventLog; +import cn.orionsec.ops.annotation.RestWrapper; +import cn.orionsec.ops.constant.event.EventType; +import cn.orionsec.ops.entity.request.machine.MachineMonitorRequest; +import cn.orionsec.ops.entity.vo.machine.MachineMonitorVO; +import cn.orionsec.ops.service.api.MachineMonitorService; +import cn.orionsec.ops.utils.Valid; import com.orion.lang.define.wrapper.DataGrid; import com.orion.lang.utils.Booleans; -import com.orion.ops.annotation.DemoDisableApi; -import com.orion.ops.annotation.EventLog; -import com.orion.ops.annotation.RestWrapper; -import com.orion.ops.constant.event.EventType; -import com.orion.ops.entity.request.machine.MachineMonitorRequest; -import com.orion.ops.entity.vo.machine.MachineMonitorVO; -import com.orion.ops.service.api.MachineMonitorService; -import com.orion.ops.utils.Valid; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; diff --git a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/MachineMonitorEndpointController.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/MachineMonitorEndpointController.java similarity index 93% rename from orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/MachineMonitorEndpointController.java rename to orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/MachineMonitorEndpointController.java index aeb430dd..efb90f4d 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/MachineMonitorEndpointController.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/MachineMonitorEndpointController.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.controller; +package cn.orionsec.ops.controller; +import cn.orionsec.ops.annotation.RestWrapper; +import cn.orionsec.ops.entity.request.machine.MachineMonitorEndpointRequest; +import cn.orionsec.ops.service.api.MachineMonitorEndpointService; +import cn.orionsec.ops.utils.Valid; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.orion.ops.annotation.RestWrapper; -import com.orion.ops.entity.request.machine.MachineMonitorEndpointRequest; -import com.orion.ops.service.api.MachineMonitorEndpointService; -import com.orion.ops.utils.Valid; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; diff --git a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/MachineProxyController.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/MachineProxyController.java similarity index 86% rename from orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/MachineProxyController.java rename to orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/MachineProxyController.java index 5c399408..b5244086 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/MachineProxyController.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/MachineProxyController.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.controller; +package cn.orionsec.ops.controller; +import cn.orionsec.ops.annotation.DemoDisableApi; +import cn.orionsec.ops.annotation.EventLog; +import cn.orionsec.ops.annotation.RestWrapper; +import cn.orionsec.ops.constant.event.EventType; +import cn.orionsec.ops.constant.machine.ProxyType; +import cn.orionsec.ops.entity.request.machine.MachineProxyRequest; +import cn.orionsec.ops.entity.vo.machine.MachineProxyVO; +import cn.orionsec.ops.service.api.MachineProxyService; +import cn.orionsec.ops.utils.Valid; import com.orion.lang.define.wrapper.DataGrid; import com.orion.lang.utils.Strings; -import com.orion.ops.annotation.DemoDisableApi; -import com.orion.ops.annotation.EventLog; -import com.orion.ops.annotation.RestWrapper; -import com.orion.ops.constant.event.EventType; -import com.orion.ops.constant.machine.ProxyType; -import com.orion.ops.entity.request.machine.MachineProxyRequest; -import com.orion.ops.entity.vo.machine.MachineProxyVO; -import com.orion.ops.service.api.MachineProxyService; -import com.orion.ops.utils.Valid; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.PostMapping; diff --git a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/MachineTerminalController.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/MachineTerminalController.java similarity index 86% rename from orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/MachineTerminalController.java rename to orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/MachineTerminalController.java index 83e4479e..550b323e 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/MachineTerminalController.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/MachineTerminalController.java @@ -13,8 +13,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.controller; +package cn.orionsec.ops.controller; +import cn.orionsec.ops.annotation.DemoDisableApi; +import cn.orionsec.ops.annotation.EventLog; +import cn.orionsec.ops.annotation.RequireRole; +import cn.orionsec.ops.annotation.RestWrapper; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.MessageConst; +import cn.orionsec.ops.constant.ResultCode; +import cn.orionsec.ops.constant.event.EventType; +import cn.orionsec.ops.constant.user.RoleType; +import cn.orionsec.ops.entity.request.machine.MachineTerminalLogRequest; +import cn.orionsec.ops.entity.request.machine.MachineTerminalManagerRequest; +import cn.orionsec.ops.entity.request.machine.MachineTerminalRequest; +import cn.orionsec.ops.entity.vo.machine.*; +import cn.orionsec.ops.handler.terminal.manager.TerminalSessionManager; +import cn.orionsec.ops.service.api.MachineTerminalService; +import cn.orionsec.ops.utils.Valid; import com.orion.lang.define.wrapper.DataGrid; import com.orion.lang.define.wrapper.HttpWrapper; import com.orion.lang.utils.Exceptions; @@ -22,22 +38,6 @@ import com.orion.lang.utils.Strings; import com.orion.lang.utils.codec.Base64s; import com.orion.lang.utils.io.FileReaders; import com.orion.net.remote.TerminalType; -import com.orion.ops.annotation.DemoDisableApi; -import com.orion.ops.annotation.EventLog; -import com.orion.ops.annotation.RequireRole; -import com.orion.ops.annotation.RestWrapper; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.MessageConst; -import com.orion.ops.constant.ResultCode; -import com.orion.ops.constant.event.EventType; -import com.orion.ops.constant.user.RoleType; -import com.orion.ops.entity.request.machine.MachineTerminalLogRequest; -import com.orion.ops.entity.request.machine.MachineTerminalManagerRequest; -import com.orion.ops.entity.request.machine.MachineTerminalRequest; -import com.orion.ops.entity.vo.machine.*; -import com.orion.ops.handler.terminal.manager.TerminalSessionManager; -import com.orion.ops.service.api.MachineTerminalService; -import com.orion.ops.utils.Valid; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; diff --git a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/SchedulerController.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/SchedulerController.java similarity index 89% rename from orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/SchedulerController.java rename to orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/SchedulerController.java index fe7b36d5..0a49193a 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/SchedulerController.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/SchedulerController.java @@ -13,23 +13,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.controller; +package cn.orionsec.ops.controller; +import cn.orionsec.ops.annotation.DemoDisableApi; +import cn.orionsec.ops.annotation.EventLog; +import cn.orionsec.ops.annotation.RestWrapper; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.event.EventType; +import cn.orionsec.ops.entity.request.scheduler.SchedulerTaskRequest; +import cn.orionsec.ops.entity.vo.scheduler.CronNextVO; +import cn.orionsec.ops.entity.vo.scheduler.SchedulerTaskVO; +import cn.orionsec.ops.service.api.SchedulerTaskService; +import cn.orionsec.ops.utils.Valid; import com.orion.lang.define.wrapper.DataGrid; import com.orion.lang.define.wrapper.HttpWrapper; import com.orion.lang.utils.collect.Lists; import com.orion.lang.utils.time.cron.Cron; import com.orion.lang.utils.time.cron.CronSupport; -import com.orion.ops.annotation.DemoDisableApi; -import com.orion.ops.annotation.EventLog; -import com.orion.ops.annotation.RestWrapper; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.event.EventType; -import com.orion.ops.entity.request.scheduler.SchedulerTaskRequest; -import com.orion.ops.entity.vo.scheduler.CronNextVO; -import com.orion.ops.entity.vo.scheduler.SchedulerTaskVO; -import com.orion.ops.service.api.SchedulerTaskService; -import com.orion.ops.utils.Valid; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.PostMapping; diff --git a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/SchedulerRecordController.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/SchedulerRecordController.java similarity index 88% rename from orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/SchedulerRecordController.java rename to orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/SchedulerRecordController.java index daa3e99c..3ba457e6 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/SchedulerRecordController.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/SchedulerRecordController.java @@ -13,21 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.controller; +package cn.orionsec.ops.controller; +import cn.orionsec.ops.annotation.EventLog; +import cn.orionsec.ops.annotation.IgnoreLog; +import cn.orionsec.ops.annotation.RestWrapper; +import cn.orionsec.ops.constant.event.EventType; +import cn.orionsec.ops.entity.request.scheduler.SchedulerTaskRecordRequest; +import cn.orionsec.ops.entity.vo.scheduler.SchedulerTaskMachineRecordStatusVO; +import cn.orionsec.ops.entity.vo.scheduler.SchedulerTaskMachineRecordVO; +import cn.orionsec.ops.entity.vo.scheduler.SchedulerTaskRecordStatusVO; +import cn.orionsec.ops.entity.vo.scheduler.SchedulerTaskRecordVO; +import cn.orionsec.ops.service.api.SchedulerTaskRecordService; +import cn.orionsec.ops.utils.Valid; import com.orion.lang.define.wrapper.DataGrid; import com.orion.lang.define.wrapper.HttpWrapper; -import com.orion.ops.annotation.EventLog; -import com.orion.ops.annotation.IgnoreLog; -import com.orion.ops.annotation.RestWrapper; -import com.orion.ops.constant.event.EventType; -import com.orion.ops.entity.request.scheduler.SchedulerTaskRecordRequest; -import com.orion.ops.entity.vo.scheduler.SchedulerTaskMachineRecordStatusVO; -import com.orion.ops.entity.vo.scheduler.SchedulerTaskMachineRecordVO; -import com.orion.ops.entity.vo.scheduler.SchedulerTaskRecordStatusVO; -import com.orion.ops.entity.vo.scheduler.SchedulerTaskRecordVO; -import com.orion.ops.service.api.SchedulerTaskRecordService; -import com.orion.ops.utils.Valid; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.PostMapping; diff --git a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/SftpController.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/SftpController.java similarity index 93% rename from orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/SftpController.java rename to orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/SftpController.java index f5f001b7..9a0eeee3 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/SftpController.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/SftpController.java @@ -13,30 +13,30 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.controller; +package cn.orionsec.ops.controller; +import cn.orionsec.ops.annotation.EventLog; +import cn.orionsec.ops.annotation.RestWrapper; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.MessageConst; +import cn.orionsec.ops.constant.event.EventType; +import cn.orionsec.ops.constant.sftp.SftpPackageType; +import cn.orionsec.ops.constant.system.SystemEnvAttr; +import cn.orionsec.ops.entity.dto.sftp.SftpSessionTokenDTO; +import cn.orionsec.ops.entity.dto.sftp.SftpUploadInfoDTO; +import cn.orionsec.ops.entity.request.sftp.*; +import cn.orionsec.ops.entity.vo.sftp.FileListVO; +import cn.orionsec.ops.entity.vo.sftp.FileOpenVO; +import cn.orionsec.ops.entity.vo.sftp.FileTransferLogVO; +import cn.orionsec.ops.service.api.SftpService; +import cn.orionsec.ops.utils.Currents; +import cn.orionsec.ops.utils.PathBuilders; +import cn.orionsec.ops.utils.Valid; import com.orion.lang.id.ObjectIds; import com.orion.lang.utils.Exceptions; import com.orion.lang.utils.collect.Lists; import com.orion.lang.utils.io.Files1; import com.orion.net.base.file.sftp.SftpErrorMessage; -import com.orion.ops.annotation.EventLog; -import com.orion.ops.annotation.RestWrapper; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.MessageConst; -import com.orion.ops.constant.event.EventType; -import com.orion.ops.constant.sftp.SftpPackageType; -import com.orion.ops.constant.system.SystemEnvAttr; -import com.orion.ops.entity.dto.sftp.SftpSessionTokenDTO; -import com.orion.ops.entity.dto.sftp.SftpUploadInfoDTO; -import com.orion.ops.entity.request.sftp.*; -import com.orion.ops.entity.vo.sftp.FileTransferLogVO; -import com.orion.ops.entity.vo.sftp.FileListVO; -import com.orion.ops.entity.vo.sftp.FileOpenVO; -import com.orion.ops.service.api.SftpService; -import com.orion.ops.utils.Currents; -import com.orion.ops.utils.PathBuilders; -import com.orion.ops.utils.Valid; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; diff --git a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/StatisticsController.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/StatisticsController.java similarity index 88% rename from orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/StatisticsController.java rename to orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/StatisticsController.java index 65d3af1a..ac7c7ffb 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/StatisticsController.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/StatisticsController.java @@ -13,20 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.controller; +package cn.orionsec.ops.controller; -import com.orion.ops.annotation.IgnoreLog; -import com.orion.ops.annotation.RestWrapper; -import com.orion.ops.entity.request.app.AppBuildStatisticsRequest; -import com.orion.ops.entity.request.app.AppPipelineTaskStatisticsRequest; -import com.orion.ops.entity.request.app.AppReleaseStatisticsRequest; -import com.orion.ops.entity.request.home.HomeStatisticsRequest; -import com.orion.ops.entity.request.scheduler.SchedulerTaskStatisticsRequest; -import com.orion.ops.entity.vo.app.*; -import com.orion.ops.entity.vo.home.HomeStatisticsVO; -import com.orion.ops.entity.vo.scheduler.SchedulerTaskRecordStatisticsVO; -import com.orion.ops.service.api.StatisticsService; -import com.orion.ops.utils.Valid; +import cn.orionsec.ops.annotation.IgnoreLog; +import cn.orionsec.ops.annotation.RestWrapper; +import cn.orionsec.ops.entity.request.app.AppBuildStatisticsRequest; +import cn.orionsec.ops.entity.request.app.AppPipelineTaskStatisticsRequest; +import cn.orionsec.ops.entity.request.app.AppReleaseStatisticsRequest; +import cn.orionsec.ops.entity.request.home.HomeStatisticsRequest; +import cn.orionsec.ops.entity.request.scheduler.SchedulerTaskStatisticsRequest; +import cn.orionsec.ops.entity.vo.app.*; +import cn.orionsec.ops.entity.vo.home.HomeStatisticsVO; +import cn.orionsec.ops.entity.vo.scheduler.SchedulerTaskRecordStatisticsVO; +import cn.orionsec.ops.service.api.StatisticsService; +import cn.orionsec.ops.utils.Valid; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.PostMapping; diff --git a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/SystemController.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/SystemController.java similarity index 82% rename from orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/SystemController.java rename to orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/SystemController.java index ac88b230..0444f9dd 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/SystemController.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/SystemController.java @@ -13,26 +13,26 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.controller; +package cn.orionsec.ops.controller; +import cn.orionsec.ops.annotation.DemoDisableApi; +import cn.orionsec.ops.annotation.EventLog; +import cn.orionsec.ops.annotation.RequireRole; +import cn.orionsec.ops.annotation.RestWrapper; +import cn.orionsec.ops.constant.CnConst; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.PropertiesConst; +import cn.orionsec.ops.constant.event.EventType; +import cn.orionsec.ops.constant.system.SystemCleanType; +import cn.orionsec.ops.constant.system.SystemConfigKey; +import cn.orionsec.ops.constant.user.RoleType; +import cn.orionsec.ops.entity.request.system.ConfigIpListRequest; +import cn.orionsec.ops.entity.request.system.SystemFileCleanRequest; +import cn.orionsec.ops.entity.request.system.SystemOptionRequest; +import cn.orionsec.ops.entity.vo.system.*; +import cn.orionsec.ops.service.api.SystemService; +import cn.orionsec.ops.utils.Valid; import com.orion.lang.define.wrapper.HttpWrapper; -import com.orion.ops.annotation.DemoDisableApi; -import com.orion.ops.annotation.EventLog; -import com.orion.ops.annotation.RequireRole; -import com.orion.ops.annotation.RestWrapper; -import com.orion.ops.constant.CnConst; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.PropertiesConst; -import com.orion.ops.constant.event.EventType; -import com.orion.ops.constant.system.SystemCleanType; -import com.orion.ops.constant.system.SystemConfigKey; -import com.orion.ops.constant.user.RoleType; -import com.orion.ops.entity.request.system.ConfigIpListRequest; -import com.orion.ops.entity.request.system.SystemFileCleanRequest; -import com.orion.ops.entity.request.system.SystemOptionRequest; -import com.orion.ops.entity.vo.system.*; -import com.orion.ops.service.api.SystemService; -import com.orion.ops.utils.Valid; import com.orion.web.servlet.web.Servlets; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/SystemEnvController.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/SystemEnvController.java similarity index 88% rename from orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/SystemEnvController.java rename to orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/SystemEnvController.java index f065ffd2..35a8f6ac 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/SystemEnvController.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/SystemEnvController.java @@ -13,23 +13,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.controller; +package cn.orionsec.ops.controller; +import cn.orionsec.ops.annotation.DemoDisableApi; +import cn.orionsec.ops.annotation.EventLog; +import cn.orionsec.ops.annotation.RestWrapper; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.MessageConst; +import cn.orionsec.ops.constant.env.EnvViewType; +import cn.orionsec.ops.constant.event.EventType; +import cn.orionsec.ops.entity.request.system.SystemEnvRequest; +import cn.orionsec.ops.entity.vo.system.SystemEnvVO; +import cn.orionsec.ops.service.api.SystemEnvService; +import cn.orionsec.ops.utils.Valid; import com.orion.lang.define.collect.MutableLinkedHashMap; import com.orion.lang.define.wrapper.DataGrid; import com.orion.lang.utils.Exceptions; import com.orion.lang.utils.collect.Maps; -import com.orion.ops.annotation.DemoDisableApi; -import com.orion.ops.annotation.EventLog; -import com.orion.ops.annotation.RestWrapper; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.MessageConst; -import com.orion.ops.constant.env.EnvViewType; -import com.orion.ops.constant.event.EventType; -import com.orion.ops.entity.request.system.SystemEnvRequest; -import com.orion.ops.entity.vo.system.SystemEnvVO; -import com.orion.ops.service.api.SystemEnvService; -import com.orion.ops.utils.Valid; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.PostMapping; diff --git a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/UserController.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/UserController.java similarity index 87% rename from orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/UserController.java rename to orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/UserController.java index 87c21bec..732cc0a7 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/UserController.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/UserController.java @@ -13,22 +13,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.controller; +package cn.orionsec.ops.controller; +import cn.orionsec.ops.annotation.DemoDisableApi; +import cn.orionsec.ops.annotation.EventLog; +import cn.orionsec.ops.annotation.RequireRole; +import cn.orionsec.ops.annotation.RestWrapper; +import cn.orionsec.ops.constant.Const; +import cn.orionsec.ops.constant.event.EventType; +import cn.orionsec.ops.constant.user.RoleType; +import cn.orionsec.ops.entity.request.user.UserInfoRequest; +import cn.orionsec.ops.entity.vo.user.UserInfoVO; +import cn.orionsec.ops.service.api.UserService; +import cn.orionsec.ops.utils.Currents; +import cn.orionsec.ops.utils.Valid; import com.orion.lang.define.wrapper.DataGrid; import com.orion.lang.utils.Objects1; -import com.orion.ops.annotation.DemoDisableApi; -import com.orion.ops.annotation.EventLog; -import com.orion.ops.annotation.RequireRole; -import com.orion.ops.annotation.RestWrapper; -import com.orion.ops.constant.Const; -import com.orion.ops.constant.event.EventType; -import com.orion.ops.constant.user.RoleType; -import com.orion.ops.entity.request.user.UserInfoRequest; -import com.orion.ops.entity.vo.user.UserInfoVO; -import com.orion.ops.service.api.UserService; -import com.orion.ops.utils.Currents; -import com.orion.ops.utils.Valid; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.PostMapping; diff --git a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/WebSideMessageController.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/WebSideMessageController.java similarity index 89% rename from orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/WebSideMessageController.java rename to orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/WebSideMessageController.java index 2e0cf57c..d088b7ca 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/WebSideMessageController.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/WebSideMessageController.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.controller; +package cn.orionsec.ops.controller; +import cn.orionsec.ops.annotation.IgnoreLog; +import cn.orionsec.ops.annotation.RestWrapper; +import cn.orionsec.ops.entity.request.message.WebSideMessageRequest; +import cn.orionsec.ops.entity.vo.message.WebSideMessagePollVO; +import cn.orionsec.ops.entity.vo.message.WebSideMessageVO; +import cn.orionsec.ops.service.api.WebSideMessageService; +import cn.orionsec.ops.utils.Valid; import com.orion.lang.define.wrapper.DataGrid; -import com.orion.ops.annotation.IgnoreLog; -import com.orion.ops.annotation.RestWrapper; -import com.orion.ops.entity.request.message.WebSideMessageRequest; -import com.orion.ops.entity.vo.message.WebSideMessagePollVO; -import com.orion.ops.entity.vo.message.WebSideMessageVO; -import com.orion.ops.service.api.WebSideMessageService; -import com.orion.ops.utils.Valid; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; diff --git a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/WebhookConfigController.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/WebhookConfigController.java similarity index 86% rename from orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/WebhookConfigController.java rename to orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/WebhookConfigController.java index 00a8f183..32ac25ee 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/controller/WebhookConfigController.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/WebhookConfigController.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.controller; +package cn.orionsec.ops.controller; +import cn.orionsec.ops.annotation.DemoDisableApi; +import cn.orionsec.ops.annotation.EventLog; +import cn.orionsec.ops.annotation.RestWrapper; +import cn.orionsec.ops.constant.event.EventType; +import cn.orionsec.ops.constant.webhook.WebhookType; +import cn.orionsec.ops.entity.request.webhook.WebhookConfigRequest; +import cn.orionsec.ops.entity.vo.webhook.WebhookConfigVO; +import cn.orionsec.ops.service.api.WebhookConfigService; +import cn.orionsec.ops.utils.Valid; import com.orion.lang.define.wrapper.DataGrid; -import com.orion.ops.annotation.DemoDisableApi; -import com.orion.ops.annotation.EventLog; -import com.orion.ops.annotation.RestWrapper; -import com.orion.ops.constant.event.EventType; -import com.orion.ops.constant.webhook.WebhookType; -import com.orion.ops.entity.request.webhook.WebhookConfigRequest; -import com.orion.ops.entity.vo.webhook.WebhookConfigVO; -import com.orion.ops.service.api.WebhookConfigService; -import com.orion.ops.utils.Valid; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.PostMapping; diff --git a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/expose/MachineAlarmExposeController.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/expose/MachineAlarmExposeController.java similarity index 82% rename from orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/expose/MachineAlarmExposeController.java rename to orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/expose/MachineAlarmExposeController.java index d9e05beb..d0bcf16b 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/expose/MachineAlarmExposeController.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/expose/MachineAlarmExposeController.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.expose; +package cn.orionsec.ops.expose; +import cn.orionsec.ops.annotation.RestWrapper; +import cn.orionsec.ops.constant.machine.MachineAlarmType; +import cn.orionsec.ops.entity.request.machine.MachineAlarmRequest; +import cn.orionsec.ops.entity.vo.machine.MachineAlarmConfigVO; +import cn.orionsec.ops.service.api.MachineAlarmConfigService; +import cn.orionsec.ops.service.api.MachineAlarmService; +import cn.orionsec.ops.utils.Valid; import com.orion.lang.define.wrapper.HttpWrapper; -import com.orion.ops.annotation.RestWrapper; -import com.orion.ops.constant.machine.MachineAlarmType; -import com.orion.ops.entity.request.machine.MachineAlarmRequest; -import com.orion.ops.entity.vo.machine.MachineAlarmConfigVO; -import com.orion.ops.service.api.MachineAlarmConfigService; -import com.orion.ops.service.api.MachineAlarmService; -import com.orion.ops.utils.Valid; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; diff --git a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/expose/MachineMonitorExposeController.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/expose/MachineMonitorExposeController.java similarity index 88% rename from orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/expose/MachineMonitorExposeController.java rename to orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/expose/MachineMonitorExposeController.java index 957cb9e5..d9bbbdb5 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/expose/MachineMonitorExposeController.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/expose/MachineMonitorExposeController.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.ops.expose; +package cn.orionsec.ops.expose; -import com.orion.ops.annotation.RestWrapper; -import com.orion.ops.constant.monitor.MonitorStatus; -import com.orion.ops.entity.domain.MachineMonitorDO; -import com.orion.ops.service.api.MachineMonitorService; +import cn.orionsec.ops.annotation.RestWrapper; +import cn.orionsec.ops.constant.monitor.MonitorStatus; +import cn.orionsec.ops.entity.domain.MachineMonitorDO; +import cn.orionsec.ops.service.api.MachineMonitorService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.GetMapping; diff --git a/orion-ops-api/orion-ops-web/src/main/resources/application.properties b/orion-ops-api/orion-ops-web/src/main/resources/application.properties index cd1d2a79..c9d3f304 100644 --- a/orion-ops-api/orion-ops-web/src/main/resources/application.properties +++ b/orion-ops-api/orion-ops-web/src/main/resources/application.properties @@ -31,19 +31,19 @@ logging.logback.rollingpolicy.max-history=30 logging.logback.rollingpolicy.max-file-size=64MB logging.logback.rollingpolicy.total-size-cap=0B # app -app.version=1.2.9 +app.version=1.3.0 login.token.header=O-Login-Token value.mix.secret.key=${SECRET_KEY:orion_ops} demo.mode=${DEMO_MODE:false} # 全局日志打印切入点 -log.interceptor.expression=execution (* com.orion.ops.controller.*.*(..)) && !@annotation(com.orion.ops.annotation.IgnoreLog) +log.interceptor.expression=execution (* cn.orionsec.ops.controller.*.*(..)) && !@annotation(cn.orionsec.ops.annotation.IgnoreLog) # 全局日志打印忽略字段 log.interceptor.ignore.fields=avatar,password,beforePassword,protectPassword,commandLine,metrics # 暴露服务配置 expose.api.access.header=accessToken expose.api.access.secret=ops_access # 监控配置 -machine.monitor.latest.version=1.0.2 +machine.monitor.latest.version=1.1.0 machine.monitor.default.url=http://{}:9220 machine.monitor.default.access.header=accessToken machine.monitor.default.access.token=agent_access diff --git a/orion-ops-api/pom.xml b/orion-ops-api/pom.xml index 1bb00798..c2a8d091 100644 --- a/orion-ops-api/pom.xml +++ b/orion-ops-api/pom.xml @@ -9,9 +9,9 @@ orion-ops-api - com.orion.ops + cn.orionsec.ops orion-ops-api - 1.2.9 + 1.3.0 pom 4.0.0 https://github.com/lijiahangmax/orion-ops diff --git a/orion-ops-vue/package.json b/orion-ops-vue/package.json index 36a6cd42..a7dcac7b 100644 --- a/orion-ops-vue/package.json +++ b/orion-ops-vue/package.json @@ -1,6 +1,6 @@ { "name": "orion-ops-vue", - "version": "1.2.9", + "version": "1.3.0", "private": true, "scripts": { "serve": "vue-cli-service serve --mode dev", diff --git a/orion-ops-vue/src/components/app/AppReleaseConfigForm.vue b/orion-ops-vue/src/components/app/AppReleaseConfigForm.vue index 5c3dddd6..9b108ae9 100644 --- a/orion-ops-vue/src/components/app/AppReleaseConfigForm.vue +++ b/orion-ops-vue/src/components/app/AppReleaseConfigForm.vue @@ -104,7 +104,7 @@ v-model="action.command" :autoSize="{minRows: 1}" :maxLength="1024" - placeholder="目标机器和宿主机需要建立 ssh 免密登陆"/> + placeholder="目标机器和宿主机需要建立 ssh 免密登录"/> diff --git a/orion-ops-vue/src/components/system/SecurityConfig.vue b/orion-ops-vue/src/components/system/SecurityConfig.vue index e296f52c..3551a903 100644 --- a/orion-ops-vue/src/components/system/SecurityConfig.vue +++ b/orion-ops-vue/src/components/system/SecurityConfig.vue @@ -5,8 +5,8 @@

- - + + - - + + - - + + - + @@ -62,7 +62,7 @@ @@ -72,12 +72,12 @@ - - + + - - + + diff --git a/orion-ops-vue/src/components/terminal/TerminalModal.vue b/orion-ops-vue/src/components/terminal/TerminalModal.vue index e81ec845..f45bd27a 100644 --- a/orion-ops-vue/src/components/terminal/TerminalModal.vue +++ b/orion-ops-vue/src/components/terminal/TerminalModal.vue @@ -136,9 +136,12 @@ export default { }, close() { this.visible = false - this.$refs.terminal.dispose() this.machineId = null this.status = TERMINAL_STATUS.NOT_CONNECT.value + try { + this.$refs.terminal.dispose(); + } catch (e) { + } this.$emit('close', this.terminalId) }, onchangeStatus(status) { diff --git a/orion-ops-vue/src/components/user/LoginHistory.vue b/orion-ops-vue/src/components/user/LoginHistory.vue index f44ca4a7..62a8f7a4 100644 --- a/orion-ops-vue/src/components/user/LoginHistory.vue +++ b/orion-ops-vue/src/components/user/LoginHistory.vue @@ -1,9 +1,9 @@ - + - + diff --git a/orion-ops-vue/src/lib/api.js b/orion-ops-vue/src/lib/api.js index 83ab0adb..e37b8f81 100644 --- a/orion-ops-vue/src/lib/api.js +++ b/orion-ops-vue/src/lib/api.js @@ -62,7 +62,7 @@ const $api = { ...$url, /** - * 登陆 + * 登录 */ login: param => { return $http.$post('/auth/login', param, { auth: false }) diff --git a/orion-ops-vue/src/lib/enum.js b/orion-ops-vue/src/lib/enum.js index 6f200cd8..d64c6bf0 100644 --- a/orion-ops-vue/src/lib/enum.js +++ b/orion-ops-vue/src/lib/enum.js @@ -1015,7 +1015,7 @@ export const EVENT_CLASSIFY = { export const EVENT_TYPE = { LOGIN: { value: 100010, - label: '登陆系统', + label: '登录系统', classify: 100 }, LOGOUT: { diff --git a/orion-ops-vue/src/lib/http.js b/orion-ops-vue/src/lib/http.js index 1e13efcb..905d5902 100644 --- a/orion-ops-vue/src/lib/http.js +++ b/orion-ops-vue/src/lib/http.js @@ -11,7 +11,7 @@ const $http = axios.create({ // 默认配置项 const defaultConfig = { - // 是否需要登陆 + // 是否需要登录 auth: true, // 超时时间 timeout: 10000, @@ -97,7 +97,7 @@ $http.interceptors.request.use( const loginToken = $storage.get($storage.keys.LOGIN_TOKEN) // 设置 Content-Type config.headers['Content-Type'] = config.contentType - // 登陆判断 + // 登录判断 if (config.auth && !loginToken) { throw new RequestError(700, '会话过期') } diff --git a/orion-ops-vue/src/main.js b/orion-ops-vue/src/main.js index 73b4a991..82fe9617 100644 --- a/orion-ops-vue/src/main.js +++ b/orion-ops-vue/src/main.js @@ -23,7 +23,7 @@ $message.config({ }) router.beforeEach((to, from, next) => { - // 校验登陆 + // 校验登录 if (to.meta.requireAuth !== false && !$storage.get($storage.keys.LOGIN_TOKEN)) { router.push({ path: '/login' }) return diff --git a/orion-ops-vue/src/router/index.js b/orion-ops-vue/src/router/index.js index eabf7b0d..ccad9986 100644 --- a/orion-ops-vue/src/router/index.js +++ b/orion-ops-vue/src/router/index.js @@ -21,7 +21,7 @@ const routes = [ name: 'login', meta: { requireAuth: false, - title: '登陆', + title: '登录', mask: false }, component: Login diff --git a/orion-ops-vue/src/views/user/UserDetail.vue b/orion-ops-vue/src/views/user/UserDetail.vue index 9efae987..2cab482a 100644 --- a/orion-ops-vue/src/views/user/UserDetail.vue +++ b/orion-ops-vue/src/views/user/UserDetail.vue @@ -9,8 +9,8 @@ - - + + @@ -42,7 +42,7 @@ export default { document.title = '操作日志' break case 3: - document.title = '登陆历史' + document.title = '登录历史' break default: break diff --git a/orion-ops-vue/src/views/user/UserList.vue b/orion-ops-vue/src/views/user/UserList.vue index 6f764d13..717b35ca 100644 --- a/orion-ops-vue/src/views/user/UserList.vue +++ b/orion-ops-vue/src/views/user/UserList.vue @@ -104,7 +104,7 @@ - +