diff --git a/README.md b/README.md index 68491941..f581ea8e 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,8 @@ * 🔗 演示地址: [https://dv.orionsec.cn/](https://dv.orionsec.cn/) * 🔏 演示账号: admin/admin -* ⭐ 体验后可以点一下 `star` 这对我很重要! [github](https://github.com/dromara/orion-visor) [gitee](https://gitee.com/dromara/orion-visor) [gitcode](https://gitcode.com/dromara/orion-visor/overview) +* ⭐ 体验后可以点一下 `star` + 这对我很重要! [github](https://github.com/dromara/orion-visor) [gitee](https://gitee.com/dromara/orion-visor) [gitcode](https://gitcode.com/dromara/orion-visor/overview) * 🌈 如果本项目对你有帮助请帮忙推广一下 让更多的人知道此项目! * 🎭 演示环境部分功能不可用, 完整功能请本地部署! * 📛 演示环境请不要随便删除数据! @@ -80,7 +81,7 @@ docker compose up -d ## 技术栈 -* SpringBoot 2.7.17 +* SpringBoot 2.7.+ * Mysql 8.0.+ * Redis 6.0.+ * Vue3 3.2.+ @@ -122,7 +123,7 @@ docker compose up -d 微信: ljh1553488 QQ群: 755242157 -📧 咨询问题微信备注: vis +📧 问题/加群微信备注: ops 📧 合作/功能定制备注: 合作 ## 支持一下 @@ -137,4 +138,8 @@ QQ群: 755242157 ## License -本项目遵循 [Apache-2.0](https://github.com/dromara/orion-visor/blob/main/LICENSE) 开源许可证。 +本项目遵循 [Apache-2.0](https://github.com/dromara/orion-visor/blob/main/LICENSE) 开源许可证。 + +## Gite 最有价值开源项目 GVP + +![GVP](https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/10/24/8dd98b8d-9de5-44e6-86d3-04e27ec66123.jpg "GVP") diff --git a/docker-compose-testing.yml b/docker-compose-testing.yml index 2f9d537e..6033d357 100644 --- a/docker-compose-testing.yml +++ b/docker-compose-testing.yml @@ -1,7 +1,7 @@ version: '3.3' services: service: - image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.1.8 + image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.2.0 privileged: true ports: - 1081:80 @@ -32,7 +32,7 @@ services: - mysql - redis mysql: - image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.1.8 + image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.2.0 privileged: true ports: - 3307:3306 @@ -52,7 +52,7 @@ services: retries: 10 start_period: 3s redis: - image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.1.8 + image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.2.0 privileged: true ports: - 6380:6379 diff --git a/docker-compose.yml b/docker-compose.yml index 663f23ee..e2966de2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.3' services: service: - image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.1.8 + image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.2.0 privileged: true ports: - ${SERVICE_PORT:-1081}:80 @@ -32,7 +32,7 @@ services: - mysql - redis mysql: - image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.1.8 + image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.2.0 privileged: true ports: - 3307:3306 @@ -52,7 +52,7 @@ services: retries: 15 start_period: 3s redis: - image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.1.8 + image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.2.0 privileged: true ports: - 6380:6379 @@ -68,7 +68,7 @@ services: retries: 15 start_period: 3s adminer: - image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-adminer:2.1.8 + image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-adminer:2.2.0 ports: - 8081:8080 depends_on: diff --git a/docker/adminer/build.sh b/docker/adminer/build.sh index 7ccbb6c1..83260fac 100644 --- a/docker/adminer/build.sh +++ b/docker/adminer/build.sh @@ -1,4 +1,4 @@ #/bin/bash -version=2.1.8 +version=2.2.0 docker build -t orion-visor-adminer:${version} . docker tag orion-visor-adminer:${version} registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-adminer:${version} diff --git a/docker/mysql/build.sh b/docker/mysql/build.sh index 5b7b42b4..b02592be 100644 --- a/docker/mysql/build.sh +++ b/docker/mysql/build.sh @@ -1,5 +1,5 @@ #/bin/bash -version=2.1.8 +version=2.2.0 cp -r ../../sql ./sql docker build -t orion-visor-mysql:${version} . rm -rf ./sql diff --git a/docker/push.sh b/docker/push.sh index a820b3a8..4c5a6406 100644 --- a/docker/push.sh +++ b/docker/push.sh @@ -1,5 +1,5 @@ #/bin/bash -version=2.1.8 +version=2.2.0 docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-adminer:${version} docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:${version} docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:${version} diff --git a/docker/redis/build.sh b/docker/redis/build.sh index 7cb39f68..fef5dc2c 100644 --- a/docker/redis/build.sh +++ b/docker/redis/build.sh @@ -1,4 +1,4 @@ #/bin/bash -version=2.1.8 +version=2.2.0 docker build -t orion-visor-redis:${version} . docker tag orion-visor-redis:${version} registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:${version} diff --git a/docker/service/build.sh b/docker/service/build.sh index b76c0352..1e673e48 100644 --- a/docker/service/build.sh +++ b/docker/service/build.sh @@ -1,5 +1,5 @@ #/bin/bash -version=2.1.8 +version=2.2.0 mv ../../orion-visor-launch/target/orion-visor-launch.jar ./orion-visor-launch.jar mv ../../orion-visor-ui/dist ./dist docker build -t orion-visor-service:${version} . diff --git a/orion-visor-dependencies/pom.xml b/orion-visor-dependencies/pom.xml index 0b0f5167..8416dfd1 100644 --- a/orion-visor-dependencies/pom.xml +++ b/orion-visor-dependencies/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.orion.visor + org.dromara.visor orion-visor-dependencies ${revision} pom @@ -14,11 +14,11 @@ https://github.com/dromara/orion-visor - 2.1.8 + 2.2.0 2.7.17 2.7.15 1.5.0 - 1.0.9 + 2.0.0 1.9.7 1.18.26 1.6.15 @@ -48,95 +48,95 @@ - io.github.lijiahangmax + cn.orionsec.kit orion-all ${orion.kit.version} orion-log - io.github.lijiahangmax + cn.orionsec.kit - com.orion.visor + org.dromara.visor orion-visor-framework-common ${revision} - com.orion.visor + org.dromara.visor orion-visor-spring-boot-starter-banner ${revision} - com.orion.visor + org.dromara.visor orion-visor-spring-boot-starter-web ${revision} - com.orion.visor + org.dromara.visor orion-visor-spring-boot-starter-swagger ${revision} - com.orion.visor + org.dromara.visor orion-visor-spring-boot-starter-datasource ${revision} - com.orion.visor + org.dromara.visor orion-visor-spring-boot-starter-mybatis ${revision} - com.orion.visor + org.dromara.visor orion-visor-spring-boot-starter-job ${revision} - com.orion.visor + org.dromara.visor orion-visor-spring-boot-starter-websocket ${revision} - com.orion.visor + org.dromara.visor orion-visor-spring-boot-starter-redis ${revision} - com.orion.visor + org.dromara.visor orion-visor-spring-boot-starter-desensitize ${revision} - com.orion.visor + org.dromara.visor orion-visor-spring-boot-starter-log ${revision} - com.orion.visor + org.dromara.visor orion-visor-spring-boot-starter-storage ${revision} - com.orion.visor + org.dromara.visor orion-visor-spring-boot-starter-security ${revision} - com.orion.visor + org.dromara.visor orion-visor-spring-boot-starter-monitor ${revision} - com.orion.visor + org.dromara.visor orion-visor-spring-boot-starter-test ${revision} - com.orion.visor + org.dromara.visor orion-visor-spring-boot-starter-biz-operator-log ${revision} diff --git a/orion-visor-framework/orion-visor-framework-common/pom.xml b/orion-visor-framework/orion-visor-framework-common/pom.xml index 6b446405..c377e6fb 100644 --- a/orion-visor-framework/orion-visor-framework-common/pom.xml +++ b/orion-visor-framework/orion-visor-framework-common/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - com.orion.visor + org.dromara.visor orion-visor-framework ${revision} @@ -18,7 +18,7 @@ - io.github.lijiahangmax + cn.orionsec.kit orion-all diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/configuration/OrionCommonAutoConfiguration.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/configuration/OrionCommonAutoConfiguration.java similarity index 89% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/configuration/OrionCommonAutoConfiguration.java rename to orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/configuration/OrionCommonAutoConfiguration.java index 479da905..f1095d9b 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/configuration/OrionCommonAutoConfiguration.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/configuration/OrionCommonAutoConfiguration.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.common.configuration; +package org.dromara.visor.framework.common.configuration; -import com.orion.spring.SpringHolder; -import com.orion.visor.framework.common.configuration.config.AsyncExecutorConfig; -import com.orion.visor.framework.common.constant.AutoConfigureOrderConst; -import com.orion.visor.framework.common.thread.ThreadPoolMdcTaskExecutor; +import cn.orionsec.kit.spring.SpringHolder; +import org.dromara.visor.framework.common.configuration.config.AsyncExecutorConfig; +import org.dromara.visor.framework.common.constant.AutoConfigureOrderConst; +import org.dromara.visor.framework.common.thread.ThreadPoolMdcTaskExecutor; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigureOrder; import org.springframework.boot.context.properties.EnableConfigurationProperties; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/configuration/config/AsyncExecutorConfig.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/configuration/config/AsyncExecutorConfig.java similarity index 95% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/configuration/config/AsyncExecutorConfig.java rename to orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/configuration/config/AsyncExecutorConfig.java index 863de2b2..e0a95eeb 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/configuration/config/AsyncExecutorConfig.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/configuration/config/AsyncExecutorConfig.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.common.configuration.config; +package org.dromara.visor.framework.common.configuration.config; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/AppConst.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/AppConst.java similarity index 89% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/AppConst.java rename to orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/AppConst.java index c2393ab9..53853c13 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/AppConst.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/AppConst.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.common.constant; +package org.dromara.visor.framework.common.constant; -import com.orion.lang.constant.OrionConst; +import cn.orionsec.kit.lang.constant.OrionConst; /** * 项目常量 @@ -29,7 +29,7 @@ public interface AppConst extends OrionConst { /** * 同 ${orion.version} 迭代时候需要手动更改 */ - String VERSION = "2.1.8"; + String VERSION = "2.2.0"; /** * 同 ${spring.application.name} diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/AutoConfigureOrderConst.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/AutoConfigureOrderConst.java similarity index 97% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/AutoConfigureOrderConst.java rename to orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/AutoConfigureOrderConst.java index 01b250f4..8ae94df4 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/AutoConfigureOrderConst.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/AutoConfigureOrderConst.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.common.constant; +package org.dromara.visor.framework.common.constant; /** * 自动装配排序常量 diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/BeanOrderConst.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/BeanOrderConst.java similarity index 95% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/BeanOrderConst.java rename to orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/BeanOrderConst.java index e2303290..8f38c196 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/BeanOrderConst.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/BeanOrderConst.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.common.constant; +package org.dromara.visor.framework.common.constant; /** * bean 排序常量 diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/CnConst.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/CnConst.java similarity index 94% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/CnConst.java rename to orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/CnConst.java index cdb27540..2e215ec9 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/CnConst.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/CnConst.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.common.constant; +package org.dromara.visor.framework.common.constant; /** * 常量 - 中文 diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/Const.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/Const.java similarity index 88% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/Const.java rename to orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/Const.java index 30cd0d42..1bccb2ef 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/Const.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/Const.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.common.constant; +package org.dromara.visor.framework.common.constant; /** * 常量 @@ -22,7 +22,7 @@ package com.orion.visor.framework.common.constant; * @version 1.0.0 * @since 2023/6/23 18:49 */ -public interface Const extends com.orion.lang.constant.Const, FieldConst, CnConst { +public interface Const extends cn.orionsec.kit.lang.constant.Const, FieldConst, CnConst { Integer NOT_DELETE = 0; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/ErrorCode.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/ErrorCode.java similarity index 94% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/ErrorCode.java rename to orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/ErrorCode.java index 3318d6b2..6e87cfef 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/ErrorCode.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/ErrorCode.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.common.constant; +package org.dromara.visor.framework.common.constant; -import com.orion.lang.define.wrapper.CodeInfo; -import com.orion.lang.define.wrapper.HttpWrapper; -import com.orion.lang.utils.Exceptions; -import com.orion.lang.utils.Strings; +import cn.orionsec.kit.lang.define.wrapper.CodeInfo; +import cn.orionsec.kit.lang.define.wrapper.HttpWrapper; +import cn.orionsec.kit.lang.utils.Exceptions; +import cn.orionsec.kit.lang.utils.Strings; /** * 用于定义错误码 diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/ErrorMessage.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/ErrorMessage.java similarity index 96% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/ErrorMessage.java rename to orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/ErrorMessage.java index 825d0e0b..49b5e723 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/ErrorMessage.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/ErrorMessage.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.common.constant; +package org.dromara.visor.framework.common.constant; -import com.orion.lang.exception.ApplicationException; -import com.orion.lang.exception.argument.InvalidArgumentException; +import cn.orionsec.kit.lang.exception.ApplicationException; +import cn.orionsec.kit.lang.exception.argument.InvalidArgumentException; /** * 错误信息 diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/ExtraFieldConst.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/ExtraFieldConst.java similarity index 96% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/ExtraFieldConst.java rename to orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/ExtraFieldConst.java index 9263aec8..43f169d5 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/ExtraFieldConst.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/ExtraFieldConst.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.common.constant; +package org.dromara.visor.framework.common.constant; /** * 额外字段常量 diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/FieldConst.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/FieldConst.java similarity index 97% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/FieldConst.java rename to orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/FieldConst.java index 375396e6..e7378ec8 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/FieldConst.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/FieldConst.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.common.constant; +package org.dromara.visor.framework.common.constant; /** * 字段常量 diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/FileConst.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/FileConst.java similarity index 94% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/FileConst.java rename to orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/FileConst.java index b3b28696..3f3c8c18 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/FileConst.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/FileConst.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.common.constant; +package org.dromara.visor.framework.common.constant; /** * 文件常量 diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/FilterOrderConst.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/FilterOrderConst.java similarity index 94% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/FilterOrderConst.java rename to orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/FilterOrderConst.java index c9a77569..d3d44e50 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/FilterOrderConst.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/FilterOrderConst.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.common.constant; +package org.dromara.visor.framework.common.constant; /** * 过滤器排序常量 diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/ValidConst.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/ValidConst.java similarity index 95% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/ValidConst.java rename to orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/ValidConst.java index f70b74c9..48631156 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/ValidConst.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/ValidConst.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.common.constant; +package org.dromara.visor.framework.common.constant; /** * 验证常量 diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/crypto/ValueCrypto.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/crypto/ValueCrypto.java similarity index 88% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/crypto/ValueCrypto.java rename to orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/crypto/ValueCrypto.java index 22cba8bb..7b9ac79d 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/crypto/ValueCrypto.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/crypto/ValueCrypto.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.common.crypto; +package org.dromara.visor.framework.common.crypto; -import com.orion.lang.utils.codec.Base62s; -import com.orion.lang.utils.crypto.symmetric.SymmetricCrypto; +import cn.orionsec.kit.lang.utils.codec.Base62s; +import cn.orionsec.kit.lang.utils.crypto.symmetric.SymmetricCrypto; /** * 数据加密器 diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/entity/AutoClearConfig.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/AutoClearConfig.java similarity index 94% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/entity/AutoClearConfig.java rename to orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/AutoClearConfig.java index 908f521f..595809b2 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/entity/AutoClearConfig.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/AutoClearConfig.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.common.entity; +package org.dromara.visor.framework.common.entity; import lombok.Data; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/entity/DataClearRequest.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/DataClearRequest.java similarity index 95% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/entity/DataClearRequest.java rename to orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/DataClearRequest.java index acfba6b7..b5d4eb95 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/entity/DataClearRequest.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/DataClearRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.common.entity; +package org.dromara.visor.framework.common.entity; /** * 数据清理请求 定义 diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/entity/PageRequest.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/PageRequest.java similarity index 92% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/entity/PageRequest.java rename to orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/PageRequest.java index 64f0b7ab..5ff48c8a 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/entity/PageRequest.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/PageRequest.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.common.entity; +package org.dromara.visor.framework.common.entity; -import com.orion.visor.framework.common.validator.group.Page; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import org.dromara.visor.framework.common.validator.group.Page; import javax.validation.constraints.Max; import javax.validation.constraints.Min; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/entity/RequestIdentity.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/RequestIdentity.java similarity index 96% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/entity/RequestIdentity.java rename to orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/RequestIdentity.java index c4187dd2..0b3e794a 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/entity/RequestIdentity.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/RequestIdentity.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.common.entity; +package org.dromara.visor.framework.common.entity; import java.io.Serializable; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/entity/RequestIdentityModel.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/RequestIdentityModel.java similarity index 95% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/entity/RequestIdentityModel.java rename to orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/RequestIdentityModel.java index bae800ac..ae980499 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/entity/RequestIdentityModel.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/RequestIdentityModel.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.common.entity; +package org.dromara.visor.framework.common.entity; import lombok.Data; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/entity/TreeNode.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/TreeNode.java similarity index 96% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/entity/TreeNode.java rename to orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/TreeNode.java index 35e5d97d..cc46152e 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/entity/TreeNode.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/TreeNode.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.common.entity; +package org.dromara.visor.framework.common.entity; import java.util.List; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/enums/BooleanBit.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/enums/BooleanBit.java similarity index 97% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/enums/BooleanBit.java rename to orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/enums/BooleanBit.java index a29e288e..4c7f9c80 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/enums/BooleanBit.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/enums/BooleanBit.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.common.enums; +package org.dromara.visor.framework.common.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/enums/EnableStatus.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/enums/EnableStatus.java similarity index 96% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/enums/EnableStatus.java rename to orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/enums/EnableStatus.java index b9048308..35175a3e 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/enums/EnableStatus.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/enums/EnableStatus.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.common.enums; +package org.dromara.visor.framework.common.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/enums/EndpointDefine.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/enums/EndpointDefine.java similarity index 93% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/enums/EndpointDefine.java rename to orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/enums/EndpointDefine.java index f68afbcd..4c76edb3 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/enums/EndpointDefine.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/enums/EndpointDefine.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.common.enums; +package org.dromara.visor.framework.common.enums; -import com.orion.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.Strings; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/enums/MovePosition.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/enums/MovePosition.java similarity index 96% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/enums/MovePosition.java rename to orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/enums/MovePosition.java index 6f916dcc..029291a9 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/enums/MovePosition.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/enums/MovePosition.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.common.enums; +package org.dromara.visor.framework.common.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/file/FileClient.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/file/FileClient.java similarity index 98% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/file/FileClient.java rename to orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/file/FileClient.java index c4a802c2..55e4bc49 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/file/FileClient.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/file/FileClient.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.common.file; +package org.dromara.visor.framework.common.file; import java.io.InputStream; import java.io.OutputStream; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/handler/data/GenericsDataDefinition.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/handler/data/GenericsDataDefinition.java similarity index 88% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/handler/data/GenericsDataDefinition.java rename to orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/handler/data/GenericsDataDefinition.java index 83aba0b0..6067d7e5 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/handler/data/GenericsDataDefinition.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/handler/data/GenericsDataDefinition.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.common.handler.data; +package org.dromara.visor.framework.common.handler.data; -import com.orion.spring.SpringHolder; -import com.orion.visor.framework.common.handler.data.model.GenericsDataModel; -import com.orion.visor.framework.common.handler.data.strategy.GenericsDataStrategy; +import cn.orionsec.kit.spring.SpringHolder; +import org.dromara.visor.framework.common.handler.data.model.GenericsDataModel; +import org.dromara.visor.framework.common.handler.data.strategy.GenericsDataStrategy; /** * 标准数据定义 diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/handler/data/model/GenericsDataModel.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/handler/data/model/GenericsDataModel.java similarity index 94% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/handler/data/model/GenericsDataModel.java rename to orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/handler/data/model/GenericsDataModel.java index 5c768a26..59450fb9 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/handler/data/model/GenericsDataModel.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/handler/data/model/GenericsDataModel.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.common.handler.data.model; +package org.dromara.visor.framework.common.handler.data.model; import com.alibaba.fastjson.JSON; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/handler/data/strategy/AbstractGenericsDataStrategy.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/handler/data/strategy/AbstractGenericsDataStrategy.java similarity index 93% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/handler/data/strategy/AbstractGenericsDataStrategy.java rename to orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/handler/data/strategy/AbstractGenericsDataStrategy.java index 09092ba3..a96e14ea 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/handler/data/strategy/AbstractGenericsDataStrategy.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/handler/data/strategy/AbstractGenericsDataStrategy.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.common.handler.data.strategy; +package org.dromara.visor.framework.common.handler.data.strategy; import com.alibaba.fastjson.JSON; -import com.orion.visor.framework.common.handler.data.model.GenericsDataModel; +import org.dromara.visor.framework.common.handler.data.model.GenericsDataModel; /** * 标准数据处理策略 基类 diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/handler/data/strategy/GenericsDataStrategy.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/handler/data/strategy/GenericsDataStrategy.java similarity index 90% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/handler/data/strategy/GenericsDataStrategy.java rename to orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/handler/data/strategy/GenericsDataStrategy.java index 28cd6558..3459a09f 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/handler/data/strategy/GenericsDataStrategy.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/handler/data/strategy/GenericsDataStrategy.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.common.handler.data.strategy; +package org.dromara.visor.framework.common.handler.data.strategy; -import com.orion.visor.framework.common.handler.data.model.GenericsDataModel; +import org.dromara.visor.framework.common.handler.data.model.GenericsDataModel; /** * 标准数据处理策略 diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/json/filter/FieldDesensitizeFilter.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/json/filter/FieldDesensitizeFilter.java similarity index 89% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/json/filter/FieldDesensitizeFilter.java rename to orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/json/filter/FieldDesensitizeFilter.java index 82a2c226..217418d3 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/json/filter/FieldDesensitizeFilter.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/json/filter/FieldDesensitizeFilter.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.common.json.filter; +package org.dromara.visor.framework.common.json.filter; +import cn.orionsec.kit.lang.utils.Desensitizes; +import cn.orionsec.kit.lang.utils.Objects1; +import cn.orionsec.kit.lang.utils.collect.Lists; import com.alibaba.fastjson.serializer.ValueFilter; -import com.orion.lang.utils.Desensitizes; -import com.orion.lang.utils.Objects1; -import com.orion.lang.utils.collect.Lists; import java.util.List; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/json/filter/FieldIgnoreFilter.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/json/filter/FieldIgnoreFilter.java similarity index 92% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/json/filter/FieldIgnoreFilter.java rename to orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/json/filter/FieldIgnoreFilter.java index 38ac796e..8fa25b48 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/json/filter/FieldIgnoreFilter.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/json/filter/FieldIgnoreFilter.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.common.json.filter; +package org.dromara.visor.framework.common.json.filter; +import cn.orionsec.kit.lang.utils.collect.Lists; import com.alibaba.fastjson.serializer.PropertyFilter; -import com.orion.lang.utils.collect.Lists; import java.util.List; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/lock/Locker.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/lock/Locker.java similarity index 95% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/lock/Locker.java rename to orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/lock/Locker.java index d41c1b35..c748eb80 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/lock/Locker.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/lock/Locker.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.common.lock; +package org.dromara.visor.framework.common.lock; import java.util.function.Supplier; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/meta/TraceIdHolder.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/meta/TraceIdHolder.java similarity index 96% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/meta/TraceIdHolder.java rename to orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/meta/TraceIdHolder.java index c1489209..cfe23c90 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/meta/TraceIdHolder.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/meta/TraceIdHolder.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.common.meta; +package org.dromara.visor.framework.common.meta; +import cn.orionsec.kit.lang.id.UUIds; import com.alibaba.ttl.TransmittableThreadLocal; -import com.orion.lang.id.UUIds; import org.slf4j.MDC; /** diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/security/LoginUser.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/security/LoginUser.java similarity index 96% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/security/LoginUser.java rename to orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/security/LoginUser.java index d08f306a..b6e8c3aa 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/security/LoginUser.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/security/LoginUser.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.common.security; +package org.dromara.visor.framework.common.security; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/security/PasswordModifier.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/security/PasswordModifier.java similarity index 84% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/security/PasswordModifier.java rename to orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/security/PasswordModifier.java index fbc688c7..6f77c4dc 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/security/PasswordModifier.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/security/PasswordModifier.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.common.security; +package org.dromara.visor.framework.common.security; -import com.orion.lang.utils.Booleans; -import com.orion.lang.utils.Strings; -import com.orion.visor.framework.common.constant.Const; -import com.orion.visor.framework.common.utils.CryptoUtils; +import cn.orionsec.kit.lang.utils.Booleans; +import cn.orionsec.kit.lang.utils.Strings; +import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.framework.common.utils.CryptoUtils; /** * 密码修改器 diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/security/SecurityHolder.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/security/SecurityHolder.java similarity index 94% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/security/SecurityHolder.java rename to orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/security/SecurityHolder.java index 0ffccbb4..7b09891f 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/security/SecurityHolder.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/security/SecurityHolder.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.common.security; +package org.dromara.visor.framework.common.security; /** * SecurityUtils 的 bean 对象 diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/security/UpdatePasswordAction.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/security/UpdatePasswordAction.java similarity index 95% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/security/UpdatePasswordAction.java rename to orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/security/UpdatePasswordAction.java index 6b80824f..3a76f394 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/security/UpdatePasswordAction.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/security/UpdatePasswordAction.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.common.security; +package org.dromara.visor.framework.common.security; import java.io.Serializable; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/security/UserRole.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/security/UserRole.java similarity index 95% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/security/UserRole.java rename to orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/security/UserRole.java index 858e03b5..691315d1 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/security/UserRole.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/security/UserRole.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.common.security; +package org.dromara.visor.framework.common.security; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/thread/ThreadPoolMdcTaskExecutor.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/thread/ThreadPoolMdcTaskExecutor.java similarity index 92% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/thread/ThreadPoolMdcTaskExecutor.java rename to orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/thread/ThreadPoolMdcTaskExecutor.java index 2398ecac..7011bd33 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/thread/ThreadPoolMdcTaskExecutor.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/thread/ThreadPoolMdcTaskExecutor.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.common.thread; +package org.dromara.visor.framework.common.thread; -import com.orion.visor.framework.common.utils.ThreadMdcUtils; +import org.dromara.visor.framework.common.utils.ThreadMdcUtils; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import java.util.concurrent.Callable; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/utils/ConfigUtils.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/ConfigUtils.java similarity index 94% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/utils/ConfigUtils.java rename to orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/ConfigUtils.java index 6bb7236c..53245559 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/utils/ConfigUtils.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/ConfigUtils.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.common.utils; +package org.dromara.visor.framework.common.utils; -import com.orion.lang.constant.Const; +import cn.orionsec.kit.lang.constant.Const; import java.util.Arrays; import java.util.List; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/utils/CryptoUtils.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/CryptoUtils.java similarity index 95% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/utils/CryptoUtils.java rename to orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/CryptoUtils.java index 14842110..ad9736c8 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/utils/CryptoUtils.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/CryptoUtils.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.common.utils; +package org.dromara.visor.framework.common.utils; -import com.orion.lang.utils.Exceptions; -import com.orion.visor.framework.common.crypto.ValueCrypto; +import cn.orionsec.kit.lang.utils.Exceptions; +import org.dromara.visor.framework.common.crypto.ValueCrypto; /** * 加密工具类 diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/utils/FileClientUtils.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/FileClientUtils.java similarity index 97% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/utils/FileClientUtils.java rename to orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/FileClientUtils.java index 1f0889f9..df82f86d 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/utils/FileClientUtils.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/FileClientUtils.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.common.utils; +package org.dromara.visor.framework.common.utils; -import com.orion.lang.utils.Exceptions; -import com.orion.visor.framework.common.file.FileClient; +import cn.orionsec.kit.lang.utils.Exceptions; +import org.dromara.visor.framework.common.file.FileClient; import java.io.InputStream; import java.io.OutputStream; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/utils/FileNames.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/FileNames.java similarity index 87% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/utils/FileNames.java rename to orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/FileNames.java index d6ee0408..425b187e 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/utils/FileNames.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/FileNames.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.common.utils; +package org.dromara.visor.framework.common.utils; -import com.orion.lang.utils.time.Dates; -import com.orion.visor.framework.common.constant.Const; +import cn.orionsec.kit.lang.utils.time.Dates; +import org.dromara.visor.framework.common.constant.Const; /** * 文件名称 diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/utils/IpUtils.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/IpUtils.java similarity index 91% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/utils/IpUtils.java rename to orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/IpUtils.java index 569d2f7d..d379f540 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/utils/IpUtils.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/IpUtils.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.common.utils; +package org.dromara.visor.framework.common.utils; -import com.orion.ext.location.Region; -import com.orion.ext.location.region.LocationRegions; -import com.orion.visor.framework.common.constant.Const; -import com.orion.web.servlet.web.Servlets; +import cn.orionsec.kit.ext.location.Region; +import cn.orionsec.kit.ext.location.region.LocationRegions; +import cn.orionsec.kit.web.servlet.web.Servlets; +import org.dromara.visor.framework.common.constant.Const; import javax.servlet.http.HttpServletRequest; import java.util.HashMap; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/utils/LockerUtils.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/LockerUtils.java similarity index 91% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/utils/LockerUtils.java rename to orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/LockerUtils.java index d10b7528..79909c50 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/utils/LockerUtils.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/LockerUtils.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.common.utils; +package org.dromara.visor.framework.common.utils; -import com.orion.lang.utils.Exceptions; -import com.orion.visor.framework.common.lock.Locker; +import cn.orionsec.kit.lang.utils.Exceptions; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.common.lock.Locker; import java.util.function.Supplier; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/utils/PathUtils.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/PathUtils.java similarity index 91% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/utils/PathUtils.java rename to orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/PathUtils.java index 43e3373c..e5fbe3cd 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/utils/PathUtils.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/PathUtils.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.common.utils; +package org.dromara.visor.framework.common.utils; -import com.orion.lang.utils.Objects1; -import com.orion.lang.utils.Systems; -import com.orion.lang.utils.io.Files1; -import com.orion.visor.framework.common.constant.AppConst; -import com.orion.visor.framework.common.constant.Const; +import cn.orionsec.kit.lang.utils.Objects1; +import cn.orionsec.kit.lang.utils.Systems; +import cn.orionsec.kit.lang.utils.io.Files1; +import org.dromara.visor.framework.common.constant.AppConst; +import org.dromara.visor.framework.common.constant.Const; /** * 路径工具类 diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/utils/Requests.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/Requests.java similarity index 88% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/utils/Requests.java rename to orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/Requests.java index bb526352..ddb8fee5 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/utils/Requests.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/Requests.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.common.utils; +package org.dromara.visor.framework.common.utils; -import com.orion.visor.framework.common.entity.RequestIdentity; -import com.orion.visor.framework.common.entity.RequestIdentityModel; -import com.orion.web.servlet.web.Servlets; +import cn.orionsec.kit.web.servlet.web.Servlets; +import org.dromara.visor.framework.common.entity.RequestIdentity; +import org.dromara.visor.framework.common.entity.RequestIdentityModel; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/utils/SqlUtils.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/SqlUtils.java similarity index 92% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/utils/SqlUtils.java rename to orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/SqlUtils.java index 29427d31..c7582381 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/utils/SqlUtils.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/SqlUtils.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.common.utils; +package org.dromara.visor.framework.common.utils; -import com.orion.visor.framework.common.constant.Const; +import org.dromara.visor.framework.common.constant.Const; /** * sql 工具类 diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/utils/SwaggerUtils.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/SwaggerUtils.java similarity index 88% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/utils/SwaggerUtils.java rename to orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/SwaggerUtils.java index c6ff0a30..67eb8fcc 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/utils/SwaggerUtils.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/SwaggerUtils.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.common.utils; +package org.dromara.visor.framework.common.utils; -import com.orion.lang.utils.collect.Maps; -import com.orion.lang.utils.reflect.Annotations; -import com.orion.visor.framework.common.constant.Const; +import cn.orionsec.kit.lang.utils.collect.Maps; +import cn.orionsec.kit.lang.utils.reflect.Annotations; import io.swagger.v3.oas.annotations.Operation; +import org.dromara.visor.framework.common.constant.Const; import java.lang.reflect.Method; import java.util.Map; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/utils/ThreadMdcUtils.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/ThreadMdcUtils.java similarity index 95% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/utils/ThreadMdcUtils.java rename to orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/ThreadMdcUtils.java index d11e5d63..a98e6d6f 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/utils/ThreadMdcUtils.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/ThreadMdcUtils.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.common.utils; +package org.dromara.visor.framework.common.utils; -import com.orion.visor.framework.common.meta.TraceIdHolder; +import org.dromara.visor.framework.common.meta.TraceIdHolder; import org.slf4j.MDC; import java.util.Map; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/utils/TreeUtils.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/TreeUtils.java similarity index 93% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/utils/TreeUtils.java rename to orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/TreeUtils.java index 42a839cc..202cd55c 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/utils/TreeUtils.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/TreeUtils.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.common.utils; +package org.dromara.visor.framework.common.utils; -import com.orion.lang.utils.collect.Lists; -import com.orion.visor.framework.common.constant.Const; -import com.orion.visor.framework.common.entity.TreeNode; +import cn.orionsec.kit.lang.utils.collect.Lists; +import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.framework.common.entity.TreeNode; import java.util.Comparator; import java.util.List; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/utils/Valid.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/Valid.java similarity index 92% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/utils/Valid.java rename to orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/Valid.java index 6149d6fd..4a730011 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/utils/Valid.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/Valid.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.common.utils; +package org.dromara.visor.framework.common.utils; -import com.orion.lang.utils.Arrays1; -import com.orion.lang.utils.io.Files1; -import com.orion.spring.SpringHolder; -import com.orion.visor.framework.common.constant.ErrorMessage; +import cn.orionsec.kit.lang.utils.Arrays1; +import cn.orionsec.kit.lang.utils.io.Files1; +import cn.orionsec.kit.spring.SpringHolder; +import org.dromara.visor.framework.common.constant.ErrorMessage; import javax.validation.ConstraintViolation; import javax.validation.ConstraintViolationException; @@ -35,7 +35,7 @@ import java.util.function.Function; * @version 1.0.0 * @since 2023/7/18 11:23 */ -public class Valid extends com.orion.lang.utils.Valid { +public class Valid extends cn.orionsec.kit.lang.utils.Valid { private static final Validator VALIDATOR = SpringHolder.getBean(Validator.class); diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/validator/group/Batch.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/validator/group/Batch.java similarity index 92% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/validator/group/Batch.java rename to orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/validator/group/Batch.java index b0e2f197..b2a071f6 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/validator/group/Batch.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/validator/group/Batch.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.common.validator.group; +package org.dromara.visor.framework.common.validator.group; /** * 批量验证分组 diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/validator/group/Clear.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/validator/group/Clear.java similarity index 92% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/validator/group/Clear.java rename to orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/validator/group/Clear.java index cc551a6e..a1b13f81 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/validator/group/Clear.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/validator/group/Clear.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.common.validator.group; +package org.dromara.visor.framework.common.validator.group; /** * 清理验证分组 diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/validator/group/Export.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/validator/group/Export.java similarity index 92% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/validator/group/Export.java rename to orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/validator/group/Export.java index 164a61be..5567fc76 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/validator/group/Export.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/validator/group/Export.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.common.validator.group; +package org.dromara.visor.framework.common.validator.group; /** * 导出验证分组 diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/validator/group/Id.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/validator/group/Id.java similarity index 92% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/validator/group/Id.java rename to orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/validator/group/Id.java index 15cacefd..ea7d8852 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/validator/group/Id.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/validator/group/Id.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.common.validator.group; +package org.dromara.visor.framework.common.validator.group; /** * 分页验证分组 diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/validator/group/Import.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/validator/group/Import.java similarity index 92% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/validator/group/Import.java rename to orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/validator/group/Import.java index c9d8ec38..784cc368 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/validator/group/Import.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/validator/group/Import.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.common.validator.group; +package org.dromara.visor.framework.common.validator.group; /** * 导出验证分组 diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/validator/group/Page.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/validator/group/Page.java similarity index 92% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/validator/group/Page.java rename to orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/validator/group/Page.java index b0774853..115449c2 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/validator/group/Page.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/validator/group/Page.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.common.validator.group; +package org.dromara.visor.framework.common.validator.group; /** * 分页验证分组 diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/web/filter/FilterCreator.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/web/filter/FilterCreator.java similarity index 95% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/web/filter/FilterCreator.java rename to orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/web/filter/FilterCreator.java index 59396ea1..301c8c64 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/web/filter/FilterCreator.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/web/filter/FilterCreator.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.common.web.filter; +package org.dromara.visor.framework.common.web.filter; import org.springframework.boot.web.servlet.FilterRegistrationBean; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/orion-visor-framework/orion-visor-framework-common/src/main/resources/META-INF/additional-spring-configuration-metadata.json index e8e6d292..5381052c 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/orion-visor-framework/orion-visor-framework-common/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -2,8 +2,8 @@ "groups": [ { "name": "orion.async.executor", - "type": "com.orion.visor.framework.common.configuration.config.AsyncExecutorConfig", - "sourceType": "com.orion.visor.framework.common.configuration.config.AsyncExecutorConfig" + "type": "org.dromara.visor.framework.common.configuration.config.AsyncExecutorConfig", + "sourceType": "org.dromara.visor.framework.common.configuration.config.AsyncExecutorConfig" } ], "properties": [ diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/orion-visor-framework/orion-visor-framework-common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 7bb4c20c..455845f5 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/orion-visor-framework/orion-visor-framework-common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -com.orion.visor.framework.common.configuration.OrionCommonAutoConfiguration \ No newline at end of file +org.dromara.visor.framework.common.configuration.OrionCommonAutoConfiguration \ No newline at end of file diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-banner/pom.xml b/orion-visor-framework/orion-visor-spring-boot-starter-banner/pom.xml index a650c6d2..9fc7bce2 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-banner/pom.xml +++ b/orion-visor-framework/orion-visor-spring-boot-starter-banner/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - com.orion.visor + org.dromara.visor orion-visor-framework ${revision} @@ -18,7 +18,7 @@ - com.orion.visor + org.dromara.visor orion-visor-framework-common diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-banner/src/main/java/com/orion/visor/framework/banner/configuration/OrionBannerAutoConfiguration.java b/orion-visor-framework/orion-visor-spring-boot-starter-banner/src/main/java/org/dromara/visor/framework/banner/configuration/OrionBannerAutoConfiguration.java similarity index 85% rename from orion-visor-framework/orion-visor-spring-boot-starter-banner/src/main/java/com/orion/visor/framework/banner/configuration/OrionBannerAutoConfiguration.java rename to orion-visor-framework/orion-visor-spring-boot-starter-banner/src/main/java/org/dromara/visor/framework/banner/configuration/OrionBannerAutoConfiguration.java index e7a12d08..a1eafb66 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-banner/src/main/java/com/orion/visor/framework/banner/configuration/OrionBannerAutoConfiguration.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-banner/src/main/java/org/dromara/visor/framework/banner/configuration/OrionBannerAutoConfiguration.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.banner.configuration; +package org.dromara.visor.framework.banner.configuration; -import com.orion.visor.framework.banner.core.runner.BannerApplicationRunner; -import com.orion.visor.framework.common.constant.AutoConfigureOrderConst; +import org.dromara.visor.framework.banner.core.runner.BannerApplicationRunner; +import org.dromara.visor.framework.common.constant.AutoConfigureOrderConst; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigureOrder; import org.springframework.context.annotation.Bean; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-banner/src/main/java/com/orion/visor/framework/banner/core/runner/BannerApplicationRunner.java b/orion-visor-framework/orion-visor-spring-boot-starter-banner/src/main/java/org/dromara/visor/framework/banner/core/runner/BannerApplicationRunner.java similarity index 94% rename from orion-visor-framework/orion-visor-spring-boot-starter-banner/src/main/java/com/orion/visor/framework/banner/core/runner/BannerApplicationRunner.java rename to orion-visor-framework/orion-visor-spring-boot-starter-banner/src/main/java/org/dromara/visor/framework/banner/core/runner/BannerApplicationRunner.java index 0219090d..b663d487 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-banner/src/main/java/com/orion/visor/framework/banner/core/runner/BannerApplicationRunner.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-banner/src/main/java/org/dromara/visor/framework/banner/core/runner/BannerApplicationRunner.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.banner.core.runner; +package org.dromara.visor.framework.banner.core.runner; -import com.orion.lang.utils.Threads; -import com.orion.lang.utils.ansi.AnsiAppender; -import com.orion.lang.utils.ansi.style.color.AnsiForeground; +import cn.orionsec.kit.lang.utils.Threads; +import cn.orionsec.kit.lang.utils.ansi.AnsiAppender; +import cn.orionsec.kit.lang.utils.ansi.style.color.AnsiForeground; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.ApplicationArguments; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-banner/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/orion-visor-framework/orion-visor-spring-boot-starter-banner/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 6724a5a7..8d7dd9b1 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-banner/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/orion-visor-framework/orion-visor-spring-boot-starter-banner/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -com.orion.visor.framework.banner.configuration.OrionBannerAutoConfiguration \ No newline at end of file +org.dromara.visor.framework.banner.configuration.OrionBannerAutoConfiguration \ No newline at end of file diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/pom.xml b/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/pom.xml index 3859eaa3..e738642b 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/pom.xml +++ b/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - com.orion.visor + org.dromara.visor orion-visor-framework ${revision} @@ -18,7 +18,7 @@ - com.orion.visor + org.dromara.visor orion-visor-framework-common diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/com/orion/visor/framework/biz/operator/log/configuration/OrionOperatorLogAutoConfiguration.java b/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/configuration/OrionOperatorLogAutoConfiguration.java similarity index 78% rename from orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/com/orion/visor/framework/biz/operator/log/configuration/OrionOperatorLogAutoConfiguration.java rename to orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/configuration/OrionOperatorLogAutoConfiguration.java index f0217a66..b8625d63 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/com/orion/visor/framework/biz/operator/log/configuration/OrionOperatorLogAutoConfiguration.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/configuration/OrionOperatorLogAutoConfiguration.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.biz.operator.log.configuration; +package org.dromara.visor.framework.biz.operator.log.configuration; import com.alibaba.fastjson.serializer.SerializeFilter; import com.alibaba.fastjson.serializer.ValueFilter; -import com.orion.visor.framework.biz.operator.log.configuration.config.OperatorLogConfig; -import com.orion.visor.framework.biz.operator.log.core.aspect.OperatorLogAspect; -import com.orion.visor.framework.biz.operator.log.core.service.OperatorLogFrameworkService; -import com.orion.visor.framework.biz.operator.log.core.service.OperatorLogFrameworkServiceDelegate; -import com.orion.visor.framework.biz.operator.log.core.utils.OperatorLogFiller; -import com.orion.visor.framework.biz.operator.log.core.utils.OperatorLogs; -import com.orion.visor.framework.common.constant.AutoConfigureOrderConst; -import com.orion.visor.framework.common.json.filter.FieldDesensitizeFilter; -import com.orion.visor.framework.common.json.filter.FieldIgnoreFilter; +import org.dromara.visor.framework.biz.operator.log.configuration.config.OperatorLogConfig; +import org.dromara.visor.framework.biz.operator.log.core.aspect.OperatorLogAspect; +import org.dromara.visor.framework.biz.operator.log.core.service.OperatorLogFrameworkService; +import org.dromara.visor.framework.biz.operator.log.core.service.OperatorLogFrameworkServiceDelegate; +import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogFiller; +import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; +import org.dromara.visor.framework.common.constant.AutoConfigureOrderConst; +import org.dromara.visor.framework.common.json.filter.FieldDesensitizeFilter; +import org.dromara.visor.framework.common.json.filter.FieldIgnoreFilter; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigureOrder; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/com/orion/visor/framework/biz/operator/log/configuration/config/OperatorLogConfig.java b/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/configuration/config/OperatorLogConfig.java similarity index 92% rename from orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/com/orion/visor/framework/biz/operator/log/configuration/config/OperatorLogConfig.java rename to orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/configuration/config/OperatorLogConfig.java index 49581962..fd3cec52 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/com/orion/visor/framework/biz/operator/log/configuration/config/OperatorLogConfig.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/configuration/config/OperatorLogConfig.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.biz.operator.log.configuration.config; +package org.dromara.visor.framework.biz.operator.log.configuration.config; -import com.orion.visor.framework.common.utils.ConfigUtils; import lombok.Data; +import org.dromara.visor.framework.common.utils.ConfigUtils; import org.springframework.boot.context.properties.ConfigurationProperties; import java.util.List; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/com/orion/visor/framework/biz/operator/log/core/annotation/IgnoreParameter.java b/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/core/annotation/IgnoreParameter.java similarity index 92% rename from orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/com/orion/visor/framework/biz/operator/log/core/annotation/IgnoreParameter.java rename to orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/core/annotation/IgnoreParameter.java index b11ba8d6..a92ff185 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/com/orion/visor/framework/biz/operator/log/core/annotation/IgnoreParameter.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/core/annotation/IgnoreParameter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.biz.operator.log.core.annotation; +package org.dromara.visor.framework.biz.operator.log.core.annotation; import java.lang.annotation.*; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/com/orion/visor/framework/biz/operator/log/core/annotation/Module.java b/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/core/annotation/Module.java similarity index 93% rename from orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/com/orion/visor/framework/biz/operator/log/core/annotation/Module.java rename to orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/core/annotation/Module.java index b6735c90..85128093 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/com/orion/visor/framework/biz/operator/log/core/annotation/Module.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/core/annotation/Module.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.biz.operator.log.core.annotation; +package org.dromara.visor.framework.biz.operator.log.core.annotation; import org.springframework.stereotype.Component; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/com/orion/visor/framework/biz/operator/log/core/annotation/OperatorLog.java b/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/core/annotation/OperatorLog.java similarity index 91% rename from orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/com/orion/visor/framework/biz/operator/log/core/annotation/OperatorLog.java rename to orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/core/annotation/OperatorLog.java index f3788a17..268de651 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/com/orion/visor/framework/biz/operator/log/core/annotation/OperatorLog.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/core/annotation/OperatorLog.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.biz.operator.log.core.annotation; +package org.dromara.visor.framework.biz.operator.log.core.annotation; -import com.orion.visor.framework.biz.operator.log.core.enums.ReturnType; +import org.dromara.visor.framework.biz.operator.log.core.enums.ReturnType; import java.lang.annotation.*; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/com/orion/visor/framework/biz/operator/log/core/aspect/OperatorLogAspect.java b/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/core/aspect/OperatorLogAspect.java similarity index 87% rename from orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/com/orion/visor/framework/biz/operator/log/core/aspect/OperatorLogAspect.java rename to orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/core/aspect/OperatorLogAspect.java index 29171c02..fddf47ec 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/com/orion/visor/framework/biz/operator/log/core/aspect/OperatorLogAspect.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/core/aspect/OperatorLogAspect.java @@ -13,27 +13,27 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.biz.operator.log.core.aspect; +package org.dromara.visor.framework.biz.operator.log.core.aspect; -import com.orion.lang.define.thread.ExecutorBuilder; -import com.orion.lang.utils.Arrays1; -import com.orion.lang.utils.Strings; -import com.orion.visor.framework.biz.operator.log.core.annotation.IgnoreParameter; -import com.orion.visor.framework.biz.operator.log.core.annotation.OperatorLog; -import com.orion.visor.framework.biz.operator.log.core.factory.OperatorTypeHolder; -import com.orion.visor.framework.biz.operator.log.core.model.OperatorLogModel; -import com.orion.visor.framework.biz.operator.log.core.model.OperatorType; -import com.orion.visor.framework.biz.operator.log.core.service.OperatorLogFrameworkService; -import com.orion.visor.framework.biz.operator.log.core.utils.OperatorLogFiller; -import com.orion.visor.framework.biz.operator.log.core.utils.OperatorLogs; -import com.orion.visor.framework.common.constant.BeanOrderConst; -import com.orion.visor.framework.common.security.LoginUser; -import com.orion.visor.framework.common.security.SecurityHolder; +import cn.orionsec.kit.lang.define.thread.ExecutorBuilder; +import cn.orionsec.kit.lang.utils.Arrays1; +import cn.orionsec.kit.lang.utils.Strings; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.reflect.MethodSignature; +import org.dromara.visor.framework.biz.operator.log.core.annotation.IgnoreParameter; +import org.dromara.visor.framework.biz.operator.log.core.annotation.OperatorLog; +import org.dromara.visor.framework.biz.operator.log.core.factory.OperatorTypeHolder; +import org.dromara.visor.framework.biz.operator.log.core.model.OperatorLogModel; +import org.dromara.visor.framework.biz.operator.log.core.model.OperatorType; +import org.dromara.visor.framework.biz.operator.log.core.service.OperatorLogFrameworkService; +import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogFiller; +import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; +import org.dromara.visor.framework.common.constant.BeanOrderConst; +import org.dromara.visor.framework.common.security.LoginUser; +import org.dromara.visor.framework.common.security.SecurityHolder; import org.springframework.core.annotation.Order; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/com/orion/visor/framework/biz/operator/log/core/enums/OperatorRiskLevel.java b/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/core/enums/OperatorRiskLevel.java similarity index 93% rename from orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/com/orion/visor/framework/biz/operator/log/core/enums/OperatorRiskLevel.java rename to orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/core/enums/OperatorRiskLevel.java index 1b7f1564..1549b075 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/com/orion/visor/framework/biz/operator/log/core/enums/OperatorRiskLevel.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/core/enums/OperatorRiskLevel.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.biz.operator.log.core.enums; +package org.dromara.visor.framework.biz.operator.log.core.enums; import lombok.Getter; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/com/orion/visor/framework/biz/operator/log/core/enums/ReturnType.java b/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/core/enums/ReturnType.java similarity index 93% rename from orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/com/orion/visor/framework/biz/operator/log/core/enums/ReturnType.java rename to orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/core/enums/ReturnType.java index 99353c50..f19797d1 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/com/orion/visor/framework/biz/operator/log/core/enums/ReturnType.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/core/enums/ReturnType.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.biz.operator.log.core.enums; +package org.dromara.visor.framework.biz.operator.log.core.enums; /** * 返回值类型 diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/com/orion/visor/framework/biz/operator/log/core/factory/InitializingOperatorTypes.java b/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/core/factory/InitializingOperatorTypes.java similarity index 84% rename from orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/com/orion/visor/framework/biz/operator/log/core/factory/InitializingOperatorTypes.java rename to orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/core/factory/InitializingOperatorTypes.java index 6d5eb6bd..431f56db 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/com/orion/visor/framework/biz/operator/log/core/factory/InitializingOperatorTypes.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/core/factory/InitializingOperatorTypes.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.biz.operator.log.core.factory; +package org.dromara.visor.framework.biz.operator.log.core.factory; -import com.orion.lang.utils.Arrays1; -import com.orion.visor.framework.biz.operator.log.core.annotation.Module; -import com.orion.visor.framework.biz.operator.log.core.model.OperatorType; +import cn.orionsec.kit.lang.utils.Arrays1; +import org.dromara.visor.framework.biz.operator.log.core.annotation.Module; +import org.dromara.visor.framework.biz.operator.log.core.model.OperatorType; import javax.annotation.PostConstruct; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/com/orion/visor/framework/biz/operator/log/core/factory/OperatorTypeDefinition.java b/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/core/factory/OperatorTypeDefinition.java similarity index 86% rename from orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/com/orion/visor/framework/biz/operator/log/core/factory/OperatorTypeDefinition.java rename to orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/core/factory/OperatorTypeDefinition.java index d8d7c856..8a065e52 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/com/orion/visor/framework/biz/operator/log/core/factory/OperatorTypeDefinition.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/core/factory/OperatorTypeDefinition.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.biz.operator.log.core.factory; +package org.dromara.visor.framework.biz.operator.log.core.factory; -import com.orion.visor.framework.biz.operator.log.core.model.OperatorType; +import org.dromara.visor.framework.biz.operator.log.core.model.OperatorType; /** * 操作类型定义 diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/com/orion/visor/framework/biz/operator/log/core/factory/OperatorTypeHolder.java b/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/core/factory/OperatorTypeHolder.java similarity index 90% rename from orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/com/orion/visor/framework/biz/operator/log/core/factory/OperatorTypeHolder.java rename to orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/core/factory/OperatorTypeHolder.java index 5640a6d4..d5c2f89d 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/com/orion/visor/framework/biz/operator/log/core/factory/OperatorTypeHolder.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/core/factory/OperatorTypeHolder.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.biz.operator.log.core.factory; +package org.dromara.visor.framework.biz.operator.log.core.factory; -import com.orion.visor.framework.biz.operator.log.core.model.OperatorType; +import org.dromara.visor.framework.biz.operator.log.core.model.OperatorType; import java.util.HashMap; import java.util.Map; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/com/orion/visor/framework/biz/operator/log/core/model/OperatorLogModel.java b/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/core/model/OperatorLogModel.java similarity index 93% rename from orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/com/orion/visor/framework/biz/operator/log/core/model/OperatorLogModel.java rename to orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/core/model/OperatorLogModel.java index 992e4dd9..484dae76 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/com/orion/visor/framework/biz/operator/log/core/model/OperatorLogModel.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/core/model/OperatorLogModel.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.biz.operator.log.core.model; +package org.dromara.visor.framework.biz.operator.log.core.model; -import com.orion.visor.framework.common.entity.RequestIdentity; import lombok.Data; +import org.dromara.visor.framework.common.entity.RequestIdentity; import java.util.Date; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/com/orion/visor/framework/biz/operator/log/core/model/OperatorType.java b/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/core/model/OperatorType.java similarity index 91% rename from orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/com/orion/visor/framework/biz/operator/log/core/model/OperatorType.java rename to orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/core/model/OperatorType.java index 736be460..9d3cb6ec 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/com/orion/visor/framework/biz/operator/log/core/model/OperatorType.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/core/model/OperatorType.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.biz.operator.log.core.model; +package org.dromara.visor.framework.biz.operator.log.core.model; -import com.orion.visor.framework.biz.operator.log.core.enums.OperatorRiskLevel; import lombok.Getter; +import org.dromara.visor.framework.biz.operator.log.core.enums.OperatorRiskLevel; /** * 操作类型定义 diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/com/orion/visor/framework/biz/operator/log/core/service/OperatorLogFrameworkService.java b/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/core/service/OperatorLogFrameworkService.java similarity index 86% rename from orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/com/orion/visor/framework/biz/operator/log/core/service/OperatorLogFrameworkService.java rename to orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/core/service/OperatorLogFrameworkService.java index 001749df..459b3995 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/com/orion/visor/framework/biz/operator/log/core/service/OperatorLogFrameworkService.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/core/service/OperatorLogFrameworkService.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.biz.operator.log.core.service; +package org.dromara.visor.framework.biz.operator.log.core.service; -import com.orion.visor.framework.biz.operator.log.core.model.OperatorLogModel; +import org.dromara.visor.framework.biz.operator.log.core.model.OperatorLogModel; /** * 操作日志框架服务 diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/com/orion/visor/framework/biz/operator/log/core/service/OperatorLogFrameworkServiceDelegate.java b/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/core/service/OperatorLogFrameworkServiceDelegate.java similarity index 89% rename from orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/com/orion/visor/framework/biz/operator/log/core/service/OperatorLogFrameworkServiceDelegate.java rename to orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/core/service/OperatorLogFrameworkServiceDelegate.java index f65e1019..b1d81432 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/com/orion/visor/framework/biz/operator/log/core/service/OperatorLogFrameworkServiceDelegate.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/core/service/OperatorLogFrameworkServiceDelegate.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.biz.operator.log.core.service; +package org.dromara.visor.framework.biz.operator.log.core.service; -import com.orion.visor.framework.biz.operator.log.core.model.OperatorLogModel; +import org.dromara.visor.framework.biz.operator.log.core.model.OperatorLogModel; /** * 操作日志框架服务 委托类 diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/com/orion/visor/framework/biz/operator/log/core/utils/OperatorLogFiller.java b/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/core/utils/OperatorLogFiller.java similarity index 88% rename from orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/com/orion/visor/framework/biz/operator/log/core/utils/OperatorLogFiller.java rename to orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/core/utils/OperatorLogFiller.java index d8974cc6..efb9f8d9 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/com/orion/visor/framework/biz/operator/log/core/utils/OperatorLogFiller.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/core/utils/OperatorLogFiller.java @@ -13,25 +13,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.biz.operator.log.core.utils; +package org.dromara.visor.framework.biz.operator.log.core.utils; +import cn.orionsec.kit.lang.able.Gettable; +import cn.orionsec.kit.lang.utils.Exceptions; +import cn.orionsec.kit.lang.utils.Refs; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.json.matcher.ReplacementFormatters; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.serializer.SerializeFilter; -import com.orion.lang.able.Gettable; -import com.orion.lang.utils.Exceptions; -import com.orion.lang.utils.Refs; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.json.matcher.ReplacementFormatters; -import com.orion.visor.framework.biz.operator.log.configuration.config.OperatorLogConfig; -import com.orion.visor.framework.biz.operator.log.core.enums.ReturnType; -import com.orion.visor.framework.biz.operator.log.core.factory.OperatorTypeHolder; -import com.orion.visor.framework.biz.operator.log.core.model.OperatorLogModel; -import com.orion.visor.framework.biz.operator.log.core.model.OperatorType; -import com.orion.visor.framework.common.entity.RequestIdentity; -import com.orion.visor.framework.common.enums.BooleanBit; -import com.orion.visor.framework.common.meta.TraceIdHolder; -import com.orion.visor.framework.common.security.LoginUser; -import com.orion.visor.framework.common.utils.Requests; +import org.dromara.visor.framework.biz.operator.log.configuration.config.OperatorLogConfig; +import org.dromara.visor.framework.biz.operator.log.core.enums.ReturnType; +import org.dromara.visor.framework.biz.operator.log.core.factory.OperatorTypeHolder; +import org.dromara.visor.framework.biz.operator.log.core.model.OperatorLogModel; +import org.dromara.visor.framework.biz.operator.log.core.model.OperatorType; +import org.dromara.visor.framework.common.entity.RequestIdentity; +import org.dromara.visor.framework.common.enums.BooleanBit; +import org.dromara.visor.framework.common.meta.TraceIdHolder; +import org.dromara.visor.framework.common.security.LoginUser; +import org.dromara.visor.framework.common.utils.Requests; import java.util.Date; import java.util.Map; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/com/orion/visor/framework/biz/operator/log/core/utils/OperatorLogs.java b/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/core/utils/OperatorLogs.java similarity index 93% rename from orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/com/orion/visor/framework/biz/operator/log/core/utils/OperatorLogs.java rename to orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/core/utils/OperatorLogs.java index b4070bf1..539a2435 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/com/orion/visor/framework/biz/operator/log/core/utils/OperatorLogs.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/core/utils/OperatorLogs.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.biz.operator.log.core.utils; +package org.dromara.visor.framework.biz.operator.log.core.utils; +import cn.orionsec.kit.lang.utils.Exceptions; +import cn.orionsec.kit.lang.utils.collect.Maps; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.serializer.SerializeFilter; -import com.orion.lang.utils.Exceptions; -import com.orion.lang.utils.collect.Maps; -import com.orion.visor.framework.common.constant.ExtraFieldConst; -import com.orion.visor.framework.common.security.LoginUser; +import org.dromara.visor.framework.common.constant.ExtraFieldConst; +import org.dromara.visor.framework.common.security.LoginUser; import java.util.Map; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/resources/META-INF/additional-spring-configuration-metadata.json index eaaf0cee..2c27acb8 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -2,8 +2,8 @@ "groups": [ { "name": "orion.operator-log", - "type": "com.orion.visor.framework.biz.operator.log.configuration.config.OperatorLogConfig", - "sourceType": "com.orion.visor.framework.biz.operator.log.configuration.config.OperatorLogConfig" + "type": "org.dromara.visor.framework.biz.operator.log.configuration.config.OperatorLogConfig", + "sourceType": "org.dromara.visor.framework.biz.operator.log.configuration.config.OperatorLogConfig" } ], "properties": [ diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index aeea1b23..bd5d1364 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -com.orion.visor.framework.biz.operator.log.configuration.OrionOperatorLogAutoConfiguration \ No newline at end of file +org.dromara.visor.framework.biz.operator.log.configuration.OrionOperatorLogAutoConfiguration \ No newline at end of file diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-datasource/pom.xml b/orion-visor-framework/orion-visor-spring-boot-starter-datasource/pom.xml index 137ceed3..3571a237 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-datasource/pom.xml +++ b/orion-visor-framework/orion-visor-spring-boot-starter-datasource/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - com.orion.visor + org.dromara.visor orion-visor-framework ${revision} @@ -18,7 +18,7 @@ - com.orion.visor + org.dromara.visor orion-visor-framework-common diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-datasource/src/main/java/com/orion/visor/framework/datasource/configuration/OrionDataSourceAutoConfiguration.java b/orion-visor-framework/orion-visor-spring-boot-starter-datasource/src/main/java/org/dromara/visor/framework/datasource/configuration/OrionDataSourceAutoConfiguration.java similarity index 92% rename from orion-visor-framework/orion-visor-spring-boot-starter-datasource/src/main/java/com/orion/visor/framework/datasource/configuration/OrionDataSourceAutoConfiguration.java rename to orion-visor-framework/orion-visor-spring-boot-starter-datasource/src/main/java/org/dromara/visor/framework/datasource/configuration/OrionDataSourceAutoConfiguration.java index fd4dd02d..614acaaf 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-datasource/src/main/java/com/orion/visor/framework/datasource/configuration/OrionDataSourceAutoConfiguration.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-datasource/src/main/java/org/dromara/visor/framework/datasource/configuration/OrionDataSourceAutoConfiguration.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.datasource.configuration; +package org.dromara.visor.framework.datasource.configuration; import com.alibaba.druid.spring.boot.autoconfigure.properties.DruidStatProperties; -import com.orion.visor.framework.common.constant.AutoConfigureOrderConst; -import com.orion.visor.framework.datasource.core.filter.DruidAdRemoveFilter; +import org.dromara.visor.framework.common.constant.AutoConfigureOrderConst; +import org.dromara.visor.framework.datasource.core.filter.DruidAdRemoveFilter; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigureOrder; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-datasource/src/main/java/com/orion/visor/framework/datasource/core/filter/DruidAdRemoveFilter.java b/orion-visor-framework/orion-visor-spring-boot-starter-datasource/src/main/java/org/dromara/visor/framework/datasource/core/filter/DruidAdRemoveFilter.java similarity index 96% rename from orion-visor-framework/orion-visor-spring-boot-starter-datasource/src/main/java/com/orion/visor/framework/datasource/core/filter/DruidAdRemoveFilter.java rename to orion-visor-framework/orion-visor-spring-boot-starter-datasource/src/main/java/org/dromara/visor/framework/datasource/core/filter/DruidAdRemoveFilter.java index 543197fa..8db34875 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-datasource/src/main/java/com/orion/visor/framework/datasource/core/filter/DruidAdRemoveFilter.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-datasource/src/main/java/org/dromara/visor/framework/datasource/core/filter/DruidAdRemoveFilter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.datasource.core.filter; +package org.dromara.visor.framework.datasource.core.filter; import com.alibaba.druid.util.Utils; import org.springframework.web.filter.OncePerRequestFilter; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-datasource/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/orion-visor-framework/orion-visor-spring-boot-starter-datasource/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 6772bd05..24b33609 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-datasource/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/orion-visor-framework/orion-visor-spring-boot-starter-datasource/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -com.orion.visor.framework.datasource.configuration.OrionDataSourceAutoConfiguration \ No newline at end of file +org.dromara.visor.framework.datasource.configuration.OrionDataSourceAutoConfiguration \ No newline at end of file diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-desensitize/pom.xml b/orion-visor-framework/orion-visor-spring-boot-starter-desensitize/pom.xml index db012646..d3e280ae 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-desensitize/pom.xml +++ b/orion-visor-framework/orion-visor-spring-boot-starter-desensitize/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - com.orion.visor + org.dromara.visor orion-visor-framework ${revision} @@ -18,7 +18,7 @@ - com.orion.visor + org.dromara.visor orion-visor-framework-common diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-desensitize/src/main/java/com/orion/visor/framework/desensitize/configuration/OrionDesensitizeAutoConfiguration.java b/orion-visor-framework/orion-visor-spring-boot-starter-desensitize/src/main/java/org/dromara/visor/framework/desensitize/configuration/OrionDesensitizeAutoConfiguration.java similarity index 86% rename from orion-visor-framework/orion-visor-spring-boot-starter-desensitize/src/main/java/com/orion/visor/framework/desensitize/configuration/OrionDesensitizeAutoConfiguration.java rename to orion-visor-framework/orion-visor-spring-boot-starter-desensitize/src/main/java/org/dromara/visor/framework/desensitize/configuration/OrionDesensitizeAutoConfiguration.java index ba535782..dc49a415 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-desensitize/src/main/java/com/orion/visor/framework/desensitize/configuration/OrionDesensitizeAutoConfiguration.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-desensitize/src/main/java/org/dromara/visor/framework/desensitize/configuration/OrionDesensitizeAutoConfiguration.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.desensitize.configuration; +package org.dromara.visor.framework.desensitize.configuration; -import com.orion.visor.framework.common.constant.AutoConfigureOrderConst; -import com.orion.visor.framework.desensitize.core.filter.DesensitizeValueFilter; -import com.orion.visor.framework.desensitize.core.serializer.DesensitizeJsonSerializer; +import org.dromara.visor.framework.common.constant.AutoConfigureOrderConst; +import org.dromara.visor.framework.desensitize.core.filter.DesensitizeValueFilter; +import org.dromara.visor.framework.desensitize.core.serializer.DesensitizeJsonSerializer; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigureOrder; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-desensitize/src/main/java/com/orion/visor/framework/desensitize/core/annotation/Desensitize.java b/orion-visor-framework/orion-visor-spring-boot-starter-desensitize/src/main/java/org/dromara/visor/framework/desensitize/core/annotation/Desensitize.java similarity index 85% rename from orion-visor-framework/orion-visor-spring-boot-starter-desensitize/src/main/java/com/orion/visor/framework/desensitize/core/annotation/Desensitize.java rename to orion-visor-framework/orion-visor-spring-boot-starter-desensitize/src/main/java/org/dromara/visor/framework/desensitize/core/annotation/Desensitize.java index 974254f4..595df995 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-desensitize/src/main/java/com/orion/visor/framework/desensitize/core/annotation/Desensitize.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-desensitize/src/main/java/org/dromara/visor/framework/desensitize/core/annotation/Desensitize.java @@ -13,11 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.desensitize.core.annotation; +package org.dromara.visor.framework.desensitize.core.annotation; import com.fasterxml.jackson.annotation.JacksonAnnotationsInside; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.orion.visor.framework.desensitize.core.serializer.DesensitizeJsonSerializer; +import org.dromara.visor.framework.desensitize.core.filter.DesensitizeValueFilter; +import org.dromara.visor.framework.desensitize.core.serializer.DesensitizeJsonSerializer; import java.lang.annotation.*; @@ -27,7 +28,7 @@ import java.lang.annotation.*; * Jackson 标注在字段上则标记该字段执行 http 序列化 (返回 VO)时脱敏 (http-message-converts 用的是 jackson) *

* FastJson 需要组合 {@link DesensitizeObject} 一起使用 - * JSON.toJSONString 时需要使用过滤器 {@link com.orion.visor.framework.desensitize.core.filter.DesensitizeValueFilter} + * JSON.toJSONString 时需要使用过滤器 {@link DesensitizeValueFilter} * - 全局日志打印 {@see LogPrinterInterceptor} * - 操作日志切面 {@see OperatorLogAspect} * diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-desensitize/src/main/java/com/orion/visor/framework/desensitize/core/annotation/DesensitizeObject.java b/orion-visor-framework/orion-visor-spring-boot-starter-desensitize/src/main/java/org/dromara/visor/framework/desensitize/core/annotation/DesensitizeObject.java similarity index 93% rename from orion-visor-framework/orion-visor-spring-boot-starter-desensitize/src/main/java/com/orion/visor/framework/desensitize/core/annotation/DesensitizeObject.java rename to orion-visor-framework/orion-visor-spring-boot-starter-desensitize/src/main/java/org/dromara/visor/framework/desensitize/core/annotation/DesensitizeObject.java index a73f2d0f..65f32f41 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-desensitize/src/main/java/com/orion/visor/framework/desensitize/core/annotation/DesensitizeObject.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-desensitize/src/main/java/org/dromara/visor/framework/desensitize/core/annotation/DesensitizeObject.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.desensitize.core.annotation; +package org.dromara.visor.framework.desensitize.core.annotation; import java.lang.annotation.*; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-desensitize/src/main/java/com/orion/visor/framework/desensitize/core/filter/DesensitizeValueFilter.java b/orion-visor-framework/orion-visor-spring-boot-starter-desensitize/src/main/java/org/dromara/visor/framework/desensitize/core/filter/DesensitizeValueFilter.java similarity index 86% rename from orion-visor-framework/orion-visor-spring-boot-starter-desensitize/src/main/java/com/orion/visor/framework/desensitize/core/filter/DesensitizeValueFilter.java rename to orion-visor-framework/orion-visor-spring-boot-starter-desensitize/src/main/java/org/dromara/visor/framework/desensitize/core/filter/DesensitizeValueFilter.java index 21a704f0..2af92eba 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-desensitize/src/main/java/com/orion/visor/framework/desensitize/core/filter/DesensitizeValueFilter.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-desensitize/src/main/java/org/dromara/visor/framework/desensitize/core/filter/DesensitizeValueFilter.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.desensitize.core.filter; +package org.dromara.visor.framework.desensitize.core.filter; +import cn.orionsec.kit.lang.utils.Desensitizes; +import cn.orionsec.kit.lang.utils.Objects1; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.collect.Maps; +import cn.orionsec.kit.lang.utils.reflect.Annotations; +import cn.orionsec.kit.lang.utils.reflect.Fields; import com.alibaba.fastjson.annotation.JSONField; import com.alibaba.fastjson.serializer.ValueFilter; -import com.orion.lang.utils.Desensitizes; -import com.orion.lang.utils.Objects1; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.collect.Maps; -import com.orion.lang.utils.reflect.Annotations; -import com.orion.lang.utils.reflect.Fields; -import com.orion.visor.framework.common.constant.Const; -import com.orion.visor.framework.desensitize.core.annotation.Desensitize; -import com.orion.visor.framework.desensitize.core.annotation.DesensitizeObject; +import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.framework.desensitize.core.annotation.Desensitize; +import org.dromara.visor.framework.desensitize.core.annotation.DesensitizeObject; import java.lang.reflect.Field; import java.util.HashMap; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-desensitize/src/main/java/com/orion/visor/framework/desensitize/core/serializer/DesensitizeJsonSerializer.java b/orion-visor-framework/orion-visor-spring-boot-starter-desensitize/src/main/java/org/dromara/visor/framework/desensitize/core/serializer/DesensitizeJsonSerializer.java similarity index 89% rename from orion-visor-framework/orion-visor-spring-boot-starter-desensitize/src/main/java/com/orion/visor/framework/desensitize/core/serializer/DesensitizeJsonSerializer.java rename to orion-visor-framework/orion-visor-spring-boot-starter-desensitize/src/main/java/org/dromara/visor/framework/desensitize/core/serializer/DesensitizeJsonSerializer.java index 3af8a9c3..d1543242 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-desensitize/src/main/java/com/orion/visor/framework/desensitize/core/serializer/DesensitizeJsonSerializer.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-desensitize/src/main/java/org/dromara/visor/framework/desensitize/core/serializer/DesensitizeJsonSerializer.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.desensitize.core.serializer; +package org.dromara.visor.framework.desensitize.core.serializer; +import cn.orionsec.kit.lang.constant.Const; +import cn.orionsec.kit.lang.utils.Desensitizes; +import cn.orionsec.kit.lang.utils.Objects1; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.BeanProperty; import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.ser.ContextualSerializer; -import com.orion.lang.constant.Const; -import com.orion.lang.utils.Desensitizes; -import com.orion.lang.utils.Objects1; -import com.orion.visor.framework.desensitize.core.annotation.Desensitize; +import org.dromara.visor.framework.desensitize.core.annotation.Desensitize; import java.io.IOException; import java.util.Objects; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-desensitize/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/orion-visor-framework/orion-visor-spring-boot-starter-desensitize/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 45674b37..587af9c8 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-desensitize/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/orion-visor-framework/orion-visor-spring-boot-starter-desensitize/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -com.orion.visor.framework.desensitize.configuration.OrionDesensitizeAutoConfiguration \ No newline at end of file +org.dromara.visor.framework.desensitize.configuration.OrionDesensitizeAutoConfiguration \ No newline at end of file diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-job/pom.xml b/orion-visor-framework/orion-visor-spring-boot-starter-job/pom.xml index b225ecf9..789edbd9 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-job/pom.xml +++ b/orion-visor-framework/orion-visor-spring-boot-starter-job/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - com.orion.visor + org.dromara.visor orion-visor-framework ${revision} @@ -18,7 +18,7 @@ - com.orion.visor + org.dromara.visor orion-visor-framework-common diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-job/src/main/java/com/orion/visor/framework/job/configuration/OrionQuartzAutoConfiguration.java b/orion-visor-framework/orion-visor-spring-boot-starter-job/src/main/java/org/dromara/visor/framework/job/configuration/OrionQuartzAutoConfiguration.java similarity index 88% rename from orion-visor-framework/orion-visor-spring-boot-starter-job/src/main/java/com/orion/visor/framework/job/configuration/OrionQuartzAutoConfiguration.java rename to orion-visor-framework/orion-visor-spring-boot-starter-job/src/main/java/org/dromara/visor/framework/job/configuration/OrionQuartzAutoConfiguration.java index ac528a30..120105bb 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-job/src/main/java/com/orion/visor/framework/job/configuration/OrionQuartzAutoConfiguration.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-job/src/main/java/org/dromara/visor/framework/job/configuration/OrionQuartzAutoConfiguration.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.job.configuration; +package org.dromara.visor.framework.job.configuration; -import com.orion.visor.framework.common.constant.AutoConfigureOrderConst; -import com.orion.visor.framework.job.core.utils.QuartzUtils; +import org.dromara.visor.framework.common.constant.AutoConfigureOrderConst; +import org.dromara.visor.framework.job.core.utils.QuartzUtils; import org.quartz.Scheduler; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigureOrder; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-job/src/main/java/com/orion/visor/framework/job/configuration/OrionSchedulerAutoConfiguration.java b/orion-visor-framework/orion-visor-spring-boot-starter-job/src/main/java/org/dromara/visor/framework/job/configuration/OrionSchedulerAutoConfiguration.java similarity index 92% rename from orion-visor-framework/orion-visor-spring-boot-starter-job/src/main/java/com/orion/visor/framework/job/configuration/OrionSchedulerAutoConfiguration.java rename to orion-visor-framework/orion-visor-spring-boot-starter-job/src/main/java/org/dromara/visor/framework/job/configuration/OrionSchedulerAutoConfiguration.java index 49ec99e8..4e363a78 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-job/src/main/java/com/orion/visor/framework/job/configuration/OrionSchedulerAutoConfiguration.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-job/src/main/java/org/dromara/visor/framework/job/configuration/OrionSchedulerAutoConfiguration.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.job.configuration; +package org.dromara.visor.framework.job.configuration; -import com.orion.visor.framework.common.constant.AutoConfigureOrderConst; +import org.dromara.visor.framework.common.constant.AutoConfigureOrderConst; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigureOrder; import org.springframework.context.annotation.Bean; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-job/src/main/java/com/orion/visor/framework/job/core/utils/QuartzUtils.java b/orion-visor-framework/orion-visor-spring-boot-starter-job/src/main/java/org/dromara/visor/framework/job/core/utils/QuartzUtils.java similarity index 95% rename from orion-visor-framework/orion-visor-spring-boot-starter-job/src/main/java/com/orion/visor/framework/job/core/utils/QuartzUtils.java rename to orion-visor-framework/orion-visor-spring-boot-starter-job/src/main/java/org/dromara/visor/framework/job/core/utils/QuartzUtils.java index 7535e2a0..10706ada 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-job/src/main/java/com/orion/visor/framework/job/core/utils/QuartzUtils.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-job/src/main/java/org/dromara/visor/framework/job/core/utils/QuartzUtils.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.job.core.utils; +package org.dromara.visor.framework.job.core.utils; -import com.orion.lang.utils.Exceptions; -import com.orion.lang.utils.Objects1; -import com.orion.lang.utils.collect.Maps; -import com.orion.visor.framework.common.constant.FieldConst; +import cn.orionsec.kit.lang.utils.Exceptions; +import cn.orionsec.kit.lang.utils.Objects1; +import cn.orionsec.kit.lang.utils.collect.Maps; +import org.dromara.visor.framework.common.constant.FieldConst; import org.quartz.*; import java.util.Map; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-job/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/orion-visor-framework/orion-visor-spring-boot-starter-job/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 6f435670..2552da5d 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-job/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/orion-visor-framework/orion-visor-spring-boot-starter-job/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1,2 +1,2 @@ -com.orion.visor.framework.job.configuration.OrionSchedulerAutoConfiguration -com.orion.visor.framework.job.configuration.OrionQuartzAutoConfiguration \ No newline at end of file +org.dromara.visor.framework.job.configuration.OrionSchedulerAutoConfiguration +org.dromara.visor.framework.job.configuration.OrionQuartzAutoConfiguration \ No newline at end of file diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-log/pom.xml b/orion-visor-framework/orion-visor-spring-boot-starter-log/pom.xml index e2e47972..95c39220 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-log/pom.xml +++ b/orion-visor-framework/orion-visor-spring-boot-starter-log/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - com.orion.visor + org.dromara.visor orion-visor-framework ${revision} @@ -18,7 +18,7 @@ - com.orion.visor + org.dromara.visor orion-visor-framework-common diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/com/orion/visor/framework/log/configuration/OrionLogPrinterConfiguration.java b/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/org/dromara/visor/framework/log/configuration/OrionLogPrinterConfiguration.java similarity index 83% rename from orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/com/orion/visor/framework/log/configuration/OrionLogPrinterConfiguration.java rename to orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/org/dromara/visor/framework/log/configuration/OrionLogPrinterConfiguration.java index 91ff664e..40e0b904 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/com/orion/visor/framework/log/configuration/OrionLogPrinterConfiguration.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/org/dromara/visor/framework/log/configuration/OrionLogPrinterConfiguration.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.log.configuration; +package org.dromara.visor.framework.log.configuration; -import com.orion.visor.framework.common.constant.AutoConfigureOrderConst; -import com.orion.visor.framework.common.constant.BeanOrderConst; -import com.orion.visor.framework.log.configuration.config.LogPrinterConfig; -import com.orion.visor.framework.log.core.interceptor.LogPrinterInterceptor; -import com.orion.visor.framework.log.core.interceptor.PrettyLogPrinterInterceptor; -import com.orion.visor.framework.log.core.interceptor.RowLogPrinterInterceptor; +import org.dromara.visor.framework.common.constant.AutoConfigureOrderConst; +import org.dromara.visor.framework.common.constant.BeanOrderConst; +import org.dromara.visor.framework.log.configuration.config.LogPrinterConfig; +import org.dromara.visor.framework.log.core.interceptor.LogPrinterInterceptor; +import org.dromara.visor.framework.log.core.interceptor.PrettyLogPrinterInterceptor; +import org.dromara.visor.framework.log.core.interceptor.RowLogPrinterInterceptor; import org.springframework.aop.aspectj.AspectJExpressionPointcutAdvisor; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigureOrder; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/com/orion/visor/framework/log/configuration/config/LogPrinterConfig.java b/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/org/dromara/visor/framework/log/configuration/config/LogPrinterConfig.java similarity index 91% rename from orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/com/orion/visor/framework/log/configuration/config/LogPrinterConfig.java rename to orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/org/dromara/visor/framework/log/configuration/config/LogPrinterConfig.java index 29f21284..ed54e8df 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/com/orion/visor/framework/log/configuration/config/LogPrinterConfig.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/org/dromara/visor/framework/log/configuration/config/LogPrinterConfig.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.log.configuration.config; +package org.dromara.visor.framework.log.configuration.config; -import com.orion.visor.framework.common.utils.ConfigUtils; -import com.orion.visor.framework.log.core.enums.LogPrinterMode; import lombok.Data; +import org.dromara.visor.framework.common.utils.ConfigUtils; +import org.dromara.visor.framework.log.core.enums.LogPrinterMode; import org.springframework.boot.context.properties.ConfigurationProperties; import java.util.List; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/com/orion/visor/framework/log/core/annotation/IgnoreLog.java b/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/org/dromara/visor/framework/log/core/annotation/IgnoreLog.java similarity index 90% rename from orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/com/orion/visor/framework/log/core/annotation/IgnoreLog.java rename to orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/org/dromara/visor/framework/log/core/annotation/IgnoreLog.java index b2a15284..a9ee05f1 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/com/orion/visor/framework/log/core/annotation/IgnoreLog.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/org/dromara/visor/framework/log/core/annotation/IgnoreLog.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.log.core.annotation; +package org.dromara.visor.framework.log.core.annotation; -import com.orion.visor.framework.log.core.enums.IgnoreLogMode; +import org.dromara.visor.framework.log.core.enums.IgnoreLogMode; import java.lang.annotation.*; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/com/orion/visor/framework/log/core/enums/IgnoreLogMode.java b/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/org/dromara/visor/framework/log/core/enums/IgnoreLogMode.java similarity index 95% rename from orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/com/orion/visor/framework/log/core/enums/IgnoreLogMode.java rename to orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/org/dromara/visor/framework/log/core/enums/IgnoreLogMode.java index 1f4add3c..a0e6e492 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/com/orion/visor/framework/log/core/enums/IgnoreLogMode.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/org/dromara/visor/framework/log/core/enums/IgnoreLogMode.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.log.core.enums; +package org.dromara.visor.framework.log.core.enums; /** * 日志忽略模式 diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/com/orion/visor/framework/log/core/enums/LogFieldConst.java b/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/org/dromara/visor/framework/log/core/enums/LogFieldConst.java similarity index 95% rename from orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/com/orion/visor/framework/log/core/enums/LogFieldConst.java rename to orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/org/dromara/visor/framework/log/core/enums/LogFieldConst.java index b9690851..78002575 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/com/orion/visor/framework/log/core/enums/LogFieldConst.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/org/dromara/visor/framework/log/core/enums/LogFieldConst.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.log.core.enums; +package org.dromara.visor.framework.log.core.enums; /** * 日志字段常量 diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/com/orion/visor/framework/log/core/enums/LogPrinterMode.java b/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/org/dromara/visor/framework/log/core/enums/LogPrinterMode.java similarity index 94% rename from orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/com/orion/visor/framework/log/core/enums/LogPrinterMode.java rename to orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/org/dromara/visor/framework/log/core/enums/LogPrinterMode.java index 795871fa..7404e039 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/com/orion/visor/framework/log/core/enums/LogPrinterMode.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/org/dromara/visor/framework/log/core/enums/LogPrinterMode.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.log.core.enums; +package org.dromara.visor.framework.log.core.enums; /** * 日志打印模型 diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/com/orion/visor/framework/log/core/interceptor/AbstractLogPrinterInterceptor.java b/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/org/dromara/visor/framework/log/core/interceptor/AbstractLogPrinterInterceptor.java similarity index 93% rename from orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/com/orion/visor/framework/log/core/interceptor/AbstractLogPrinterInterceptor.java rename to orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/org/dromara/visor/framework/log/core/interceptor/AbstractLogPrinterInterceptor.java index 550cbba8..681de701 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/com/orion/visor/framework/log/core/interceptor/AbstractLogPrinterInterceptor.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/org/dromara/visor/framework/log/core/interceptor/AbstractLogPrinterInterceptor.java @@ -13,22 +13,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.log.core.interceptor; +package org.dromara.visor.framework.log.core.interceptor; +import cn.orionsec.kit.lang.utils.collect.Maps; +import cn.orionsec.kit.lang.utils.reflect.Classes; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.serializer.SerializeFilter; import com.alibaba.fastjson.serializer.ValueFilter; -import com.orion.lang.utils.collect.Maps; -import com.orion.lang.utils.reflect.Classes; -import com.orion.visor.framework.common.json.filter.FieldDesensitizeFilter; -import com.orion.visor.framework.common.json.filter.FieldIgnoreFilter; -import com.orion.visor.framework.common.meta.TraceIdHolder; -import com.orion.visor.framework.common.security.SecurityHolder; -import com.orion.visor.framework.log.configuration.config.LogPrinterConfig; -import com.orion.visor.framework.log.core.annotation.IgnoreLog; -import com.orion.visor.framework.log.core.enums.IgnoreLogMode; import org.aopalliance.intercept.MethodInvocation; +import org.dromara.visor.framework.common.json.filter.FieldDesensitizeFilter; +import org.dromara.visor.framework.common.json.filter.FieldIgnoreFilter; +import org.dromara.visor.framework.common.meta.TraceIdHolder; +import org.dromara.visor.framework.common.security.SecurityHolder; +import org.dromara.visor.framework.log.configuration.config.LogPrinterConfig; +import org.dromara.visor.framework.log.core.annotation.IgnoreLog; +import org.dromara.visor.framework.log.core.enums.IgnoreLogMode; import org.springframework.validation.BindingResult; import org.springframework.web.multipart.MultipartFile; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/com/orion/visor/framework/log/core/interceptor/LogPrinterInterceptor.java b/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/org/dromara/visor/framework/log/core/interceptor/LogPrinterInterceptor.java similarity index 94% rename from orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/com/orion/visor/framework/log/core/interceptor/LogPrinterInterceptor.java rename to orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/org/dromara/visor/framework/log/core/interceptor/LogPrinterInterceptor.java index a31aa046..cc428a1a 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/com/orion/visor/framework/log/core/interceptor/LogPrinterInterceptor.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/org/dromara/visor/framework/log/core/interceptor/LogPrinterInterceptor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.log.core.interceptor; +package org.dromara.visor.framework.log.core.interceptor; import org.aopalliance.intercept.MethodInterceptor; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/com/orion/visor/framework/log/core/interceptor/PrettyLogPrinterInterceptor.java b/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/org/dromara/visor/framework/log/core/interceptor/PrettyLogPrinterInterceptor.java similarity index 91% rename from orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/com/orion/visor/framework/log/core/interceptor/PrettyLogPrinterInterceptor.java rename to orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/org/dromara/visor/framework/log/core/interceptor/PrettyLogPrinterInterceptor.java index bcc170f5..a826fd47 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/com/orion/visor/framework/log/core/interceptor/PrettyLogPrinterInterceptor.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/org/dromara/visor/framework/log/core/interceptor/PrettyLogPrinterInterceptor.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.log.core.interceptor; +package org.dromara.visor.framework.log.core.interceptor; -import com.orion.lang.utils.Exceptions; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.time.Dates; -import com.orion.visor.framework.common.utils.IpUtils; -import com.orion.visor.framework.common.utils.SwaggerUtils; -import com.orion.visor.framework.log.configuration.config.LogPrinterConfig; -import com.orion.web.servlet.web.Servlets; +import cn.orionsec.kit.lang.utils.Exceptions; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.time.Dates; +import cn.orionsec.kit.web.servlet.web.Servlets; import lombok.extern.slf4j.Slf4j; import org.aopalliance.intercept.MethodInvocation; +import org.dromara.visor.framework.common.utils.IpUtils; +import org.dromara.visor.framework.common.utils.SwaggerUtils; +import org.dromara.visor.framework.log.configuration.config.LogPrinterConfig; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/com/orion/visor/framework/log/core/interceptor/RowLogPrinterInterceptor.java b/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/org/dromara/visor/framework/log/core/interceptor/RowLogPrinterInterceptor.java similarity index 90% rename from orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/com/orion/visor/framework/log/core/interceptor/RowLogPrinterInterceptor.java rename to orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/org/dromara/visor/framework/log/core/interceptor/RowLogPrinterInterceptor.java index efa71e7a..093feba1 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/com/orion/visor/framework/log/core/interceptor/RowLogPrinterInterceptor.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/org/dromara/visor/framework/log/core/interceptor/RowLogPrinterInterceptor.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.log.core.interceptor; +package org.dromara.visor.framework.log.core.interceptor; +import cn.orionsec.kit.lang.utils.Exceptions; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.time.Dates; +import cn.orionsec.kit.web.servlet.web.Servlets; import com.alibaba.fastjson.JSON; -import com.orion.lang.utils.Exceptions; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.time.Dates; -import com.orion.visor.framework.common.utils.IpUtils; -import com.orion.visor.framework.common.utils.SwaggerUtils; -import com.orion.visor.framework.log.configuration.config.LogPrinterConfig; -import com.orion.visor.framework.log.core.enums.LogFieldConst; -import com.orion.web.servlet.web.Servlets; import lombok.extern.slf4j.Slf4j; import org.aopalliance.intercept.MethodInvocation; +import org.dromara.visor.framework.common.utils.IpUtils; +import org.dromara.visor.framework.common.utils.SwaggerUtils; +import org.dromara.visor.framework.log.configuration.config.LogPrinterConfig; +import org.dromara.visor.framework.log.core.enums.LogFieldConst; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/resources/META-INF/additional-spring-configuration-metadata.json index aed3566b..a4139e09 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -2,14 +2,14 @@ "groups": [ { "name": "orion.logging.printer", - "type": "com.orion.visor.framework.log.configuration.config.LogPrinterConfig", - "sourceType": "com.orion.visor.framework.log.configuration.config.LogPrinterConfig" + "type": "org.dromara.visor.framework.log.configuration.config.LogPrinterConfig", + "sourceType": "org.dromara.visor.framework.log.configuration.config.LogPrinterConfig" } ], "properties": [ { "name": "orion.logging.printer.mode", - "type": "com.orion.visor.framework.log.core.enums.LogPrinterMode", + "type": "org.dromara.visor.framework.log.core.enums.LogPrinterMode", "description": "日志打印模型.", "defaultValue": "NONE" }, diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 49f894d7..56616505 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -com.orion.visor.framework.log.configuration.OrionLogPrinterConfiguration \ No newline at end of file +org.dromara.visor.framework.log.configuration.OrionLogPrinterConfiguration \ No newline at end of file diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-monitor/pom.xml b/orion-visor-framework/orion-visor-spring-boot-starter-monitor/pom.xml index 7765d62a..eb036f5f 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-monitor/pom.xml +++ b/orion-visor-framework/orion-visor-spring-boot-starter-monitor/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - com.orion.visor + org.dromara.visor orion-visor-framework ${revision} @@ -18,7 +18,7 @@ - com.orion.visor + org.dromara.visor orion-visor-framework-common diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-monitor/src/main/java/com/orion/visor/framework/monitor/configuration/OrionAdminAutoConfiguration.java b/orion-visor-framework/orion-visor-spring-boot-starter-monitor/src/main/java/org/dromara/visor/framework/monitor/configuration/OrionAdminAutoConfiguration.java similarity index 93% rename from orion-visor-framework/orion-visor-spring-boot-starter-monitor/src/main/java/com/orion/visor/framework/monitor/configuration/OrionAdminAutoConfiguration.java rename to orion-visor-framework/orion-visor-spring-boot-starter-monitor/src/main/java/org/dromara/visor/framework/monitor/configuration/OrionAdminAutoConfiguration.java index d6662b67..d3ca7c4b 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-monitor/src/main/java/com/orion/visor/framework/monitor/configuration/OrionAdminAutoConfiguration.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-monitor/src/main/java/org/dromara/visor/framework/monitor/configuration/OrionAdminAutoConfiguration.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.monitor.configuration; +package org.dromara.visor.framework.monitor.configuration; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.module.SimpleModule; -import com.orion.visor.framework.common.constant.AutoConfigureOrderConst; import de.codecentric.boot.admin.server.config.EnableAdminServer; import de.codecentric.boot.admin.server.utils.jackson.AdminServerModule; +import org.dromara.visor.framework.common.constant.AutoConfigureOrderConst; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigureOrder; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-monitor/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/orion-visor-framework/orion-visor-spring-boot-starter-monitor/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 1c2e4e8d..5525ac9b 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-monitor/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/orion-visor-framework/orion-visor-spring-boot-starter-monitor/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -com.orion.visor.framework.monitor.configuration.OrionAdminAutoConfiguration \ No newline at end of file +org.dromara.visor.framework.monitor.configuration.OrionAdminAutoConfiguration \ No newline at end of file diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/pom.xml b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/pom.xml index ad4e9fdb..85cb2fcd 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/pom.xml +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - com.orion.visor + org.dromara.visor orion-visor-framework ${revision} @@ -18,7 +18,7 @@ - com.orion.visor + org.dromara.visor orion-visor-framework-common diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/configuration/OrionMybatisAutoConfiguration.java b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/configuration/OrionMybatisAutoConfiguration.java similarity index 81% rename from orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/configuration/OrionMybatisAutoConfiguration.java rename to orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/configuration/OrionMybatisAutoConfiguration.java index 06a3a338..881f5e0a 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/configuration/OrionMybatisAutoConfiguration.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/configuration/OrionMybatisAutoConfiguration.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.mybatis.configuration; +package org.dromara.visor.framework.mybatis.configuration; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor; -import com.orion.visor.framework.common.constant.AutoConfigureOrderConst; -import com.orion.visor.framework.common.security.SecurityHolder; -import com.orion.visor.framework.mybatis.core.handler.FieldFillHandler; -import com.orion.visor.framework.mybatis.core.utils.DomainFillUtils; import org.apache.ibatis.annotations.Mapper; +import org.dromara.visor.framework.common.constant.AutoConfigureOrderConst; +import org.dromara.visor.framework.common.security.SecurityHolder; +import org.dromara.visor.framework.mybatis.core.handler.FieldFillHandler; +import org.dromara.visor.framework.mybatis.core.utils.DomainFillUtils; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigureOrder; @@ -37,7 +37,7 @@ import org.springframework.context.annotation.Bean; */ @AutoConfiguration @AutoConfigureOrder(AutoConfigureOrderConst.FRAMEWORK_MYBATIS) -@MapperScan(value = "com.orion.visor.module.*.dao", annotationClass = Mapper.class, lazyInitialization = "true") +@MapperScan(value = "org.dromara.visor.module.*.dao", annotationClass = Mapper.class, lazyInitialization = "true") public class OrionMybatisAutoConfiguration { /** diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/domain/BaseDO.java b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/domain/BaseDO.java similarity index 90% rename from orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/domain/BaseDO.java rename to orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/domain/BaseDO.java index 59feb5a0..9e27c0f6 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/domain/BaseDO.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/domain/BaseDO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.mybatis.core.domain; +package org.dromara.visor.framework.mybatis.core.domain; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; @@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.annotation.TableLogic; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import org.apache.ibatis.type.JdbcType; +import org.dromara.visor.framework.common.constant.Const; import java.io.Serializable; import java.util.Date; @@ -54,8 +55,8 @@ public class BaseDO implements Serializable { private String updater; /** - * @see com.orion.visor.framework.common.constant.Const#NOT_DELETE - * @see com.orion.visor.framework.common.constant.Const#IS_DELETED + * @see Const#NOT_DELETE + * @see Const#IS_DELETED */ @Schema(description = "是否删除 0未删除 1已删除") @TableLogic diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/generator/CodeGenerators.java b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/generator/CodeGenerators.java similarity index 89% rename from orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/generator/CodeGenerators.java rename to orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/generator/CodeGenerators.java index e676ed39..f2eb6d43 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/generator/CodeGenerators.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/generator/CodeGenerators.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.mybatis.core.generator; +package org.dromara.visor.framework.mybatis.core.generator; -import com.orion.lang.constant.Const; -import com.orion.lang.utils.ansi.AnsiAppender; -import com.orion.lang.utils.ansi.style.AnsiFont; -import com.orion.lang.utils.ansi.style.color.AnsiForeground; -import com.orion.lang.utils.ext.yml.YmlExt; -import com.orion.visor.framework.mybatis.core.generator.core.CodeGenerator; -import com.orion.visor.framework.mybatis.core.generator.template.Table; -import com.orion.visor.framework.mybatis.core.generator.template.Template; +import cn.orionsec.kit.lang.constant.Const; +import cn.orionsec.kit.lang.utils.ansi.AnsiAppender; +import cn.orionsec.kit.lang.utils.ansi.style.AnsiFont; +import cn.orionsec.kit.lang.utils.ansi.style.color.AnsiForeground; +import cn.orionsec.kit.lang.utils.ext.yml.YmlExt; +import org.dromara.visor.framework.mybatis.core.generator.core.CodeGenerator; +import org.dromara.visor.framework.mybatis.core.generator.template.Table; +import org.dromara.visor.framework.mybatis.core.generator.template.Template; import java.io.File; @@ -61,7 +61,8 @@ public class CodeGenerators { // .valueUseFields() // .build(), // Template.create("exec_template_host", "执行模板主机", "exec") - // .disableUnitTest() + // .enableProviderApi() + // .cache("sl", "22") // .vue("exec", "exec-template-host") // .build(), Template.create("system_message", "系统消息", "message") diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/generator/core/CodeGenerator.java b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/generator/core/CodeGenerator.java similarity index 97% rename from orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/generator/core/CodeGenerator.java rename to orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/generator/core/CodeGenerator.java index 94cf7c04..e9818f41 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/generator/core/CodeGenerator.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/generator/core/CodeGenerator.java @@ -13,8 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.mybatis.core.generator.core; +package org.dromara.visor.framework.mybatis.core.generator.core; +import cn.orionsec.kit.lang.able.Executable; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.generator.AutoGenerator; import com.baomidou.mybatisplus.generator.config.*; @@ -23,16 +24,15 @@ import com.baomidou.mybatisplus.generator.config.querys.MySqlQuery; import com.baomidou.mybatisplus.generator.config.rules.DateType; import com.baomidou.mybatisplus.generator.config.rules.DbColumnType; import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy; -import com.orion.lang.able.Executable; -import com.orion.visor.framework.common.utils.Valid; -import com.orion.visor.framework.mybatis.core.domain.BaseDO; -import com.orion.visor.framework.mybatis.core.generator.template.Table; -import com.orion.visor.framework.mybatis.core.mapper.IMapper; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import org.apache.ibatis.annotations.Mapper; +import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.framework.mybatis.core.domain.BaseDO; +import org.dromara.visor.framework.mybatis.core.generator.template.Table; +import org.dromara.visor.framework.mybatis.core.mapper.IMapper; import java.sql.Types; import java.util.Arrays; @@ -272,7 +272,7 @@ public class CodeGenerator implements Executable { private PackageConfig getPackageConfig(String module) { return new PackageConfig.Builder() // 声明父包 - .parent("com.orion.visor.module") + .parent("org.dromara.visor.module") // 模块名称 .moduleName(module) // 实体类的包 diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/generator/core/CodeGeneratorEngine.java b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/generator/core/CodeGeneratorEngine.java similarity index 96% rename from orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/generator/core/CodeGeneratorEngine.java rename to orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/generator/core/CodeGeneratorEngine.java index 5120addd..12312510 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/generator/core/CodeGeneratorEngine.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/generator/core/CodeGeneratorEngine.java @@ -13,20 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.mybatis.core.generator.core; +package org.dromara.visor.framework.mybatis.core.generator.core; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.VariableStyles; +import cn.orionsec.kit.lang.utils.io.Files1; +import cn.orionsec.kit.lang.utils.reflect.BeanMap; +import cn.orionsec.kit.lang.utils.reflect.Fields; import com.baomidou.mybatisplus.core.toolkit.StringPool; import com.baomidou.mybatisplus.generator.config.OutputFile; import com.baomidou.mybatisplus.generator.config.builder.CustomFile; import com.baomidou.mybatisplus.generator.config.po.TableInfo; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.VariableStyles; -import com.orion.lang.utils.io.Files1; -import com.orion.lang.utils.reflect.BeanMap; -import com.orion.lang.utils.reflect.Fields; -import com.orion.visor.framework.common.constant.AppConst; -import com.orion.visor.framework.common.constant.Const; -import com.orion.visor.framework.mybatis.core.generator.template.Table; +import org.dromara.visor.framework.common.constant.AppConst; +import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.framework.mybatis.core.generator.template.Table; import org.jetbrains.annotations.NotNull; import java.io.File; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/generator/core/CustomFileFilter.java b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/generator/core/CustomFileFilter.java similarity index 98% rename from orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/generator/core/CustomFileFilter.java rename to orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/generator/core/CustomFileFilter.java index 1501beb4..26253a01 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/generator/core/CustomFileFilter.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/generator/core/CustomFileFilter.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.mybatis.core.generator.core; +package org.dromara.visor.framework.mybatis.core.generator.core; import com.baomidou.mybatisplus.generator.config.builder.CustomFile; -import com.orion.visor.framework.mybatis.core.generator.template.Table; +import org.dromara.visor.framework.mybatis.core.generator.template.Table; import java.util.List; import java.util.stream.Collectors; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/generator/core/DictParser.java b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/generator/core/DictParser.java similarity index 88% rename from orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/generator/core/DictParser.java rename to orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/generator/core/DictParser.java index f0a0b1a4..64d5efd8 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/generator/core/DictParser.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/generator/core/DictParser.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.mybatis.core.generator.core; +package org.dromara.visor.framework.mybatis.core.generator.core; +import cn.orionsec.kit.lang.utils.Exceptions; +import cn.orionsec.kit.lang.utils.Strings; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.generator.config.po.TableField; import com.baomidou.mybatisplus.generator.config.po.TableInfo; -import com.orion.lang.utils.Exceptions; -import com.orion.lang.utils.Strings; -import com.orion.visor.framework.common.constant.Const; -import com.orion.visor.framework.common.constant.FieldConst; -import com.orion.visor.framework.mybatis.core.generator.template.DictMeta; -import com.orion.visor.framework.mybatis.core.generator.template.Table; +import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.framework.common.constant.FieldConst; +import org.dromara.visor.framework.mybatis.core.generator.template.DictMeta; +import org.dromara.visor.framework.mybatis.core.generator.template.Table; import java.util.LinkedHashMap; import java.util.List; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/generator/core/VelocityTemplateEngine.java b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/generator/core/VelocityTemplateEngine.java similarity index 98% rename from orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/generator/core/VelocityTemplateEngine.java rename to orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/generator/core/VelocityTemplateEngine.java index 8852939d..624a3e51 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/generator/core/VelocityTemplateEngine.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/generator/core/VelocityTemplateEngine.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.mybatis.core.generator.core; +package org.dromara.visor.framework.mybatis.core.generator.core; import com.baomidou.mybatisplus.core.toolkit.StringPool; import com.baomidou.mybatisplus.generator.config.ConstVal; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/generator/template/CacheTemplate.java b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/generator/template/CacheTemplate.java similarity index 97% rename from orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/generator/template/CacheTemplate.java rename to orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/generator/template/CacheTemplate.java index 280f0771..fc31abb1 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/generator/template/CacheTemplate.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/generator/template/CacheTemplate.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.mybatis.core.generator.template; +package org.dromara.visor.framework.mybatis.core.generator.template; import java.util.concurrent.TimeUnit; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/generator/template/DictMeta.java b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/generator/template/DictMeta.java similarity index 97% rename from orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/generator/template/DictMeta.java rename to orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/generator/template/DictMeta.java index 53755ffc..6dc510b1 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/generator/template/DictMeta.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/generator/template/DictMeta.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.mybatis.core.generator.template; +package org.dromara.visor.framework.mybatis.core.generator.template; import lombok.Data; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/generator/template/DictTemplate.java b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/generator/template/DictTemplate.java similarity index 96% rename from orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/generator/template/DictTemplate.java rename to orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/generator/template/DictTemplate.java index 50d3b9d8..bfd28de4 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/generator/template/DictTemplate.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/generator/template/DictTemplate.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.mybatis.core.generator.template; +package org.dromara.visor.framework.mybatis.core.generator.template; -import com.orion.lang.utils.collect.Lists; -import com.orion.visor.framework.common.constant.Const; +import cn.orionsec.kit.lang.utils.collect.Lists; +import org.dromara.visor.framework.common.constant.Const; import java.util.LinkedHashMap; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/generator/template/ServerTemplate.java b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/generator/template/ServerTemplate.java similarity index 98% rename from orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/generator/template/ServerTemplate.java rename to orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/generator/template/ServerTemplate.java index 764b1431..745a77ec 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/generator/template/ServerTemplate.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/generator/template/ServerTemplate.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.mybatis.core.generator.template; +package org.dromara.visor.framework.mybatis.core.generator.template; /** * 后端代码模板 diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/generator/template/Table.java b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/generator/template/Table.java similarity index 97% rename from orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/generator/template/Table.java rename to orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/generator/template/Table.java index d19c3f5b..03df280b 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/generator/template/Table.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/generator/template/Table.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.mybatis.core.generator.template; +package org.dromara.visor.framework.mybatis.core.generator.template; import lombok.Data; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/generator/template/Template.java b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/generator/template/Template.java similarity index 97% rename from orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/generator/template/Template.java rename to orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/generator/template/Template.java index 88a9bd61..17209fc3 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/generator/template/Template.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/generator/template/Template.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.mybatis.core.generator.template; +package org.dromara.visor.framework.mybatis.core.generator.template; import lombok.Data; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/generator/template/VueTemplate.java b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/generator/template/VueTemplate.java similarity index 96% rename from orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/generator/template/VueTemplate.java rename to orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/generator/template/VueTemplate.java index a117ed8e..39854b66 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/generator/template/VueTemplate.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/generator/template/VueTemplate.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.mybatis.core.generator.template; +package org.dromara.visor.framework.mybatis.core.generator.template; /** * 前端代码模板 diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/handler/FieldFillHandler.java b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/handler/FieldFillHandler.java similarity index 88% rename from orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/handler/FieldFillHandler.java rename to orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/handler/FieldFillHandler.java index 9501e268..3d101b88 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/handler/FieldFillHandler.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/handler/FieldFillHandler.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.mybatis.core.handler; +package org.dromara.visor.framework.mybatis.core.handler; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; -import com.orion.visor.framework.mybatis.core.domain.BaseDO; -import com.orion.visor.framework.mybatis.core.utils.DomainFillUtils; import org.apache.ibatis.reflection.MetaObject; +import org.dromara.visor.framework.mybatis.core.domain.BaseDO; +import org.dromara.visor.framework.mybatis.core.utils.DomainFillUtils; import java.util.Objects; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/mapper/IJoinMapper.java b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/mapper/IJoinMapper.java similarity index 95% rename from orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/mapper/IJoinMapper.java rename to orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/mapper/IJoinMapper.java index a455e38f..602cc48b 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/mapper/IJoinMapper.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/mapper/IJoinMapper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.mybatis.core.mapper; +package org.dromara.visor.framework.mybatis.core.mapper; import com.github.yulichang.base.MPJBaseMapper; import com.github.yulichang.toolkit.JoinWrappers; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/mapper/IMapper.java b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/mapper/IMapper.java similarity index 93% rename from orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/mapper/IMapper.java rename to orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/mapper/IMapper.java index c1be4537..cb8e448b 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/mapper/IMapper.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/mapper/IMapper.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.mybatis.core.mapper; +package org.dromara.visor.framework.mybatis.core.mapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.toolkit.Db; -import com.orion.visor.framework.common.constant.Const; -import com.orion.visor.framework.mybatis.core.query.Conditions; -import com.orion.visor.framework.mybatis.core.query.DataQuery; +import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.framework.mybatis.core.query.Conditions; +import org.dromara.visor.framework.mybatis.core.query.DataQuery; import java.util.Collection; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/query/Conditions.java b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/query/Conditions.java similarity index 94% rename from orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/query/Conditions.java rename to orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/query/Conditions.java index 470d6cd2..75727834 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/query/Conditions.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/query/Conditions.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.mybatis.core.query; +package org.dromara.visor.framework.mybatis.core.query; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.support.SFunction; -import com.orion.visor.framework.common.constant.ErrorMessage; -import com.orion.visor.framework.common.utils.Valid; +import org.dromara.visor.framework.common.constant.ErrorMessage; +import org.dromara.visor.framework.common.utils.Valid; import java.util.Collection; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/query/DataQuery.java b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/query/DataQuery.java similarity index 89% rename from orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/query/DataQuery.java rename to orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/query/DataQuery.java index 528ed06e..13672983 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/query/DataQuery.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/query/DataQuery.java @@ -13,26 +13,26 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.mybatis.core.query; +package org.dromara.visor.framework.mybatis.core.query; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import cn.orionsec.kit.lang.define.wrapper.IPageRequest; +import cn.orionsec.kit.lang.define.wrapper.PageRequest; +import cn.orionsec.kit.lang.define.wrapper.Pager; +import cn.orionsec.kit.lang.utils.Exceptions; +import cn.orionsec.kit.lang.utils.Objects1; +import cn.orionsec.kit.lang.utils.Valid; +import cn.orionsec.kit.lang.utils.collect.Lists; +import cn.orionsec.kit.lang.utils.reflect.Classes; +import cn.orionsec.kit.spring.SpringHolder; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.interfaces.Join; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.TableInfo; import com.baomidou.mybatisplus.core.metadata.TableInfoHelper; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.lang.define.wrapper.IPageRequest; -import com.orion.lang.define.wrapper.PageRequest; -import com.orion.lang.define.wrapper.Pager; -import com.orion.lang.utils.Exceptions; -import com.orion.lang.utils.Objects1; -import com.orion.lang.utils.Valid; -import com.orion.lang.utils.collect.Lists; -import com.orion.lang.utils.reflect.Classes; -import com.orion.spring.SpringHolder; -import com.orion.visor.framework.common.constant.Const; -import com.orion.visor.framework.common.utils.SqlUtils; -import com.orion.visor.framework.mybatis.core.domain.BaseDO; +import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.framework.common.utils.SqlUtils; +import org.dromara.visor.framework.mybatis.core.domain.BaseDO; import java.io.Serializable; import java.util.List; @@ -89,8 +89,8 @@ public class DataQuery { return new DataQuery<>(dao, wrapper); } - public DataQuery page(com.orion.visor.framework.common.entity.PageRequest page) { - com.orion.visor.framework.common.entity.PageRequest pr = Valid.notNull(page, "page is null"); + public DataQuery page(org.dromara.visor.framework.common.entity.PageRequest page) { + org.dromara.visor.framework.common.entity.PageRequest pr = Valid.notNull(page, "page is null"); this.page = new PageRequest(pr.getPage(), pr.getLimit()); return this; } diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/query/Then.java b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/query/Then.java similarity index 93% rename from orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/query/Then.java rename to orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/query/Then.java index 9f75c47f..e912cb28 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/query/Then.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/query/Then.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.mybatis.core.query; +package org.dromara.visor.framework.mybatis.core.query; /** * 链式操作 diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/query/ThenLambdaWrapper.java b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/query/ThenLambdaWrapper.java similarity index 98% rename from orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/query/ThenLambdaWrapper.java rename to orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/query/ThenLambdaWrapper.java index 907fad8e..5dcd566a 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/query/ThenLambdaWrapper.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/query/ThenLambdaWrapper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.mybatis.core.query; +package org.dromara.visor.framework.mybatis.core.query; import com.baomidou.mybatisplus.core.conditions.AbstractLambdaWrapper; import com.baomidou.mybatisplus.core.conditions.SharedString; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/query/ThenValidateLambdaWrapper.java b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/query/ThenValidateLambdaWrapper.java similarity index 97% rename from orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/query/ThenValidateLambdaWrapper.java rename to orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/query/ThenValidateLambdaWrapper.java index e83c5858..849d46bf 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/query/ThenValidateLambdaWrapper.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/query/ThenValidateLambdaWrapper.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.mybatis.core.query; +package org.dromara.visor.framework.mybatis.core.query; import com.baomidou.mybatisplus.core.toolkit.support.SFunction; import java.util.Collection; -import static com.orion.visor.framework.mybatis.core.query.Conditions.isIllegal; +import static org.dromara.visor.framework.mybatis.core.query.Conditions.isIllegal; /** * 复制 ValidateLambdaWrapper diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/query/ValidateLambdaWrapper.java b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/query/ValidateLambdaWrapper.java similarity index 97% rename from orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/query/ValidateLambdaWrapper.java rename to orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/query/ValidateLambdaWrapper.java index 59aaf1aa..36953eac 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/query/ValidateLambdaWrapper.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/query/ValidateLambdaWrapper.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.mybatis.core.query; +package org.dromara.visor.framework.mybatis.core.query; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.support.SFunction; import java.util.Collection; -import static com.orion.visor.framework.mybatis.core.query.Conditions.isIllegal; +import static org.dromara.visor.framework.mybatis.core.query.Conditions.isIllegal; /** * 有效性验证 wrapper diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/type/ITypeHandler.java b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/type/ITypeHandler.java similarity index 94% rename from orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/type/ITypeHandler.java rename to orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/type/ITypeHandler.java index 82b1c064..41ea3aa8 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/type/ITypeHandler.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/type/ITypeHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.mybatis.core.type; +package org.dromara.visor.framework.mybatis.core.type; import org.apache.ibatis.type.TypeHandler; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/type/IntegerListTypeHandler.java b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/type/IntegerListTypeHandler.java similarity index 91% rename from orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/type/IntegerListTypeHandler.java rename to orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/type/IntegerListTypeHandler.java index 152a5ecf..b26e83ff 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/type/IntegerListTypeHandler.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/type/IntegerListTypeHandler.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.mybatis.core.type; +package org.dromara.visor.framework.mybatis.core.type; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.collect.Lists; -import com.orion.visor.framework.common.constant.Const; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.collect.Lists; import org.apache.ibatis.type.JdbcType; import org.apache.ibatis.type.MappedJdbcTypes; import org.apache.ibatis.type.MappedTypes; +import org.dromara.visor.framework.common.constant.Const; import java.sql.CallableStatement; import java.sql.PreparedStatement; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/type/JSONArrayTypeHandler.java b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/type/JSONArrayTypeHandler.java similarity index 97% rename from orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/type/JSONArrayTypeHandler.java rename to orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/type/JSONArrayTypeHandler.java index 7eaa00a2..3edfddee 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/type/JSONArrayTypeHandler.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/type/JSONArrayTypeHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.mybatis.core.type; +package org.dromara.visor.framework.mybatis.core.type; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/type/JSONObjectTypeHandler.java b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/type/JSONObjectTypeHandler.java similarity index 97% rename from orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/type/JSONObjectTypeHandler.java rename to orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/type/JSONObjectTypeHandler.java index f09479f9..391f77e9 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/type/JSONObjectTypeHandler.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/type/JSONObjectTypeHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.mybatis.core.type; +package org.dromara.visor.framework.mybatis.core.type; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/type/LongListTypeHandler.java b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/type/LongListTypeHandler.java similarity index 91% rename from orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/type/LongListTypeHandler.java rename to orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/type/LongListTypeHandler.java index 18df1e11..30d3603d 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/type/LongListTypeHandler.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/type/LongListTypeHandler.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.mybatis.core.type; +package org.dromara.visor.framework.mybatis.core.type; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.collect.Lists; -import com.orion.visor.framework.common.constant.Const; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.collect.Lists; import org.apache.ibatis.type.JdbcType; import org.apache.ibatis.type.MappedJdbcTypes; import org.apache.ibatis.type.MappedTypes; +import org.dromara.visor.framework.common.constant.Const; import java.sql.CallableStatement; import java.sql.PreparedStatement; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/type/StringListTypeHandler.java b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/type/StringListTypeHandler.java similarity index 92% rename from orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/type/StringListTypeHandler.java rename to orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/type/StringListTypeHandler.java index 6af8e6f1..70580bf8 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/type/StringListTypeHandler.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/type/StringListTypeHandler.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.mybatis.core.type; +package org.dromara.visor.framework.mybatis.core.type; -import com.orion.lang.utils.collect.Lists; -import com.orion.visor.framework.common.constant.Const; +import cn.orionsec.kit.lang.utils.collect.Lists; import org.apache.ibatis.type.JdbcType; import org.apache.ibatis.type.MappedJdbcTypes; import org.apache.ibatis.type.MappedTypes; +import org.dromara.visor.framework.common.constant.Const; import java.sql.CallableStatement; import java.sql.PreparedStatement; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/utils/DomainFillUtils.java b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/utils/DomainFillUtils.java similarity index 91% rename from orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/utils/DomainFillUtils.java rename to orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/utils/DomainFillUtils.java index 89c414ae..7e55645e 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/utils/DomainFillUtils.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/utils/DomainFillUtils.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.mybatis.core.utils; +package org.dromara.visor.framework.mybatis.core.utils; -import com.orion.lang.utils.Exceptions; -import com.orion.visor.framework.common.security.SecurityHolder; -import com.orion.visor.framework.mybatis.core.domain.BaseDO; +import cn.orionsec.kit.lang.utils.Exceptions; +import org.dromara.visor.framework.common.security.SecurityHolder; +import org.dromara.visor.framework.mybatis.core.domain.BaseDO; import java.util.Date; import java.util.Objects; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 992f65cc..14929a96 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -com.orion.visor.framework.mybatis.configuration.OrionMybatisAutoConfiguration \ No newline at end of file +org.dromara.visor.framework.mybatis.configuration.OrionMybatisAutoConfiguration \ No newline at end of file diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-cache-dto.java.vm b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-cache-dto.java.vm index 8eed5168..8597654a 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-cache-dto.java.vm +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-cache-dto.java.vm @@ -15,7 +15,7 @@ */ package ${currentPackage}; -import com.orion.lang.define.cache.key.model.LongCacheIdModel; +import cn.orionsec.kit.lang.define.cache.key.model.LongCacheIdModel; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-cache-key-define.java.vm b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-cache-key-define.java.vm index 6cf0d1e5..47f7cd67 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-cache-key-define.java.vm +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-cache-key-define.java.vm @@ -15,9 +15,9 @@ */ package ${currentPackage}; -import com.orion.lang.define.cache.key.CacheKeyBuilder; -import com.orion.lang.define.cache.key.CacheKeyDefine; -import com.orion.lang.define.cache.key.struct.RedisCacheStruct; +import cn.orionsec.kit.lang.define.cache.key.CacheKeyBuilder; +import cn.orionsec.kit.lang.define.cache.key.CacheKeyDefine; +import cn.orionsec.kit.lang.define.cache.key.struct.RedisCacheStruct; #foreach($pkg in ${customModuleFilePackages}) import ${pkg}.*; #end diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-controller.java.vm b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-controller.java.vm index fef1cc42..42cc56b0 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-controller.java.vm +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-controller.java.vm @@ -15,17 +15,21 @@ */ package ${package.Controller}; -import com.orion.lang.define.wrapper.DataGrid; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.extern.slf4j.Slf4j; #if($meta.enableOperatorLog) -import com.orion.visor.framework.biz.operator.log.core.annotation.OperatorLog; +import org.dromara.visor.framework.biz.operator.log.core.annotation.OperatorLog; #end -import com.orion.visor.framework.common.validator.group.Page; -import com.orion.visor.framework.log.core.annotation.IgnoreLog; +import org.dromara.visor.framework.common.validator.group.Page; +import org.dromara.visor.framework.log.core.annotation.IgnoreLog; #if($meta.enableDemoApi) -import com.orion.visor.framework.web.core.annotation.DemoDisableApi; +import org.dromara.visor.framework.web.core.annotation.DemoDisableApi; #end -import com.orion.visor.framework.log.core.enums.IgnoreLogMode; -import com.orion.visor.framework.web.core.annotation.RestWrapper; +import org.dromara.visor.framework.log.core.enums.IgnoreLogMode; +import org.dromara.visor.framework.web.core.annotation.RestWrapper; import ${package.Service}.*; #foreach($pkg in ${customModuleFilePackages}) import ${pkg}.*; @@ -33,10 +37,6 @@ import ${pkg}.*; #if(${superControllerClassPackage}) import ${superControllerClassPackage}; #end -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.extern.slf4j.Slf4j; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-entity-do.java.vm b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-entity-do.java.vm index 5c311415..23d61f50 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-entity-do.java.vm +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-entity-do.java.vm @@ -16,8 +16,8 @@ package ${package.Entity}; import com.baomidou.mybatisplus.annotation.*; -import com.orion.visor.framework.mybatis.core.domain.BaseDO; import io.swagger.v3.oas.annotations.media.Schema; +import org.dromara.visor.framework.mybatis.core.domain.BaseDO; import lombok.*; import java.util.*; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-entity-request-query.java.vm b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-entity-request-query.java.vm index 40bffbf4..8bab0792 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-entity-request-query.java.vm +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-entity-request-query.java.vm @@ -16,9 +16,9 @@ package ${currentPackage}; import com.fasterxml.jackson.annotation.JsonFormat; -import com.orion.visor.framework.common.entity.PageRequest; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import org.dromara.visor.framework.common.entity.PageRequest; import javax.validation.constraints.Size; import java.util.*; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-mapper.java.vm b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-mapper.java.vm index f9b963e4..d5a0a123 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-mapper.java.vm +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-mapper.java.vm @@ -16,11 +16,11 @@ package ${package.Mapper}; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import ${superMapperClassPackage}; -import ${package.Entity}.${entity}; #if(${mapperAnnotationClass}) import ${mapperAnnotationClass.name}; #end +import ${superMapperClassPackage}; +import ${package.Entity}.${entity}; /** * $!{table.comment} Mapper 接口 diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-operator-key-define.java.vm b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-operator-key-define.java.vm index e79d70e3..c21b2a75 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-operator-key-define.java.vm +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-operator-key-define.java.vm @@ -15,11 +15,11 @@ */ package ${currentPackage}; -import com.orion.visor.framework.biz.operator.log.core.annotation.Module; -import com.orion.visor.framework.biz.operator.log.core.factory.InitializingOperatorTypes; -import com.orion.visor.framework.biz.operator.log.core.model.OperatorType; +import org.dromara.visor.framework.biz.operator.log.core.annotation.Module; +import org.dromara.visor.framework.biz.operator.log.core.factory.InitializingOperatorTypes; +import org.dromara.visor.framework.biz.operator.log.core.model.OperatorType; -import static com.orion.visor.framework.biz.operator.log.core.enums.OperatorRiskLevel.*; +import static org.dromara.visor.framework.biz.operator.log.core.enums.OperatorRiskLevel.*; /** * $!{table.comment} 操作日志类型 diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-service-impl.java.vm b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-service-impl.java.vm index e1ec26e5..3181fc84 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-service-impl.java.vm +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-service-impl.java.vm @@ -15,16 +15,17 @@ */ package ${package.ServiceImpl}; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.collect.Lists; 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.visor.framework.common.constant.ErrorMessage; -import com.orion.visor.framework.common.utils.Valid; +import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.common.constant.ErrorMessage; +import org.dromara.visor.framework.common.utils.Valid; #if($meta.enableCache) -import com.orion.visor.framework.redis.core.utils.RedisMaps; -import com.orion.visor.framework.redis.core.utils.barrier.CacheBarriers; +import org.dromara.visor.framework.redis.core.utils.RedisMaps; +import org.dromara.visor.framework.redis.core.utils.barrier.CacheBarriers; #end #foreach($pkg in ${customModuleFilePackages}) import ${pkg}.*; @@ -32,7 +33,6 @@ import ${pkg}.*; import ${package.Entity}.${entity}; import ${package.Mapper}.${table.mapperName}; import ${package.Service}.${table.serviceName}; -import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-service.java.vm b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-service.java.vm index 58c01e5c..432369d3 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-service.java.vm +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-service.java.vm @@ -15,8 +15,8 @@ */ package ${package.Service}; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.lang.define.wrapper.DataGrid; #foreach($pkg in ${customModuleFilePackages}) import ${pkg}.*; #end diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-provider-api-impl.java.vm b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-provider-api-impl.java.vm index b42fd795..937b8c67 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-provider-api-impl.java.vm +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-provider-api-impl.java.vm @@ -15,11 +15,12 @@ */ package ${currentPackage}; +import cn.orionsec.kit.lang.utils.collect.Lists; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.lang.utils.collect.Lists; -import com.orion.visor.framework.common.constant.ErrorMessage; -import com.orion.visor.framework.common.utils.Valid; +import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.common.constant.ErrorMessage; +import org.dromara.visor.framework.common.utils.Valid; #foreach($pkg in ${customModuleFilePackages}) import ${pkg}.*; #end @@ -29,7 +30,6 @@ import ${pkg}.*; import ${package.Entity}.${entity}; import ${package.Mapper}.${table.mapperName}; import ${package.Service}.${table.serviceName}; -import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-test-api-impl-tests.java.vm b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-test-api-impl-tests.java.vm index 94ece8fd..c4a691e3 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-test-api-impl-tests.java.vm +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-test-api-impl-tests.java.vm @@ -15,14 +15,14 @@ */ package ${currentPackage}; -import com.orion.lang.utils.collect.Lists; -import com.orion.visor.framework.test.core.base.BaseUnitTest; -import com.orion.visor.framework.test.core.utils.EntityRandoms; +import cn.orionsec.kit.lang.utils.collect.Lists; +import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.test.core.base.BaseUnitTest; +import org.dromara.visor.framework.test.core.utils.EntityRandoms; import ${package.ServiceImpl}.*; #foreach($pkg in ${customProviderFilePackages}) import ${pkg}.*; #end -import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.springframework.context.annotation.Import; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-test-service-impl-tests.java.vm b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-test-service-impl-tests.java.vm index 21f08483..62b070e2 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-test-service-impl-tests.java.vm +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-test-service-impl-tests.java.vm @@ -15,15 +15,15 @@ */ package ${currentPackage}; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.lang.utils.collect.Lists; -import com.orion.visor.framework.test.core.base.BaseUnitTest; -import com.orion.visor.framework.test.core.utils.EntityRandoms; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import cn.orionsec.kit.lang.utils.collect.Lists; +import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.test.core.base.BaseUnitTest; +import org.dromara.visor.framework.test.core.utils.EntityRandoms; import ${package.Service}.*; #foreach($pkg in ${customModuleFilePackages}) import ${pkg}.*; #end -import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.springframework.context.annotation.Import; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-redis/pom.xml b/orion-visor-framework/orion-visor-spring-boot-starter-redis/pom.xml index 449bd426..8b4ddb23 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-redis/pom.xml +++ b/orion-visor-framework/orion-visor-spring-boot-starter-redis/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - com.orion.visor + org.dromara.visor orion-visor-framework ${revision} @@ -18,7 +18,7 @@ - com.orion.visor + org.dromara.visor orion-visor-framework-common diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/com/orion/visor/framework/redis/configuration/OrionCacheAutoConfiguration.java b/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/configuration/OrionCacheAutoConfiguration.java similarity index 95% rename from orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/com/orion/visor/framework/redis/configuration/OrionCacheAutoConfiguration.java rename to orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/configuration/OrionCacheAutoConfiguration.java index 20d6bb9c..e3bebba8 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/com/orion/visor/framework/redis/configuration/OrionCacheAutoConfiguration.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/configuration/OrionCacheAutoConfiguration.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.redis.configuration; +package org.dromara.visor.framework.redis.configuration; -import com.orion.visor.framework.common.constant.AutoConfigureOrderConst; +import org.dromara.visor.framework.common.constant.AutoConfigureOrderConst; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigureOrder; import org.springframework.boot.autoconfigure.cache.CacheProperties; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/com/orion/visor/framework/redis/configuration/OrionRedisAutoConfiguration.java b/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/configuration/OrionRedisAutoConfiguration.java similarity index 88% rename from orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/com/orion/visor/framework/redis/configuration/OrionRedisAutoConfiguration.java rename to orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/configuration/OrionRedisAutoConfiguration.java index 9a9a048e..299ac856 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/com/orion/visor/framework/redis/configuration/OrionRedisAutoConfiguration.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/configuration/OrionRedisAutoConfiguration.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.redis.configuration; +package org.dromara.visor.framework.redis.configuration; -import com.orion.visor.framework.common.constant.AutoConfigureOrderConst; -import com.orion.visor.framework.common.lock.Locker; -import com.orion.visor.framework.common.utils.LockerUtils; -import com.orion.visor.framework.redis.configuration.config.RedissonConfig; -import com.orion.visor.framework.redis.core.lock.RedisLocker; -import com.orion.visor.framework.redis.core.utils.RedisUtils; +import org.dromara.visor.framework.common.constant.AutoConfigureOrderConst; +import org.dromara.visor.framework.common.lock.Locker; +import org.dromara.visor.framework.common.utils.LockerUtils; +import org.dromara.visor.framework.redis.configuration.config.RedissonConfig; +import org.dromara.visor.framework.redis.core.lock.RedisLocker; +import org.dromara.visor.framework.redis.core.utils.RedisUtils; import org.redisson.api.RedissonClient; import org.redisson.config.SingleServerConfig; import org.redisson.spring.starter.RedissonAutoConfigurationCustomizer; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/com/orion/visor/framework/redis/configuration/config/RedissonConfig.java b/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/configuration/config/RedissonConfig.java similarity index 95% rename from orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/com/orion/visor/framework/redis/configuration/config/RedissonConfig.java rename to orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/configuration/config/RedissonConfig.java index 9d3094a5..44d5d203 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/com/orion/visor/framework/redis/configuration/config/RedissonConfig.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/configuration/config/RedissonConfig.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.redis.configuration.config; +package org.dromara.visor.framework.redis.configuration.config; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/com/orion/visor/framework/redis/core/lock/RedisLocker.java b/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/core/lock/RedisLocker.java similarity index 92% rename from orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/com/orion/visor/framework/redis/core/lock/RedisLocker.java rename to orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/core/lock/RedisLocker.java index 52488e54..712fa544 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/com/orion/visor/framework/redis/core/lock/RedisLocker.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/core/lock/RedisLocker.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.redis.core.lock; +package org.dromara.visor.framework.redis.core.lock; -import com.orion.lang.utils.Exceptions; -import com.orion.visor.framework.common.lock.Locker; +import cn.orionsec.kit.lang.utils.Exceptions; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.common.lock.Locker; import org.redisson.api.RLock; import org.redisson.api.RedissonClient; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/com/orion/visor/framework/redis/core/utils/RedisLists.java b/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/core/utils/RedisLists.java similarity index 97% rename from orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/com/orion/visor/framework/redis/core/utils/RedisLists.java rename to orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/core/utils/RedisLists.java index b42122e8..eaf2a74a 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/com/orion/visor/framework/redis/core/utils/RedisLists.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/core/utils/RedisLists.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.redis.core.utils; +package org.dromara.visor.framework.redis.core.utils; +import cn.orionsec.kit.lang.define.cache.key.CacheKeyDefine; +import cn.orionsec.kit.lang.utils.collect.Lists; import com.alibaba.fastjson.JSON; -import com.orion.lang.define.cache.key.CacheKeyDefine; -import com.orion.lang.utils.collect.Lists; -import com.orion.visor.framework.common.constant.Const; +import org.dromara.visor.framework.common.constant.Const; import java.util.List; import java.util.function.Function; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/com/orion/visor/framework/redis/core/utils/RedisMaps.java b/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/core/utils/RedisMaps.java similarity index 98% rename from orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/com/orion/visor/framework/redis/core/utils/RedisMaps.java rename to orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/core/utils/RedisMaps.java index 07701df1..66b52768 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/com/orion/visor/framework/redis/core/utils/RedisMaps.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/core/utils/RedisMaps.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.redis.core.utils; +package org.dromara.visor.framework.redis.core.utils; +import cn.orionsec.kit.lang.define.cache.key.CacheKeyDefine; +import cn.orionsec.kit.lang.function.Functions; +import cn.orionsec.kit.lang.utils.Objects1; +import cn.orionsec.kit.lang.utils.collect.Lists; +import cn.orionsec.kit.lang.utils.collect.Maps; import com.alibaba.fastjson.JSON; -import com.orion.lang.define.cache.key.CacheKeyDefine; -import com.orion.lang.function.Functions; -import com.orion.lang.utils.Objects1; -import com.orion.lang.utils.collect.Lists; -import com.orion.lang.utils.collect.Maps; import org.springframework.data.redis.core.HashOperations; import java.util.List; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/com/orion/visor/framework/redis/core/utils/RedisStrings.java b/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/core/utils/RedisStrings.java similarity index 98% rename from orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/com/orion/visor/framework/redis/core/utils/RedisStrings.java rename to orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/core/utils/RedisStrings.java index d906e3fa..7ef4b706 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/com/orion/visor/framework/redis/core/utils/RedisStrings.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/core/utils/RedisStrings.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.redis.core.utils; +package org.dromara.visor.framework.redis.core.utils; +import cn.orionsec.kit.lang.define.cache.key.CacheKeyDefine; +import cn.orionsec.kit.lang.utils.Strings; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.orion.lang.define.cache.key.CacheKeyDefine; -import com.orion.lang.utils.Strings; import java.util.ArrayList; import java.util.Collection; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/com/orion/visor/framework/redis/core/utils/RedisUtils.java b/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/core/utils/RedisUtils.java similarity index 95% rename from orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/com/orion/visor/framework/redis/core/utils/RedisUtils.java rename to orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/core/utils/RedisUtils.java index 5e51582b..668fcdcf 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/com/orion/visor/framework/redis/core/utils/RedisUtils.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/core/utils/RedisUtils.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.redis.core.utils; +package org.dromara.visor.framework.redis.core.utils; -import com.orion.lang.define.cache.key.CacheKeyDefine; -import com.orion.lang.utils.Arrays1; -import com.orion.lang.utils.Exceptions; -import com.orion.lang.utils.io.Streams; +import cn.orionsec.kit.lang.define.cache.key.CacheKeyDefine; +import cn.orionsec.kit.lang.utils.Arrays1; +import cn.orionsec.kit.lang.utils.Exceptions; +import cn.orionsec.kit.lang.utils.io.Streams; import org.springframework.data.redis.core.Cursor; import org.springframework.data.redis.core.RedisCallback; import org.springframework.data.redis.core.RedisTemplate; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/com/orion/visor/framework/redis/core/utils/barrier/CacheBarriers.java b/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/core/utils/barrier/CacheBarriers.java similarity index 83% rename from orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/com/orion/visor/framework/redis/core/utils/barrier/CacheBarriers.java rename to orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/core/utils/barrier/CacheBarriers.java index a19888ff..adcac857 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/com/orion/visor/framework/redis/core/utils/barrier/CacheBarriers.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/core/utils/barrier/CacheBarriers.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.redis.core.utils.barrier; +package org.dromara.visor.framework.redis.core.utils.barrier; -import com.orion.lang.define.barrier.GenericsAnonymousCollectionBarrier; -import com.orion.lang.define.barrier.GenericsAnonymousMapBarrier; -import com.orion.lang.define.barrier.GenericsBarrier; -import com.orion.lang.define.cache.key.model.LongCacheIdModel; -import com.orion.lang.utils.collect.Lists; -import com.orion.visor.framework.common.constant.Const; +import cn.orionsec.kit.lang.define.barrier.GenericsAnonymousCollectionBarrier; +import cn.orionsec.kit.lang.define.barrier.GenericsAnonymousMapBarrier; +import cn.orionsec.kit.lang.define.barrier.GenericsBarrier; +import cn.orionsec.kit.lang.define.cache.key.model.LongCacheIdModel; +import cn.orionsec.kit.lang.utils.collect.Lists; +import org.dromara.visor.framework.common.constant.Const; import java.util.Collection; import java.util.Map; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/resources/META-INF/additional-spring-configuration-metadata.json index f6df31da..742bca9f 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -2,8 +2,8 @@ "groups": [ { "name": "spring.redisson", - "type": "com.orion.visor.framework.redis.configuration.config.RedissonConfig", - "sourceType": "com.orion.visor.framework.redis.configuration.config.RedissonConfig" + "type": "org.dromara.visor.framework.redis.configuration.config.RedissonConfig", + "sourceType": "org.dromara.visor.framework.redis.configuration.config.RedissonConfig" } ], "properties": [ diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 02165398..87d2d384 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1,2 +1,2 @@ -com.orion.visor.framework.redis.configuration.OrionRedisAutoConfiguration -com.orion.visor.framework.redis.configuration.OrionCacheAutoConfiguration \ No newline at end of file +org.dromara.visor.framework.redis.configuration.OrionRedisAutoConfiguration +org.dromara.visor.framework.redis.configuration.OrionCacheAutoConfiguration \ No newline at end of file diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-security/pom.xml b/orion-visor-framework/orion-visor-spring-boot-starter-security/pom.xml index 691e2dba..7ebd4451 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-security/pom.xml +++ b/orion-visor-framework/orion-visor-spring-boot-starter-security/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - com.orion.visor + org.dromara.visor orion-visor-framework ${revision} @@ -18,7 +18,7 @@ - com.orion.visor + org.dromara.visor orion-visor-framework-common diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/configuration/OrionCryptoAutoConfiguration.java b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/configuration/OrionCryptoAutoConfiguration.java similarity index 80% rename from orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/configuration/OrionCryptoAutoConfiguration.java rename to orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/configuration/OrionCryptoAutoConfiguration.java index 0fe0a8e8..219740b9 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/configuration/OrionCryptoAutoConfiguration.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/configuration/OrionCryptoAutoConfiguration.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.security.configuration; +package org.dromara.visor.framework.security.configuration; -import com.orion.visor.framework.common.constant.AutoConfigureOrderConst; -import com.orion.visor.framework.common.crypto.ValueCrypto; -import com.orion.visor.framework.security.configuration.config.AesCryptoConfig; -import com.orion.visor.framework.security.core.crypto.PrimaryValueCrypto; -import com.orion.visor.framework.security.core.crypto.processor.AesCryptoProcessor; +import org.dromara.visor.framework.common.constant.AutoConfigureOrderConst; +import org.dromara.visor.framework.common.crypto.ValueCrypto; +import org.dromara.visor.framework.security.configuration.config.AesCryptoConfig; +import org.dromara.visor.framework.security.core.crypto.PrimaryValueCrypto; +import org.dromara.visor.framework.security.core.crypto.processor.AesCryptoProcessor; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigureOrder; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/configuration/OrionSecurityAutoConfiguration.java b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/configuration/OrionSecurityAutoConfiguration.java similarity index 91% rename from orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/configuration/OrionSecurityAutoConfiguration.java rename to orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/configuration/OrionSecurityAutoConfiguration.java index 0174c1bb..73fee580 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/configuration/OrionSecurityAutoConfiguration.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/configuration/OrionSecurityAutoConfiguration.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.security.configuration; +package org.dromara.visor.framework.security.configuration; -import com.orion.visor.framework.common.constant.AutoConfigureOrderConst; -import com.orion.visor.framework.security.configuration.config.SecurityConfig; -import com.orion.visor.framework.security.core.context.TransmittableThreadLocalSecurityContextHolderStrategy; -import com.orion.visor.framework.security.core.filter.TokenAuthenticationFilter; -import com.orion.visor.framework.security.core.handler.AuthenticationEntryPointHandler; -import com.orion.visor.framework.security.core.handler.ForbiddenAccessDeniedHandler; -import com.orion.visor.framework.security.core.service.SecurityFrameworkService; -import com.orion.visor.framework.security.core.service.SecurityFrameworkServiceDelegate; -import com.orion.visor.framework.security.core.service.SecurityHolderDelegate; -import com.orion.visor.framework.security.core.strategy.*; +import org.dromara.visor.framework.common.constant.AutoConfigureOrderConst; +import org.dromara.visor.framework.security.configuration.config.SecurityConfig; +import org.dromara.visor.framework.security.core.context.TransmittableThreadLocalSecurityContextHolderStrategy; +import org.dromara.visor.framework.security.core.filter.TokenAuthenticationFilter; +import org.dromara.visor.framework.security.core.handler.AuthenticationEntryPointHandler; +import org.dromara.visor.framework.security.core.handler.ForbiddenAccessDeniedHandler; +import org.dromara.visor.framework.security.core.service.SecurityFrameworkService; +import org.dromara.visor.framework.security.core.service.SecurityFrameworkServiceDelegate; +import org.dromara.visor.framework.security.core.service.SecurityHolderDelegate; +import org.dromara.visor.framework.security.core.strategy.*; import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.config.MethodInvokingFactoryBean; import org.springframework.boot.autoconfigure.AutoConfiguration; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/configuration/config/AesCryptoConfig.java b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/configuration/config/AesCryptoConfig.java similarity index 85% rename from orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/configuration/config/AesCryptoConfig.java rename to orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/configuration/config/AesCryptoConfig.java index 413c3888..b95edf8b 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/configuration/config/AesCryptoConfig.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/configuration/config/AesCryptoConfig.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.security.configuration.config; +package org.dromara.visor.framework.security.configuration.config; -import com.orion.lang.utils.crypto.CryptoConst; -import com.orion.lang.utils.crypto.enums.PaddingMode; -import com.orion.lang.utils.crypto.enums.WorkingMode; -import com.orion.visor.framework.security.core.crypto.CryptoConfig; +import cn.orionsec.kit.lang.utils.crypto.CryptoConst; +import cn.orionsec.kit.lang.utils.crypto.enums.PaddingMode; +import cn.orionsec.kit.lang.utils.crypto.enums.WorkingMode; import lombok.Data; import lombok.EqualsAndHashCode; +import org.dromara.visor.framework.security.core.crypto.CryptoConfig; import org.springframework.boot.context.properties.ConfigurationProperties; /** diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/configuration/config/SecurityConfig.java b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/configuration/config/SecurityConfig.java similarity index 91% rename from orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/configuration/config/SecurityConfig.java rename to orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/configuration/config/SecurityConfig.java index 9cdfc2d6..2828cc3c 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/configuration/config/SecurityConfig.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/configuration/config/SecurityConfig.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.security.configuration.config; +package org.dromara.visor.framework.security.configuration.config; -import com.orion.visor.framework.common.utils.ConfigUtils; import lombok.Data; +import org.dromara.visor.framework.common.utils.ConfigUtils; import org.springframework.boot.context.properties.ConfigurationProperties; import java.util.List; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/context/TransmittableThreadLocalSecurityContextHolderStrategy.java b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/context/TransmittableThreadLocalSecurityContextHolderStrategy.java similarity index 95% rename from orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/context/TransmittableThreadLocalSecurityContextHolderStrategy.java rename to orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/context/TransmittableThreadLocalSecurityContextHolderStrategy.java index a2c4daee..2eda59a6 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/context/TransmittableThreadLocalSecurityContextHolderStrategy.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/context/TransmittableThreadLocalSecurityContextHolderStrategy.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.security.core.context; +package org.dromara.visor.framework.security.core.context; +import cn.orionsec.kit.lang.utils.Valid; import com.alibaba.ttl.TransmittableThreadLocal; -import com.orion.lang.utils.Valid; import org.springframework.security.core.context.SecurityContext; import org.springframework.security.core.context.SecurityContextHolderStrategy; import org.springframework.security.core.context.SecurityContextImpl; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/crypto/CryptoConfig.java b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/crypto/CryptoConfig.java similarity index 94% rename from orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/crypto/CryptoConfig.java rename to orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/crypto/CryptoConfig.java index 71c67787..4291d9c3 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/crypto/CryptoConfig.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/crypto/CryptoConfig.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.security.core.crypto; +package org.dromara.visor.framework.security.core.crypto; import lombok.Data; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/crypto/CryptoProcessor.java b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/crypto/CryptoProcessor.java similarity index 88% rename from orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/crypto/CryptoProcessor.java rename to orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/crypto/CryptoProcessor.java index 14a7bb0e..8c2eb174 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/crypto/CryptoProcessor.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/crypto/CryptoProcessor.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.security.core.crypto; +package org.dromara.visor.framework.security.core.crypto; -import com.orion.visor.framework.common.crypto.ValueCrypto; -import com.orion.visor.framework.common.utils.CryptoUtils; +import org.dromara.visor.framework.common.crypto.ValueCrypto; +import org.dromara.visor.framework.common.utils.CryptoUtils; /** * 数据加密器 diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/crypto/PrimaryValueCrypto.java b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/crypto/PrimaryValueCrypto.java similarity index 88% rename from orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/crypto/PrimaryValueCrypto.java rename to orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/crypto/PrimaryValueCrypto.java index c141685e..27884fb5 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/crypto/PrimaryValueCrypto.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/crypto/PrimaryValueCrypto.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.security.core.crypto; +package org.dromara.visor.framework.security.core.crypto; -import com.orion.lang.utils.Exceptions; -import com.orion.visor.framework.common.crypto.ValueCrypto; +import cn.orionsec.kit.lang.utils.Exceptions; +import org.dromara.visor.framework.common.crypto.ValueCrypto; /** * 默认加密器 diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/crypto/processor/AesCryptoProcessor.java b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/crypto/processor/AesCryptoProcessor.java similarity index 84% rename from orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/crypto/processor/AesCryptoProcessor.java rename to orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/crypto/processor/AesCryptoProcessor.java index 0aa838b1..ba98a8d9 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/crypto/processor/AesCryptoProcessor.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/crypto/processor/AesCryptoProcessor.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.security.core.crypto.processor; +package org.dromara.visor.framework.security.core.crypto.processor; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.crypto.Keys; -import com.orion.lang.utils.crypto.enums.CipherAlgorithm; -import com.orion.lang.utils.crypto.enums.WorkingMode; -import com.orion.lang.utils.crypto.symmetric.SymmetricBuilder; -import com.orion.lang.utils.crypto.symmetric.SymmetricCrypto; -import com.orion.visor.framework.security.configuration.config.AesCryptoConfig; -import com.orion.visor.framework.security.core.crypto.CryptoProcessor; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.crypto.Keys; +import cn.orionsec.kit.lang.utils.crypto.enums.CipherAlgorithm; +import cn.orionsec.kit.lang.utils.crypto.enums.WorkingMode; +import cn.orionsec.kit.lang.utils.crypto.symmetric.SymmetricBuilder; +import cn.orionsec.kit.lang.utils.crypto.symmetric.SymmetricCrypto; +import org.dromara.visor.framework.security.configuration.config.AesCryptoConfig; +import org.dromara.visor.framework.security.core.crypto.CryptoProcessor; import javax.crypto.SecretKey; import java.security.spec.AlgorithmParameterSpec; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/filter/TokenAuthenticationFilter.java b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/filter/TokenAuthenticationFilter.java similarity index 83% rename from orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/filter/TokenAuthenticationFilter.java rename to orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/filter/TokenAuthenticationFilter.java index be984319..b83e372f 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/filter/TokenAuthenticationFilter.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/filter/TokenAuthenticationFilter.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.security.core.filter; +package org.dromara.visor.framework.security.core.filter; -import com.orion.lang.exception.argument.HttpWrapperException; -import com.orion.lang.utils.Strings; -import com.orion.visor.framework.common.constant.ErrorCode; -import com.orion.visor.framework.common.security.LoginUser; -import com.orion.visor.framework.security.core.service.SecurityFrameworkService; -import com.orion.visor.framework.security.core.utils.SecurityUtils; -import com.orion.web.servlet.web.Servlets; +import cn.orionsec.kit.lang.exception.argument.HttpWrapperException; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.web.servlet.web.Servlets; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.common.constant.ErrorCode; +import org.dromara.visor.framework.common.security.LoginUser; +import org.dromara.visor.framework.security.core.service.SecurityFrameworkService; +import org.dromara.visor.framework.security.core.utils.SecurityUtils; import org.springframework.web.filter.OncePerRequestFilter; import javax.servlet.FilterChain; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/handler/AuthenticationEntryPointHandler.java b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/handler/AuthenticationEntryPointHandler.java similarity index 90% rename from orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/handler/AuthenticationEntryPointHandler.java rename to orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/handler/AuthenticationEntryPointHandler.java index afea1072..5772cb62 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/handler/AuthenticationEntryPointHandler.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/handler/AuthenticationEntryPointHandler.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.security.core.handler; +package org.dromara.visor.framework.security.core.handler; -import com.orion.visor.framework.common.constant.ErrorCode; -import com.orion.web.servlet.web.Servlets; +import cn.orionsec.kit.web.servlet.web.Servlets; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.common.constant.ErrorCode; import org.springframework.security.core.AuthenticationException; import org.springframework.security.web.AuthenticationEntryPoint; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/handler/ForbiddenAccessDeniedHandler.java b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/handler/ForbiddenAccessDeniedHandler.java similarity index 86% rename from orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/handler/ForbiddenAccessDeniedHandler.java rename to orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/handler/ForbiddenAccessDeniedHandler.java index e5ab330b..0abe9d5f 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/handler/ForbiddenAccessDeniedHandler.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/handler/ForbiddenAccessDeniedHandler.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.security.core.handler; +package org.dromara.visor.framework.security.core.handler; -import com.orion.visor.framework.common.constant.ErrorCode; -import com.orion.visor.framework.security.core.utils.SecurityUtils; -import com.orion.web.servlet.web.Servlets; +import cn.orionsec.kit.web.servlet.web.Servlets; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.common.constant.ErrorCode; +import org.dromara.visor.framework.security.core.utils.SecurityUtils; import org.springframework.security.access.AccessDeniedException; import org.springframework.security.web.access.AccessDeniedHandler; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/service/SecurityFrameworkService.java b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/service/SecurityFrameworkService.java similarity index 93% rename from orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/service/SecurityFrameworkService.java rename to orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/service/SecurityFrameworkService.java index 90cbd04f..e524ae56 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/service/SecurityFrameworkService.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/service/SecurityFrameworkService.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.security.core.service; +package org.dromara.visor.framework.security.core.service; -import com.orion.visor.framework.common.security.LoginUser; +import org.dromara.visor.framework.common.security.LoginUser; /** * 权限校验服务 diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/service/SecurityFrameworkServiceDelegate.java b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/service/SecurityFrameworkServiceDelegate.java similarity index 93% rename from orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/service/SecurityFrameworkServiceDelegate.java rename to orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/service/SecurityFrameworkServiceDelegate.java index 00d1f217..71bb96ff 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/service/SecurityFrameworkServiceDelegate.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/service/SecurityFrameworkServiceDelegate.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.security.core.service; +package org.dromara.visor.framework.security.core.service; -import com.orion.visor.framework.common.security.LoginUser; +import org.dromara.visor.framework.common.security.LoginUser; /** * 权限校验服务委托类 diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/service/SecurityHolderDelegate.java b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/service/SecurityHolderDelegate.java similarity index 79% rename from orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/service/SecurityHolderDelegate.java rename to orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/service/SecurityHolderDelegate.java index 4033a7b1..a7540675 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/service/SecurityHolderDelegate.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/service/SecurityHolderDelegate.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.security.core.service; +package org.dromara.visor.framework.security.core.service; -import com.orion.visor.framework.common.security.LoginUser; -import com.orion.visor.framework.common.security.SecurityHolder; -import com.orion.visor.framework.security.core.utils.SecurityUtils; +import org.dromara.visor.framework.common.security.LoginUser; +import org.dromara.visor.framework.common.security.SecurityHolder; +import org.dromara.visor.framework.security.core.utils.SecurityUtils; /** * SecurityHolder 委托类 diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/strategy/AuthorizeRequestsCustomizer.java b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/strategy/AuthorizeRequestsCustomizer.java similarity index 95% rename from orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/strategy/AuthorizeRequestsCustomizer.java rename to orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/strategy/AuthorizeRequestsCustomizer.java index c632f814..ffe3400a 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/strategy/AuthorizeRequestsCustomizer.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/strategy/AuthorizeRequestsCustomizer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.security.core.strategy; +package org.dromara.visor.framework.security.core.strategy; import org.springframework.core.Ordered; import org.springframework.security.config.Customizer; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/strategy/ConfigAuthorizeRequestsCustomizer.java b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/strategy/ConfigAuthorizeRequestsCustomizer.java similarity index 91% rename from orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/strategy/ConfigAuthorizeRequestsCustomizer.java rename to orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/strategy/ConfigAuthorizeRequestsCustomizer.java index ce78530a..de74fce1 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/strategy/ConfigAuthorizeRequestsCustomizer.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/strategy/ConfigAuthorizeRequestsCustomizer.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.security.core.strategy; +package org.dromara.visor.framework.security.core.strategy; -import com.orion.visor.framework.security.configuration.config.SecurityConfig; +import org.dromara.visor.framework.security.configuration.config.SecurityConfig; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configurers.ExpressionUrlAuthorizationConfigurer; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/strategy/ConsoleAuthorizeRequestsCustomizer.java b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/strategy/ConsoleAuthorizeRequestsCustomizer.java similarity index 97% rename from orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/strategy/ConsoleAuthorizeRequestsCustomizer.java rename to orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/strategy/ConsoleAuthorizeRequestsCustomizer.java index 4a2d250a..026cff30 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/strategy/ConsoleAuthorizeRequestsCustomizer.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/strategy/ConsoleAuthorizeRequestsCustomizer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.security.core.strategy; +package org.dromara.visor.framework.security.core.strategy; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configurers.ExpressionUrlAuthorizationConfigurer; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/strategy/PermitAllAnnotationAuthorizeRequestsCustomizer.java b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/strategy/PermitAllAnnotationAuthorizeRequestsCustomizer.java similarity index 98% rename from orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/strategy/PermitAllAnnotationAuthorizeRequestsCustomizer.java rename to orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/strategy/PermitAllAnnotationAuthorizeRequestsCustomizer.java index d0d5e7a5..501ef65b 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/strategy/PermitAllAnnotationAuthorizeRequestsCustomizer.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/strategy/PermitAllAnnotationAuthorizeRequestsCustomizer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.security.core.strategy; +package org.dromara.visor.framework.security.core.strategy; import org.springframework.context.ApplicationContext; import org.springframework.http.HttpMethod; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/strategy/StaticResourceAuthorizeRequestsCustomizer.java b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/strategy/StaticResourceAuthorizeRequestsCustomizer.java similarity index 95% rename from orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/strategy/StaticResourceAuthorizeRequestsCustomizer.java rename to orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/strategy/StaticResourceAuthorizeRequestsCustomizer.java index 375833f7..384e75e8 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/strategy/StaticResourceAuthorizeRequestsCustomizer.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/strategy/StaticResourceAuthorizeRequestsCustomizer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.security.core.strategy; +package org.dromara.visor.framework.security.core.strategy; import org.springframework.http.HttpMethod; import org.springframework.security.config.annotation.web.builders.HttpSecurity; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/strategy/WebsocketAuthorizeRequestsCustomizer.java b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/strategy/WebsocketAuthorizeRequestsCustomizer.java similarity index 95% rename from orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/strategy/WebsocketAuthorizeRequestsCustomizer.java rename to orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/strategy/WebsocketAuthorizeRequestsCustomizer.java index dd5f5ed2..880bae59 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/strategy/WebsocketAuthorizeRequestsCustomizer.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/strategy/WebsocketAuthorizeRequestsCustomizer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.security.core.strategy; +package org.dromara.visor.framework.security.core.strategy; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configurers.ExpressionUrlAuthorizationConfigurer; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/utils/SecurityUtils.java b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/utils/SecurityUtils.java similarity index 93% rename from orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/utils/SecurityUtils.java rename to orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/utils/SecurityUtils.java index fba6c409..21927175 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/com/orion/visor/framework/security/core/utils/SecurityUtils.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/utils/SecurityUtils.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.security.core.utils; +package org.dromara.visor.framework.security.core.utils; -import com.orion.lang.constant.StandardHttpHeader; -import com.orion.lang.utils.Strings; -import com.orion.visor.framework.common.constant.Const; -import com.orion.visor.framework.common.security.LoginUser; +import cn.orionsec.kit.lang.constant.StandardHttpHeader; +import cn.orionsec.kit.lang.utils.Strings; +import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.framework.common.security.LoginUser; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContext; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/resources/META-INF/additional-spring-configuration-metadata.json index 84baae38..9c0b0f26 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -2,13 +2,13 @@ "groups": [ { "name": "orion.security", - "type": "com.orion.visor.framework.security.configuration.config.SecurityConfig", - "sourceType": "com.orion.visor.framework.security.configuration.config.SecurityConfig" + "type": "org.dromara.visor.framework.security.configuration.config.SecurityConfig", + "sourceType": "org.dromara.visor.framework.security.configuration.config.SecurityConfig" }, { "name": "orion.crypto.aes", - "type": "com.orion.visor.framework.security.configuration.config.AesCryptoConfig", - "sourceType": "com.orion.visor.framework.security.configuration.config.AesCryptoConfig" + "type": "org.dromara.visor.framework.security.configuration.config.AesCryptoConfig", + "sourceType": "org.dromara.visor.framework.security.configuration.config.AesCryptoConfig" } ], "properties": [ @@ -37,13 +37,13 @@ }, { "name": "orion.crypto.aes.working-mode", - "type": "com.orion.lang.utils.crypto.enums.WorkingMode", + "type": "cn.orionsec.kit.lang.utils.crypto.enums.WorkingMode", "description": "加密模式.", "defaultValue": "ECB" }, { "name": "orion.crypto.aes.padding-mode", - "type": "com.orion.lang.utils.crypto.enums.PaddingMode", + "type": "cn.orionsec.kit.lang.utils.crypto.enums.PaddingMode", "description": "填充模式.", "defaultValue": "PKCS5_PADDING" }, diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 200e1549..0de7d6c5 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1,2 +1,2 @@ -com.orion.visor.framework.security.configuration.OrionSecurityAutoConfiguration -com.orion.visor.framework.security.configuration.OrionCryptoAutoConfiguration \ No newline at end of file +org.dromara.visor.framework.security.configuration.OrionSecurityAutoConfiguration +org.dromara.visor.framework.security.configuration.OrionCryptoAutoConfiguration \ No newline at end of file diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-storage/pom.xml b/orion-visor-framework/orion-visor-spring-boot-starter-storage/pom.xml index 07ec23b2..698525c6 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-storage/pom.xml +++ b/orion-visor-framework/orion-visor-spring-boot-starter-storage/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - com.orion.visor + org.dromara.visor orion-visor-framework ${revision} @@ -18,7 +18,7 @@ - com.orion.visor + org.dromara.visor orion-visor-framework-common diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/com/orion/visor/framework/storage/configuration/OrionStorageAutoConfiguration.java b/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/org/dromara/visor/framework/storage/configuration/OrionStorageAutoConfiguration.java similarity index 80% rename from orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/com/orion/visor/framework/storage/configuration/OrionStorageAutoConfiguration.java rename to orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/org/dromara/visor/framework/storage/configuration/OrionStorageAutoConfiguration.java index 46a31c40..941cc657 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/com/orion/visor/framework/storage/configuration/OrionStorageAutoConfiguration.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/org/dromara/visor/framework/storage/configuration/OrionStorageAutoConfiguration.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.storage.configuration; +package org.dromara.visor.framework.storage.configuration; -import com.orion.visor.framework.common.constant.AutoConfigureOrderConst; -import com.orion.visor.framework.common.file.FileClient; -import com.orion.visor.framework.storage.configuration.config.LocalStorageConfig; -import com.orion.visor.framework.storage.configuration.config.LogsStorageConfig; -import com.orion.visor.framework.storage.core.client.PrimaryFileClient; -import com.orion.visor.framework.storage.core.client.local.LocalFileClient; +import org.dromara.visor.framework.common.constant.AutoConfigureOrderConst; +import org.dromara.visor.framework.common.file.FileClient; +import org.dromara.visor.framework.storage.configuration.config.LocalStorageConfig; +import org.dromara.visor.framework.storage.configuration.config.LogsStorageConfig; +import org.dromara.visor.framework.storage.core.client.PrimaryFileClient; +import org.dromara.visor.framework.storage.core.client.local.LocalFileClient; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigureOrder; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/com/orion/visor/framework/storage/configuration/config/LocalStorageConfig.java b/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/org/dromara/visor/framework/storage/configuration/config/LocalStorageConfig.java similarity index 87% rename from orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/com/orion/visor/framework/storage/configuration/config/LocalStorageConfig.java rename to orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/org/dromara/visor/framework/storage/configuration/config/LocalStorageConfig.java index acd1d412..e840fb80 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/com/orion/visor/framework/storage/configuration/config/LocalStorageConfig.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/org/dromara/visor/framework/storage/configuration/config/LocalStorageConfig.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.storage.configuration.config; +package org.dromara.visor.framework.storage.configuration.config; -import com.orion.visor.framework.storage.core.client.local.LocalFileClientConfig; import lombok.Data; import lombok.EqualsAndHashCode; +import org.dromara.visor.framework.storage.core.client.local.LocalFileClientConfig; import org.springframework.boot.context.properties.ConfigurationProperties; /** diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/com/orion/visor/framework/storage/configuration/config/LogsStorageConfig.java b/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/org/dromara/visor/framework/storage/configuration/config/LogsStorageConfig.java similarity index 87% rename from orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/com/orion/visor/framework/storage/configuration/config/LogsStorageConfig.java rename to orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/org/dromara/visor/framework/storage/configuration/config/LogsStorageConfig.java index dfd88415..e03a5e95 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/com/orion/visor/framework/storage/configuration/config/LogsStorageConfig.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/org/dromara/visor/framework/storage/configuration/config/LogsStorageConfig.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.storage.configuration.config; +package org.dromara.visor.framework.storage.configuration.config; -import com.orion.visor.framework.storage.core.client.local.LocalFileClientConfig; import lombok.Data; import lombok.EqualsAndHashCode; +import org.dromara.visor.framework.storage.core.client.local.LocalFileClientConfig; import org.springframework.boot.context.properties.ConfigurationProperties; /** diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/com/orion/visor/framework/storage/core/client/AbstractFileClient.java b/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/org/dromara/visor/framework/storage/core/client/AbstractFileClient.java similarity index 91% rename from orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/com/orion/visor/framework/storage/core/client/AbstractFileClient.java rename to orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/org/dromara/visor/framework/storage/core/client/AbstractFileClient.java index 18c0441b..3bc6e2fe 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/com/orion/visor/framework/storage/core/client/AbstractFileClient.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/org/dromara/visor/framework/storage/core/client/AbstractFileClient.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.storage.core.client; +package org.dromara.visor.framework.storage.core.client; -import com.orion.lang.utils.io.Files1; -import com.orion.lang.utils.io.Streams; -import com.orion.lang.utils.time.Dates; -import com.orion.visor.framework.common.constant.Const; -import com.orion.visor.framework.common.file.FileClient; -import com.orion.visor.framework.common.utils.FileClientUtils; +import cn.orionsec.kit.lang.utils.io.Files1; +import cn.orionsec.kit.lang.utils.io.Streams; +import cn.orionsec.kit.lang.utils.time.Dates; +import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.framework.common.file.FileClient; +import org.dromara.visor.framework.common.utils.FileClientUtils; import java.io.InputStream; import java.io.OutputStream; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/com/orion/visor/framework/storage/core/client/FileClientConfig.java b/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/org/dromara/visor/framework/storage/core/client/FileClientConfig.java similarity index 92% rename from orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/com/orion/visor/framework/storage/core/client/FileClientConfig.java rename to orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/org/dromara/visor/framework/storage/core/client/FileClientConfig.java index a83d3c3e..8ca3dda9 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/com/orion/visor/framework/storage/core/client/FileClientConfig.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/org/dromara/visor/framework/storage/core/client/FileClientConfig.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.storage.core.client; +package org.dromara.visor.framework.storage.core.client; -import com.orion.lang.utils.time.Dates; +import cn.orionsec.kit.lang.utils.time.Dates; import lombok.Data; /** diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/com/orion/visor/framework/storage/core/client/PrimaryFileClient.java b/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/org/dromara/visor/framework/storage/core/client/PrimaryFileClient.java similarity index 94% rename from orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/com/orion/visor/framework/storage/core/client/PrimaryFileClient.java rename to orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/org/dromara/visor/framework/storage/core/client/PrimaryFileClient.java index 71954678..8b52d762 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/com/orion/visor/framework/storage/core/client/PrimaryFileClient.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/org/dromara/visor/framework/storage/core/client/PrimaryFileClient.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.storage.core.client; +package org.dromara.visor.framework.storage.core.client; -import com.orion.lang.utils.Exceptions; -import com.orion.visor.framework.common.file.FileClient; +import cn.orionsec.kit.lang.utils.Exceptions; +import org.dromara.visor.framework.common.file.FileClient; import java.io.InputStream; import java.io.OutputStream; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/com/orion/visor/framework/storage/core/client/local/LocalFileClient.java b/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/org/dromara/visor/framework/storage/core/client/local/LocalFileClient.java similarity index 89% rename from orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/com/orion/visor/framework/storage/core/client/local/LocalFileClient.java rename to orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/org/dromara/visor/framework/storage/core/client/local/LocalFileClient.java index 8588c36e..dca3f83b 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/com/orion/visor/framework/storage/core/client/local/LocalFileClient.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/org/dromara/visor/framework/storage/core/client/local/LocalFileClient.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.storage.core.client.local; +package org.dromara.visor.framework.storage.core.client.local; -import com.orion.lang.utils.io.FileWriters; -import com.orion.lang.utils.io.Files1; -import com.orion.visor.framework.common.constant.Const; -import com.orion.visor.framework.storage.core.client.AbstractFileClient; +import cn.orionsec.kit.lang.utils.io.FileWriters; +import cn.orionsec.kit.lang.utils.io.Files1; +import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.framework.storage.core.client.AbstractFileClient; import java.io.InputStream; import java.io.OutputStream; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/com/orion/visor/framework/storage/core/client/local/LocalFileClientConfig.java b/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/org/dromara/visor/framework/storage/core/client/local/LocalFileClientConfig.java similarity index 90% rename from orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/com/orion/visor/framework/storage/core/client/local/LocalFileClientConfig.java rename to orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/org/dromara/visor/framework/storage/core/client/local/LocalFileClientConfig.java index 9f093ed7..9a6659cf 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/com/orion/visor/framework/storage/core/client/local/LocalFileClientConfig.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/org/dromara/visor/framework/storage/core/client/local/LocalFileClientConfig.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.storage.core.client.local; +package org.dromara.visor.framework.storage.core.client.local; -import com.orion.visor.framework.storage.core.client.FileClientConfig; import lombok.Data; import lombok.EqualsAndHashCode; +import org.dromara.visor.framework.storage.core.client.FileClientConfig; /** * 本地文件客户端 配置 diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/resources/META-INF/additional-spring-configuration-metadata.json index 46ac9a50..965b6c8a 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -2,13 +2,13 @@ "groups": [ { "name": "orion.storage.local", - "type": "com.orion.visor.framework.storage.configuration.config.LocalStorageConfig", - "sourceType": "com.orion.visor.framework.storage.configuration.config.LocalStorageConfig" + "type": "org.dromara.visor.framework.storage.configuration.config.LocalStorageConfig", + "sourceType": "org.dromara.visor.framework.storage.configuration.config.LocalStorageConfig" }, { "name": "orion.storage.logs", - "type": "com.orion.visor.framework.storage.configuration.config.LogsStorageConfig", - "sourceType": "com.orion.visor.framework.storage.configuration.config.LogsStorageConfig" + "type": "org.dromara.visor.framework.storage.configuration.config.LogsStorageConfig", + "sourceType": "org.dromara.visor.framework.storage.configuration.config.LogsStorageConfig" } ], "properties": [ diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index af662d2f..f734e4b8 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -com.orion.visor.framework.storage.configuration.OrionStorageAutoConfiguration \ No newline at end of file +org.dromara.visor.framework.storage.configuration.OrionStorageAutoConfiguration \ No newline at end of file diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-swagger/pom.xml b/orion-visor-framework/orion-visor-spring-boot-starter-swagger/pom.xml index 323a9915..6e923407 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-swagger/pom.xml +++ b/orion-visor-framework/orion-visor-spring-boot-starter-swagger/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - com.orion.visor + org.dromara.visor orion-visor-framework ${revision} @@ -18,7 +18,7 @@ - com.orion.visor + org.dromara.visor orion-visor-framework-common diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-swagger/src/main/java/com/orion/visor/framework/swagger/configuration/OrionSwaggerAutoConfiguration.java b/orion-visor-framework/orion-visor-spring-boot-starter-swagger/src/main/java/org/dromara/visor/framework/swagger/configuration/OrionSwaggerAutoConfiguration.java similarity index 96% rename from orion-visor-framework/orion-visor-spring-boot-starter-swagger/src/main/java/com/orion/visor/framework/swagger/configuration/OrionSwaggerAutoConfiguration.java rename to orion-visor-framework/orion-visor-spring-boot-starter-swagger/src/main/java/org/dromara/visor/framework/swagger/configuration/OrionSwaggerAutoConfiguration.java index 1b9147cd..39213d0c 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-swagger/src/main/java/com/orion/visor/framework/swagger/configuration/OrionSwaggerAutoConfiguration.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-swagger/src/main/java/org/dromara/visor/framework/swagger/configuration/OrionSwaggerAutoConfiguration.java @@ -13,10 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.swagger.configuration; +package org.dromara.visor.framework.swagger.configuration; -import com.orion.visor.framework.common.constant.AutoConfigureOrderConst; -import com.orion.visor.framework.swagger.configuration.config.SwaggerConfig; import io.swagger.v3.oas.models.Components; import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.info.Contact; @@ -26,6 +24,8 @@ import io.swagger.v3.oas.models.media.StringSchema; import io.swagger.v3.oas.models.parameters.Parameter; import io.swagger.v3.oas.models.security.SecurityRequirement; import io.swagger.v3.oas.models.security.SecurityScheme; +import org.dromara.visor.framework.common.constant.AutoConfigureOrderConst; +import org.dromara.visor.framework.swagger.configuration.config.SwaggerConfig; import org.springdoc.core.*; import org.springdoc.core.customizers.OpenApiBuilderCustomizer; import org.springdoc.core.customizers.ServerBaseUrlCustomizer; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-swagger/src/main/java/com/orion/visor/framework/swagger/configuration/config/SwaggerConfig.java b/orion-visor-framework/orion-visor-spring-boot-starter-swagger/src/main/java/org/dromara/visor/framework/swagger/configuration/config/SwaggerConfig.java similarity index 96% rename from orion-visor-framework/orion-visor-spring-boot-starter-swagger/src/main/java/com/orion/visor/framework/swagger/configuration/config/SwaggerConfig.java rename to orion-visor-framework/orion-visor-spring-boot-starter-swagger/src/main/java/org/dromara/visor/framework/swagger/configuration/config/SwaggerConfig.java index 095f4bf1..211b49ae 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-swagger/src/main/java/com/orion/visor/framework/swagger/configuration/config/SwaggerConfig.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-swagger/src/main/java/org/dromara/visor/framework/swagger/configuration/config/SwaggerConfig.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.swagger.configuration.config; +package org.dromara.visor.framework.swagger.configuration.config; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-swagger/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/orion-visor-framework/orion-visor-spring-boot-starter-swagger/src/main/resources/META-INF/additional-spring-configuration-metadata.json index cc5cf90b..521c02b8 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-swagger/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/orion-visor-framework/orion-visor-spring-boot-starter-swagger/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -2,8 +2,8 @@ "groups": [ { "name": "orion.swagger", - "type": "com.orion.visor.framework.swagger.configuration.config.SwaggerConfig", - "sourceType": "com.orion.visor.framework.swagger.configuration.config.SwaggerConfig" + "type": "org.dromara.visor.framework.swagger.configuration.config.SwaggerConfig", + "sourceType": "org.dromara.visor.framework.swagger.configuration.config.SwaggerConfig" } ], "properties": [ diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-swagger/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/orion-visor-framework/orion-visor-spring-boot-starter-swagger/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index bc325af8..feaaca09 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-swagger/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/orion-visor-framework/orion-visor-spring-boot-starter-swagger/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -com.orion.visor.framework.swagger.configuration.OrionSwaggerAutoConfiguration \ No newline at end of file +org.dromara.visor.framework.swagger.configuration.OrionSwaggerAutoConfiguration \ No newline at end of file diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-test/pom.xml b/orion-visor-framework/orion-visor-spring-boot-starter-test/pom.xml index 9feb54cd..62514a9a 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-test/pom.xml +++ b/orion-visor-framework/orion-visor-spring-boot-starter-test/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - com.orion.visor + org.dromara.visor orion-visor-framework ${revision} @@ -18,19 +18,19 @@ - com.orion.visor + org.dromara.visor orion-visor-framework-common - com.orion.visor + org.dromara.visor orion-visor-spring-boot-starter-mybatis - com.orion.visor + org.dromara.visor orion-visor-spring-boot-starter-datasource - com.orion.visor + org.dromara.visor orion-visor-spring-boot-starter-redis diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-test/src/main/java/com/orion/visor/framework/test/configuration/OrionH2SqlInitializationTestConfiguration.java b/orion-visor-framework/orion-visor-spring-boot-starter-test/src/main/java/org/dromara/visor/framework/test/configuration/OrionH2SqlInitializationTestConfiguration.java similarity index 98% rename from orion-visor-framework/orion-visor-spring-boot-starter-test/src/main/java/com/orion/visor/framework/test/configuration/OrionH2SqlInitializationTestConfiguration.java rename to orion-visor-framework/orion-visor-spring-boot-starter-test/src/main/java/org/dromara/visor/framework/test/configuration/OrionH2SqlInitializationTestConfiguration.java index 033de723..b0373010 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-test/src/main/java/com/orion/visor/framework/test/configuration/OrionH2SqlInitializationTestConfiguration.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-test/src/main/java/org/dromara/visor/framework/test/configuration/OrionH2SqlInitializationTestConfiguration.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.test.configuration; +package org.dromara.visor.framework.test.configuration; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-test/src/main/java/com/orion/visor/framework/test/configuration/OrionMockBeanTestConfiguration.java b/orion-visor-framework/orion-visor-spring-boot-starter-test/src/main/java/org/dromara/visor/framework/test/configuration/OrionMockBeanTestConfiguration.java similarity index 91% rename from orion-visor-framework/orion-visor-spring-boot-starter-test/src/main/java/com/orion/visor/framework/test/configuration/OrionMockBeanTestConfiguration.java rename to orion-visor-framework/orion-visor-spring-boot-starter-test/src/main/java/org/dromara/visor/framework/test/configuration/OrionMockBeanTestConfiguration.java index deb991d8..cb917c56 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-test/src/main/java/com/orion/visor/framework/test/configuration/OrionMockBeanTestConfiguration.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-test/src/main/java/org/dromara/visor/framework/test/configuration/OrionMockBeanTestConfiguration.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.test.configuration; +package org.dromara.visor.framework.test.configuration; -import com.orion.lang.utils.collect.Sets; -import com.orion.visor.framework.common.security.LoginUser; -import com.orion.visor.framework.common.security.SecurityHolder; -import com.orion.visor.framework.test.core.utils.EntityRandoms; +import cn.orionsec.kit.lang.utils.collect.Sets; +import org.dromara.visor.framework.common.security.LoginUser; +import org.dromara.visor.framework.common.security.SecurityHolder; +import org.dromara.visor.framework.test.core.utils.EntityRandoms; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-test/src/main/java/com/orion/visor/framework/test/configuration/OrionMockRedisTestConfiguration.java b/orion-visor-framework/orion-visor-spring-boot-starter-test/src/main/java/org/dromara/visor/framework/test/configuration/OrionMockRedisTestConfiguration.java similarity index 92% rename from orion-visor-framework/orion-visor-spring-boot-starter-test/src/main/java/com/orion/visor/framework/test/configuration/OrionMockRedisTestConfiguration.java rename to orion-visor-framework/orion-visor-spring-boot-starter-test/src/main/java/org/dromara/visor/framework/test/configuration/OrionMockRedisTestConfiguration.java index f5568a38..4f958bae 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-test/src/main/java/com/orion/visor/framework/test/configuration/OrionMockRedisTestConfiguration.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-test/src/main/java/org/dromara/visor/framework/test/configuration/OrionMockRedisTestConfiguration.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.test.configuration; +package org.dromara.visor.framework.test.configuration; import com.github.fppt.jedismock.RedisServer; -import com.orion.visor.framework.common.lock.Locker; -import com.orion.visor.framework.common.utils.LockerUtils; +import org.dromara.visor.framework.common.lock.Locker; +import org.dromara.visor.framework.common.utils.LockerUtils; import org.springframework.boot.autoconfigure.data.redis.RedisProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-test/src/main/java/com/orion/visor/framework/test/core/base/BaseUnitTest.java b/orion-visor-framework/orion-visor-spring-boot-starter-test/src/main/java/org/dromara/visor/framework/test/core/base/BaseUnitTest.java similarity index 80% rename from orion-visor-framework/orion-visor-spring-boot-starter-test/src/main/java/com/orion/visor/framework/test/core/base/BaseUnitTest.java rename to orion-visor-framework/orion-visor-spring-boot-starter-test/src/main/java/org/dromara/visor/framework/test/core/base/BaseUnitTest.java index ccf8c5d5..cf63ed1e 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-test/src/main/java/com/orion/visor/framework/test/core/base/BaseUnitTest.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-test/src/main/java/org/dromara/visor/framework/test/core/base/BaseUnitTest.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.test.core.base; +package org.dromara.visor.framework.test.core.base; import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure; import com.baomidou.mybatisplus.autoconfigure.MybatisPlusAutoConfiguration; -import com.orion.visor.framework.common.configuration.OrionCommonAutoConfiguration; -import com.orion.visor.framework.datasource.configuration.OrionDataSourceAutoConfiguration; -import com.orion.visor.framework.mybatis.configuration.OrionMybatisAutoConfiguration; -import com.orion.visor.framework.redis.configuration.OrionRedisAutoConfiguration; -import com.orion.visor.framework.test.configuration.OrionH2SqlInitializationTestConfiguration; -import com.orion.visor.framework.test.configuration.OrionMockBeanTestConfiguration; -import com.orion.visor.framework.test.configuration.OrionMockRedisTestConfiguration; +import org.dromara.visor.framework.common.configuration.OrionCommonAutoConfiguration; +import org.dromara.visor.framework.datasource.configuration.OrionDataSourceAutoConfiguration; +import org.dromara.visor.framework.mybatis.configuration.OrionMybatisAutoConfiguration; +import org.dromara.visor.framework.redis.configuration.OrionRedisAutoConfiguration; +import org.dromara.visor.framework.test.configuration.OrionH2SqlInitializationTestConfiguration; +import org.dromara.visor.framework.test.configuration.OrionMockBeanTestConfiguration; +import org.dromara.visor.framework.test.configuration.OrionMockRedisTestConfiguration; import org.junit.jupiter.api.MethodOrderer; import org.junit.jupiter.api.TestMethodOrder; import org.redisson.spring.starter.RedissonAutoConfiguration; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-test/src/main/java/com/orion/visor/framework/test/core/utils/EntityRandoms.java b/orion-visor-framework/orion-visor-spring-boot-starter-test/src/main/java/org/dromara/visor/framework/test/core/utils/EntityRandoms.java similarity index 95% rename from orion-visor-framework/orion-visor-spring-boot-starter-test/src/main/java/com/orion/visor/framework/test/core/utils/EntityRandoms.java rename to orion-visor-framework/orion-visor-spring-boot-starter-test/src/main/java/org/dromara/visor/framework/test/core/utils/EntityRandoms.java index ab50ae0d..49c15dbf 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-test/src/main/java/com/orion/visor/framework/test/core/utils/EntityRandoms.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-test/src/main/java/org/dromara/visor/framework/test/core/utils/EntityRandoms.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.test.core.utils; +package org.dromara.visor.framework.test.core.utils; -import com.orion.lang.utils.Arrays1; -import com.orion.lang.utils.random.Randoms; +import cn.orionsec.kit.lang.utils.Arrays1; +import cn.orionsec.kit.lang.utils.random.Randoms; import uk.co.jemos.podam.api.PodamFactory; import uk.co.jemos.podam.api.PodamFactoryImpl; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-web/pom.xml b/orion-visor-framework/orion-visor-spring-boot-starter-web/pom.xml index b2def1f8..0c1251e7 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-web/pom.xml +++ b/orion-visor-framework/orion-visor-spring-boot-starter-web/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - com.orion.visor + org.dromara.visor orion-visor-framework ${revision} @@ -18,7 +18,7 @@ - com.orion.visor + org.dromara.visor orion-visor-framework-common diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/com/orion/visor/framework/web/configuration/OrionWebAutoConfiguration.java b/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/org/dromara/visor/framework/web/configuration/OrionWebAutoConfiguration.java similarity index 89% rename from orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/com/orion/visor/framework/web/configuration/OrionWebAutoConfiguration.java rename to orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/org/dromara/visor/framework/web/configuration/OrionWebAutoConfiguration.java index efe92a9f..5556db45 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/com/orion/visor/framework/web/configuration/OrionWebAutoConfiguration.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/org/dromara/visor/framework/web/configuration/OrionWebAutoConfiguration.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.web.configuration; +package org.dromara.visor.framework.web.configuration; +import cn.orionsec.kit.lang.utils.collect.Lists; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.ObjectMapper; -import com.orion.lang.utils.collect.Lists; -import com.orion.visor.framework.common.constant.AutoConfigureOrderConst; -import com.orion.visor.framework.common.constant.FilterOrderConst; -import com.orion.visor.framework.common.web.filter.FilterCreator; -import com.orion.visor.framework.web.core.aspect.DemoDisableApiAspect; -import com.orion.visor.framework.web.core.filter.TraceIdFilter; -import com.orion.visor.framework.web.core.handler.GlobalExceptionHandler; -import com.orion.visor.framework.web.core.handler.WrapperResultHandler; +import org.dromara.visor.framework.common.constant.AutoConfigureOrderConst; +import org.dromara.visor.framework.common.constant.FilterOrderConst; +import org.dromara.visor.framework.common.web.filter.FilterCreator; +import org.dromara.visor.framework.web.core.aspect.DemoDisableApiAspect; +import org.dromara.visor.framework.web.core.filter.TraceIdFilter; +import org.dromara.visor.framework.web.core.handler.GlobalExceptionHandler; +import org.dromara.visor.framework.web.core.handler.WrapperResultHandler; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigureOrder; @@ -70,7 +70,7 @@ public class OrionWebAutoConfiguration implements WebMvcConfigurer { // 公共 api 前缀 AntPathMatcher antPathMatcher = new AntPathMatcher("."); configurer.addPathPrefix(orionApiPrefix, clazz -> clazz.isAnnotationPresent(RestController.class) - && antPathMatcher.match("com.orion.visor.**.controller.**", clazz.getPackage().getName())); + && antPathMatcher.match("org.dromara.visor.**.controller.**", clazz.getPackage().getName())); } /** diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/com/orion/visor/framework/web/core/annotation/DemoDisableApi.java b/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/org/dromara/visor/framework/web/core/annotation/DemoDisableApi.java similarity index 94% rename from orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/com/orion/visor/framework/web/core/annotation/DemoDisableApi.java rename to orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/org/dromara/visor/framework/web/core/annotation/DemoDisableApi.java index 6fd699dc..14ac2b4f 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/com/orion/visor/framework/web/core/annotation/DemoDisableApi.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/org/dromara/visor/framework/web/core/annotation/DemoDisableApi.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.web.core.annotation; +package org.dromara.visor.framework.web.core.annotation; import java.lang.annotation.*; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/com/orion/visor/framework/web/core/annotation/IgnoreWrapper.java b/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/org/dromara/visor/framework/web/core/annotation/IgnoreWrapper.java similarity index 94% rename from orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/com/orion/visor/framework/web/core/annotation/IgnoreWrapper.java rename to orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/org/dromara/visor/framework/web/core/annotation/IgnoreWrapper.java index 3bdcce27..ca7234ac 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/com/orion/visor/framework/web/core/annotation/IgnoreWrapper.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/org/dromara/visor/framework/web/core/annotation/IgnoreWrapper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.web.core.annotation; +package org.dromara.visor.framework.web.core.annotation; import java.lang.annotation.*; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/com/orion/visor/framework/web/core/annotation/RestWrapper.java b/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/org/dromara/visor/framework/web/core/annotation/RestWrapper.java similarity index 94% rename from orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/com/orion/visor/framework/web/core/annotation/RestWrapper.java rename to orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/org/dromara/visor/framework/web/core/annotation/RestWrapper.java index 80ee95b9..fe311f3d 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/com/orion/visor/framework/web/core/annotation/RestWrapper.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/org/dromara/visor/framework/web/core/annotation/RestWrapper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.web.core.annotation; +package org.dromara.visor.framework.web.core.annotation; import java.lang.annotation.*; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/com/orion/visor/framework/web/core/aspect/DemoDisableApiAspect.java b/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/org/dromara/visor/framework/web/core/aspect/DemoDisableApiAspect.java similarity index 84% rename from orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/com/orion/visor/framework/web/core/aspect/DemoDisableApiAspect.java rename to orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/org/dromara/visor/framework/web/core/aspect/DemoDisableApiAspect.java index 7fcaa900..bd6d967e 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/com/orion/visor/framework/web/core/aspect/DemoDisableApiAspect.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/org/dromara/visor/framework/web/core/aspect/DemoDisableApiAspect.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.web.core.aspect; +package org.dromara.visor.framework.web.core.aspect; -import com.orion.visor.framework.common.constant.BeanOrderConst; -import com.orion.visor.framework.common.constant.ErrorCode; -import com.orion.visor.framework.web.core.annotation.DemoDisableApi; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Before; import org.aspectj.lang.annotation.Pointcut; +import org.dromara.visor.framework.common.constant.BeanOrderConst; +import org.dromara.visor.framework.common.constant.ErrorCode; +import org.dromara.visor.framework.web.core.annotation.DemoDisableApi; import org.springframework.core.annotation.Order; /** diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/com/orion/visor/framework/web/core/filter/TraceIdFilter.java b/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/org/dromara/visor/framework/web/core/filter/TraceIdFilter.java similarity index 93% rename from orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/com/orion/visor/framework/web/core/filter/TraceIdFilter.java rename to orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/org/dromara/visor/framework/web/core/filter/TraceIdFilter.java index 308f37d6..5ce11366 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/com/orion/visor/framework/web/core/filter/TraceIdFilter.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/org/dromara/visor/framework/web/core/filter/TraceIdFilter.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.web.core.filter; +package org.dromara.visor.framework.web.core.filter; -import com.orion.visor.framework.common.meta.TraceIdHolder; +import org.dromara.visor.framework.common.meta.TraceIdHolder; import org.springframework.web.filter.OncePerRequestFilter; import javax.servlet.FilterChain; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/com/orion/visor/framework/web/core/handler/GlobalExceptionHandler.java b/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/org/dromara/visor/framework/web/core/handler/GlobalExceptionHandler.java similarity index 93% rename from orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/com/orion/visor/framework/web/core/handler/GlobalExceptionHandler.java rename to orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/org/dromara/visor/framework/web/core/handler/GlobalExceptionHandler.java index 0e780228..f21c0a4b 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/com/orion/visor/framework/web/core/handler/GlobalExceptionHandler.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/org/dromara/visor/framework/web/core/handler/GlobalExceptionHandler.java @@ -13,21 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.web.core.handler; +package org.dromara.visor.framework.web.core.handler; -import com.orion.lang.define.wrapper.HttpWrapper; -import com.orion.lang.exception.*; -import com.orion.lang.exception.argument.CodeArgumentException; -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.lang.utils.Strings; -import com.orion.visor.framework.common.constant.Const; -import com.orion.visor.framework.common.constant.ErrorCode; -import com.orion.visor.framework.common.constant.ErrorMessage; +import cn.orionsec.kit.lang.define.wrapper.HttpWrapper; +import cn.orionsec.kit.lang.exception.*; +import cn.orionsec.kit.lang.exception.argument.CodeArgumentException; +import cn.orionsec.kit.lang.exception.argument.HttpWrapperException; +import cn.orionsec.kit.lang.exception.argument.InvalidArgumentException; +import cn.orionsec.kit.lang.exception.argument.RpcWrapperException; +import cn.orionsec.kit.lang.utils.Exceptions; +import cn.orionsec.kit.lang.utils.Strings; import lombok.extern.slf4j.Slf4j; import org.apache.poi.EncryptedDocumentException; +import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.framework.common.constant.ErrorCode; +import org.dromara.visor.framework.common.constant.ErrorMessage; import org.springframework.dao.DataAccessResourceFailureException; import org.springframework.http.converter.HttpMessageNotReadableException; import org.springframework.security.access.AccessDeniedException; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/com/orion/visor/framework/web/core/handler/WrapperResultHandler.java b/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/org/dromara/visor/framework/web/core/handler/WrapperResultHandler.java similarity index 86% rename from orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/com/orion/visor/framework/web/core/handler/WrapperResultHandler.java rename to orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/org/dromara/visor/framework/web/core/handler/WrapperResultHandler.java index 4e48ecb9..c72154ac 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/com/orion/visor/framework/web/core/handler/WrapperResultHandler.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/org/dromara/visor/framework/web/core/handler/WrapperResultHandler.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.web.core.handler; +package org.dromara.visor.framework.web.core.handler; -import com.orion.lang.constant.StandardContentType; -import com.orion.lang.define.wrapper.HttpWrapper; -import com.orion.lang.define.wrapper.RpcWrapper; -import com.orion.visor.framework.common.constant.BeanOrderConst; -import com.orion.visor.framework.web.core.annotation.IgnoreWrapper; -import com.orion.visor.framework.web.core.annotation.RestWrapper; +import cn.orionsec.kit.lang.constant.StandardContentType; +import cn.orionsec.kit.lang.define.wrapper.HttpWrapper; +import cn.orionsec.kit.lang.define.wrapper.RpcWrapper; +import org.dromara.visor.framework.common.constant.BeanOrderConst; +import org.dromara.visor.framework.web.core.annotation.IgnoreWrapper; +import org.dromara.visor.framework.web.core.annotation.RestWrapper; import org.jetbrains.annotations.NotNull; import org.springframework.core.MethodParameter; import org.springframework.core.annotation.Order; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 585f4385..c6b65cce 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -com.orion.visor.framework.web.configuration.OrionWebAutoConfiguration \ No newline at end of file +org.dromara.visor.framework.web.configuration.OrionWebAutoConfiguration \ No newline at end of file diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-websocket/pom.xml b/orion-visor-framework/orion-visor-spring-boot-starter-websocket/pom.xml index 4508ce85..ce8e971f 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-websocket/pom.xml +++ b/orion-visor-framework/orion-visor-spring-boot-starter-websocket/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - com.orion.visor + org.dromara.visor orion-visor-framework ${revision} @@ -18,7 +18,7 @@ - com.orion.visor + org.dromara.visor orion-visor-framework-common diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-websocket/src/main/java/com/orion/visor/framework/websocket/configuration/OrionWebSocketAutoConfiguration.java b/orion-visor-framework/orion-visor-spring-boot-starter-websocket/src/main/java/org/dromara/visor/framework/websocket/configuration/OrionWebSocketAutoConfiguration.java similarity index 89% rename from orion-visor-framework/orion-visor-spring-boot-starter-websocket/src/main/java/com/orion/visor/framework/websocket/configuration/OrionWebSocketAutoConfiguration.java rename to orion-visor-framework/orion-visor-spring-boot-starter-websocket/src/main/java/org/dromara/visor/framework/websocket/configuration/OrionWebSocketAutoConfiguration.java index 39c4cdd1..6c5051b7 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-websocket/src/main/java/com/orion/visor/framework/websocket/configuration/OrionWebSocketAutoConfiguration.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-websocket/src/main/java/org/dromara/visor/framework/websocket/configuration/OrionWebSocketAutoConfiguration.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.websocket.configuration; +package org.dromara.visor.framework.websocket.configuration; -import com.orion.visor.framework.common.constant.AutoConfigureOrderConst; -import com.orion.visor.framework.websocket.configuration.config.WebSocketConfig; +import org.dromara.visor.framework.common.constant.AutoConfigureOrderConst; +import org.dromara.visor.framework.websocket.configuration.config.WebSocketConfig; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigureOrder; import org.springframework.boot.context.properties.EnableConfigurationProperties; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-websocket/src/main/java/com/orion/visor/framework/websocket/configuration/config/WebSocketConfig.java b/orion-visor-framework/orion-visor-spring-boot-starter-websocket/src/main/java/org/dromara/visor/framework/websocket/configuration/config/WebSocketConfig.java similarity index 95% rename from orion-visor-framework/orion-visor-spring-boot-starter-websocket/src/main/java/com/orion/visor/framework/websocket/configuration/config/WebSocketConfig.java rename to orion-visor-framework/orion-visor-spring-boot-starter-websocket/src/main/java/org/dromara/visor/framework/websocket/configuration/config/WebSocketConfig.java index 25f388fc..6c4b70a8 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-websocket/src/main/java/com/orion/visor/framework/websocket/configuration/config/WebSocketConfig.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-websocket/src/main/java/org/dromara/visor/framework/websocket/configuration/config/WebSocketConfig.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.websocket.configuration.config; +package org.dromara.visor.framework.websocket.configuration.config; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-websocket/src/main/java/com/orion/visor/framework/websocket/core/constant/WsCloseCode.java b/orion-visor-framework/orion-visor-spring-boot-starter-websocket/src/main/java/org/dromara/visor/framework/websocket/core/constant/WsCloseCode.java similarity index 93% rename from orion-visor-framework/orion-visor-spring-boot-starter-websocket/src/main/java/com/orion/visor/framework/websocket/core/constant/WsCloseCode.java rename to orion-visor-framework/orion-visor-spring-boot-starter-websocket/src/main/java/org/dromara/visor/framework/websocket/core/constant/WsCloseCode.java index 956c4e80..95c2e9f5 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-websocket/src/main/java/com/orion/visor/framework/websocket/core/constant/WsCloseCode.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-websocket/src/main/java/org/dromara/visor/framework/websocket/core/constant/WsCloseCode.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.websocket.core.constant; +package org.dromara.visor.framework.websocket.core.constant; /** * ws 服务端关闭 code diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-websocket/src/main/java/com/orion/visor/framework/websocket/core/session/WebSocketSyncSession.java b/orion-visor-framework/orion-visor-spring-boot-starter-websocket/src/main/java/org/dromara/visor/framework/websocket/core/session/WebSocketSyncSession.java similarity index 98% rename from orion-visor-framework/orion-visor-spring-boot-starter-websocket/src/main/java/com/orion/visor/framework/websocket/core/session/WebSocketSyncSession.java rename to orion-visor-framework/orion-visor-spring-boot-starter-websocket/src/main/java/org/dromara/visor/framework/websocket/core/session/WebSocketSyncSession.java index b4f6d275..94f90bb5 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-websocket/src/main/java/com/orion/visor/framework/websocket/core/session/WebSocketSyncSession.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-websocket/src/main/java/org/dromara/visor/framework/websocket/core/session/WebSocketSyncSession.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.websocket.core.session; +package org.dromara.visor.framework.websocket.core.session; import org.springframework.http.HttpHeaders; import org.springframework.web.socket.CloseStatus; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-websocket/src/main/java/com/orion/visor/framework/websocket/core/utils/WebSockets.java b/orion-visor-framework/orion-visor-spring-boot-starter-websocket/src/main/java/org/dromara/visor/framework/websocket/core/utils/WebSockets.java similarity index 91% rename from orion-visor-framework/orion-visor-spring-boot-starter-websocket/src/main/java/com/orion/visor/framework/websocket/core/utils/WebSockets.java rename to orion-visor-framework/orion-visor-spring-boot-starter-websocket/src/main/java/org/dromara/visor/framework/websocket/core/utils/WebSockets.java index e7f76a9e..7b1355dc 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-websocket/src/main/java/com/orion/visor/framework/websocket/core/utils/WebSockets.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-websocket/src/main/java/org/dromara/visor/framework/websocket/core/utils/WebSockets.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.framework.websocket.core.utils; +package org.dromara.visor.framework.websocket.core.utils; +import cn.orionsec.kit.lang.utils.Exceptions; +import cn.orionsec.kit.lang.utils.Threads; import com.alibaba.fastjson.JSON; -import com.orion.lang.utils.Exceptions; -import com.orion.lang.utils.Threads; -import com.orion.visor.framework.common.constant.Const; -import com.orion.visor.framework.websocket.core.constant.WsCloseCode; -import com.orion.visor.framework.websocket.core.session.WebSocketSyncSession; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.framework.websocket.core.constant.WsCloseCode; +import org.dromara.visor.framework.websocket.core.session.WebSocketSyncSession; import org.springframework.web.socket.CloseStatus; import org.springframework.web.socket.TextMessage; import org.springframework.web.socket.WebSocketSession; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-websocket/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/orion-visor-framework/orion-visor-spring-boot-starter-websocket/src/main/resources/META-INF/additional-spring-configuration-metadata.json index 3796121a..af216cc2 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-websocket/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/orion-visor-framework/orion-visor-spring-boot-starter-websocket/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -2,8 +2,8 @@ "groups": [ { "name": "orion.websocket", - "type": "com.orion.visor.framework.websocket.configuration.config.WebSocketConfig", - "sourceType": "com.orion.visor.framework.websocket.configuration.config.WebSocketConfig" + "type": "org.dromara.visor.framework.websocket.configuration.config.WebSocketConfig", + "sourceType": "org.dromara.visor.framework.websocket.configuration.config.WebSocketConfig" } ], "properties": [ diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-websocket/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/orion-visor-framework/orion-visor-spring-boot-starter-websocket/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index dd60b97f..f8d20414 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-websocket/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/orion-visor-framework/orion-visor-spring-boot-starter-websocket/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -com.orion.visor.framework.websocket.configuration.OrionWebSocketAutoConfiguration \ No newline at end of file +org.dromara.visor.framework.websocket.configuration.OrionWebSocketAutoConfiguration \ No newline at end of file diff --git a/orion-visor-framework/pom.xml b/orion-visor-framework/pom.xml index dbaa7974..5f73606d 100644 --- a/orion-visor-framework/pom.xml +++ b/orion-visor-framework/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - com.orion.visor + org.dromara.visor orion-visor ${revision} diff --git a/orion-visor-launch/pom.xml b/orion-visor-launch/pom.xml index c2e14714..56f1725b 100644 --- a/orion-visor-launch/pom.xml +++ b/orion-visor-launch/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - com.orion.visor + org.dromara.visor orion-visor ${revision} @@ -30,70 +30,70 @@ - com.orion.visor + org.dromara.visor orion-visor-spring-boot-starter-banner - com.orion.visor + org.dromara.visor orion-visor-spring-boot-starter-web - com.orion.visor + org.dromara.visor orion-visor-spring-boot-starter-swagger - com.orion.visor + org.dromara.visor orion-visor-spring-boot-starter-datasource - com.orion.visor + org.dromara.visor orion-visor-spring-boot-starter-mybatis - com.orion.visor + org.dromara.visor orion-visor-spring-boot-starter-job - com.orion.visor + org.dromara.visor orion-visor-spring-boot-starter-websocket - com.orion.visor + org.dromara.visor orion-visor-spring-boot-starter-redis - com.orion.visor + org.dromara.visor orion-visor-spring-boot-starter-desensitize - com.orion.visor + org.dromara.visor orion-visor-spring-boot-starter-log - com.orion.visor + org.dromara.visor orion-visor-spring-boot-starter-storage - com.orion.visor + org.dromara.visor orion-visor-spring-boot-starter-security - com.orion.visor + org.dromara.visor orion-visor-spring-boot-starter-monitor - com.orion.visor + org.dromara.visor orion-visor-spring-boot-starter-biz-operator-log - com.orion.visor + org.dromara.visor orion-visor-module-infra-service ${revision} - com.orion.visor + org.dromara.visor orion-visor-module-asset-service ${revision} @@ -140,6 +140,14 @@ false + + org.apache.maven.plugins + maven-compiler-plugin + + 8 + 8 + + diff --git a/orion-visor-launch/src/main/java/com/orion/visor/launch/LaunchApplication.java b/orion-visor-launch/src/main/java/org/dromara/visor/launch/LaunchApplication.java similarity index 92% rename from orion-visor-launch/src/main/java/com/orion/visor/launch/LaunchApplication.java rename to orion-visor-launch/src/main/java/org/dromara/visor/launch/LaunchApplication.java index 932b08c7..60260880 100644 --- a/orion-visor-launch/src/main/java/com/orion/visor/launch/LaunchApplication.java +++ b/orion-visor-launch/src/main/java/org/dromara/visor/launch/LaunchApplication.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.launch; +package org.dromara.visor.launch; -import com.orion.lang.utils.Strings; -import com.orion.visor.framework.common.constant.Const; +import cn.orionsec.kit.lang.utils.Strings; +import org.dromara.visor.framework.common.constant.Const; import org.springframework.beans.factory.annotation.AnnotatedBeanDefinition; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionReaderUtils; @@ -35,7 +35,7 @@ import java.util.Optional; * @version 1.0.0 * @since 2023/6/19 16:55 */ -@SpringBootApplication(scanBasePackages = {"com.orion.visor.launch", "com.orion.visor.module"}) +@SpringBootApplication(scanBasePackages = {"org.dromara.visor.launch", "org.dromara.visor.module"}) public class LaunchApplication { public static void main(String[] args) { diff --git a/orion-visor-launch/src/main/java/com/orion/visor/launch/controller/BootstrapController.http b/orion-visor-launch/src/main/java/org/dromara/visor/launch/controller/BootstrapController.http similarity index 100% rename from orion-visor-launch/src/main/java/com/orion/visor/launch/controller/BootstrapController.http rename to orion-visor-launch/src/main/java/org/dromara/visor/launch/controller/BootstrapController.http diff --git a/orion-visor-launch/src/main/java/com/orion/visor/launch/controller/BootstrapController.java b/orion-visor-launch/src/main/java/org/dromara/visor/launch/controller/BootstrapController.java similarity index 91% rename from orion-visor-launch/src/main/java/com/orion/visor/launch/controller/BootstrapController.java rename to orion-visor-launch/src/main/java/org/dromara/visor/launch/controller/BootstrapController.java index fb4c5c2f..3feb8b54 100644 --- a/orion-visor-launch/src/main/java/com/orion/visor/launch/controller/BootstrapController.java +++ b/orion-visor-launch/src/main/java/org/dromara/visor/launch/controller/BootstrapController.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.launch.controller; +package org.dromara.visor.launch.controller; -import com.orion.visor.framework.web.core.annotation.RestWrapper; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; +import org.dromara.visor.framework.web.core.annotation.RestWrapper; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/orion-visor-launch/src/main/resources/application.yaml b/orion-visor-launch/src/main/resources/application.yaml index 21011943..7e8bf4a5 100644 --- a/orion-visor-launch/src/main/resources/application.yaml +++ b/orion-visor-launch/src/main/resources/application.yaml @@ -155,7 +155,7 @@ logging: console: '%clr(%d{${LOG_DATEFORMAT_PATTERN:yyyy-MM-dd HH:mm:ss.SSS}}){faint} %clr(${LOG_LEVEL_PATTERN:-%6p}) %boldBlue([%X{tid}]) %clr([%22.22t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:%wEx}' file: "%d{${LOG_DATEFORMAT_PATTERN:yyyy-MM-dd HH:mm:ss.SSS}} ${LOG_LEVEL_PATTERN:-%6p} [%X{tid}] [%t] %-40.40logger{39} : %m%n${LOG_EXCEPTION_CONVERSION_WORD:%wEx}" level: - com.orion.visor.launch.controller.BootstrapController: INFO + org.dromara.visor.launch.controller.BootstrapController: INFO # 应用配置 app: @@ -243,7 +243,7 @@ orion: # 全局日志打印 printer: mode: PRETTY - expression: 'execution (* com.orion.visor..*.controller..*.*(..))' + expression: 'execution (* org.dromara.visor..*.controller..*.*(..))' headers: - user-agent,accept - content-type diff --git a/orion-visor-launch/src/test/java/com/orion/visor/launch/AddLicenseHeader.java b/orion-visor-launch/src/test/java/org/dromara/visor/launch/AddLicenseHeader.java similarity index 94% rename from orion-visor-launch/src/test/java/com/orion/visor/launch/AddLicenseHeader.java rename to orion-visor-launch/src/test/java/org/dromara/visor/launch/AddLicenseHeader.java index 78d79468..59a28ed0 100644 --- a/orion-visor-launch/src/test/java/com/orion/visor/launch/AddLicenseHeader.java +++ b/orion-visor-launch/src/test/java/org/dromara/visor/launch/AddLicenseHeader.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.launch; +package org.dromara.visor.launch; -import com.orion.lang.define.StopWatch; -import com.orion.lang.utils.io.FileReaders; -import com.orion.lang.utils.io.FileWriters; -import com.orion.lang.utils.io.Files1; +import cn.orionsec.kit.lang.define.StopWatch; +import cn.orionsec.kit.lang.utils.io.FileReaders; +import cn.orionsec.kit.lang.utils.io.FileWriters; +import cn.orionsec.kit.lang.utils.io.Files1; import java.io.ByteArrayOutputStream; import java.io.File; diff --git a/orion-visor-module-asset/orion-visor-module-asset-provider/pom.xml b/orion-visor-module-asset/orion-visor-module-asset-provider/pom.xml index 787ab92b..f43901e8 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-provider/pom.xml +++ b/orion-visor-module-asset/orion-visor-module-asset-provider/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - com.orion.visor + org.dromara.visor orion-visor-module-asset ${revision} @@ -17,7 +17,7 @@ - com.orion.visor + org.dromara.visor orion-visor-framework-common diff --git a/orion-visor-module-asset/orion-visor-module-asset-provider/src/main/java/com/orion/visor/module/asset/api/CommandSnippetApi.java b/orion-visor-module-asset/orion-visor-module-asset-provider/src/main/java/org/dromara/visor/module/asset/api/CommandSnippetApi.java similarity index 95% rename from orion-visor-module-asset/orion-visor-module-asset-provider/src/main/java/com/orion/visor/module/asset/api/CommandSnippetApi.java rename to orion-visor-module-asset/orion-visor-module-asset-provider/src/main/java/org/dromara/visor/module/asset/api/CommandSnippetApi.java index ec9eebe7..fa806552 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-provider/src/main/java/com/orion/visor/module/asset/api/CommandSnippetApi.java +++ b/orion-visor-module-asset/orion-visor-module-asset-provider/src/main/java/org/dromara/visor/module/asset/api/CommandSnippetApi.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.api; +package org.dromara.visor.module.asset.api; import java.util.List; diff --git a/orion-visor-module-asset/orion-visor-module-asset-provider/src/main/java/com/orion/visor/module/asset/api/PathBookmarkApi.java b/orion-visor-module-asset/orion-visor-module-asset-provider/src/main/java/org/dromara/visor/module/asset/api/PathBookmarkApi.java similarity index 95% rename from orion-visor-module-asset/orion-visor-module-asset-provider/src/main/java/com/orion/visor/module/asset/api/PathBookmarkApi.java rename to orion-visor-module-asset/orion-visor-module-asset-provider/src/main/java/org/dromara/visor/module/asset/api/PathBookmarkApi.java index 47fff55a..db3c5f98 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-provider/src/main/java/com/orion/visor/module/asset/api/PathBookmarkApi.java +++ b/orion-visor-module-asset/orion-visor-module-asset-provider/src/main/java/org/dromara/visor/module/asset/api/PathBookmarkApi.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.api; +package org.dromara.visor.module.asset.api; import java.util.List; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/pom.xml b/orion-visor-module-asset/orion-visor-module-asset-service/pom.xml index d42203a8..e6693a93 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/pom.xml +++ b/orion-visor-module-asset/orion-visor-module-asset-service/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - com.orion.visor + org.dromara.visor orion-visor-module-asset ${revision} @@ -17,81 +17,81 @@ - com.orion.visor + org.dromara.visor orion-visor-framework-common - com.orion.visor + org.dromara.visor orion-visor-module-infra-provider ${revision} - com.orion.visor + org.dromara.visor orion-visor-module-asset-provider ${revision} - com.orion.visor + org.dromara.visor orion-visor-spring-boot-starter-web - com.orion.visor + org.dromara.visor orion-visor-spring-boot-starter-websocket - com.orion.visor + org.dromara.visor orion-visor-spring-boot-starter-log - com.orion.visor + org.dromara.visor orion-visor-spring-boot-starter-biz-operator-log - com.orion.visor + org.dromara.visor orion-visor-spring-boot-starter-desensitize - com.orion.visor + org.dromara.visor orion-visor-spring-boot-starter-security - com.orion.visor + org.dromara.visor orion-visor-spring-boot-starter-redis - com.orion.visor + org.dromara.visor orion-visor-spring-boot-starter-mybatis - com.orion.visor + org.dromara.visor orion-visor-spring-boot-starter-storage - com.orion.visor + org.dromara.visor orion-visor-spring-boot-starter-job diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/api/impl/CommandSnippetApiImpl.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/api/impl/CommandSnippetApiImpl.java similarity index 87% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/api/impl/CommandSnippetApiImpl.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/api/impl/CommandSnippetApiImpl.java index 21906eff..2dd9805d 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/api/impl/CommandSnippetApiImpl.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/api/impl/CommandSnippetApiImpl.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.api.impl; +package org.dromara.visor.module.asset.api.impl; -import com.orion.visor.module.asset.api.CommandSnippetApi; -import com.orion.visor.module.asset.service.CommandSnippetService; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.module.asset.api.CommandSnippetApi; +import org.dromara.visor.module.asset.service.CommandSnippetService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/api/impl/PathBookmarkApiImpl.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/api/impl/PathBookmarkApiImpl.java similarity index 87% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/api/impl/PathBookmarkApiImpl.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/api/impl/PathBookmarkApiImpl.java index 58d9a8e8..d0059280 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/api/impl/PathBookmarkApiImpl.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/api/impl/PathBookmarkApiImpl.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.api.impl; +package org.dromara.visor.module.asset.api.impl; -import com.orion.visor.module.asset.api.PathBookmarkApi; -import com.orion.visor.module.asset.service.PathBookmarkService; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.module.asset.api.PathBookmarkApi; +import org.dromara.visor.module.asset.service.PathBookmarkService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/configuration/AssetWebSocketConfiguration.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/configuration/AssetWebSocketConfiguration.java similarity index 82% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/configuration/AssetWebSocketConfiguration.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/configuration/AssetWebSocketConfiguration.java index bd18b696..048e0e21 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/configuration/AssetWebSocketConfiguration.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/configuration/AssetWebSocketConfiguration.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.configuration; +package org.dromara.visor.module.asset.configuration; -import com.orion.visor.module.asset.handler.host.exec.log.ExecLogTailHandler; -import com.orion.visor.module.asset.handler.host.terminal.TerminalMessageDispatcher; -import com.orion.visor.module.asset.handler.host.transfer.TransferMessageDispatcher; -import com.orion.visor.module.asset.interceptor.ExecLogTailInterceptor; -import com.orion.visor.module.asset.interceptor.TerminalAccessInterceptor; -import com.orion.visor.module.asset.interceptor.TerminalTransferInterceptor; +import org.dromara.visor.module.asset.handler.host.exec.log.ExecLogTailHandler; +import org.dromara.visor.module.asset.handler.host.terminal.TerminalMessageDispatcher; +import org.dromara.visor.module.asset.handler.host.transfer.TransferMessageDispatcher; +import org.dromara.visor.module.asset.interceptor.ExecLogTailInterceptor; +import org.dromara.visor.module.asset.interceptor.TerminalAccessInterceptor; +import org.dromara.visor.module.asset.interceptor.TerminalTransferInterceptor; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; import org.springframework.web.socket.config.annotation.WebSocketConfigurer; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/AssetAuthorizedDataServiceController.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/AssetAuthorizedDataServiceController.java similarity index 80% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/AssetAuthorizedDataServiceController.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/AssetAuthorizedDataServiceController.java index dc687b0a..e6e87a5a 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/AssetAuthorizedDataServiceController.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/AssetAuthorizedDataServiceController.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.controller; +package org.dromara.visor.module.asset.controller; -import com.orion.visor.framework.log.core.annotation.IgnoreLog; -import com.orion.visor.framework.log.core.enums.IgnoreLogMode; -import com.orion.visor.framework.security.core.utils.SecurityUtils; -import com.orion.visor.framework.web.core.annotation.RestWrapper; -import com.orion.visor.module.asset.entity.vo.AuthorizedHostWrapperVO; -import com.orion.visor.module.asset.entity.vo.HostIdentityVO; -import com.orion.visor.module.asset.entity.vo.HostKeyVO; -import com.orion.visor.module.asset.service.AssetAuthorizedDataService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.log.core.annotation.IgnoreLog; +import org.dromara.visor.framework.log.core.enums.IgnoreLogMode; +import org.dromara.visor.framework.security.core.utils.SecurityUtils; +import org.dromara.visor.framework.web.core.annotation.RestWrapper; +import org.dromara.visor.module.asset.entity.vo.AuthorizedHostWrapperVO; +import org.dromara.visor.module.asset.entity.vo.HostIdentityVO; +import org.dromara.visor.module.asset.entity.vo.HostKeyVO; +import org.dromara.visor.module.asset.service.AssetAuthorizedDataService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/AssetDataGrantServiceController.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/AssetDataGrantServiceController.java similarity index 79% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/AssetDataGrantServiceController.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/AssetDataGrantServiceController.java index 9570dd31..f649d4ae 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/AssetDataGrantServiceController.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/AssetDataGrantServiceController.java @@ -13,24 +13,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.controller; +package org.dromara.visor.module.asset.controller; -import com.orion.visor.framework.biz.operator.log.core.annotation.OperatorLog; -import com.orion.visor.framework.log.core.annotation.IgnoreLog; -import com.orion.visor.framework.log.core.enums.IgnoreLogMode; -import com.orion.visor.framework.web.core.annotation.DemoDisableApi; -import com.orion.visor.framework.web.core.annotation.RestWrapper; -import com.orion.visor.module.asset.define.operator.HostGroupOperatorType; -import com.orion.visor.module.asset.define.operator.HostIdentityOperatorType; -import com.orion.visor.module.asset.define.operator.HostKeyOperatorType; -import com.orion.visor.module.asset.entity.request.asset.AssetAuthorizedDataQueryRequest; -import com.orion.visor.module.asset.entity.request.asset.AssetDataGrantRequest; -import com.orion.visor.module.asset.service.AssetAuthorizedDataService; -import com.orion.visor.module.asset.service.AssetDataGrantService; -import com.orion.visor.module.infra.enums.DataPermissionTypeEnum; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.biz.operator.log.core.annotation.OperatorLog; +import org.dromara.visor.framework.log.core.annotation.IgnoreLog; +import org.dromara.visor.framework.log.core.enums.IgnoreLogMode; +import org.dromara.visor.framework.web.core.annotation.DemoDisableApi; +import org.dromara.visor.framework.web.core.annotation.RestWrapper; +import org.dromara.visor.module.asset.define.operator.HostGroupOperatorType; +import org.dromara.visor.module.asset.define.operator.HostIdentityOperatorType; +import org.dromara.visor.module.asset.define.operator.HostKeyOperatorType; +import org.dromara.visor.module.asset.entity.request.asset.AssetAuthorizedDataQueryRequest; +import org.dromara.visor.module.asset.entity.request.asset.AssetDataGrantRequest; +import org.dromara.visor.module.asset.service.AssetAuthorizedDataService; +import org.dromara.visor.module.asset.service.AssetDataGrantService; +import org.dromara.visor.module.infra.enums.DataPermissionTypeEnum; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/CommandSnippetController.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/CommandSnippetController.java similarity index 80% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/CommandSnippetController.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/CommandSnippetController.java index 80cc9ef4..3606ea82 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/CommandSnippetController.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/CommandSnippetController.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.controller; +package org.dromara.visor.module.asset.controller; -import com.orion.visor.framework.log.core.annotation.IgnoreLog; -import com.orion.visor.framework.log.core.enums.IgnoreLogMode; -import com.orion.visor.framework.web.core.annotation.RestWrapper; -import com.orion.visor.module.asset.entity.request.command.CommandSnippetCreateRequest; -import com.orion.visor.module.asset.entity.request.command.CommandSnippetUpdateRequest; -import com.orion.visor.module.asset.entity.vo.CommandSnippetWrapperVO; -import com.orion.visor.module.asset.service.CommandSnippetService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.log.core.annotation.IgnoreLog; +import org.dromara.visor.framework.log.core.enums.IgnoreLogMode; +import org.dromara.visor.framework.web.core.annotation.RestWrapper; +import org.dromara.visor.module.asset.entity.request.command.CommandSnippetCreateRequest; +import org.dromara.visor.module.asset.entity.request.command.CommandSnippetUpdateRequest; +import org.dromara.visor.module.asset.entity.vo.CommandSnippetWrapperVO; +import org.dromara.visor.module.asset.service.CommandSnippetService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/CommandSnippetGroupController.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/CommandSnippetGroupController.java similarity index 76% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/CommandSnippetGroupController.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/CommandSnippetGroupController.java index 5e15af97..52c0818e 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/CommandSnippetGroupController.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/CommandSnippetGroupController.java @@ -13,20 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.controller; +package org.dromara.visor.module.asset.controller; -import com.orion.visor.framework.common.validator.group.Id; -import com.orion.visor.framework.log.core.annotation.IgnoreLog; -import com.orion.visor.framework.log.core.enums.IgnoreLogMode; -import com.orion.visor.framework.web.core.annotation.RestWrapper; -import com.orion.visor.module.asset.entity.request.command.CommandSnippetGroupCreateRequest; -import com.orion.visor.module.asset.entity.request.command.CommandSnippetGroupDeleteRequest; -import com.orion.visor.module.asset.entity.request.command.CommandSnippetGroupUpdateRequest; -import com.orion.visor.module.asset.entity.vo.CommandSnippetGroupVO; -import com.orion.visor.module.asset.service.CommandSnippetGroupService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.common.validator.group.Id; +import org.dromara.visor.framework.log.core.annotation.IgnoreLog; +import org.dromara.visor.framework.log.core.enums.IgnoreLogMode; +import org.dromara.visor.framework.web.core.annotation.RestWrapper; +import org.dromara.visor.module.asset.entity.request.command.CommandSnippetGroupCreateRequest; +import org.dromara.visor.module.asset.entity.request.command.CommandSnippetGroupDeleteRequest; +import org.dromara.visor.module.asset.entity.request.command.CommandSnippetGroupUpdateRequest; +import org.dromara.visor.module.asset.entity.vo.CommandSnippetGroupVO; +import org.dromara.visor.module.asset.service.CommandSnippetGroupService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/ExecCommandController.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/ExecCommandController.java similarity index 78% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/ExecCommandController.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/ExecCommandController.java index 93ebeed6..9f5048ba 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/ExecCommandController.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/ExecCommandController.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.controller; +package org.dromara.visor.module.asset.controller; -import com.orion.visor.framework.biz.operator.log.core.annotation.OperatorLog; -import com.orion.visor.framework.biz.operator.log.core.enums.ReturnType; -import com.orion.visor.framework.web.core.annotation.RestWrapper; -import com.orion.visor.module.asset.define.operator.ExecCommandOperatorType; -import com.orion.visor.module.asset.entity.request.exec.ExecCommandRequest; -import com.orion.visor.module.asset.entity.request.exec.ReExecCommandRequest; -import com.orion.visor.module.asset.entity.vo.ExecLogVO; -import com.orion.visor.module.asset.service.ExecCommandService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.biz.operator.log.core.annotation.OperatorLog; +import org.dromara.visor.framework.biz.operator.log.core.enums.ReturnType; +import org.dromara.visor.framework.web.core.annotation.RestWrapper; +import org.dromara.visor.module.asset.define.operator.ExecCommandOperatorType; +import org.dromara.visor.module.asset.entity.request.exec.ExecCommandRequest; +import org.dromara.visor.module.asset.entity.request.exec.ReExecCommandRequest; +import org.dromara.visor.module.asset.entity.vo.ExecLogVO; +import org.dromara.visor.module.asset.service.ExecCommandService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PostMapping; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/ExecCommandLogController.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/ExecCommandLogController.java similarity index 84% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/ExecCommandLogController.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/ExecCommandLogController.java index 135500bd..607c22f7 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/ExecCommandLogController.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/ExecCommandLogController.java @@ -13,31 +13,31 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.controller; +package org.dromara.visor.module.asset.controller; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.visor.framework.biz.operator.log.core.annotation.OperatorLog; -import com.orion.visor.framework.common.utils.Valid; -import com.orion.visor.framework.common.validator.group.Page; -import com.orion.visor.framework.log.core.annotation.IgnoreLog; -import com.orion.visor.framework.log.core.enums.IgnoreLogMode; -import com.orion.visor.framework.security.core.utils.SecurityUtils; -import com.orion.visor.framework.web.core.annotation.RestWrapper; -import com.orion.visor.module.asset.define.operator.ExecCommandLogOperatorType; -import com.orion.visor.module.asset.entity.request.exec.ExecInterruptRequest; -import com.orion.visor.module.asset.entity.request.exec.ExecLogClearRequest; -import com.orion.visor.module.asset.entity.request.exec.ExecLogQueryRequest; -import com.orion.visor.module.asset.entity.request.exec.ExecLogTailRequest; -import com.orion.visor.module.asset.entity.vo.ExecHostLogVO; -import com.orion.visor.module.asset.entity.vo.ExecLogStatusVO; -import com.orion.visor.module.asset.entity.vo.ExecLogVO; -import com.orion.visor.module.asset.enums.ExecSourceEnum; -import com.orion.visor.module.asset.service.ExecHostLogService; -import com.orion.visor.module.asset.service.ExecLogService; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.biz.operator.log.core.annotation.OperatorLog; +import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.framework.common.validator.group.Page; +import org.dromara.visor.framework.log.core.annotation.IgnoreLog; +import org.dromara.visor.framework.log.core.enums.IgnoreLogMode; +import org.dromara.visor.framework.security.core.utils.SecurityUtils; +import org.dromara.visor.framework.web.core.annotation.RestWrapper; +import org.dromara.visor.module.asset.define.operator.ExecCommandLogOperatorType; +import org.dromara.visor.module.asset.entity.request.exec.ExecInterruptRequest; +import org.dromara.visor.module.asset.entity.request.exec.ExecLogClearRequest; +import org.dromara.visor.module.asset.entity.request.exec.ExecLogQueryRequest; +import org.dromara.visor.module.asset.entity.request.exec.ExecLogTailRequest; +import org.dromara.visor.module.asset.entity.vo.ExecHostLogVO; +import org.dromara.visor.module.asset.entity.vo.ExecLogStatusVO; +import org.dromara.visor.module.asset.entity.vo.ExecLogVO; +import org.dromara.visor.module.asset.enums.ExecSourceEnum; +import org.dromara.visor.module.asset.service.ExecHostLogService; +import org.dromara.visor.module.asset.service.ExecLogService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/ExecJobController.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/ExecJobController.java similarity index 85% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/ExecJobController.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/ExecJobController.java index 7c085b28..a9878e56 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/ExecJobController.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/ExecJobController.java @@ -13,23 +13,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.controller; +package org.dromara.visor.module.asset.controller; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.visor.framework.biz.operator.log.core.annotation.OperatorLog; -import com.orion.visor.framework.common.validator.group.Page; -import com.orion.visor.framework.log.core.annotation.IgnoreLog; -import com.orion.visor.framework.log.core.enums.IgnoreLogMode; -import com.orion.visor.framework.web.core.annotation.DemoDisableApi; -import com.orion.visor.framework.web.core.annotation.RestWrapper; -import com.orion.visor.module.asset.define.operator.ExecJobOperatorType; -import com.orion.visor.module.asset.entity.request.exec.*; -import com.orion.visor.module.asset.entity.vo.ExecJobVO; -import com.orion.visor.module.asset.service.ExecJobService; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.biz.operator.log.core.annotation.OperatorLog; +import org.dromara.visor.framework.common.validator.group.Page; +import org.dromara.visor.framework.log.core.annotation.IgnoreLog; +import org.dromara.visor.framework.log.core.enums.IgnoreLogMode; +import org.dromara.visor.framework.web.core.annotation.DemoDisableApi; +import org.dromara.visor.framework.web.core.annotation.RestWrapper; +import org.dromara.visor.module.asset.define.operator.ExecJobOperatorType; +import org.dromara.visor.module.asset.entity.request.exec.*; +import org.dromara.visor.module.asset.entity.vo.ExecJobVO; +import org.dromara.visor.module.asset.service.ExecJobService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/ExecJobLogController.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/ExecJobLogController.java similarity index 83% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/ExecJobLogController.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/ExecJobLogController.java index 57f3a092..fac7c85b 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/ExecJobLogController.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/ExecJobLogController.java @@ -13,30 +13,30 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.controller; +package org.dromara.visor.module.asset.controller; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.visor.framework.biz.operator.log.core.annotation.OperatorLog; -import com.orion.visor.framework.common.utils.Valid; -import com.orion.visor.framework.common.validator.group.Page; -import com.orion.visor.framework.log.core.annotation.IgnoreLog; -import com.orion.visor.framework.log.core.enums.IgnoreLogMode; -import com.orion.visor.framework.web.core.annotation.RestWrapper; -import com.orion.visor.module.asset.define.operator.ExecJobLogOperatorType; -import com.orion.visor.module.asset.entity.request.exec.ExecInterruptRequest; -import com.orion.visor.module.asset.entity.request.exec.ExecLogClearRequest; -import com.orion.visor.module.asset.entity.request.exec.ExecLogQueryRequest; -import com.orion.visor.module.asset.entity.request.exec.ExecLogTailRequest; -import com.orion.visor.module.asset.entity.vo.ExecHostLogVO; -import com.orion.visor.module.asset.entity.vo.ExecLogStatusVO; -import com.orion.visor.module.asset.entity.vo.ExecLogVO; -import com.orion.visor.module.asset.enums.ExecSourceEnum; -import com.orion.visor.module.asset.service.ExecHostLogService; -import com.orion.visor.module.asset.service.ExecLogService; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.biz.operator.log.core.annotation.OperatorLog; +import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.framework.common.validator.group.Page; +import org.dromara.visor.framework.log.core.annotation.IgnoreLog; +import org.dromara.visor.framework.log.core.enums.IgnoreLogMode; +import org.dromara.visor.framework.web.core.annotation.RestWrapper; +import org.dromara.visor.module.asset.define.operator.ExecJobLogOperatorType; +import org.dromara.visor.module.asset.entity.request.exec.ExecInterruptRequest; +import org.dromara.visor.module.asset.entity.request.exec.ExecLogClearRequest; +import org.dromara.visor.module.asset.entity.request.exec.ExecLogQueryRequest; +import org.dromara.visor.module.asset.entity.request.exec.ExecLogTailRequest; +import org.dromara.visor.module.asset.entity.vo.ExecHostLogVO; +import org.dromara.visor.module.asset.entity.vo.ExecLogStatusVO; +import org.dromara.visor.module.asset.entity.vo.ExecLogVO; +import org.dromara.visor.module.asset.enums.ExecSourceEnum; +import org.dromara.visor.module.asset.service.ExecHostLogService; +import org.dromara.visor.module.asset.service.ExecLogService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/ExecTemplateController.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/ExecTemplateController.java similarity index 81% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/ExecTemplateController.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/ExecTemplateController.java index 472ca7db..c8ee847d 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/ExecTemplateController.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/ExecTemplateController.java @@ -13,25 +13,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.controller; +package org.dromara.visor.module.asset.controller; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.visor.framework.biz.operator.log.core.annotation.OperatorLog; -import com.orion.visor.framework.common.validator.group.Page; -import com.orion.visor.framework.log.core.annotation.IgnoreLog; -import com.orion.visor.framework.log.core.enums.IgnoreLogMode; -import com.orion.visor.framework.web.core.annotation.DemoDisableApi; -import com.orion.visor.framework.web.core.annotation.RestWrapper; -import com.orion.visor.module.asset.define.operator.ExecTemplateOperatorType; -import com.orion.visor.module.asset.entity.request.exec.ExecTemplateCreateRequest; -import com.orion.visor.module.asset.entity.request.exec.ExecTemplateQueryRequest; -import com.orion.visor.module.asset.entity.request.exec.ExecTemplateUpdateRequest; -import com.orion.visor.module.asset.entity.vo.ExecTemplateVO; -import com.orion.visor.module.asset.service.ExecTemplateService; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.biz.operator.log.core.annotation.OperatorLog; +import org.dromara.visor.framework.common.validator.group.Page; +import org.dromara.visor.framework.log.core.annotation.IgnoreLog; +import org.dromara.visor.framework.log.core.enums.IgnoreLogMode; +import org.dromara.visor.framework.web.core.annotation.DemoDisableApi; +import org.dromara.visor.framework.web.core.annotation.RestWrapper; +import org.dromara.visor.module.asset.define.operator.ExecTemplateOperatorType; +import org.dromara.visor.module.asset.entity.request.exec.ExecTemplateCreateRequest; +import org.dromara.visor.module.asset.entity.request.exec.ExecTemplateQueryRequest; +import org.dromara.visor.module.asset.entity.request.exec.ExecTemplateUpdateRequest; +import org.dromara.visor.module.asset.entity.vo.ExecTemplateVO; +import org.dromara.visor.module.asset.service.ExecTemplateService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostController.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/HostController.java similarity index 86% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostController.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/HostController.java index cc31531c..c621ca59 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostController.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/HostController.java @@ -13,24 +13,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.controller; +package org.dromara.visor.module.asset.controller; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.visor.framework.biz.operator.log.core.annotation.OperatorLog; -import com.orion.visor.framework.common.validator.group.Page; -import com.orion.visor.framework.log.core.annotation.IgnoreLog; -import com.orion.visor.framework.log.core.enums.IgnoreLogMode; -import com.orion.visor.framework.web.core.annotation.DemoDisableApi; -import com.orion.visor.framework.web.core.annotation.RestWrapper; -import com.orion.visor.module.asset.define.operator.HostOperatorType; -import com.orion.visor.module.asset.entity.request.host.*; -import com.orion.visor.module.asset.entity.vo.HostConfigVO; -import com.orion.visor.module.asset.entity.vo.HostVO; -import com.orion.visor.module.asset.service.HostService; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.biz.operator.log.core.annotation.OperatorLog; +import org.dromara.visor.framework.common.validator.group.Page; +import org.dromara.visor.framework.log.core.annotation.IgnoreLog; +import org.dromara.visor.framework.log.core.enums.IgnoreLogMode; +import org.dromara.visor.framework.web.core.annotation.DemoDisableApi; +import org.dromara.visor.framework.web.core.annotation.RestWrapper; +import org.dromara.visor.module.asset.define.operator.HostOperatorType; +import org.dromara.visor.module.asset.entity.request.host.*; +import org.dromara.visor.module.asset.entity.vo.HostConfigVO; +import org.dromara.visor.module.asset.entity.vo.HostVO; +import org.dromara.visor.module.asset.service.HostService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostExtraController.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/HostExtraController.java similarity index 82% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostExtraController.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/HostExtraController.java index 74883c4d..b46757d9 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostExtraController.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/HostExtraController.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.controller; +package org.dromara.visor.module.asset.controller; -import com.orion.visor.framework.log.core.annotation.IgnoreLog; -import com.orion.visor.framework.log.core.enums.IgnoreLogMode; -import com.orion.visor.framework.web.core.annotation.RestWrapper; -import com.orion.visor.module.asset.entity.request.host.HostExtraQueryRequest; -import com.orion.visor.module.asset.entity.request.host.HostExtraUpdateRequest; -import com.orion.visor.module.asset.service.HostExtraService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.log.core.annotation.IgnoreLog; +import org.dromara.visor.framework.log.core.enums.IgnoreLogMode; +import org.dromara.visor.framework.web.core.annotation.RestWrapper; +import org.dromara.visor.module.asset.entity.request.host.HostExtraQueryRequest; +import org.dromara.visor.module.asset.entity.request.host.HostExtraUpdateRequest; +import org.dromara.visor.module.asset.service.HostExtraService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostGroupController.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/HostGroupController.java similarity index 81% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostGroupController.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/HostGroupController.java index 2ed9e83a..fd01bd3e 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostGroupController.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/HostGroupController.java @@ -13,24 +13,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.controller; +package org.dromara.visor.module.asset.controller; -import com.orion.visor.framework.biz.operator.log.core.annotation.OperatorLog; -import com.orion.visor.framework.log.core.annotation.IgnoreLog; -import com.orion.visor.framework.log.core.enums.IgnoreLogMode; -import com.orion.visor.framework.web.core.annotation.DemoDisableApi; -import com.orion.visor.framework.web.core.annotation.RestWrapper; -import com.orion.visor.module.asset.define.operator.HostGroupOperatorType; -import com.orion.visor.module.asset.entity.request.host.HostGroupRelUpdateRequest; -import com.orion.visor.module.asset.entity.vo.HostGroupTreeVO; -import com.orion.visor.module.asset.service.HostGroupService; -import com.orion.visor.module.infra.entity.dto.data.DataGroupCreateDTO; -import com.orion.visor.module.infra.entity.dto.data.DataGroupMoveDTO; -import com.orion.visor.module.infra.entity.dto.data.DataGroupRenameDTO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.biz.operator.log.core.annotation.OperatorLog; +import org.dromara.visor.framework.log.core.annotation.IgnoreLog; +import org.dromara.visor.framework.log.core.enums.IgnoreLogMode; +import org.dromara.visor.framework.web.core.annotation.DemoDisableApi; +import org.dromara.visor.framework.web.core.annotation.RestWrapper; +import org.dromara.visor.module.asset.define.operator.HostGroupOperatorType; +import org.dromara.visor.module.asset.entity.request.host.HostGroupRelUpdateRequest; +import org.dromara.visor.module.asset.entity.vo.HostGroupTreeVO; +import org.dromara.visor.module.asset.service.HostGroupService; +import org.dromara.visor.module.infra.entity.dto.data.DataGroupCreateDTO; +import org.dromara.visor.module.infra.entity.dto.data.DataGroupMoveDTO; +import org.dromara.visor.module.infra.entity.dto.data.DataGroupRenameDTO; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostIdentityController.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/HostIdentityController.java similarity index 81% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostIdentityController.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/HostIdentityController.java index a1756a9d..96e5b5da 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostIdentityController.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/HostIdentityController.java @@ -13,25 +13,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.controller; +package org.dromara.visor.module.asset.controller; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.visor.framework.biz.operator.log.core.annotation.OperatorLog; -import com.orion.visor.framework.common.validator.group.Page; -import com.orion.visor.framework.log.core.annotation.IgnoreLog; -import com.orion.visor.framework.log.core.enums.IgnoreLogMode; -import com.orion.visor.framework.web.core.annotation.DemoDisableApi; -import com.orion.visor.framework.web.core.annotation.RestWrapper; -import com.orion.visor.module.asset.define.operator.HostIdentityOperatorType; -import com.orion.visor.module.asset.entity.request.host.HostIdentityCreateRequest; -import com.orion.visor.module.asset.entity.request.host.HostIdentityQueryRequest; -import com.orion.visor.module.asset.entity.request.host.HostIdentityUpdateRequest; -import com.orion.visor.module.asset.entity.vo.HostIdentityVO; -import com.orion.visor.module.asset.service.HostIdentityService; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.biz.operator.log.core.annotation.OperatorLog; +import org.dromara.visor.framework.common.validator.group.Page; +import org.dromara.visor.framework.log.core.annotation.IgnoreLog; +import org.dromara.visor.framework.log.core.enums.IgnoreLogMode; +import org.dromara.visor.framework.web.core.annotation.DemoDisableApi; +import org.dromara.visor.framework.web.core.annotation.RestWrapper; +import org.dromara.visor.module.asset.define.operator.HostIdentityOperatorType; +import org.dromara.visor.module.asset.entity.request.host.HostIdentityCreateRequest; +import org.dromara.visor.module.asset.entity.request.host.HostIdentityQueryRequest; +import org.dromara.visor.module.asset.entity.request.host.HostIdentityUpdateRequest; +import org.dromara.visor.module.asset.entity.vo.HostIdentityVO; +import org.dromara.visor.module.asset.service.HostIdentityService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostKeyController.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/HostKeyController.java similarity index 80% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostKeyController.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/HostKeyController.java index d2b94e67..683dba8c 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostKeyController.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/HostKeyController.java @@ -13,25 +13,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.controller; +package org.dromara.visor.module.asset.controller; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.visor.framework.biz.operator.log.core.annotation.OperatorLog; -import com.orion.visor.framework.common.validator.group.Page; -import com.orion.visor.framework.log.core.annotation.IgnoreLog; -import com.orion.visor.framework.log.core.enums.IgnoreLogMode; -import com.orion.visor.framework.web.core.annotation.DemoDisableApi; -import com.orion.visor.framework.web.core.annotation.RestWrapper; -import com.orion.visor.module.asset.define.operator.HostKeyOperatorType; -import com.orion.visor.module.asset.entity.request.host.HostKeyCreateRequest; -import com.orion.visor.module.asset.entity.request.host.HostKeyQueryRequest; -import com.orion.visor.module.asset.entity.request.host.HostKeyUpdateRequest; -import com.orion.visor.module.asset.entity.vo.HostKeyVO; -import com.orion.visor.module.asset.service.HostKeyService; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.biz.operator.log.core.annotation.OperatorLog; +import org.dromara.visor.framework.common.validator.group.Page; +import org.dromara.visor.framework.log.core.annotation.IgnoreLog; +import org.dromara.visor.framework.log.core.enums.IgnoreLogMode; +import org.dromara.visor.framework.web.core.annotation.DemoDisableApi; +import org.dromara.visor.framework.web.core.annotation.RestWrapper; +import org.dromara.visor.module.asset.define.operator.HostKeyOperatorType; +import org.dromara.visor.module.asset.entity.request.host.HostKeyCreateRequest; +import org.dromara.visor.module.asset.entity.request.host.HostKeyQueryRequest; +import org.dromara.visor.module.asset.entity.request.host.HostKeyUpdateRequest; +import org.dromara.visor.module.asset.entity.vo.HostKeyVO; +import org.dromara.visor.module.asset.service.HostKeyService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/PathBookmarkController.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/PathBookmarkController.java similarity index 84% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/PathBookmarkController.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/PathBookmarkController.java index 7d797a33..a9ec751f 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/PathBookmarkController.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/PathBookmarkController.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.controller; +package org.dromara.visor.module.asset.controller; -import com.orion.visor.framework.web.core.annotation.RestWrapper; -import com.orion.visor.module.asset.entity.request.path.PathBookmarkCreateRequest; -import com.orion.visor.module.asset.entity.request.path.PathBookmarkUpdateRequest; -import com.orion.visor.module.asset.entity.vo.PathBookmarkWrapperVO; -import com.orion.visor.module.asset.service.PathBookmarkService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.web.core.annotation.RestWrapper; +import org.dromara.visor.module.asset.entity.request.path.PathBookmarkCreateRequest; +import org.dromara.visor.module.asset.entity.request.path.PathBookmarkUpdateRequest; +import org.dromara.visor.module.asset.entity.vo.PathBookmarkWrapperVO; +import org.dromara.visor.module.asset.service.PathBookmarkService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/PathBookmarkGroupController.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/PathBookmarkGroupController.java similarity index 76% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/PathBookmarkGroupController.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/PathBookmarkGroupController.java index 0269f779..e1332e3b 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/PathBookmarkGroupController.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/PathBookmarkGroupController.java @@ -13,20 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.controller; +package org.dromara.visor.module.asset.controller; -import com.orion.visor.framework.common.validator.group.Id; -import com.orion.visor.framework.log.core.annotation.IgnoreLog; -import com.orion.visor.framework.log.core.enums.IgnoreLogMode; -import com.orion.visor.framework.web.core.annotation.RestWrapper; -import com.orion.visor.module.asset.entity.request.path.PathBookmarkGroupCreateRequest; -import com.orion.visor.module.asset.entity.request.path.PathBookmarkGroupDeleteRequest; -import com.orion.visor.module.asset.entity.request.path.PathBookmarkGroupUpdateRequest; -import com.orion.visor.module.asset.entity.vo.PathBookmarkGroupVO; -import com.orion.visor.module.asset.service.PathBookmarkGroupService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.common.validator.group.Id; +import org.dromara.visor.framework.log.core.annotation.IgnoreLog; +import org.dromara.visor.framework.log.core.enums.IgnoreLogMode; +import org.dromara.visor.framework.web.core.annotation.RestWrapper; +import org.dromara.visor.module.asset.entity.request.path.PathBookmarkGroupCreateRequest; +import org.dromara.visor.module.asset.entity.request.path.PathBookmarkGroupDeleteRequest; +import org.dromara.visor.module.asset.entity.request.path.PathBookmarkGroupUpdateRequest; +import org.dromara.visor.module.asset.entity.vo.PathBookmarkGroupVO; +import org.dromara.visor.module.asset.service.PathBookmarkGroupService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/TerminalConnectLogController.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/TerminalConnectLogController.java similarity index 81% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/TerminalConnectLogController.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/TerminalConnectLogController.java index dd5f3c25..ea5cc2e4 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/TerminalConnectLogController.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/TerminalConnectLogController.java @@ -13,25 +13,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.controller; +package org.dromara.visor.module.asset.controller; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.visor.framework.biz.operator.log.core.annotation.OperatorLog; -import com.orion.visor.framework.common.validator.group.Id; -import com.orion.visor.framework.common.validator.group.Page; -import com.orion.visor.framework.log.core.annotation.IgnoreLog; -import com.orion.visor.framework.log.core.enums.IgnoreLogMode; -import com.orion.visor.framework.web.core.annotation.DemoDisableApi; -import com.orion.visor.framework.web.core.annotation.RestWrapper; -import com.orion.visor.module.asset.define.operator.TerminalConnectLogOperatorType; -import com.orion.visor.module.asset.entity.request.host.TerminalConnectLogClearRequest; -import com.orion.visor.module.asset.entity.request.host.TerminalConnectLogQueryRequest; -import com.orion.visor.module.asset.entity.vo.TerminalConnectLogVO; -import com.orion.visor.module.asset.service.TerminalConnectLogService; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.biz.operator.log.core.annotation.OperatorLog; +import org.dromara.visor.framework.common.validator.group.Id; +import org.dromara.visor.framework.common.validator.group.Page; +import org.dromara.visor.framework.log.core.annotation.IgnoreLog; +import org.dromara.visor.framework.log.core.enums.IgnoreLogMode; +import org.dromara.visor.framework.web.core.annotation.DemoDisableApi; +import org.dromara.visor.framework.web.core.annotation.RestWrapper; +import org.dromara.visor.module.asset.define.operator.TerminalConnectLogOperatorType; +import org.dromara.visor.module.asset.entity.request.host.TerminalConnectLogClearRequest; +import org.dromara.visor.module.asset.entity.request.host.TerminalConnectLogQueryRequest; +import org.dromara.visor.module.asset.entity.vo.TerminalConnectLogVO; +import org.dromara.visor.module.asset.service.TerminalConnectLogService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/TerminalController.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/TerminalController.java similarity index 85% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/TerminalController.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/TerminalController.java index 20d17d46..66c71f19 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/TerminalController.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/TerminalController.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.controller; +package org.dromara.visor.module.asset.controller; -import com.orion.visor.framework.log.core.annotation.IgnoreLog; -import com.orion.visor.framework.log.core.enums.IgnoreLogMode; -import com.orion.visor.framework.web.core.annotation.RestWrapper; -import com.orion.visor.module.asset.entity.vo.TerminalThemeVO; -import com.orion.visor.module.asset.service.TerminalService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.log.core.annotation.IgnoreLog; +import org.dromara.visor.framework.log.core.enums.IgnoreLogMode; +import org.dromara.visor.framework.web.core.annotation.RestWrapper; +import org.dromara.visor.module.asset.entity.vo.TerminalThemeVO; +import org.dromara.visor.module.asset.service.TerminalService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/TerminalSftpController.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/TerminalSftpController.java similarity index 83% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/TerminalSftpController.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/TerminalSftpController.java index b11772ff..25185dd9 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/TerminalSftpController.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/TerminalSftpController.java @@ -13,23 +13,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.controller; +package org.dromara.visor.module.asset.controller; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.visor.framework.biz.operator.log.core.annotation.OperatorLog; -import com.orion.visor.framework.common.validator.group.Page; -import com.orion.visor.framework.log.core.annotation.IgnoreLog; -import com.orion.visor.framework.log.core.enums.IgnoreLogMode; -import com.orion.visor.framework.web.core.annotation.IgnoreWrapper; -import com.orion.visor.framework.web.core.annotation.RestWrapper; -import com.orion.visor.module.asset.define.operator.TerminalOperatorType; -import com.orion.visor.module.asset.entity.request.host.TerminalSftpLogQueryRequest; -import com.orion.visor.module.asset.entity.vo.TerminalSftpLogVO; -import com.orion.visor.module.asset.service.TerminalSftpService; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.biz.operator.log.core.annotation.OperatorLog; +import org.dromara.visor.framework.common.validator.group.Page; +import org.dromara.visor.framework.log.core.annotation.IgnoreLog; +import org.dromara.visor.framework.log.core.enums.IgnoreLogMode; +import org.dromara.visor.framework.web.core.annotation.IgnoreWrapper; +import org.dromara.visor.framework.web.core.annotation.RestWrapper; +import org.dromara.visor.module.asset.define.operator.TerminalOperatorType; +import org.dromara.visor.module.asset.entity.request.host.TerminalSftpLogQueryRequest; +import org.dromara.visor.module.asset.entity.vo.TerminalSftpLogVO; +import org.dromara.visor.module.asset.service.TerminalSftpService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/UploadTaskController.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/UploadTaskController.java similarity index 82% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/UploadTaskController.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/UploadTaskController.java index 1ebc8112..15bc5900 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/UploadTaskController.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/UploadTaskController.java @@ -13,27 +13,27 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.controller; +package org.dromara.visor.module.asset.controller; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.visor.framework.biz.operator.log.core.annotation.OperatorLog; -import com.orion.visor.framework.common.validator.group.Page; -import com.orion.visor.framework.log.core.annotation.IgnoreLog; -import com.orion.visor.framework.log.core.enums.IgnoreLogMode; -import com.orion.visor.framework.web.core.annotation.RestWrapper; -import com.orion.visor.module.asset.define.operator.UploadTaskOperatorType; -import com.orion.visor.module.asset.entity.request.upload.UploadTaskClearRequest; -import com.orion.visor.module.asset.entity.request.upload.UploadTaskCreateRequest; -import com.orion.visor.module.asset.entity.request.upload.UploadTaskQueryRequest; -import com.orion.visor.module.asset.entity.request.upload.UploadTaskRequest; -import com.orion.visor.module.asset.entity.vo.UploadTaskCreateVO; -import com.orion.visor.module.asset.entity.vo.UploadTaskStatusVO; -import com.orion.visor.module.asset.entity.vo.UploadTaskVO; -import com.orion.visor.module.asset.service.UploadTaskService; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.biz.operator.log.core.annotation.OperatorLog; +import org.dromara.visor.framework.common.validator.group.Page; +import org.dromara.visor.framework.log.core.annotation.IgnoreLog; +import org.dromara.visor.framework.log.core.enums.IgnoreLogMode; +import org.dromara.visor.framework.web.core.annotation.RestWrapper; +import org.dromara.visor.module.asset.define.operator.UploadTaskOperatorType; +import org.dromara.visor.module.asset.entity.request.upload.UploadTaskClearRequest; +import org.dromara.visor.module.asset.entity.request.upload.UploadTaskCreateRequest; +import org.dromara.visor.module.asset.entity.request.upload.UploadTaskQueryRequest; +import org.dromara.visor.module.asset.entity.request.upload.UploadTaskRequest; +import org.dromara.visor.module.asset.entity.vo.UploadTaskCreateVO; +import org.dromara.visor.module.asset.entity.vo.UploadTaskStatusVO; +import org.dromara.visor.module.asset.entity.vo.UploadTaskVO; +import org.dromara.visor.module.asset.service.UploadTaskService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/convert/CommandSnippetConvert.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/CommandSnippetConvert.java similarity index 75% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/convert/CommandSnippetConvert.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/CommandSnippetConvert.java index 31ff4124..e2a39a9d 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/convert/CommandSnippetConvert.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/CommandSnippetConvert.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.convert; +package org.dromara.visor.module.asset.convert; -import com.orion.visor.module.asset.entity.domain.CommandSnippetDO; -import com.orion.visor.module.asset.entity.dto.CommandSnippetCacheDTO; -import com.orion.visor.module.asset.entity.request.command.CommandSnippetCreateRequest; -import com.orion.visor.module.asset.entity.request.command.CommandSnippetUpdateRequest; -import com.orion.visor.module.asset.entity.vo.CommandSnippetVO; +import org.dromara.visor.module.asset.entity.domain.CommandSnippetDO; +import org.dromara.visor.module.asset.entity.dto.CommandSnippetCacheDTO; +import org.dromara.visor.module.asset.entity.request.command.CommandSnippetCreateRequest; +import org.dromara.visor.module.asset.entity.request.command.CommandSnippetUpdateRequest; +import org.dromara.visor.module.asset.entity.vo.CommandSnippetVO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/convert/CommandSnippetGroupConvert.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/CommandSnippetGroupConvert.java similarity index 69% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/convert/CommandSnippetGroupConvert.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/CommandSnippetGroupConvert.java index b73f82c1..701305c7 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/convert/CommandSnippetGroupConvert.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/CommandSnippetGroupConvert.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.convert; +package org.dromara.visor.module.asset.convert; -import com.orion.visor.module.asset.entity.request.command.CommandSnippetGroupCreateRequest; -import com.orion.visor.module.asset.entity.request.command.CommandSnippetGroupUpdateRequest; -import com.orion.visor.module.asset.entity.vo.CommandSnippetGroupVO; -import com.orion.visor.module.infra.entity.dto.data.DataGroupCreateDTO; -import com.orion.visor.module.infra.entity.dto.data.DataGroupDTO; -import com.orion.visor.module.infra.entity.dto.data.DataGroupRenameDTO; +import org.dromara.visor.module.asset.entity.request.command.CommandSnippetGroupCreateRequest; +import org.dromara.visor.module.asset.entity.request.command.CommandSnippetGroupUpdateRequest; +import org.dromara.visor.module.asset.entity.vo.CommandSnippetGroupVO; +import org.dromara.visor.module.infra.entity.dto.data.DataGroupCreateDTO; +import org.dromara.visor.module.infra.entity.dto.data.DataGroupDTO; +import org.dromara.visor.module.infra.entity.dto.data.DataGroupRenameDTO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/convert/ExecConvert.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/ExecConvert.java similarity index 83% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/convert/ExecConvert.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/ExecConvert.java index 846f55d6..83d73f05 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/convert/ExecConvert.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/ExecConvert.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.convert; +package org.dromara.visor.module.asset.convert; -import com.orion.visor.module.asset.entity.dto.ExecCommandExecDTO; -import com.orion.visor.module.asset.entity.request.exec.ExecCommandRequest; +import org.dromara.visor.module.asset.entity.dto.ExecCommandExecDTO; +import org.dromara.visor.module.asset.entity.request.exec.ExecCommandRequest; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/convert/ExecHostLogConvert.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/ExecHostLogConvert.java similarity index 86% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/convert/ExecHostLogConvert.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/ExecHostLogConvert.java index 851cd2e8..f7a5eae3 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/convert/ExecHostLogConvert.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/ExecHostLogConvert.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.convert; +package org.dromara.visor.module.asset.convert; -import com.orion.visor.module.asset.entity.domain.ExecHostLogDO; -import com.orion.visor.module.asset.entity.vo.ExecHostLogVO; +import org.dromara.visor.module.asset.entity.domain.ExecHostLogDO; +import org.dromara.visor.module.asset.entity.vo.ExecHostLogVO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/convert/ExecJobConvert.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/ExecJobConvert.java similarity index 74% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/convert/ExecJobConvert.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/ExecJobConvert.java index b38fb302..3e89ab87 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/convert/ExecJobConvert.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/ExecJobConvert.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.convert; +package org.dromara.visor.module.asset.convert; -import com.orion.visor.module.asset.entity.domain.ExecJobDO; -import com.orion.visor.module.asset.entity.request.exec.ExecJobCreateRequest; -import com.orion.visor.module.asset.entity.request.exec.ExecJobQueryRequest; -import com.orion.visor.module.asset.entity.request.exec.ExecJobUpdateRequest; -import com.orion.visor.module.asset.entity.vo.ExecJobVO; +import org.dromara.visor.module.asset.entity.domain.ExecJobDO; +import org.dromara.visor.module.asset.entity.request.exec.ExecJobCreateRequest; +import org.dromara.visor.module.asset.entity.request.exec.ExecJobQueryRequest; +import org.dromara.visor.module.asset.entity.request.exec.ExecJobUpdateRequest; +import org.dromara.visor.module.asset.entity.vo.ExecJobVO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/convert/ExecLogConvert.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/ExecLogConvert.java similarity index 81% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/convert/ExecLogConvert.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/ExecLogConvert.java index ca9ca144..bca246f1 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/convert/ExecLogConvert.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/ExecLogConvert.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.convert; +package org.dromara.visor.module.asset.convert; -import com.orion.visor.module.asset.entity.domain.ExecLogDO; -import com.orion.visor.module.asset.entity.request.exec.ExecLogQueryRequest; -import com.orion.visor.module.asset.entity.vo.ExecLogVO; +import org.dromara.visor.module.asset.entity.domain.ExecLogDO; +import org.dromara.visor.module.asset.entity.request.exec.ExecLogQueryRequest; +import org.dromara.visor.module.asset.entity.vo.ExecLogVO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/convert/ExecTemplateConvert.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/ExecTemplateConvert.java similarity index 76% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/convert/ExecTemplateConvert.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/ExecTemplateConvert.java index f9ca0d46..be41bec3 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/convert/ExecTemplateConvert.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/ExecTemplateConvert.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.convert; +package org.dromara.visor.module.asset.convert; -import com.orion.visor.module.asset.entity.domain.ExecTemplateDO; -import com.orion.visor.module.asset.entity.request.exec.ExecTemplateCreateRequest; -import com.orion.visor.module.asset.entity.request.exec.ExecTemplateUpdateRequest; -import com.orion.visor.module.asset.entity.vo.ExecTemplateVO; +import org.dromara.visor.module.asset.entity.domain.ExecTemplateDO; +import org.dromara.visor.module.asset.entity.request.exec.ExecTemplateCreateRequest; +import org.dromara.visor.module.asset.entity.request.exec.ExecTemplateUpdateRequest; +import org.dromara.visor.module.asset.entity.vo.ExecTemplateVO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/convert/HostConvert.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/HostConvert.java similarity index 72% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/convert/HostConvert.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/HostConvert.java index 7f24d3d7..c3d00afe 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/convert/HostConvert.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/HostConvert.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.convert; +package org.dromara.visor.module.asset.convert; -import com.orion.visor.module.asset.entity.domain.HostDO; -import com.orion.visor.module.asset.entity.dto.HostCacheDTO; -import com.orion.visor.module.asset.entity.request.host.HostCreateRequest; -import com.orion.visor.module.asset.entity.request.host.HostQueryRequest; -import com.orion.visor.module.asset.entity.request.host.HostUpdateRequest; -import com.orion.visor.module.asset.entity.vo.HostBaseVO; -import com.orion.visor.module.asset.entity.vo.HostVO; +import org.dromara.visor.module.asset.entity.domain.HostDO; +import org.dromara.visor.module.asset.entity.dto.HostCacheDTO; +import org.dromara.visor.module.asset.entity.request.host.HostCreateRequest; +import org.dromara.visor.module.asset.entity.request.host.HostQueryRequest; +import org.dromara.visor.module.asset.entity.request.host.HostUpdateRequest; +import org.dromara.visor.module.asset.entity.vo.HostBaseVO; +import org.dromara.visor.module.asset.entity.vo.HostVO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/convert/HostGroupConvert.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/HostGroupConvert.java similarity index 85% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/convert/HostGroupConvert.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/HostGroupConvert.java index b8a38fa6..cf0a122d 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/convert/HostGroupConvert.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/HostGroupConvert.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.convert; +package org.dromara.visor.module.asset.convert; -import com.orion.visor.module.asset.entity.vo.HostGroupTreeVO; -import com.orion.visor.module.infra.entity.dto.data.DataGroupDTO; +import org.dromara.visor.module.asset.entity.vo.HostGroupTreeVO; +import org.dromara.visor.module.infra.entity.dto.data.DataGroupDTO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/convert/HostIdentityConvert.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/HostIdentityConvert.java similarity index 73% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/convert/HostIdentityConvert.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/HostIdentityConvert.java index 6cd0d77a..da5f7695 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/convert/HostIdentityConvert.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/HostIdentityConvert.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.convert; +package org.dromara.visor.module.asset.convert; -import com.orion.visor.module.asset.entity.domain.HostIdentityDO; -import com.orion.visor.module.asset.entity.dto.HostIdentityCacheDTO; -import com.orion.visor.module.asset.entity.request.host.HostIdentityCreateRequest; -import com.orion.visor.module.asset.entity.request.host.HostIdentityQueryRequest; -import com.orion.visor.module.asset.entity.request.host.HostIdentityUpdateRequest; -import com.orion.visor.module.asset.entity.vo.HostIdentityVO; +import org.dromara.visor.module.asset.entity.domain.HostIdentityDO; +import org.dromara.visor.module.asset.entity.dto.HostIdentityCacheDTO; +import org.dromara.visor.module.asset.entity.request.host.HostIdentityCreateRequest; +import org.dromara.visor.module.asset.entity.request.host.HostIdentityQueryRequest; +import org.dromara.visor.module.asset.entity.request.host.HostIdentityUpdateRequest; +import org.dromara.visor.module.asset.entity.vo.HostIdentityVO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/convert/HostKeyConvert.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/HostKeyConvert.java similarity index 73% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/convert/HostKeyConvert.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/HostKeyConvert.java index 58f3be74..69b70694 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/convert/HostKeyConvert.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/HostKeyConvert.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.convert; +package org.dromara.visor.module.asset.convert; -import com.orion.visor.module.asset.entity.domain.HostKeyDO; -import com.orion.visor.module.asset.entity.dto.HostKeyCacheDTO; -import com.orion.visor.module.asset.entity.request.host.HostKeyCreateRequest; -import com.orion.visor.module.asset.entity.request.host.HostKeyQueryRequest; -import com.orion.visor.module.asset.entity.request.host.HostKeyUpdateRequest; -import com.orion.visor.module.asset.entity.vo.HostKeyVO; +import org.dromara.visor.module.asset.entity.domain.HostKeyDO; +import org.dromara.visor.module.asset.entity.dto.HostKeyCacheDTO; +import org.dromara.visor.module.asset.entity.request.host.HostKeyCreateRequest; +import org.dromara.visor.module.asset.entity.request.host.HostKeyQueryRequest; +import org.dromara.visor.module.asset.entity.request.host.HostKeyUpdateRequest; +import org.dromara.visor.module.asset.entity.vo.HostKeyVO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/convert/PathBookmarkConvert.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/PathBookmarkConvert.java similarity index 75% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/convert/PathBookmarkConvert.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/PathBookmarkConvert.java index 43c94790..7f5adcda 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/convert/PathBookmarkConvert.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/PathBookmarkConvert.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.convert; +package org.dromara.visor.module.asset.convert; -import com.orion.visor.module.asset.entity.domain.PathBookmarkDO; -import com.orion.visor.module.asset.entity.dto.PathBookmarkCacheDTO; -import com.orion.visor.module.asset.entity.request.path.PathBookmarkCreateRequest; -import com.orion.visor.module.asset.entity.request.path.PathBookmarkUpdateRequest; -import com.orion.visor.module.asset.entity.vo.PathBookmarkVO; +import org.dromara.visor.module.asset.entity.domain.PathBookmarkDO; +import org.dromara.visor.module.asset.entity.dto.PathBookmarkCacheDTO; +import org.dromara.visor.module.asset.entity.request.path.PathBookmarkCreateRequest; +import org.dromara.visor.module.asset.entity.request.path.PathBookmarkUpdateRequest; +import org.dromara.visor.module.asset.entity.vo.PathBookmarkVO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/convert/PathBookmarkGroupConvert.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/PathBookmarkGroupConvert.java similarity index 69% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/convert/PathBookmarkGroupConvert.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/PathBookmarkGroupConvert.java index abf1a8ef..5e8da56b 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/convert/PathBookmarkGroupConvert.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/PathBookmarkGroupConvert.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.convert; +package org.dromara.visor.module.asset.convert; -import com.orion.visor.module.asset.entity.request.path.PathBookmarkGroupCreateRequest; -import com.orion.visor.module.asset.entity.request.path.PathBookmarkGroupUpdateRequest; -import com.orion.visor.module.asset.entity.vo.PathBookmarkGroupVO; -import com.orion.visor.module.infra.entity.dto.data.DataGroupCreateDTO; -import com.orion.visor.module.infra.entity.dto.data.DataGroupDTO; -import com.orion.visor.module.infra.entity.dto.data.DataGroupRenameDTO; +import org.dromara.visor.module.asset.entity.request.path.PathBookmarkGroupCreateRequest; +import org.dromara.visor.module.asset.entity.request.path.PathBookmarkGroupUpdateRequest; +import org.dromara.visor.module.asset.entity.vo.PathBookmarkGroupVO; +import org.dromara.visor.module.infra.entity.dto.data.DataGroupCreateDTO; +import org.dromara.visor.module.infra.entity.dto.data.DataGroupDTO; +import org.dromara.visor.module.infra.entity.dto.data.DataGroupRenameDTO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/convert/TerminalConnectLogConvert.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/TerminalConnectLogConvert.java similarity index 75% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/convert/TerminalConnectLogConvert.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/TerminalConnectLogConvert.java index 4ed878d7..b1658375 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/convert/TerminalConnectLogConvert.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/TerminalConnectLogConvert.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.convert; +package org.dromara.visor.module.asset.convert; -import com.orion.visor.module.asset.entity.domain.TerminalConnectLogDO; -import com.orion.visor.module.asset.entity.dto.TerminalConnectDTO; -import com.orion.visor.module.asset.entity.request.host.TerminalConnectLogCreateRequest; -import com.orion.visor.module.asset.entity.request.host.TerminalConnectLogQueryRequest; -import com.orion.visor.module.asset.entity.vo.TerminalConnectLogVO; +import org.dromara.visor.module.asset.entity.domain.TerminalConnectLogDO; +import org.dromara.visor.module.asset.entity.dto.TerminalConnectDTO; +import org.dromara.visor.module.asset.entity.request.host.TerminalConnectLogCreateRequest; +import org.dromara.visor.module.asset.entity.request.host.TerminalConnectLogQueryRequest; +import org.dromara.visor.module.asset.entity.vo.TerminalConnectLogVO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/convert/TerminalSftpLogConvert.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/TerminalSftpLogConvert.java similarity index 85% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/convert/TerminalSftpLogConvert.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/TerminalSftpLogConvert.java index edd84e31..f56cfb8d 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/convert/TerminalSftpLogConvert.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/TerminalSftpLogConvert.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.convert; +package org.dromara.visor.module.asset.convert; -import com.orion.visor.module.asset.entity.vo.TerminalSftpLogVO; -import com.orion.visor.module.infra.entity.dto.operator.OperatorLogDTO; +import org.dromara.visor.module.asset.entity.vo.TerminalSftpLogVO; +import org.dromara.visor.module.infra.entity.dto.operator.OperatorLogDTO; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.factory.Mappers; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/convert/UploadTaskConvert.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/UploadTaskConvert.java similarity index 75% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/convert/UploadTaskConvert.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/UploadTaskConvert.java index 15a47816..38cca8e4 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/convert/UploadTaskConvert.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/UploadTaskConvert.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.convert; +package org.dromara.visor.module.asset.convert; -import com.orion.visor.module.asset.entity.domain.UploadTaskDO; -import com.orion.visor.module.asset.entity.request.upload.UploadTaskCreateRequest; -import com.orion.visor.module.asset.entity.request.upload.UploadTaskQueryRequest; -import com.orion.visor.module.asset.entity.vo.UploadTaskStatusVO; -import com.orion.visor.module.asset.entity.vo.UploadTaskVO; +import org.dromara.visor.module.asset.entity.domain.UploadTaskDO; +import org.dromara.visor.module.asset.entity.request.upload.UploadTaskCreateRequest; +import org.dromara.visor.module.asset.entity.request.upload.UploadTaskQueryRequest; +import org.dromara.visor.module.asset.entity.vo.UploadTaskStatusVO; +import org.dromara.visor.module.asset.entity.vo.UploadTaskVO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/convert/UploadTaskFileConvert.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/UploadTaskFileConvert.java similarity index 85% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/convert/UploadTaskFileConvert.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/UploadTaskFileConvert.java index a10c43be..c2362127 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/convert/UploadTaskFileConvert.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/UploadTaskFileConvert.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.convert; +package org.dromara.visor.module.asset.convert; -import com.orion.visor.module.asset.entity.domain.UploadTaskFileDO; -import com.orion.visor.module.asset.entity.vo.UploadTaskFileVO; +import org.dromara.visor.module.asset.entity.domain.UploadTaskFileDO; +import org.dromara.visor.module.asset.entity.vo.UploadTaskFileVO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/dao/CommandSnippetDAO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/CommandSnippetDAO.java similarity index 92% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/dao/CommandSnippetDAO.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/CommandSnippetDAO.java index 3852590f..c1f43be0 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/dao/CommandSnippetDAO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/CommandSnippetDAO.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.dao; +package org.dromara.visor.module.asset.dao; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.orion.visor.framework.mybatis.core.mapper.IMapper; -import com.orion.visor.module.asset.entity.domain.CommandSnippetDO; import org.apache.ibatis.annotations.Mapper; +import org.dromara.visor.framework.mybatis.core.mapper.IMapper; +import org.dromara.visor.module.asset.entity.domain.CommandSnippetDO; import java.util.List; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/dao/ExecHostLogDAO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/ExecHostLogDAO.java similarity index 87% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/dao/ExecHostLogDAO.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/ExecHostLogDAO.java index 45d45cd1..eb319ae2 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/dao/ExecHostLogDAO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/ExecHostLogDAO.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.dao; +package org.dromara.visor.module.asset.dao; -import com.orion.visor.framework.mybatis.core.mapper.IMapper; -import com.orion.visor.module.asset.entity.domain.ExecHostLogDO; import org.apache.ibatis.annotations.Mapper; +import org.dromara.visor.framework.mybatis.core.mapper.IMapper; +import org.dromara.visor.module.asset.entity.domain.ExecHostLogDO; import java.util.List; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/dao/ExecJobDAO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/ExecJobDAO.java similarity index 85% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/dao/ExecJobDAO.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/ExecJobDAO.java index b6bfc8a5..9848b5c7 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/dao/ExecJobDAO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/ExecJobDAO.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.dao; +package org.dromara.visor.module.asset.dao; -import com.orion.visor.framework.mybatis.core.mapper.IMapper; -import com.orion.visor.module.asset.entity.domain.ExecJobDO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import org.dromara.visor.framework.mybatis.core.mapper.IMapper; +import org.dromara.visor.module.asset.entity.domain.ExecJobDO; /** * 计划任务 Mapper 接口 diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/dao/ExecJobHostDAO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/ExecJobHostDAO.java similarity index 93% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/dao/ExecJobHostDAO.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/ExecJobHostDAO.java index e45eb4d4..916c79d2 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/dao/ExecJobHostDAO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/ExecJobHostDAO.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.dao; +package org.dromara.visor.module.asset.dao; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.visor.framework.mybatis.core.mapper.IMapper; -import com.orion.visor.module.asset.entity.domain.ExecJobHostDO; import org.apache.ibatis.annotations.Mapper; +import org.dromara.visor.framework.mybatis.core.mapper.IMapper; +import org.dromara.visor.module.asset.entity.domain.ExecJobHostDO; import java.util.List; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/dao/ExecLogDAO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/ExecLogDAO.java similarity index 90% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/dao/ExecLogDAO.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/ExecLogDAO.java index a88370cc..4ead24a6 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/dao/ExecLogDAO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/ExecLogDAO.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.dao; +package org.dromara.visor.module.asset.dao; -import com.orion.visor.framework.mybatis.core.mapper.IMapper; -import com.orion.visor.module.asset.entity.domain.ExecLogDO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import org.dromara.visor.framework.mybatis.core.mapper.IMapper; +import org.dromara.visor.module.asset.entity.domain.ExecLogDO; import java.util.List; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/dao/ExecTemplateDAO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/ExecTemplateDAO.java similarity index 83% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/dao/ExecTemplateDAO.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/ExecTemplateDAO.java index f6751064..3f39c122 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/dao/ExecTemplateDAO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/ExecTemplateDAO.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.dao; +package org.dromara.visor.module.asset.dao; -import com.orion.visor.framework.mybatis.core.mapper.IMapper; -import com.orion.visor.module.asset.entity.domain.ExecTemplateDO; import org.apache.ibatis.annotations.Mapper; +import org.dromara.visor.framework.mybatis.core.mapper.IMapper; +import org.dromara.visor.module.asset.entity.domain.ExecTemplateDO; /** * 执行模板 Mapper 接口 diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/dao/ExecTemplateHostDAO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/ExecTemplateHostDAO.java similarity index 83% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/dao/ExecTemplateHostDAO.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/ExecTemplateHostDAO.java index b526e97a..27b90b69 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/dao/ExecTemplateHostDAO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/ExecTemplateHostDAO.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.dao; +package org.dromara.visor.module.asset.dao; -import com.orion.visor.framework.mybatis.core.mapper.IMapper; -import com.orion.visor.module.asset.entity.domain.ExecTemplateHostDO; import org.apache.ibatis.annotations.Mapper; +import org.dromara.visor.framework.mybatis.core.mapper.IMapper; +import org.dromara.visor.module.asset.entity.domain.ExecTemplateHostDO; /** * 执行模板主机 Mapper 接口 diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/dao/HostDAO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/HostDAO.java similarity index 94% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/dao/HostDAO.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/HostDAO.java index 7152eff0..fdd98720 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/dao/HostDAO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/HostDAO.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.dao; +package org.dromara.visor.module.asset.dao; import com.baomidou.mybatisplus.core.toolkit.support.SFunction; -import com.orion.visor.framework.mybatis.core.mapper.IMapper; -import com.orion.visor.module.asset.entity.domain.HostDO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import org.dromara.visor.framework.mybatis.core.mapper.IMapper; +import org.dromara.visor.module.asset.entity.domain.HostDO; import java.util.Arrays; import java.util.List; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/dao/HostIdentityDAO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/HostIdentityDAO.java similarity index 89% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/dao/HostIdentityDAO.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/HostIdentityDAO.java index cded801f..52d74175 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/dao/HostIdentityDAO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/HostIdentityDAO.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.dao; +package org.dromara.visor.module.asset.dao; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.orion.visor.framework.mybatis.core.mapper.IMapper; -import com.orion.visor.module.asset.entity.domain.HostIdentityDO; import org.apache.ibatis.annotations.Mapper; +import org.dromara.visor.framework.mybatis.core.mapper.IMapper; +import org.dromara.visor.module.asset.entity.domain.HostIdentityDO; import java.util.List; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/dao/HostKeyDAO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/HostKeyDAO.java similarity index 83% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/dao/HostKeyDAO.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/HostKeyDAO.java index 06e798d4..e0cf74c7 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/dao/HostKeyDAO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/HostKeyDAO.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.dao; +package org.dromara.visor.module.asset.dao; -import com.orion.visor.framework.mybatis.core.mapper.IMapper; -import com.orion.visor.module.asset.entity.domain.HostKeyDO; import org.apache.ibatis.annotations.Mapper; +import org.dromara.visor.framework.mybatis.core.mapper.IMapper; +import org.dromara.visor.module.asset.entity.domain.HostKeyDO; /** * 主机密钥 Mapper 接口 diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/dao/PathBookmarkDAO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/PathBookmarkDAO.java similarity index 92% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/dao/PathBookmarkDAO.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/PathBookmarkDAO.java index c8c01873..719c6b4a 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/dao/PathBookmarkDAO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/PathBookmarkDAO.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.dao; +package org.dromara.visor.module.asset.dao; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.orion.visor.framework.mybatis.core.mapper.IMapper; -import com.orion.visor.module.asset.entity.domain.PathBookmarkDO; import org.apache.ibatis.annotations.Mapper; +import org.dromara.visor.framework.mybatis.core.mapper.IMapper; +import org.dromara.visor.module.asset.entity.domain.PathBookmarkDO; import java.util.List; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/dao/TerminalConnectLogDAO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/TerminalConnectLogDAO.java similarity index 87% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/dao/TerminalConnectLogDAO.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/TerminalConnectLogDAO.java index 77bdd4e2..52155894 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/dao/TerminalConnectLogDAO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/TerminalConnectLogDAO.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.dao; +package org.dromara.visor.module.asset.dao; -import com.orion.visor.framework.mybatis.core.mapper.IMapper; -import com.orion.visor.module.asset.entity.domain.TerminalConnectLogDO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import org.dromara.visor.framework.mybatis.core.mapper.IMapper; +import org.dromara.visor.module.asset.entity.domain.TerminalConnectLogDO; import java.util.List; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/dao/UploadTaskDAO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/UploadTaskDAO.java similarity index 83% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/dao/UploadTaskDAO.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/UploadTaskDAO.java index a45f7a82..54e46661 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/dao/UploadTaskDAO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/UploadTaskDAO.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.dao; +package org.dromara.visor.module.asset.dao; -import com.orion.visor.framework.mybatis.core.mapper.IMapper; -import com.orion.visor.module.asset.entity.domain.UploadTaskDO; import org.apache.ibatis.annotations.Mapper; +import org.dromara.visor.framework.mybatis.core.mapper.IMapper; +import org.dromara.visor.module.asset.entity.domain.UploadTaskDO; /** * 上传任务 Mapper 接口 diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/dao/UploadTaskFileDAO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/UploadTaskFileDAO.java similarity index 91% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/dao/UploadTaskFileDAO.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/UploadTaskFileDAO.java index 47ade1c4..42df9b45 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/dao/UploadTaskFileDAO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/UploadTaskFileDAO.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.dao; +package org.dromara.visor.module.asset.dao; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.visor.framework.mybatis.core.mapper.IMapper; -import com.orion.visor.framework.mybatis.core.query.Conditions; -import com.orion.visor.module.asset.entity.domain.UploadTaskFileDO; import org.apache.ibatis.annotations.Mapper; +import org.dromara.visor.framework.mybatis.core.mapper.IMapper; +import org.dromara.visor.framework.mybatis.core.query.Conditions; +import org.dromara.visor.module.asset.entity.domain.UploadTaskFileDO; import java.util.List; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/AssetThreadPools.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/AssetThreadPools.java similarity index 96% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/AssetThreadPools.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/AssetThreadPools.java index a1d68010..093ddf50 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/AssetThreadPools.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/AssetThreadPools.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.define; +package org.dromara.visor.module.asset.define; -import com.orion.lang.define.thread.ExecutorBuilder; -import com.orion.visor.framework.common.constant.Const; +import cn.orionsec.kit.lang.define.thread.ExecutorBuilder; +import org.dromara.visor.framework.common.constant.Const; import java.util.concurrent.SynchronousQueue; import java.util.concurrent.ThreadPoolExecutor; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/cache/CommandSnippetCacheKeyDefine.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/cache/CommandSnippetCacheKeyDefine.java similarity index 78% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/cache/CommandSnippetCacheKeyDefine.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/cache/CommandSnippetCacheKeyDefine.java index 549bb4c1..b50745b1 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/cache/CommandSnippetCacheKeyDefine.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/cache/CommandSnippetCacheKeyDefine.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.define.cache; +package org.dromara.visor.module.asset.define.cache; -import com.orion.lang.define.cache.key.CacheKeyBuilder; -import com.orion.lang.define.cache.key.CacheKeyDefine; -import com.orion.lang.define.cache.key.struct.RedisCacheStruct; -import com.orion.visor.module.asset.entity.dto.CommandSnippetCacheDTO; +import cn.orionsec.kit.lang.define.cache.key.CacheKeyBuilder; +import cn.orionsec.kit.lang.define.cache.key.CacheKeyDefine; +import cn.orionsec.kit.lang.define.cache.key.struct.RedisCacheStruct; +import org.dromara.visor.module.asset.entity.dto.CommandSnippetCacheDTO; import java.util.concurrent.TimeUnit; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/cache/ExecCacheKeyDefine.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/cache/ExecCacheKeyDefine.java similarity index 78% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/cache/ExecCacheKeyDefine.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/cache/ExecCacheKeyDefine.java index d3337b2f..83f1a288 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/cache/ExecCacheKeyDefine.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/cache/ExecCacheKeyDefine.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.define.cache; +package org.dromara.visor.module.asset.define.cache; -import com.orion.lang.define.cache.key.CacheKeyBuilder; -import com.orion.lang.define.cache.key.CacheKeyDefine; -import com.orion.lang.define.cache.key.struct.RedisCacheStruct; -import com.orion.visor.module.asset.entity.dto.ExecLogTailDTO; +import cn.orionsec.kit.lang.define.cache.key.CacheKeyBuilder; +import cn.orionsec.kit.lang.define.cache.key.CacheKeyDefine; +import cn.orionsec.kit.lang.define.cache.key.struct.RedisCacheStruct; +import org.dromara.visor.module.asset.entity.dto.ExecLogTailDTO; import java.util.concurrent.TimeUnit; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/cache/HostCacheKeyDefine.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/cache/HostCacheKeyDefine.java similarity index 78% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/cache/HostCacheKeyDefine.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/cache/HostCacheKeyDefine.java index 931582a1..b53d1ca5 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/cache/HostCacheKeyDefine.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/cache/HostCacheKeyDefine.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.define.cache; +package org.dromara.visor.module.asset.define.cache; -import com.orion.lang.define.cache.key.CacheKeyBuilder; -import com.orion.lang.define.cache.key.CacheKeyDefine; -import com.orion.lang.define.cache.key.struct.RedisCacheStruct; -import com.orion.visor.module.asset.entity.dto.HostCacheDTO; -import com.orion.visor.module.asset.entity.dto.HostIdentityCacheDTO; -import com.orion.visor.module.asset.entity.dto.HostKeyCacheDTO; +import cn.orionsec.kit.lang.define.cache.key.CacheKeyBuilder; +import cn.orionsec.kit.lang.define.cache.key.CacheKeyDefine; +import cn.orionsec.kit.lang.define.cache.key.struct.RedisCacheStruct; +import org.dromara.visor.module.asset.entity.dto.HostCacheDTO; +import org.dromara.visor.module.asset.entity.dto.HostIdentityCacheDTO; +import org.dromara.visor.module.asset.entity.dto.HostKeyCacheDTO; import java.util.concurrent.TimeUnit; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/cache/PathBookmarkCacheKeyDefine.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/cache/PathBookmarkCacheKeyDefine.java similarity index 78% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/cache/PathBookmarkCacheKeyDefine.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/cache/PathBookmarkCacheKeyDefine.java index e31ae8eb..c0e14048 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/cache/PathBookmarkCacheKeyDefine.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/cache/PathBookmarkCacheKeyDefine.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.define.cache; +package org.dromara.visor.module.asset.define.cache; -import com.orion.lang.define.cache.key.CacheKeyBuilder; -import com.orion.lang.define.cache.key.CacheKeyDefine; -import com.orion.lang.define.cache.key.struct.RedisCacheStruct; -import com.orion.visor.module.asset.entity.dto.PathBookmarkCacheDTO; +import cn.orionsec.kit.lang.define.cache.key.CacheKeyBuilder; +import cn.orionsec.kit.lang.define.cache.key.CacheKeyDefine; +import cn.orionsec.kit.lang.define.cache.key.struct.RedisCacheStruct; +import org.dromara.visor.module.asset.entity.dto.PathBookmarkCacheDTO; import java.util.concurrent.TimeUnit; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/cache/TerminalCacheKeyDefine.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/cache/TerminalCacheKeyDefine.java similarity index 79% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/cache/TerminalCacheKeyDefine.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/cache/TerminalCacheKeyDefine.java index 1c215359..4932b3c3 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/cache/TerminalCacheKeyDefine.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/cache/TerminalCacheKeyDefine.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.define.cache; +package org.dromara.visor.module.asset.define.cache; -import com.orion.lang.define.cache.key.CacheKeyBuilder; -import com.orion.lang.define.cache.key.CacheKeyDefine; -import com.orion.lang.define.cache.key.struct.RedisCacheStruct; -import com.orion.visor.module.asset.entity.dto.SftpGetContentCacheDTO; -import com.orion.visor.module.asset.entity.dto.SftpSetContentCacheDTO; -import com.orion.visor.module.asset.entity.dto.TerminalAccessDTO; -import com.orion.visor.module.asset.entity.dto.TerminalTransferDTO; +import cn.orionsec.kit.lang.define.cache.key.CacheKeyBuilder; +import cn.orionsec.kit.lang.define.cache.key.CacheKeyDefine; +import cn.orionsec.kit.lang.define.cache.key.struct.RedisCacheStruct; +import org.dromara.visor.module.asset.entity.dto.SftpGetContentCacheDTO; +import org.dromara.visor.module.asset.entity.dto.SftpSetContentCacheDTO; +import org.dromara.visor.module.asset.entity.dto.TerminalAccessDTO; +import org.dromara.visor.module.asset.entity.dto.TerminalTransferDTO; import java.util.concurrent.TimeUnit; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/config/AppExecLogAutoClearConfig.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/config/AppExecLogAutoClearConfig.java similarity index 90% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/config/AppExecLogAutoClearConfig.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/config/AppExecLogAutoClearConfig.java index 4de7a576..ecd968f5 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/config/AppExecLogAutoClearConfig.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/config/AppExecLogAutoClearConfig.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.define.config; +package org.dromara.visor.module.asset.define.config; -import com.orion.visor.framework.common.entity.AutoClearConfig; import lombok.Data; import lombok.EqualsAndHashCode; +import org.dromara.visor.framework.common.entity.AutoClearConfig; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/config/AppExecLogConfig.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/config/AppExecLogConfig.java similarity index 95% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/config/AppExecLogConfig.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/config/AppExecLogConfig.java index d9acc5f8..48d5f9f2 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/config/AppExecLogConfig.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/config/AppExecLogConfig.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.define.config; +package org.dromara.visor.module.asset.define.config; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/config/AppSftpConfig.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/config/AppSftpConfig.java similarity index 96% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/config/AppSftpConfig.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/config/AppSftpConfig.java index 9a8c3aac..fc7b2331 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/config/AppSftpConfig.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/config/AppSftpConfig.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.define.config; +package org.dromara.visor.module.asset.define.config; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/config/AppTerminalConnectLogAutoClearConfig.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/config/AppTerminalConnectLogAutoClearConfig.java similarity index 90% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/config/AppTerminalConnectLogAutoClearConfig.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/config/AppTerminalConnectLogAutoClearConfig.java index c745780b..7a5886f0 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/config/AppTerminalConnectLogAutoClearConfig.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/config/AppTerminalConnectLogAutoClearConfig.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.define.config; +package org.dromara.visor.module.asset.define.config; -import com.orion.visor.framework.common.entity.AutoClearConfig; import lombok.Data; import lombok.EqualsAndHashCode; +import org.dromara.visor.framework.common.entity.AutoClearConfig; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/config/AppTrackerConfig.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/config/AppTrackerConfig.java similarity index 96% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/config/AppTrackerConfig.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/config/AppTrackerConfig.java index 97adb072..e53e6f40 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/config/AppTrackerConfig.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/config/AppTrackerConfig.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.define.config; +package org.dromara.visor.module.asset.define.config; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/message/ExecMessageDefine.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/message/ExecMessageDefine.java similarity index 89% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/message/ExecMessageDefine.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/message/ExecMessageDefine.java index a4db2114..d8962e69 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/message/ExecMessageDefine.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/message/ExecMessageDefine.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.define.message; +package org.dromara.visor.module.asset.define.message; -import com.orion.visor.module.infra.define.SystemMessageDefine; -import com.orion.visor.module.infra.enums.MessageClassifyEnum; import lombok.Getter; +import org.dromara.visor.module.infra.define.SystemMessageDefine; +import org.dromara.visor.module.infra.enums.MessageClassifyEnum; /** * 命令执行 系统消息定义 diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/message/UploadMessageDefine.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/message/UploadMessageDefine.java similarity index 89% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/message/UploadMessageDefine.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/message/UploadMessageDefine.java index ff08c0a8..ea4b295a 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/message/UploadMessageDefine.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/message/UploadMessageDefine.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.define.message; +package org.dromara.visor.module.asset.define.message; -import com.orion.visor.module.infra.define.SystemMessageDefine; -import com.orion.visor.module.infra.enums.MessageClassifyEnum; import lombok.Getter; +import org.dromara.visor.module.infra.define.SystemMessageDefine; +import org.dromara.visor.module.infra.enums.MessageClassifyEnum; /** * 上传任务 系统消息定义 diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/operator/ExecCommandLogOperatorType.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/ExecCommandLogOperatorType.java similarity index 56% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/operator/ExecCommandLogOperatorType.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/ExecCommandLogOperatorType.java index 52e680f8..ec4363a2 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/operator/ExecCommandLogOperatorType.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/ExecCommandLogOperatorType.java @@ -13,13 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.define.operator; +package org.dromara.visor.module.asset.define.operator; -import com.orion.visor.framework.biz.operator.log.core.annotation.Module; -import com.orion.visor.framework.biz.operator.log.core.factory.InitializingOperatorTypes; -import com.orion.visor.framework.biz.operator.log.core.model.OperatorType; - -import static com.orion.visor.framework.biz.operator.log.core.enums.OperatorRiskLevel.*; +import org.dromara.visor.framework.biz.operator.log.core.annotation.Module; +import org.dromara.visor.framework.biz.operator.log.core.enums.OperatorRiskLevel; +import org.dromara.visor.framework.biz.operator.log.core.factory.InitializingOperatorTypes; +import org.dromara.visor.framework.biz.operator.log.core.model.OperatorType; /** * 批量执行日志 操作记录类型 @@ -46,12 +45,12 @@ public class ExecCommandLogOperatorType extends InitializingOperatorTypes { @Override public OperatorType[] types() { return new OperatorType[]{ - new OperatorType(H, DELETE, "删除批量执行日志 ${count} 条"), - new OperatorType(H, DELETE_HOST, "删除批量执行主机日志 ${logId} ${hostName}"), - new OperatorType(H, CLEAR, "清理批量执行日志 ${count} 条"), - new OperatorType(L, DOWNLOAD, "下载批量执行日志 ${logId} ${hostName}"), - new OperatorType(M, INTERRUPT, "中断批量执行命令"), - new OperatorType(M, INTERRUPT_HOST, "中断批量执行主机命令 ${logId} ${hostName}"), + new OperatorType(OperatorRiskLevel.H, DELETE, "删除批量执行日志 ${count} 条"), + new OperatorType(OperatorRiskLevel.H, DELETE_HOST, "删除批量执行主机日志 ${logId} ${hostName}"), + new OperatorType(OperatorRiskLevel.H, CLEAR, "清理批量执行日志 ${count} 条"), + new OperatorType(OperatorRiskLevel.L, DOWNLOAD, "下载批量执行日志 ${logId} ${hostName}"), + new OperatorType(OperatorRiskLevel.M, INTERRUPT, "中断批量执行命令"), + new OperatorType(OperatorRiskLevel.M, INTERRUPT_HOST, "中断批量执行主机命令 ${logId} ${hostName}"), }; } diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/operator/ExecCommandOperatorType.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/ExecCommandOperatorType.java similarity index 68% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/operator/ExecCommandOperatorType.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/ExecCommandOperatorType.java index 0300f873..92a1509d 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/operator/ExecCommandOperatorType.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/ExecCommandOperatorType.java @@ -13,13 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.define.operator; +package org.dromara.visor.module.asset.define.operator; -import com.orion.visor.framework.biz.operator.log.core.annotation.Module; -import com.orion.visor.framework.biz.operator.log.core.factory.InitializingOperatorTypes; -import com.orion.visor.framework.biz.operator.log.core.model.OperatorType; - -import static com.orion.visor.framework.biz.operator.log.core.enums.OperatorRiskLevel.M; +import org.dromara.visor.framework.biz.operator.log.core.annotation.Module; +import org.dromara.visor.framework.biz.operator.log.core.enums.OperatorRiskLevel; +import org.dromara.visor.framework.biz.operator.log.core.factory.InitializingOperatorTypes; +import org.dromara.visor.framework.biz.operator.log.core.model.OperatorType; /** * 批量执行 操作记录类型 @@ -36,7 +35,7 @@ public class ExecCommandOperatorType extends InitializingOperatorTypes { @Override public OperatorType[] types() { return new OperatorType[]{ - new OperatorType(M, EXEC, "执行主机命令"), + new OperatorType(OperatorRiskLevel.M, EXEC, "执行主机命令"), }; } diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/operator/ExecJobLogOperatorType.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/ExecJobLogOperatorType.java similarity index 54% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/operator/ExecJobLogOperatorType.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/ExecJobLogOperatorType.java index 3e13ad5f..8eee798b 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/operator/ExecJobLogOperatorType.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/ExecJobLogOperatorType.java @@ -13,13 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.define.operator; +package org.dromara.visor.module.asset.define.operator; -import com.orion.visor.framework.biz.operator.log.core.annotation.Module; -import com.orion.visor.framework.biz.operator.log.core.factory.InitializingOperatorTypes; -import com.orion.visor.framework.biz.operator.log.core.model.OperatorType; - -import static com.orion.visor.framework.biz.operator.log.core.enums.OperatorRiskLevel.*; +import org.dromara.visor.framework.biz.operator.log.core.annotation.Module; +import org.dromara.visor.framework.biz.operator.log.core.enums.OperatorRiskLevel; +import org.dromara.visor.framework.biz.operator.log.core.factory.InitializingOperatorTypes; +import org.dromara.visor.framework.biz.operator.log.core.model.OperatorType; /** * 计划任务执行日志 操作记录类型 @@ -46,12 +45,12 @@ public class ExecJobLogOperatorType extends InitializingOperatorTypes { @Override public OperatorType[] types() { return new OperatorType[]{ - new OperatorType(H, DELETE, "删除计划任务执行日志 ${count} 条"), - new OperatorType(H, DELETE_HOST, "删除计划任务执行主机日志 ${logId} ${hostName}"), - new OperatorType(H, CLEAR, "清理计划任务执行日志 ${count} 条"), - new OperatorType(L, DOWNLOAD, "下载计划任务执行日志 ${logId} ${hostName}"), - new OperatorType(M, INTERRUPT, "中断计划任务执行命令"), - new OperatorType(M, INTERRUPT_HOST, "中断计划任务执行主机命令 ${logId} ${hostName}"), + new OperatorType(OperatorRiskLevel.H, DELETE, "删除计划任务执行日志 ${count} 条"), + new OperatorType(OperatorRiskLevel.H, DELETE_HOST, "删除计划任务执行主机日志 ${logId} ${hostName}"), + new OperatorType(OperatorRiskLevel.H, CLEAR, "清理计划任务执行日志 ${count} 条"), + new OperatorType(OperatorRiskLevel.L, DOWNLOAD, "下载计划任务执行日志 ${logId} ${hostName}"), + new OperatorType(OperatorRiskLevel.M, INTERRUPT, "中断计划任务执行命令"), + new OperatorType(OperatorRiskLevel.M, INTERRUPT_HOST, "中断计划任务执行主机命令 ${logId} ${hostName}"), }; } diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/operator/ExecJobOperatorType.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/ExecJobOperatorType.java similarity index 58% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/operator/ExecJobOperatorType.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/ExecJobOperatorType.java index 4f8a0bec..7c859191 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/operator/ExecJobOperatorType.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/ExecJobOperatorType.java @@ -13,13 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.define.operator; +package org.dromara.visor.module.asset.define.operator; -import com.orion.visor.framework.biz.operator.log.core.annotation.Module; -import com.orion.visor.framework.biz.operator.log.core.factory.InitializingOperatorTypes; -import com.orion.visor.framework.biz.operator.log.core.model.OperatorType; - -import static com.orion.visor.framework.biz.operator.log.core.enums.OperatorRiskLevel.*; +import org.dromara.visor.framework.biz.operator.log.core.annotation.Module; +import org.dromara.visor.framework.biz.operator.log.core.enums.OperatorRiskLevel; +import org.dromara.visor.framework.biz.operator.log.core.factory.InitializingOperatorTypes; +import org.dromara.visor.framework.biz.operator.log.core.model.OperatorType; /** * 计划任务 操作日志类型 @@ -44,11 +43,11 @@ public class ExecJobOperatorType extends InitializingOperatorTypes { @Override public OperatorType[] types() { return new OperatorType[]{ - new OperatorType(L, CREATE, "创建计划任务 ${name}"), - new OperatorType(M, UPDATE, "更新计划任务 ${before}"), - new OperatorType(M, UPDATE_STATUS, "${statusName} 计划任务 ${name}"), - new OperatorType(M, TRIGGER, "手动触发计划任务 ${name}"), - new OperatorType(H, DELETE, "删除计划任务 ${name}"), + new OperatorType(OperatorRiskLevel.L, CREATE, "创建计划任务 ${name}"), + new OperatorType(OperatorRiskLevel.M, UPDATE, "更新计划任务 ${before}"), + new OperatorType(OperatorRiskLevel.M, UPDATE_STATUS, "${statusName} 计划任务 ${name}"), + new OperatorType(OperatorRiskLevel.M, TRIGGER, "手动触发计划任务 ${name}"), + new OperatorType(OperatorRiskLevel.H, DELETE, "删除计划任务 ${name}"), }; } diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/operator/ExecTemplateOperatorType.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/ExecTemplateOperatorType.java similarity index 62% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/operator/ExecTemplateOperatorType.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/ExecTemplateOperatorType.java index 1c52f9c9..9497ba5d 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/operator/ExecTemplateOperatorType.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/ExecTemplateOperatorType.java @@ -13,13 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.define.operator; +package org.dromara.visor.module.asset.define.operator; -import com.orion.visor.framework.biz.operator.log.core.annotation.Module; -import com.orion.visor.framework.biz.operator.log.core.factory.InitializingOperatorTypes; -import com.orion.visor.framework.biz.operator.log.core.model.OperatorType; - -import static com.orion.visor.framework.biz.operator.log.core.enums.OperatorRiskLevel.*; +import org.dromara.visor.framework.biz.operator.log.core.annotation.Module; +import org.dromara.visor.framework.biz.operator.log.core.enums.OperatorRiskLevel; +import org.dromara.visor.framework.biz.operator.log.core.factory.InitializingOperatorTypes; +import org.dromara.visor.framework.biz.operator.log.core.model.OperatorType; /** * 执行模板 操作日志类型 @@ -40,9 +39,9 @@ public class ExecTemplateOperatorType extends InitializingOperatorTypes { @Override public OperatorType[] types() { return new OperatorType[]{ - new OperatorType(L, CREATE, "创建执行模板 ${name}"), - new OperatorType(M, UPDATE, "更新执行模板 ${name}"), - new OperatorType(H, DELETE, "删除执行模板 ${name}"), + new OperatorType(OperatorRiskLevel.L, CREATE, "创建执行模板 ${name}"), + new OperatorType(OperatorRiskLevel.M, UPDATE, "更新执行模板 ${name}"), + new OperatorType(OperatorRiskLevel.H, DELETE, "删除执行模板 ${name}"), }; } diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/operator/HostGroupOperatorType.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/HostGroupOperatorType.java similarity index 54% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/operator/HostGroupOperatorType.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/HostGroupOperatorType.java index 5b096e7a..2d111ee7 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/operator/HostGroupOperatorType.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/HostGroupOperatorType.java @@ -13,13 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.define.operator; +package org.dromara.visor.module.asset.define.operator; -import com.orion.visor.framework.biz.operator.log.core.annotation.Module; -import com.orion.visor.framework.biz.operator.log.core.factory.InitializingOperatorTypes; -import com.orion.visor.framework.biz.operator.log.core.model.OperatorType; - -import static com.orion.visor.framework.biz.operator.log.core.enums.OperatorRiskLevel.*; +import org.dromara.visor.framework.biz.operator.log.core.annotation.Module; +import org.dromara.visor.framework.biz.operator.log.core.enums.OperatorRiskLevel; +import org.dromara.visor.framework.biz.operator.log.core.factory.InitializingOperatorTypes; +import org.dromara.visor.framework.biz.operator.log.core.model.OperatorType; /** * 主机分组 操作日志类型 @@ -46,12 +45,12 @@ public class HostGroupOperatorType extends InitializingOperatorTypes { @Override public OperatorType[] types() { return new OperatorType[]{ - new OperatorType(L, CREATE, "创建主机分组 ${name}"), - new OperatorType(L, RENAME, "重命名主机分组 ${before} -> ${name}"), - new OperatorType(L, MOVE, "移动主机分组 ${source} 到 ${target}(${position})"), - new OperatorType(H, DELETE, "删除主机分组 ${groupName}"), - new OperatorType(M, UPDATE_REL, "修改分组内主机 ${groupName}"), - new OperatorType(H, GRANT, "将主机分组权限授予 ${grantType} ${grantName}"), + new OperatorType(OperatorRiskLevel.L, CREATE, "创建主机分组 ${name}"), + new OperatorType(OperatorRiskLevel.L, RENAME, "重命名主机分组 ${before} -> ${name}"), + new OperatorType(OperatorRiskLevel.L, MOVE, "移动主机分组 ${source} 到 ${target}(${position})"), + new OperatorType(OperatorRiskLevel.H, DELETE, "删除主机分组 ${groupName}"), + new OperatorType(OperatorRiskLevel.M, UPDATE_REL, "修改分组内主机 ${groupName}"), + new OperatorType(OperatorRiskLevel.H, GRANT, "将主机分组权限授予 ${grantType} ${grantName}"), }; } diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/operator/HostIdentityOperatorType.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/HostIdentityOperatorType.java similarity index 59% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/operator/HostIdentityOperatorType.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/HostIdentityOperatorType.java index 97b37476..4b13912b 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/operator/HostIdentityOperatorType.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/HostIdentityOperatorType.java @@ -13,14 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.define.operator; +package org.dromara.visor.module.asset.define.operator; -import com.orion.visor.framework.biz.operator.log.core.annotation.Module; -import com.orion.visor.framework.biz.operator.log.core.factory.InitializingOperatorTypes; -import com.orion.visor.framework.biz.operator.log.core.model.OperatorType; - -import static com.orion.visor.framework.biz.operator.log.core.enums.OperatorRiskLevel.H; -import static com.orion.visor.framework.biz.operator.log.core.enums.OperatorRiskLevel.L; +import org.dromara.visor.framework.biz.operator.log.core.annotation.Module; +import org.dromara.visor.framework.biz.operator.log.core.enums.OperatorRiskLevel; +import org.dromara.visor.framework.biz.operator.log.core.factory.InitializingOperatorTypes; +import org.dromara.visor.framework.biz.operator.log.core.model.OperatorType; /** * 主机身份 操作日志类型 @@ -43,10 +41,10 @@ public class HostIdentityOperatorType extends InitializingOperatorTypes { @Override public OperatorType[] types() { return new OperatorType[]{ - new OperatorType(L, CREATE, "创建主机身份 ${name}"), - new OperatorType(L, UPDATE, "修改主机身份 ${name}"), - new OperatorType(H, DELETE, "删除主机身份 ${name}"), - new OperatorType(H, GRANT, "将主机身份权限授予 ${grantType} ${grantName}"), + new OperatorType(OperatorRiskLevel.L, CREATE, "创建主机身份 ${name}"), + new OperatorType(OperatorRiskLevel.L, UPDATE, "修改主机身份 ${name}"), + new OperatorType(OperatorRiskLevel.H, DELETE, "删除主机身份 ${name}"), + new OperatorType(OperatorRiskLevel.H, GRANT, "将主机身份权限授予 ${grantType} ${grantName}"), }; } diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/operator/HostKeyOperatorType.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/HostKeyOperatorType.java similarity index 58% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/operator/HostKeyOperatorType.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/HostKeyOperatorType.java index bc6158cf..0be618d0 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/operator/HostKeyOperatorType.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/HostKeyOperatorType.java @@ -13,14 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.define.operator; +package org.dromara.visor.module.asset.define.operator; -import com.orion.visor.framework.biz.operator.log.core.annotation.Module; -import com.orion.visor.framework.biz.operator.log.core.factory.InitializingOperatorTypes; -import com.orion.visor.framework.biz.operator.log.core.model.OperatorType; - -import static com.orion.visor.framework.biz.operator.log.core.enums.OperatorRiskLevel.H; -import static com.orion.visor.framework.biz.operator.log.core.enums.OperatorRiskLevel.L; +import org.dromara.visor.framework.biz.operator.log.core.annotation.Module; +import org.dromara.visor.framework.biz.operator.log.core.enums.OperatorRiskLevel; +import org.dromara.visor.framework.biz.operator.log.core.factory.InitializingOperatorTypes; +import org.dromara.visor.framework.biz.operator.log.core.model.OperatorType; /** * 主机密钥 操作日志类型 @@ -43,10 +41,10 @@ public class HostKeyOperatorType extends InitializingOperatorTypes { @Override public OperatorType[] types() { return new OperatorType[]{ - new OperatorType(L, CREATE, "创建主机密钥 ${name}"), - new OperatorType(L, UPDATE, "修改主机密钥 ${name}"), - new OperatorType(H, DELETE, "删除主机密钥 ${name}"), - new OperatorType(H, GRANT, "将主机密钥权限授予 ${grantType} ${grantName}"), + new OperatorType(OperatorRiskLevel.L, CREATE, "创建主机密钥 ${name}"), + new OperatorType(OperatorRiskLevel.L, UPDATE, "修改主机密钥 ${name}"), + new OperatorType(OperatorRiskLevel.H, DELETE, "删除主机密钥 ${name}"), + new OperatorType(OperatorRiskLevel.H, GRANT, "将主机密钥权限授予 ${grantType} ${grantName}"), }; } diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/operator/HostOperatorType.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/HostOperatorType.java similarity index 57% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/operator/HostOperatorType.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/HostOperatorType.java index 15d56652..e061d93d 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/operator/HostOperatorType.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/HostOperatorType.java @@ -13,13 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.define.operator; +package org.dromara.visor.module.asset.define.operator; -import com.orion.visor.framework.biz.operator.log.core.annotation.Module; -import com.orion.visor.framework.biz.operator.log.core.factory.InitializingOperatorTypes; -import com.orion.visor.framework.biz.operator.log.core.model.OperatorType; - -import static com.orion.visor.framework.biz.operator.log.core.enums.OperatorRiskLevel.*; +import org.dromara.visor.framework.biz.operator.log.core.annotation.Module; +import org.dromara.visor.framework.biz.operator.log.core.enums.OperatorRiskLevel; +import org.dromara.visor.framework.biz.operator.log.core.factory.InitializingOperatorTypes; +import org.dromara.visor.framework.biz.operator.log.core.model.OperatorType; /** * 主机 操作日志类型 @@ -44,11 +43,11 @@ public class HostOperatorType extends InitializingOperatorTypes { @Override public OperatorType[] types() { return new OperatorType[]{ - new OperatorType(L, CREATE, "创建主机 ${name}"), - new OperatorType(L, UPDATE, "修改主机 ${name}"), - new OperatorType(H, DELETE, "删除主机 ${count} 条"), - new OperatorType(M, UPDATE_STATUS, "修改主机状态 ${name} - ${status}"), - new OperatorType(M, UPDATE_CONFIG, "修改主机配置 ${name}"), + new OperatorType(OperatorRiskLevel.L, CREATE, "创建主机 ${name}"), + new OperatorType(OperatorRiskLevel.L, UPDATE, "修改主机 ${name}"), + new OperatorType(OperatorRiskLevel.H, DELETE, "删除主机 ${count} 条"), + new OperatorType(OperatorRiskLevel.M, UPDATE_STATUS, "修改主机状态 ${name} - ${status}"), + new OperatorType(OperatorRiskLevel.M, UPDATE_CONFIG, "修改主机配置 ${name}"), }; } diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/operator/TerminalConnectLogOperatorType.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/TerminalConnectLogOperatorType.java similarity index 61% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/operator/TerminalConnectLogOperatorType.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/TerminalConnectLogOperatorType.java index 79067726..b945e582 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/operator/TerminalConnectLogOperatorType.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/TerminalConnectLogOperatorType.java @@ -13,14 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.define.operator; +package org.dromara.visor.module.asset.define.operator; -import com.orion.visor.framework.biz.operator.log.core.annotation.Module; -import com.orion.visor.framework.biz.operator.log.core.factory.InitializingOperatorTypes; -import com.orion.visor.framework.biz.operator.log.core.model.OperatorType; - -import static com.orion.visor.framework.biz.operator.log.core.enums.OperatorRiskLevel.H; -import static com.orion.visor.framework.biz.operator.log.core.enums.OperatorRiskLevel.M; +import org.dromara.visor.framework.biz.operator.log.core.annotation.Module; +import org.dromara.visor.framework.biz.operator.log.core.enums.OperatorRiskLevel; +import org.dromara.visor.framework.biz.operator.log.core.factory.InitializingOperatorTypes; +import org.dromara.visor.framework.biz.operator.log.core.model.OperatorType; /** * 终端连接日志 操作日志类型 @@ -41,9 +39,9 @@ public class TerminalConnectLogOperatorType extends InitializingOperatorTypes { @Override public OperatorType[] types() { return new OperatorType[]{ - new OperatorType(H, DELETE, "删除终端连接记录 ${count} 条"), - new OperatorType(H, CLEAR, "清空终端连接记录 ${count} 条"), - new OperatorType(M, FORCE_OFFLINE, "强制下线终端连接 ${hostName}"), + new OperatorType(OperatorRiskLevel.H, DELETE, "删除终端连接记录 ${count} 条"), + new OperatorType(OperatorRiskLevel.H, CLEAR, "清空终端连接记录 ${count} 条"), + new OperatorType(OperatorRiskLevel.M, FORCE_OFFLINE, "强制下线终端连接 ${hostName}"), }; } diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/operator/TerminalOperatorType.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/TerminalOperatorType.java similarity index 54% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/operator/TerminalOperatorType.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/TerminalOperatorType.java index ff1fe069..886f9847 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/operator/TerminalOperatorType.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/TerminalOperatorType.java @@ -13,17 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.define.operator; +package org.dromara.visor.module.asset.define.operator; -import com.orion.lang.utils.collect.Lists; -import com.orion.visor.framework.biz.operator.log.core.annotation.Module; -import com.orion.visor.framework.biz.operator.log.core.factory.InitializingOperatorTypes; -import com.orion.visor.framework.biz.operator.log.core.model.OperatorType; +import cn.orionsec.kit.lang.utils.collect.Lists; +import org.dromara.visor.framework.biz.operator.log.core.annotation.Module; +import org.dromara.visor.framework.biz.operator.log.core.enums.OperatorRiskLevel; +import org.dromara.visor.framework.biz.operator.log.core.factory.InitializingOperatorTypes; +import org.dromara.visor.framework.biz.operator.log.core.model.OperatorType; import java.util.List; -import static com.orion.visor.framework.biz.operator.log.core.enums.OperatorRiskLevel.*; - /** * 终端 操作日志类型 * @@ -71,17 +70,17 @@ public class TerminalOperatorType extends InitializingOperatorTypes { @Override public OperatorType[] types() { return new OperatorType[]{ - new OperatorType(L, CONNECT, "连接主机 ${connectType} ${hostName}"), - new OperatorType(H, DELETE_SFTP_LOG, "删除 SFTP 操作日志 ${count} 条"), - new OperatorType(L, SFTP_MKDIR, "创建文件夹 ${hostName} ${path}"), - new OperatorType(L, SFTP_TOUCH, "创建文件 ${hostName} ${path}"), - new OperatorType(M, SFTP_MOVE, "移动文件 ${hostName} ${path} 至 ${target}"), - new OperatorType(H, SFTP_REMOVE, "删除文件 ${hostName} ${path}"), - new OperatorType(H, SFTP_TRUNCATE, "截断文件 ${hostName} ${path}"), - new OperatorType(M, SFTP_CHMOD, "文件提权 ${hostName} ${path} ${mod}"), - new OperatorType(M, SFTP_SET_CONTENT, "修改文件内容 ${hostName} ${path}"), - new OperatorType(M, SFTP_UPLOAD, "上传文件 ${hostName} ${path}"), - new OperatorType(M, SFTP_DOWNLOAD, "下载文件 ${hostName} ${path}"), + new OperatorType(OperatorRiskLevel.L, CONNECT, "连接主机 ${connectType} ${hostName}"), + new OperatorType(OperatorRiskLevel.H, DELETE_SFTP_LOG, "删除 SFTP 操作日志 ${count} 条"), + new OperatorType(OperatorRiskLevel.L, SFTP_MKDIR, "创建文件夹 ${hostName} ${path}"), + new OperatorType(OperatorRiskLevel.L, SFTP_TOUCH, "创建文件 ${hostName} ${path}"), + new OperatorType(OperatorRiskLevel.M, SFTP_MOVE, "移动文件 ${hostName} ${path} 至 ${target}"), + new OperatorType(OperatorRiskLevel.H, SFTP_REMOVE, "删除文件 ${hostName} ${path}"), + new OperatorType(OperatorRiskLevel.H, SFTP_TRUNCATE, "截断文件 ${hostName} ${path}"), + new OperatorType(OperatorRiskLevel.M, SFTP_CHMOD, "文件提权 ${hostName} ${path} ${mod}"), + new OperatorType(OperatorRiskLevel.M, SFTP_SET_CONTENT, "修改文件内容 ${hostName} ${path}"), + new OperatorType(OperatorRiskLevel.M, SFTP_UPLOAD, "上传文件 ${hostName} ${path}"), + new OperatorType(OperatorRiskLevel.M, SFTP_DOWNLOAD, "下载文件 ${hostName} ${path}"), }; } diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/operator/UploadTaskOperatorType.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/UploadTaskOperatorType.java similarity index 59% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/operator/UploadTaskOperatorType.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/UploadTaskOperatorType.java index b9d5250d..1455ae2e 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/operator/UploadTaskOperatorType.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/UploadTaskOperatorType.java @@ -13,14 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.define.operator; +package org.dromara.visor.module.asset.define.operator; -import com.orion.visor.framework.biz.operator.log.core.annotation.Module; -import com.orion.visor.framework.biz.operator.log.core.factory.InitializingOperatorTypes; -import com.orion.visor.framework.biz.operator.log.core.model.OperatorType; - -import static com.orion.visor.framework.biz.operator.log.core.enums.OperatorRiskLevel.H; -import static com.orion.visor.framework.biz.operator.log.core.enums.OperatorRiskLevel.M; +import org.dromara.visor.framework.biz.operator.log.core.annotation.Module; +import org.dromara.visor.framework.biz.operator.log.core.enums.OperatorRiskLevel; +import org.dromara.visor.framework.biz.operator.log.core.factory.InitializingOperatorTypes; +import org.dromara.visor.framework.biz.operator.log.core.model.OperatorType; /** * 上传任务 操作日志类型 @@ -43,10 +41,10 @@ public class UploadTaskOperatorType extends InitializingOperatorTypes { @Override public OperatorType[] types() { return new OperatorType[]{ - new OperatorType(M, UPLOAD, "批量上传文件 ${count} 个 (${name})"), - new OperatorType(M, CANCEL, "取消上传文件 ${name}"), - new OperatorType(H, DELETE, "删除上传记录 ${count}条"), - new OperatorType(H, CLEAR, "清理上传记录 ${count}条"), + new OperatorType(OperatorRiskLevel.M, UPLOAD, "批量上传文件 ${count} 个 (${name})"), + new OperatorType(OperatorRiskLevel.M, CANCEL, "取消上传文件 ${name}"), + new OperatorType(OperatorRiskLevel.H, DELETE, "删除上传记录 ${count}条"), + new OperatorType(OperatorRiskLevel.H, CLEAR, "清理上传记录 ${count}条"), }; } diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/domain/CommandSnippetDO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/CommandSnippetDO.java similarity index 94% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/domain/CommandSnippetDO.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/CommandSnippetDO.java index 87db44c1..98e43078 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/domain/CommandSnippetDO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/CommandSnippetDO.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.domain; +package org.dromara.visor.module.asset.entity.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.orion.visor.framework.mybatis.core.domain.BaseDO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import org.dromara.visor.framework.mybatis.core.domain.BaseDO; /** * 命令片段 实体对象 diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/domain/ExecHostLogDO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/ExecHostLogDO.java similarity index 96% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/domain/ExecHostLogDO.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/ExecHostLogDO.java index 7b8cef41..fa9cc613 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/domain/ExecHostLogDO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/ExecHostLogDO.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.domain; +package org.dromara.visor.module.asset.entity.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.orion.visor.framework.mybatis.core.domain.BaseDO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import org.dromara.visor.framework.mybatis.core.domain.BaseDO; import java.util.Date; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/domain/ExecJobDO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/ExecJobDO.java similarity index 95% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/domain/ExecJobDO.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/ExecJobDO.java index 15af00bf..5e7238b8 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/domain/ExecJobDO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/ExecJobDO.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.domain; +package org.dromara.visor.module.asset.entity.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.orion.visor.framework.mybatis.core.domain.BaseDO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import org.dromara.visor.framework.mybatis.core.domain.BaseDO; /** * 计划任务 实体对象 diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/domain/ExecJobHostDO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/ExecJobHostDO.java similarity index 93% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/domain/ExecJobHostDO.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/ExecJobHostDO.java index d065cebb..2b5ea153 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/domain/ExecJobHostDO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/ExecJobHostDO.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.domain; +package org.dromara.visor.module.asset.entity.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.orion.visor.framework.mybatis.core.domain.BaseDO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import org.dromara.visor.framework.mybatis.core.domain.BaseDO; /** * 计划任务主机 实体对象 diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/domain/ExecLogDO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/ExecLogDO.java similarity index 96% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/domain/ExecLogDO.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/ExecLogDO.java index 035bef1f..1014d7f0 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/domain/ExecLogDO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/ExecLogDO.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.domain; +package org.dromara.visor.module.asset.entity.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.orion.visor.framework.mybatis.core.domain.BaseDO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import org.dromara.visor.framework.mybatis.core.domain.BaseDO; import java.util.Date; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/domain/ExecTemplateDO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/ExecTemplateDO.java similarity index 94% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/domain/ExecTemplateDO.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/ExecTemplateDO.java index 98d1647f..4507b8a9 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/domain/ExecTemplateDO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/ExecTemplateDO.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.domain; +package org.dromara.visor.module.asset.entity.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.orion.visor.framework.mybatis.core.domain.BaseDO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import org.dromara.visor.framework.mybatis.core.domain.BaseDO; /** * 执行模板 实体对象 diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/domain/ExecTemplateHostDO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/ExecTemplateHostDO.java similarity index 93% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/domain/ExecTemplateHostDO.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/ExecTemplateHostDO.java index 28880ade..f92a9de6 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/domain/ExecTemplateHostDO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/ExecTemplateHostDO.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.domain; +package org.dromara.visor.module.asset.entity.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.orion.visor.framework.mybatis.core.domain.BaseDO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import org.dromara.visor.framework.mybatis.core.domain.BaseDO; /** * 执行模板主机 实体对象 diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/domain/HostDO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/HostDO.java similarity index 94% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/domain/HostDO.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/HostDO.java index 8c5faf2a..5161b3ba 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/domain/HostDO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/HostDO.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.domain; +package org.dromara.visor.module.asset.entity.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.orion.visor.framework.mybatis.core.domain.BaseDO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import org.dromara.visor.framework.mybatis.core.domain.BaseDO; /** * 主机 实体对象 diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/domain/HostIdentityDO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/HostIdentityDO.java similarity index 94% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/domain/HostIdentityDO.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/HostIdentityDO.java index 31884c4c..4cad71fd 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/domain/HostIdentityDO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/HostIdentityDO.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.domain; +package org.dromara.visor.module.asset.entity.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.orion.visor.framework.mybatis.core.domain.BaseDO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import org.dromara.visor.framework.mybatis.core.domain.BaseDO; /** * 主机身份 实体对象 diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/domain/HostKeyDO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/HostKeyDO.java similarity index 94% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/domain/HostKeyDO.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/HostKeyDO.java index 7e3ae288..09f8bf13 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/domain/HostKeyDO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/HostKeyDO.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.domain; +package org.dromara.visor.module.asset.entity.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.orion.visor.framework.mybatis.core.domain.BaseDO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import org.dromara.visor.framework.mybatis.core.domain.BaseDO; /** * 主机密钥 实体对象 diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/domain/PathBookmarkDO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/PathBookmarkDO.java similarity index 94% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/domain/PathBookmarkDO.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/PathBookmarkDO.java index cb21c6ab..ded3195e 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/domain/PathBookmarkDO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/PathBookmarkDO.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.domain; +package org.dromara.visor.module.asset.entity.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.orion.visor.framework.mybatis.core.domain.BaseDO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import org.dromara.visor.framework.mybatis.core.domain.BaseDO; /** * 路径标签 实体对象 diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/domain/TerminalConnectLogDO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/TerminalConnectLogDO.java similarity index 95% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/domain/TerminalConnectLogDO.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/TerminalConnectLogDO.java index b7033316..250da5d5 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/domain/TerminalConnectLogDO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/TerminalConnectLogDO.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.domain; +package org.dromara.visor.module.asset.entity.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.orion.visor.framework.mybatis.core.domain.BaseDO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import org.dromara.visor.framework.mybatis.core.domain.BaseDO; import java.util.Date; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/domain/UploadTaskDO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/UploadTaskDO.java similarity index 95% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/domain/UploadTaskDO.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/UploadTaskDO.java index 2fe8e03b..c67f3f0a 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/domain/UploadTaskDO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/UploadTaskDO.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.domain; +package org.dromara.visor.module.asset.entity.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.orion.visor.framework.mybatis.core.domain.BaseDO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import org.dromara.visor.framework.mybatis.core.domain.BaseDO; import java.util.Date; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/domain/UploadTaskFileDO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/UploadTaskFileDO.java similarity index 95% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/domain/UploadTaskFileDO.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/UploadTaskFileDO.java index e7318c3e..d075d6bd 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/domain/UploadTaskFileDO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/UploadTaskFileDO.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.domain; +package org.dromara.visor.module.asset.entity.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.orion.visor.framework.mybatis.core.domain.BaseDO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import org.dromara.visor.framework.mybatis.core.domain.BaseDO; import java.util.Date; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/dto/CommandSnippetCacheDTO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/CommandSnippetCacheDTO.java similarity index 92% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/dto/CommandSnippetCacheDTO.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/CommandSnippetCacheDTO.java index a7d5c9c7..b4d952d0 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/dto/CommandSnippetCacheDTO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/CommandSnippetCacheDTO.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.dto; +package org.dromara.visor.module.asset.entity.dto; -import com.orion.lang.define.cache.key.model.LongCacheIdModel; +import cn.orionsec.kit.lang.define.cache.key.model.LongCacheIdModel; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/dto/ExecCommandExecDTO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/ExecCommandExecDTO.java similarity index 97% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/dto/ExecCommandExecDTO.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/ExecCommandExecDTO.java index 7e05e7cd..956ef61a 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/dto/ExecCommandExecDTO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/ExecCommandExecDTO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.dto; +package org.dromara.visor.module.asset.entity.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/dto/ExecHostLogTailDTO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/ExecHostLogTailDTO.java similarity index 96% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/dto/ExecHostLogTailDTO.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/ExecHostLogTailDTO.java index b7c99540..af6ce372 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/dto/ExecHostLogTailDTO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/ExecHostLogTailDTO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.dto; +package org.dromara.visor.module.asset.entity.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/dto/ExecLogTailDTO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/ExecLogTailDTO.java similarity index 96% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/dto/ExecLogTailDTO.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/ExecLogTailDTO.java index ca5b6532..420db0f6 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/dto/ExecLogTailDTO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/ExecLogTailDTO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.dto; +package org.dromara.visor.module.asset.entity.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/dto/ExecParameterSchemaDTO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/ExecParameterSchemaDTO.java similarity index 96% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/dto/ExecParameterSchemaDTO.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/ExecParameterSchemaDTO.java index 1fe34cae..6290f37d 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/dto/ExecParameterSchemaDTO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/ExecParameterSchemaDTO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.dto; +package org.dromara.visor.module.asset.entity.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/dto/HostCacheDTO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/HostCacheDTO.java similarity index 93% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/dto/HostCacheDTO.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/HostCacheDTO.java index adb2863d..2547637f 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/dto/HostCacheDTO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/HostCacheDTO.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.dto; +package org.dromara.visor.module.asset.entity.dto; -import com.orion.lang.define.cache.key.model.LongCacheIdModel; +import cn.orionsec.kit.lang.define.cache.key.model.LongCacheIdModel; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/dto/HostIdentityCacheDTO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/HostIdentityCacheDTO.java similarity index 93% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/dto/HostIdentityCacheDTO.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/HostIdentityCacheDTO.java index f2b9aa00..b20aca27 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/dto/HostIdentityCacheDTO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/HostIdentityCacheDTO.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.dto; +package org.dromara.visor.module.asset.entity.dto; -import com.orion.lang.define.cache.key.model.LongCacheIdModel; +import cn.orionsec.kit.lang.define.cache.key.model.LongCacheIdModel; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/dto/HostKeyCacheDTO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/HostKeyCacheDTO.java similarity index 92% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/dto/HostKeyCacheDTO.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/HostKeyCacheDTO.java index 8fc4ad9a..1fc97656 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/dto/HostKeyCacheDTO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/HostKeyCacheDTO.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.dto; +package org.dromara.visor.module.asset.entity.dto; -import com.orion.lang.define.cache.key.model.LongCacheIdModel; +import cn.orionsec.kit.lang.define.cache.key.model.LongCacheIdModel; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/dto/PathBookmarkCacheDTO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/PathBookmarkCacheDTO.java similarity index 92% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/dto/PathBookmarkCacheDTO.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/PathBookmarkCacheDTO.java index 193c4e20..859bae19 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/dto/PathBookmarkCacheDTO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/PathBookmarkCacheDTO.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.dto; +package org.dromara.visor.module.asset.entity.dto; -import com.orion.lang.define.cache.key.model.LongCacheIdModel; +import cn.orionsec.kit.lang.define.cache.key.model.LongCacheIdModel; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/dto/SftpGetContentCacheDTO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/SftpGetContentCacheDTO.java similarity index 96% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/dto/SftpGetContentCacheDTO.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/SftpGetContentCacheDTO.java index 6c9ffe0c..e09db2da 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/dto/SftpGetContentCacheDTO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/SftpGetContentCacheDTO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.dto; +package org.dromara.visor.module.asset.entity.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/dto/SftpSetContentCacheDTO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/SftpSetContentCacheDTO.java similarity index 96% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/dto/SftpSetContentCacheDTO.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/SftpSetContentCacheDTO.java index e3d39b90..be7013b6 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/dto/SftpSetContentCacheDTO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/SftpSetContentCacheDTO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.dto; +package org.dromara.visor.module.asset.entity.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/dto/TerminalAccessDTO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/TerminalAccessDTO.java similarity index 90% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/dto/TerminalAccessDTO.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/TerminalAccessDTO.java index 21656f4b..37a65b7a 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/dto/TerminalAccessDTO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/TerminalAccessDTO.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.dto; +package org.dromara.visor.module.asset.entity.dto; -import com.orion.visor.framework.desensitize.core.annotation.DesensitizeObject; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.dromara.visor.framework.desensitize.core.annotation.DesensitizeObject; /** * 终端访问参数 diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/dto/TerminalConnectDTO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/TerminalConnectDTO.java similarity index 92% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/dto/TerminalConnectDTO.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/TerminalConnectDTO.java index b4570d4e..9c0dc624 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/dto/TerminalConnectDTO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/TerminalConnectDTO.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.dto; +package org.dromara.visor.module.asset.entity.dto; -import com.orion.visor.framework.desensitize.core.annotation.Desensitize; -import com.orion.visor.framework.desensitize.core.annotation.DesensitizeObject; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.dromara.visor.framework.desensitize.core.annotation.Desensitize; +import org.dromara.visor.framework.desensitize.core.annotation.DesensitizeObject; /** * 终端连接参数 diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/dto/TerminalConnectLogExtraDTO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/TerminalConnectLogExtraDTO.java similarity index 97% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/dto/TerminalConnectLogExtraDTO.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/TerminalConnectLogExtraDTO.java index 531f2a5c..6552d390 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/dto/TerminalConnectLogExtraDTO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/TerminalConnectLogExtraDTO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.dto; +package org.dromara.visor.module.asset.entity.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/dto/TerminalTransferDTO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/TerminalTransferDTO.java similarity index 90% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/dto/TerminalTransferDTO.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/TerminalTransferDTO.java index 7fc4b29e..b1049723 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/dto/TerminalTransferDTO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/TerminalTransferDTO.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.dto; +package org.dromara.visor.module.asset.entity.dto; -import com.orion.visor.framework.desensitize.core.annotation.DesensitizeObject; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.dromara.visor.framework.desensitize.core.annotation.DesensitizeObject; /** * 终端传输参数 diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/dto/UploadTaskExtraDTO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/UploadTaskExtraDTO.java similarity index 92% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/dto/UploadTaskExtraDTO.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/UploadTaskExtraDTO.java index c7795f4d..01dc89b0 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/dto/UploadTaskExtraDTO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/UploadTaskExtraDTO.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.dto; +package org.dromara.visor.module.asset.entity.dto; -import com.orion.visor.module.asset.entity.vo.HostBaseVO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.dromara.visor.module.asset.entity.vo.HostBaseVO; import java.util.List; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/asset/AssetAuthorizedDataQueryRequest.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/asset/AssetAuthorizedDataQueryRequest.java similarity index 95% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/asset/AssetAuthorizedDataQueryRequest.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/asset/AssetAuthorizedDataQueryRequest.java index 39e532ba..18cfc85d 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/asset/AssetAuthorizedDataQueryRequest.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/asset/AssetAuthorizedDataQueryRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.request.asset; +package org.dromara.visor.module.asset.entity.request.asset; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/asset/AssetDataGrantRequest.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/asset/AssetDataGrantRequest.java similarity index 95% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/asset/AssetDataGrantRequest.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/asset/AssetDataGrantRequest.java index 459dbef7..18012fc4 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/asset/AssetDataGrantRequest.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/asset/AssetDataGrantRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.request.asset; +package org.dromara.visor.module.asset.entity.request.asset; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/command/CommandSnippetCreateRequest.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/command/CommandSnippetCreateRequest.java similarity index 96% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/command/CommandSnippetCreateRequest.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/command/CommandSnippetCreateRequest.java index 04040632..b9b5d71f 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/command/CommandSnippetCreateRequest.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/command/CommandSnippetCreateRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.request.command; +package org.dromara.visor.module.asset.entity.request.command; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/command/CommandSnippetGroupCreateRequest.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/command/CommandSnippetGroupCreateRequest.java similarity index 95% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/command/CommandSnippetGroupCreateRequest.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/command/CommandSnippetGroupCreateRequest.java index dd192f53..4b30ba1b 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/command/CommandSnippetGroupCreateRequest.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/command/CommandSnippetGroupCreateRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.request.command; +package org.dromara.visor.module.asset.entity.request.command; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/command/CommandSnippetGroupDeleteRequest.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/command/CommandSnippetGroupDeleteRequest.java similarity index 92% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/command/CommandSnippetGroupDeleteRequest.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/command/CommandSnippetGroupDeleteRequest.java index 3acf32b5..1a2cd22f 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/command/CommandSnippetGroupDeleteRequest.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/command/CommandSnippetGroupDeleteRequest.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.request.command; +package org.dromara.visor.module.asset.entity.request.command; -import com.orion.visor.framework.common.validator.group.Id; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.dromara.visor.framework.common.validator.group.Id; import javax.validation.constraints.NotNull; import java.io.Serializable; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/command/CommandSnippetGroupUpdateRequest.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/command/CommandSnippetGroupUpdateRequest.java similarity index 96% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/command/CommandSnippetGroupUpdateRequest.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/command/CommandSnippetGroupUpdateRequest.java index d18a68cc..21425f0d 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/command/CommandSnippetGroupUpdateRequest.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/command/CommandSnippetGroupUpdateRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.request.command; +package org.dromara.visor.module.asset.entity.request.command; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/command/CommandSnippetUpdateRequest.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/command/CommandSnippetUpdateRequest.java similarity index 96% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/command/CommandSnippetUpdateRequest.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/command/CommandSnippetUpdateRequest.java index 4e074e3e..e2b0d570 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/command/CommandSnippetUpdateRequest.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/command/CommandSnippetUpdateRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.request.command; +package org.dromara.visor.module.asset.entity.request.command; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/exec/ExecCommandRequest.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecCommandRequest.java similarity index 89% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/exec/ExecCommandRequest.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecCommandRequest.java index 4f001c85..2f04d643 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/exec/ExecCommandRequest.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecCommandRequest.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.request.exec; +package org.dromara.visor.module.asset.entity.request.exec; -import com.orion.visor.framework.desensitize.core.annotation.Desensitize; -import com.orion.visor.framework.desensitize.core.annotation.DesensitizeObject; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import org.dromara.visor.framework.desensitize.core.annotation.Desensitize; +import org.dromara.visor.framework.desensitize.core.annotation.DesensitizeObject; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotEmpty; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/exec/ExecInterruptRequest.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecInterruptRequest.java similarity index 95% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/exec/ExecInterruptRequest.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecInterruptRequest.java index 0ad5928a..6b5976e5 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/exec/ExecInterruptRequest.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecInterruptRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.request.exec; +package org.dromara.visor.module.asset.entity.request.exec; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/exec/ExecJobCreateRequest.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecJobCreateRequest.java similarity index 90% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/exec/ExecJobCreateRequest.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecJobCreateRequest.java index 6d1cbe9d..27ec8e64 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/exec/ExecJobCreateRequest.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecJobCreateRequest.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.request.exec; +package org.dromara.visor.module.asset.entity.request.exec; -import com.orion.visor.framework.desensitize.core.annotation.Desensitize; -import com.orion.visor.framework.desensitize.core.annotation.DesensitizeObject; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import org.dromara.visor.framework.desensitize.core.annotation.Desensitize; +import org.dromara.visor.framework.desensitize.core.annotation.DesensitizeObject; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotEmpty; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/exec/ExecJobQueryRequest.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecJobQueryRequest.java similarity index 92% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/exec/ExecJobQueryRequest.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecJobQueryRequest.java index 83402b4d..9f9d6a44 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/exec/ExecJobQueryRequest.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecJobQueryRequest.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.request.exec; +package org.dromara.visor.module.asset.entity.request.exec; -import com.orion.visor.framework.common.entity.PageRequest; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import org.dromara.visor.framework.common.entity.PageRequest; import javax.validation.constraints.Size; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/exec/ExecJobTriggerRequest.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecJobTriggerRequest.java similarity index 96% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/exec/ExecJobTriggerRequest.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecJobTriggerRequest.java index c1a17281..6b3ac4f8 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/exec/ExecJobTriggerRequest.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecJobTriggerRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.request.exec; +package org.dromara.visor.module.asset.entity.request.exec; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/exec/ExecJobUpdateRequest.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecJobUpdateRequest.java similarity index 90% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/exec/ExecJobUpdateRequest.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecJobUpdateRequest.java index fb730729..0f31c6fc 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/exec/ExecJobUpdateRequest.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecJobUpdateRequest.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.request.exec; +package org.dromara.visor.module.asset.entity.request.exec; -import com.orion.visor.framework.desensitize.core.annotation.Desensitize; -import com.orion.visor.framework.desensitize.core.annotation.DesensitizeObject; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import org.dromara.visor.framework.desensitize.core.annotation.Desensitize; +import org.dromara.visor.framework.desensitize.core.annotation.DesensitizeObject; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotEmpty; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/exec/ExecJobUpdateStatusRequest.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecJobUpdateStatusRequest.java similarity index 95% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/exec/ExecJobUpdateStatusRequest.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecJobUpdateStatusRequest.java index f70e8c5b..0118f6ab 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/exec/ExecJobUpdateStatusRequest.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecJobUpdateStatusRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.request.exec; +package org.dromara.visor.module.asset.entity.request.exec; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/exec/ExecLogClearRequest.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecLogClearRequest.java similarity index 91% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/exec/ExecLogClearRequest.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecLogClearRequest.java index 6d50499b..f56c3bf1 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/exec/ExecLogClearRequest.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecLogClearRequest.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.request.exec; +package org.dromara.visor.module.asset.entity.request.exec; -import com.orion.visor.framework.common.entity.DataClearRequest; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; +import org.dromara.visor.framework.common.entity.DataClearRequest; import javax.validation.constraints.Max; import javax.validation.constraints.Min; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/exec/ExecLogQueryRequest.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecLogQueryRequest.java similarity index 94% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/exec/ExecLogQueryRequest.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecLogQueryRequest.java index 1870d45f..ff7d69fa 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/exec/ExecLogQueryRequest.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecLogQueryRequest.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.request.exec; +package org.dromara.visor.module.asset.entity.request.exec; import com.fasterxml.jackson.annotation.JsonFormat; -import com.orion.visor.framework.common.entity.PageRequest; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import org.dromara.visor.framework.common.entity.PageRequest; import javax.validation.constraints.Size; import java.util.Date; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/exec/ExecLogTailRequest.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecLogTailRequest.java similarity index 95% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/exec/ExecLogTailRequest.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecLogTailRequest.java index 39f7424a..6c5913dd 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/exec/ExecLogTailRequest.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecLogTailRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.request.exec; +package org.dromara.visor.module.asset.entity.request.exec; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/exec/ExecTemplateCreateRequest.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecTemplateCreateRequest.java similarity index 89% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/exec/ExecTemplateCreateRequest.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecTemplateCreateRequest.java index 44ced258..b6f58393 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/exec/ExecTemplateCreateRequest.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecTemplateCreateRequest.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.request.exec; +package org.dromara.visor.module.asset.entity.request.exec; -import com.orion.visor.framework.desensitize.core.annotation.Desensitize; -import com.orion.visor.framework.desensitize.core.annotation.DesensitizeObject; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.dromara.visor.framework.desensitize.core.annotation.Desensitize; +import org.dromara.visor.framework.desensitize.core.annotation.DesensitizeObject; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/exec/ExecTemplateQueryRequest.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecTemplateQueryRequest.java similarity index 91% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/exec/ExecTemplateQueryRequest.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecTemplateQueryRequest.java index 6f5b435a..931edeec 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/exec/ExecTemplateQueryRequest.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecTemplateQueryRequest.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.request.exec; +package org.dromara.visor.module.asset.entity.request.exec; -import com.orion.visor.framework.common.entity.PageRequest; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import org.dromara.visor.framework.common.entity.PageRequest; import javax.validation.constraints.Size; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/exec/ExecTemplateUpdateRequest.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecTemplateUpdateRequest.java similarity index 90% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/exec/ExecTemplateUpdateRequest.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecTemplateUpdateRequest.java index 02c1389d..2d0987a2 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/exec/ExecTemplateUpdateRequest.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecTemplateUpdateRequest.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.request.exec; +package org.dromara.visor.module.asset.entity.request.exec; -import com.orion.visor.framework.desensitize.core.annotation.Desensitize; -import com.orion.visor.framework.desensitize.core.annotation.DesensitizeObject; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.dromara.visor.framework.desensitize.core.annotation.Desensitize; +import org.dromara.visor.framework.desensitize.core.annotation.DesensitizeObject; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/exec/ReExecCommandRequest.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ReExecCommandRequest.java similarity index 94% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/exec/ReExecCommandRequest.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ReExecCommandRequest.java index f00c5998..7dbc8d4f 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/exec/ReExecCommandRequest.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ReExecCommandRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.request.exec; +package org.dromara.visor.module.asset.entity.request.exec; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/HostCreateRequest.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostCreateRequest.java similarity index 97% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/HostCreateRequest.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostCreateRequest.java index 1b57e6e1..a70b30e8 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/HostCreateRequest.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostCreateRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.request.host; +package org.dromara.visor.module.asset.entity.request.host; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/HostExtraQueryRequest.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostExtraQueryRequest.java similarity index 95% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/HostExtraQueryRequest.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostExtraQueryRequest.java index 385155e5..f3b1f00b 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/HostExtraQueryRequest.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostExtraQueryRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.request.host; +package org.dromara.visor.module.asset.entity.request.host; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/HostExtraUpdateRequest.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostExtraUpdateRequest.java similarity index 95% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/HostExtraUpdateRequest.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostExtraUpdateRequest.java index a51629ec..6eb05755 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/HostExtraUpdateRequest.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostExtraUpdateRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.request.host; +package org.dromara.visor.module.asset.entity.request.host; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/HostGroupRelUpdateRequest.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostGroupRelUpdateRequest.java similarity index 95% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/HostGroupRelUpdateRequest.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostGroupRelUpdateRequest.java index 0e12e18f..25e3dcfd 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/HostGroupRelUpdateRequest.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostGroupRelUpdateRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.request.host; +package org.dromara.visor.module.asset.entity.request.host; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/HostIdentityCreateRequest.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostIdentityCreateRequest.java similarity index 96% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/HostIdentityCreateRequest.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostIdentityCreateRequest.java index 1420713b..9c339d07 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/HostIdentityCreateRequest.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostIdentityCreateRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.request.host; +package org.dromara.visor.module.asset.entity.request.host; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/HostIdentityQueryRequest.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostIdentityQueryRequest.java similarity index 93% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/HostIdentityQueryRequest.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostIdentityQueryRequest.java index ab6a1520..10d01813 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/HostIdentityQueryRequest.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostIdentityQueryRequest.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.request.host; +package org.dromara.visor.module.asset.entity.request.host; -import com.orion.visor.framework.common.entity.PageRequest; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import org.dromara.visor.framework.common.entity.PageRequest; import javax.validation.constraints.Size; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/HostIdentityUpdateRequest.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostIdentityUpdateRequest.java similarity index 93% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/HostIdentityUpdateRequest.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostIdentityUpdateRequest.java index f5c9079c..ec678f37 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/HostIdentityUpdateRequest.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostIdentityUpdateRequest.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.request.host; +package org.dromara.visor.module.asset.entity.request.host; -import com.orion.visor.framework.common.security.UpdatePasswordAction; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.dromara.visor.framework.common.security.UpdatePasswordAction; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/HostKeyCreateRequest.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostKeyCreateRequest.java similarity index 96% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/HostKeyCreateRequest.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostKeyCreateRequest.java index 14ffeef1..61aab2ce 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/HostKeyCreateRequest.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostKeyCreateRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.request.host; +package org.dromara.visor.module.asset.entity.request.host; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/HostKeyQueryRequest.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostKeyQueryRequest.java similarity index 91% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/HostKeyQueryRequest.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostKeyQueryRequest.java index 81d63fda..60421259 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/HostKeyQueryRequest.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostKeyQueryRequest.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.request.host; +package org.dromara.visor.module.asset.entity.request.host; -import com.orion.visor.framework.common.entity.PageRequest; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import org.dromara.visor.framework.common.entity.PageRequest; import javax.validation.constraints.Size; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/HostKeyUpdateRequest.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostKeyUpdateRequest.java similarity index 93% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/HostKeyUpdateRequest.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostKeyUpdateRequest.java index 42108507..3cb4973b 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/HostKeyUpdateRequest.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostKeyUpdateRequest.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.request.host; +package org.dromara.visor.module.asset.entity.request.host; -import com.orion.visor.framework.common.security.UpdatePasswordAction; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.dromara.visor.framework.common.security.UpdatePasswordAction; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/HostQueryRequest.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostQueryRequest.java similarity index 93% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/HostQueryRequest.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostQueryRequest.java index 1ef3b73b..387667e5 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/HostQueryRequest.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostQueryRequest.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.request.host; +package org.dromara.visor.module.asset.entity.request.host; -import com.orion.visor.framework.common.entity.PageRequest; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import org.dromara.visor.framework.common.entity.PageRequest; import javax.validation.constraints.Size; import java.util.List; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/HostUpdateConfigRequest.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostUpdateConfigRequest.java similarity index 95% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/HostUpdateConfigRequest.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostUpdateConfigRequest.java index 336aa595..36840732 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/HostUpdateConfigRequest.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostUpdateConfigRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.request.host; +package org.dromara.visor.module.asset.entity.request.host; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/HostUpdateRequest.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostUpdateRequest.java similarity index 96% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/HostUpdateRequest.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostUpdateRequest.java index 05852372..eda5a50f 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/HostUpdateRequest.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostUpdateRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.request.host; +package org.dromara.visor.module.asset.entity.request.host; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/HostUpdateStatusRequest.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostUpdateStatusRequest.java similarity index 95% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/HostUpdateStatusRequest.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostUpdateStatusRequest.java index e3b04eb6..0c221a9b 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/HostUpdateStatusRequest.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostUpdateStatusRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.request.host; +package org.dromara.visor.module.asset.entity.request.host; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/TerminalConnectLogClearRequest.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/TerminalConnectLogClearRequest.java similarity index 91% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/TerminalConnectLogClearRequest.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/TerminalConnectLogClearRequest.java index 1c7c8d31..73a156a3 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/TerminalConnectLogClearRequest.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/TerminalConnectLogClearRequest.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.request.host; +package org.dromara.visor.module.asset.entity.request.host; -import com.orion.visor.framework.common.entity.DataClearRequest; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; +import org.dromara.visor.framework.common.entity.DataClearRequest; import javax.validation.constraints.Max; import javax.validation.constraints.Min; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/TerminalConnectLogCreateRequest.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/TerminalConnectLogCreateRequest.java similarity index 96% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/TerminalConnectLogCreateRequest.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/TerminalConnectLogCreateRequest.java index bd414b6b..a7522311 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/TerminalConnectLogCreateRequest.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/TerminalConnectLogCreateRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.request.host; +package org.dromara.visor.module.asset.entity.request.host; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/TerminalConnectLogQueryRequest.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/TerminalConnectLogQueryRequest.java similarity index 92% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/TerminalConnectLogQueryRequest.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/TerminalConnectLogQueryRequest.java index 5b7d756e..75c01965 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/TerminalConnectLogQueryRequest.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/TerminalConnectLogQueryRequest.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.request.host; +package org.dromara.visor.module.asset.entity.request.host; import com.fasterxml.jackson.annotation.JsonFormat; -import com.orion.visor.framework.common.entity.PageRequest; -import com.orion.visor.framework.common.validator.group.Id; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import org.dromara.visor.framework.common.entity.PageRequest; +import org.dromara.visor.framework.common.validator.group.Id; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/TerminalSftpLogQueryRequest.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/TerminalSftpLogQueryRequest.java similarity index 93% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/TerminalSftpLogQueryRequest.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/TerminalSftpLogQueryRequest.java index 2f859901..4481b07e 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/host/TerminalSftpLogQueryRequest.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/TerminalSftpLogQueryRequest.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.request.host; +package org.dromara.visor.module.asset.entity.request.host; import com.fasterxml.jackson.annotation.JsonFormat; -import com.orion.visor.framework.common.entity.PageRequest; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import org.dromara.visor.framework.common.entity.PageRequest; import javax.validation.constraints.Size; import java.util.Date; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/path/PathBookmarkCreateRequest.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/path/PathBookmarkCreateRequest.java similarity index 96% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/path/PathBookmarkCreateRequest.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/path/PathBookmarkCreateRequest.java index 2aba8b6a..653ad55f 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/path/PathBookmarkCreateRequest.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/path/PathBookmarkCreateRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.request.path; +package org.dromara.visor.module.asset.entity.request.path; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/path/PathBookmarkGroupCreateRequest.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/path/PathBookmarkGroupCreateRequest.java similarity index 95% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/path/PathBookmarkGroupCreateRequest.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/path/PathBookmarkGroupCreateRequest.java index 90250442..ebe5284b 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/path/PathBookmarkGroupCreateRequest.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/path/PathBookmarkGroupCreateRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.request.path; +package org.dromara.visor.module.asset.entity.request.path; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/path/PathBookmarkGroupDeleteRequest.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/path/PathBookmarkGroupDeleteRequest.java similarity index 92% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/path/PathBookmarkGroupDeleteRequest.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/path/PathBookmarkGroupDeleteRequest.java index 3c42d210..3a031b77 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/path/PathBookmarkGroupDeleteRequest.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/path/PathBookmarkGroupDeleteRequest.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.request.path; +package org.dromara.visor.module.asset.entity.request.path; -import com.orion.visor.framework.common.validator.group.Id; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.dromara.visor.framework.common.validator.group.Id; import javax.validation.constraints.NotNull; import java.io.Serializable; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/path/PathBookmarkGroupUpdateRequest.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/path/PathBookmarkGroupUpdateRequest.java similarity index 96% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/path/PathBookmarkGroupUpdateRequest.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/path/PathBookmarkGroupUpdateRequest.java index 03e81557..a3ef5402 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/path/PathBookmarkGroupUpdateRequest.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/path/PathBookmarkGroupUpdateRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.request.path; +package org.dromara.visor.module.asset.entity.request.path; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/path/PathBookmarkUpdateRequest.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/path/PathBookmarkUpdateRequest.java similarity index 96% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/path/PathBookmarkUpdateRequest.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/path/PathBookmarkUpdateRequest.java index e9ebfaeb..b88def04 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/path/PathBookmarkUpdateRequest.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/path/PathBookmarkUpdateRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.request.path; +package org.dromara.visor.module.asset.entity.request.path; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/upload/UploadTaskClearRequest.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/upload/UploadTaskClearRequest.java similarity index 91% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/upload/UploadTaskClearRequest.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/upload/UploadTaskClearRequest.java index e1d62a4a..cd79e4a9 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/upload/UploadTaskClearRequest.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/upload/UploadTaskClearRequest.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.request.upload; +package org.dromara.visor.module.asset.entity.request.upload; -import com.orion.visor.framework.common.entity.DataClearRequest; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; +import org.dromara.visor.framework.common.entity.DataClearRequest; import javax.validation.constraints.Max; import javax.validation.constraints.Min; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/upload/UploadTaskCreateRequest.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/upload/UploadTaskCreateRequest.java similarity index 96% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/upload/UploadTaskCreateRequest.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/upload/UploadTaskCreateRequest.java index 87eb82e7..48f21434 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/upload/UploadTaskCreateRequest.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/upload/UploadTaskCreateRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.request.upload; +package org.dromara.visor.module.asset.entity.request.upload; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/upload/UploadTaskFileRequest.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/upload/UploadTaskFileRequest.java similarity index 96% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/upload/UploadTaskFileRequest.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/upload/UploadTaskFileRequest.java index 3cd10bb1..f64ca798 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/upload/UploadTaskFileRequest.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/upload/UploadTaskFileRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.request.upload; +package org.dromara.visor.module.asset.entity.request.upload; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/upload/UploadTaskQueryRequest.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/upload/UploadTaskQueryRequest.java similarity index 93% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/upload/UploadTaskQueryRequest.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/upload/UploadTaskQueryRequest.java index f46f146e..9aa5e985 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/upload/UploadTaskQueryRequest.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/upload/UploadTaskQueryRequest.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.request.upload; +package org.dromara.visor.module.asset.entity.request.upload; import com.fasterxml.jackson.annotation.JsonFormat; -import com.orion.visor.framework.common.entity.PageRequest; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import org.dromara.visor.framework.common.entity.PageRequest; import javax.validation.constraints.Size; import java.util.Date; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/upload/UploadTaskRequest.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/upload/UploadTaskRequest.java similarity index 95% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/upload/UploadTaskRequest.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/upload/UploadTaskRequest.java index 0efa1e54..0b2708a3 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/request/upload/UploadTaskRequest.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/upload/UploadTaskRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.request.upload; +package org.dromara.visor.module.asset.entity.request.upload; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/AuthorizedHostWrapperVO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/AuthorizedHostWrapperVO.java similarity index 96% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/AuthorizedHostWrapperVO.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/AuthorizedHostWrapperVO.java index 647de273..aba439b6 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/AuthorizedHostWrapperVO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/AuthorizedHostWrapperVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.vo; +package org.dromara.visor.module.asset.entity.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/CommandSnippetGroupVO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/CommandSnippetGroupVO.java similarity index 96% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/CommandSnippetGroupVO.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/CommandSnippetGroupVO.java index 4c68a748..1a5440f9 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/CommandSnippetGroupVO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/CommandSnippetGroupVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.vo; +package org.dromara.visor.module.asset.entity.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/CommandSnippetVO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/CommandSnippetVO.java similarity index 96% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/CommandSnippetVO.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/CommandSnippetVO.java index 27f50513..8e1232d5 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/CommandSnippetVO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/CommandSnippetVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.vo; +package org.dromara.visor.module.asset.entity.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/CommandSnippetWrapperVO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/CommandSnippetWrapperVO.java similarity index 96% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/CommandSnippetWrapperVO.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/CommandSnippetWrapperVO.java index 68e32f87..caac38e5 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/CommandSnippetWrapperVO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/CommandSnippetWrapperVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.vo; +package org.dromara.visor.module.asset.entity.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/ExecHostLogVO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/ExecHostLogVO.java similarity index 97% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/ExecHostLogVO.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/ExecHostLogVO.java index 24f6ea38..116f61ac 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/ExecHostLogVO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/ExecHostLogVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.vo; +package org.dromara.visor.module.asset.entity.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/ExecJobHostVO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/ExecJobHostVO.java similarity index 97% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/ExecJobHostVO.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/ExecJobHostVO.java index ffb0814f..75eab5c4 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/ExecJobHostVO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/ExecJobHostVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.vo; +package org.dromara.visor.module.asset.entity.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/ExecJobVO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/ExecJobVO.java similarity index 97% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/ExecJobVO.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/ExecJobVO.java index 4534c9cb..553ba2af 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/ExecJobVO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/ExecJobVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.vo; +package org.dromara.visor.module.asset.entity.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/ExecLogStatusVO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/ExecLogStatusVO.java similarity index 96% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/ExecLogStatusVO.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/ExecLogStatusVO.java index 1449b2c1..eb12d91c 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/ExecLogStatusVO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/ExecLogStatusVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.vo; +package org.dromara.visor.module.asset.entity.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/ExecLogVO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/ExecLogVO.java similarity index 97% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/ExecLogVO.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/ExecLogVO.java index 993acd6a..91a7839d 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/ExecLogVO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/ExecLogVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.vo; +package org.dromara.visor.module.asset.entity.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/ExecTemplateVO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/ExecTemplateVO.java similarity index 97% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/ExecTemplateVO.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/ExecTemplateVO.java index 78472726..eb2fe51c 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/ExecTemplateVO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/ExecTemplateVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.vo; +package org.dromara.visor.module.asset.entity.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/HostBaseVO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/HostBaseVO.java similarity index 96% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/HostBaseVO.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/HostBaseVO.java index 2cb734e3..da053091 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/HostBaseVO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/HostBaseVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.vo; +package org.dromara.visor.module.asset.entity.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/HostConfigVO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/HostConfigVO.java similarity index 96% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/HostConfigVO.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/HostConfigVO.java index 85753e18..ccfd9297 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/HostConfigVO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/HostConfigVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.vo; +package org.dromara.visor.module.asset.entity.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/HostGroupTreeVO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/HostGroupTreeVO.java similarity index 93% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/HostGroupTreeVO.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/HostGroupTreeVO.java index 0a19e665..cb1e9f00 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/HostGroupTreeVO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/HostGroupTreeVO.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.vo; +package org.dromara.visor.module.asset.entity.vo; import com.fasterxml.jackson.annotation.JsonProperty; -import com.orion.visor.framework.common.entity.TreeNode; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.dromara.visor.framework.common.entity.TreeNode; import java.io.Serializable; import java.util.List; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/HostIdentityVO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/HostIdentityVO.java similarity index 97% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/HostIdentityVO.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/HostIdentityVO.java index 1266f4f1..2cc8ecb5 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/HostIdentityVO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/HostIdentityVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.vo; +package org.dromara.visor.module.asset.entity.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/HostKeyVO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/HostKeyVO.java similarity index 97% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/HostKeyVO.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/HostKeyVO.java index 10153a14..772b6108 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/HostKeyVO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/HostKeyVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.vo; +package org.dromara.visor.module.asset.entity.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/HostVO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/HostVO.java similarity index 95% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/HostVO.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/HostVO.java index 8d5e0c39..e956f4d9 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/HostVO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/HostVO.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.vo; +package org.dromara.visor.module.asset.entity.vo; -import com.orion.visor.module.infra.entity.dto.tag.TagDTO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.dromara.visor.module.infra.entity.dto.tag.TagDTO; import java.io.Serializable; import java.util.Date; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/PathBookmarkGroupVO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/PathBookmarkGroupVO.java similarity index 96% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/PathBookmarkGroupVO.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/PathBookmarkGroupVO.java index c452ce91..fef1b157 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/PathBookmarkGroupVO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/PathBookmarkGroupVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.vo; +package org.dromara.visor.module.asset.entity.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/PathBookmarkVO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/PathBookmarkVO.java similarity index 96% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/PathBookmarkVO.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/PathBookmarkVO.java index 7ccb56dd..76c2ea76 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/PathBookmarkVO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/PathBookmarkVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.vo; +package org.dromara.visor.module.asset.entity.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/PathBookmarkWrapperVO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/PathBookmarkWrapperVO.java similarity index 96% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/PathBookmarkWrapperVO.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/PathBookmarkWrapperVO.java index 58ddd439..35b2085b 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/PathBookmarkWrapperVO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/PathBookmarkWrapperVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.vo; +package org.dromara.visor.module.asset.entity.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/TerminalConnectLogVO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/TerminalConnectLogVO.java similarity index 94% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/TerminalConnectLogVO.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/TerminalConnectLogVO.java index 59c5ed8f..9c9e14cc 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/TerminalConnectLogVO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/TerminalConnectLogVO.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.vo; +package org.dromara.visor.module.asset.entity.vo; -import com.orion.visor.module.asset.entity.dto.TerminalConnectLogExtraDTO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.dromara.visor.module.asset.entity.dto.TerminalConnectLogExtraDTO; import java.io.Serializable; import java.util.Date; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/TerminalSftpLogVO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/TerminalSftpLogVO.java similarity index 97% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/TerminalSftpLogVO.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/TerminalSftpLogVO.java index 34223d95..02541550 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/TerminalSftpLogVO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/TerminalSftpLogVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.vo; +package org.dromara.visor.module.asset.entity.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/TerminalThemeVO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/TerminalThemeVO.java similarity index 96% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/TerminalThemeVO.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/TerminalThemeVO.java index f6c29d38..250df16f 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/TerminalThemeVO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/TerminalThemeVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.vo; +package org.dromara.visor.module.asset.entity.vo; import com.alibaba.fastjson.JSONObject; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/UploadTaskCreateVO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/UploadTaskCreateVO.java similarity index 96% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/UploadTaskCreateVO.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/UploadTaskCreateVO.java index 845a4190..7bac3637 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/UploadTaskCreateVO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/UploadTaskCreateVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.vo; +package org.dromara.visor.module.asset.entity.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/UploadTaskFileVO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/UploadTaskFileVO.java similarity index 97% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/UploadTaskFileVO.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/UploadTaskFileVO.java index 1aa0711d..a019073b 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/UploadTaskFileVO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/UploadTaskFileVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.vo; +package org.dromara.visor.module.asset.entity.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/UploadTaskHostVO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/UploadTaskHostVO.java similarity index 96% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/UploadTaskHostVO.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/UploadTaskHostVO.java index dd75325d..c629ff8d 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/UploadTaskHostVO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/UploadTaskHostVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.vo; +package org.dromara.visor.module.asset.entity.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/UploadTaskStatusVO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/UploadTaskStatusVO.java similarity index 96% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/UploadTaskStatusVO.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/UploadTaskStatusVO.java index 796b3eca..81d55899 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/UploadTaskStatusVO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/UploadTaskStatusVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.vo; +package org.dromara.visor.module.asset.entity.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/UploadTaskVO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/UploadTaskVO.java similarity index 97% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/UploadTaskVO.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/UploadTaskVO.java index 2464b81b..7a045472 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/entity/vo/UploadTaskVO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/UploadTaskVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.entity.vo; +package org.dromara.visor.module.asset.entity.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/enums/ExecHostStatusEnum.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/ExecHostStatusEnum.java similarity index 97% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/enums/ExecHostStatusEnum.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/ExecHostStatusEnum.java index 3e14f3e7..1fb09655 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/enums/ExecHostStatusEnum.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/ExecHostStatusEnum.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.enums; +package org.dromara.visor.module.asset.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/enums/ExecJobStatusEnum.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/ExecJobStatusEnum.java similarity index 96% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/enums/ExecJobStatusEnum.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/ExecJobStatusEnum.java index 5c1849e6..3b9a6ac7 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/enums/ExecJobStatusEnum.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/ExecJobStatusEnum.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.enums; +package org.dromara.visor.module.asset.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/enums/ExecSourceEnum.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/ExecSourceEnum.java similarity index 96% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/enums/ExecSourceEnum.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/ExecSourceEnum.java index 180eaf88..3f2ebe4b 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/enums/ExecSourceEnum.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/ExecSourceEnum.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.enums; +package org.dromara.visor.module.asset.enums; /** * 批量执行来源 diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/enums/ExecStatusEnum.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/ExecStatusEnum.java similarity index 94% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/enums/ExecStatusEnum.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/ExecStatusEnum.java index b31cb6bc..a379e3d6 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/enums/ExecStatusEnum.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/ExecStatusEnum.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.enums; +package org.dromara.visor.module.asset.enums; -import com.orion.lang.utils.collect.Lists; +import cn.orionsec.kit.lang.utils.collect.Lists; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/enums/HostExtraItemEnum.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/HostExtraItemEnum.java similarity index 75% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/enums/HostExtraItemEnum.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/HostExtraItemEnum.java index 420ed1be..88ba53ae 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/enums/HostExtraItemEnum.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/HostExtraItemEnum.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.enums; +package org.dromara.visor.module.asset.enums; -import com.orion.visor.framework.common.handler.data.GenericsDataDefinition; -import com.orion.visor.framework.common.handler.data.model.GenericsDataModel; -import com.orion.visor.framework.common.handler.data.strategy.GenericsDataStrategy; -import com.orion.visor.module.asset.handler.host.extra.strategy.HostLabelExtraStrategy; -import com.orion.visor.module.asset.handler.host.extra.strategy.HostSshExtraStrategy; import lombok.AllArgsConstructor; import lombok.Getter; +import org.dromara.visor.framework.common.handler.data.GenericsDataDefinition; +import org.dromara.visor.framework.common.handler.data.model.GenericsDataModel; +import org.dromara.visor.framework.common.handler.data.strategy.GenericsDataStrategy; +import org.dromara.visor.module.asset.handler.host.extra.strategy.HostLabelExtraStrategy; +import org.dromara.visor.module.asset.handler.host.extra.strategy.HostSshExtraStrategy; /** * 主机额外配置项枚举 diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/enums/HostExtraSshAuthTypeEnum.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/HostExtraSshAuthTypeEnum.java similarity index 96% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/enums/HostExtraSshAuthTypeEnum.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/HostExtraSshAuthTypeEnum.java index a6e59e9e..7cc136fc 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/enums/HostExtraSshAuthTypeEnum.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/HostExtraSshAuthTypeEnum.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.enums; +package org.dromara.visor.module.asset.enums; /** * 主机认证类型 diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/enums/HostIdentityTypeEnum.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/HostIdentityTypeEnum.java similarity index 96% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/enums/HostIdentityTypeEnum.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/HostIdentityTypeEnum.java index d1159317..38743c21 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/enums/HostIdentityTypeEnum.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/HostIdentityTypeEnum.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.enums; +package org.dromara.visor.module.asset.enums; /** * 主机身份类型 diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/enums/HostSshAuthTypeEnum.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/HostSshAuthTypeEnum.java similarity index 96% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/enums/HostSshAuthTypeEnum.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/HostSshAuthTypeEnum.java index 51fca2d5..617980e7 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/enums/HostSshAuthTypeEnum.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/HostSshAuthTypeEnum.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.enums; +package org.dromara.visor.module.asset.enums; /** * 主机认证类型 - ssh diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/enums/HostSshOsTypeEnum.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/HostSshOsTypeEnum.java similarity index 97% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/enums/HostSshOsTypeEnum.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/HostSshOsTypeEnum.java index 89538b03..21b8ce51 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/enums/HostSshOsTypeEnum.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/HostSshOsTypeEnum.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.enums; +package org.dromara.visor.module.asset.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/enums/HostStatusEnum.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/HostStatusEnum.java similarity index 96% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/enums/HostStatusEnum.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/HostStatusEnum.java index 714bc864..2067f9b9 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/enums/HostStatusEnum.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/HostStatusEnum.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.enums; +package org.dromara.visor.module.asset.enums; /** * 主机状态 diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/enums/HostTypeEnum.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/HostTypeEnum.java similarity index 78% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/enums/HostTypeEnum.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/HostTypeEnum.java index 1b451ffc..3d1f6add 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/enums/HostTypeEnum.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/HostTypeEnum.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.enums; +package org.dromara.visor.module.asset.enums; -import com.orion.visor.framework.common.handler.data.GenericsDataDefinition; -import com.orion.visor.framework.common.handler.data.model.GenericsDataModel; -import com.orion.visor.framework.common.handler.data.strategy.GenericsDataStrategy; -import com.orion.visor.module.asset.handler.host.config.strategy.HostSshConfigStrategy; import lombok.AllArgsConstructor; import lombok.Getter; +import org.dromara.visor.framework.common.handler.data.GenericsDataDefinition; +import org.dromara.visor.framework.common.handler.data.model.GenericsDataModel; +import org.dromara.visor.framework.common.handler.data.strategy.GenericsDataStrategy; +import org.dromara.visor.module.asset.handler.host.config.strategy.HostSshConfigStrategy; /** * 主机配置类型枚举 diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/enums/ScriptExecEnum.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/ScriptExecEnum.java similarity index 97% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/enums/ScriptExecEnum.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/ScriptExecEnum.java index ef3027b5..df43db24 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/enums/ScriptExecEnum.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/ScriptExecEnum.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.enums; +package org.dromara.visor.module.asset.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/enums/TerminalConnectStatusEnum.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/TerminalConnectStatusEnum.java similarity index 93% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/enums/TerminalConnectStatusEnum.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/TerminalConnectStatusEnum.java index 0e42dcb4..49ec24fb 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/enums/TerminalConnectStatusEnum.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/TerminalConnectStatusEnum.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.enums; +package org.dromara.visor.module.asset.enums; -import com.orion.lang.utils.collect.Lists; +import cn.orionsec.kit.lang.utils.collect.Lists; import java.util.List; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/enums/TerminalConnectTypeEnum.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/TerminalConnectTypeEnum.java similarity index 96% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/enums/TerminalConnectTypeEnum.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/TerminalConnectTypeEnum.java index 42c3c8ab..fdf3618a 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/enums/TerminalConnectTypeEnum.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/TerminalConnectTypeEnum.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.enums; +package org.dromara.visor.module.asset.enums; /** * 终端连接类型 diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/enums/UploadTaskFileStatusEnum.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/UploadTaskFileStatusEnum.java similarity index 96% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/enums/UploadTaskFileStatusEnum.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/UploadTaskFileStatusEnum.java index 86d76f59..b8f3b464 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/enums/UploadTaskFileStatusEnum.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/UploadTaskFileStatusEnum.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.enums; +package org.dromara.visor.module.asset.enums; /** * 上传任务文件状态 diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/enums/UploadTaskStatusEnum.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/UploadTaskStatusEnum.java similarity index 97% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/enums/UploadTaskStatusEnum.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/UploadTaskStatusEnum.java index 9a4b6429..496a4750 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/enums/UploadTaskStatusEnum.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/UploadTaskStatusEnum.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.enums; +package org.dromara.visor.module.asset.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/config/model/HostSshConfigModel.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/config/model/HostSshConfigModel.java similarity index 90% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/config/model/HostSshConfigModel.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/config/model/HostSshConfigModel.java index b97ccb2e..b4f03932 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/config/model/HostSshConfigModel.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/config/model/HostSshConfigModel.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.config.model; +package org.dromara.visor.module.asset.handler.host.config.model; -import com.orion.visor.framework.common.handler.data.model.GenericsDataModel; -import com.orion.visor.framework.common.security.UpdatePasswordAction; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.dromara.visor.framework.common.handler.data.model.GenericsDataModel; +import org.dromara.visor.framework.common.security.UpdatePasswordAction; import javax.validation.constraints.*; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/config/strategy/HostSshConfigStrategy.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/config/strategy/HostSshConfigStrategy.java similarity index 81% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/config/strategy/HostSshConfigStrategy.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/config/strategy/HostSshConfigStrategy.java index ae4db016..0221eb41 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/config/strategy/HostSshConfigStrategy.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/config/strategy/HostSshConfigStrategy.java @@ -13,22 +13,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.config.strategy; +package org.dromara.visor.module.asset.handler.host.config.strategy; -import com.orion.lang.utils.Booleans; -import com.orion.lang.utils.Charsets; -import com.orion.lang.utils.Exceptions; -import com.orion.lang.utils.Strings; -import com.orion.visor.framework.common.constant.Const; -import com.orion.visor.framework.common.constant.ErrorMessage; -import com.orion.visor.framework.common.handler.data.strategy.AbstractGenericsDataStrategy; -import com.orion.visor.framework.common.security.PasswordModifier; -import com.orion.visor.framework.common.utils.Valid; -import com.orion.visor.module.asset.dao.HostIdentityDAO; -import com.orion.visor.module.asset.dao.HostKeyDAO; -import com.orion.visor.module.asset.enums.HostSshAuthTypeEnum; -import com.orion.visor.module.asset.enums.HostSshOsTypeEnum; -import com.orion.visor.module.asset.handler.host.config.model.HostSshConfigModel; +import cn.orionsec.kit.lang.utils.Booleans; +import cn.orionsec.kit.lang.utils.Charsets; +import cn.orionsec.kit.lang.utils.Exceptions; +import cn.orionsec.kit.lang.utils.Strings; +import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.framework.common.constant.ErrorMessage; +import org.dromara.visor.framework.common.handler.data.strategy.AbstractGenericsDataStrategy; +import org.dromara.visor.framework.common.security.PasswordModifier; +import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.module.asset.dao.HostIdentityDAO; +import org.dromara.visor.module.asset.dao.HostKeyDAO; +import org.dromara.visor.module.asset.enums.HostSshAuthTypeEnum; +import org.dromara.visor.module.asset.enums.HostSshOsTypeEnum; +import org.dromara.visor.module.asset.handler.host.config.model.HostSshConfigModel; import org.springframework.stereotype.Component; import javax.annotation.Resource; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/command/ExecTaskExecutors.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/exec/command/ExecTaskExecutors.java similarity index 76% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/command/ExecTaskExecutors.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/exec/command/ExecTaskExecutors.java index 27815f84..8e5889ec 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/command/ExecTaskExecutors.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/exec/command/ExecTaskExecutors.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.exec.command; +package org.dromara.visor.module.asset.handler.host.exec.command; -import com.orion.visor.module.asset.define.AssetThreadPools; -import com.orion.visor.module.asset.handler.host.exec.command.handler.ExecTaskHandler; -import com.orion.visor.module.asset.handler.host.exec.command.model.ExecCommandDTO; +import org.dromara.visor.module.asset.define.AssetThreadPools; +import org.dromara.visor.module.asset.handler.host.exec.command.handler.ExecTaskHandler; +import org.dromara.visor.module.asset.handler.host.exec.command.model.ExecCommandDTO; /** * 批量执行命令执行器 diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/command/handler/BaseExecCommandHandler.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/exec/command/handler/BaseExecCommandHandler.java similarity index 86% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/command/handler/BaseExecCommandHandler.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/exec/command/handler/BaseExecCommandHandler.java index c0331d4b..27854dcc 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/command/handler/BaseExecCommandHandler.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/exec/command/handler/BaseExecCommandHandler.java @@ -13,37 +13,37 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.exec.command.handler; +package org.dromara.visor.module.asset.handler.host.exec.command.handler; +import cn.orionsec.kit.lang.exception.AuthenticationException; +import cn.orionsec.kit.lang.exception.ConnectionRuntimeException; +import cn.orionsec.kit.lang.exception.SftpException; +import cn.orionsec.kit.lang.support.timeout.TimeoutChecker; +import cn.orionsec.kit.lang.support.timeout.TimeoutEndpoint; +import cn.orionsec.kit.lang.utils.Booleans; +import cn.orionsec.kit.lang.utils.Exceptions; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.ansi.AnsiAppender; +import cn.orionsec.kit.lang.utils.io.Streams; +import cn.orionsec.kit.net.host.SessionStore; +import cn.orionsec.kit.net.host.sftp.SftpExecutor; +import cn.orionsec.kit.net.host.ssh.command.CommandExecutor; +import cn.orionsec.kit.spring.SpringHolder; import com.alibaba.fastjson.JSON; -import com.orion.lang.exception.AuthenticationException; -import com.orion.lang.exception.ConnectionRuntimeException; -import com.orion.lang.exception.SftpException; -import com.orion.lang.support.timeout.TimeoutChecker; -import com.orion.lang.support.timeout.TimeoutEndpoint; -import com.orion.lang.utils.Booleans; -import com.orion.lang.utils.Exceptions; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.ansi.AnsiAppender; -import com.orion.lang.utils.io.Streams; -import com.orion.net.host.SessionStore; -import com.orion.net.host.sftp.SftpExecutor; -import com.orion.net.host.ssh.command.CommandExecutor; -import com.orion.spring.SpringHolder; -import com.orion.visor.framework.common.constant.ErrorMessage; -import com.orion.visor.framework.common.file.FileClient; -import com.orion.visor.framework.common.utils.PathUtils; -import com.orion.visor.module.asset.dao.ExecHostLogDAO; -import com.orion.visor.module.asset.entity.domain.ExecHostLogDO; -import com.orion.visor.module.asset.entity.dto.TerminalConnectDTO; -import com.orion.visor.module.asset.enums.ExecHostStatusEnum; -import com.orion.visor.module.asset.handler.host.exec.command.model.ExecCommandDTO; -import com.orion.visor.module.asset.handler.host.exec.command.model.ExecCommandHostDTO; -import com.orion.visor.module.asset.handler.host.exec.log.manager.ExecLogManager; -import com.orion.visor.module.asset.handler.host.jsch.SessionStores; -import com.orion.visor.module.asset.service.TerminalService; import lombok.Getter; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.common.constant.ErrorMessage; +import org.dromara.visor.framework.common.file.FileClient; +import org.dromara.visor.framework.common.utils.PathUtils; +import org.dromara.visor.module.asset.dao.ExecHostLogDAO; +import org.dromara.visor.module.asset.entity.domain.ExecHostLogDO; +import org.dromara.visor.module.asset.entity.dto.TerminalConnectDTO; +import org.dromara.visor.module.asset.enums.ExecHostStatusEnum; +import org.dromara.visor.module.asset.handler.host.exec.command.model.ExecCommandDTO; +import org.dromara.visor.module.asset.handler.host.exec.command.model.ExecCommandHostDTO; +import org.dromara.visor.module.asset.handler.host.exec.log.manager.ExecLogManager; +import org.dromara.visor.module.asset.handler.host.jsch.SessionStores; +import org.dromara.visor.module.asset.service.TerminalService; import java.io.IOException; import java.io.OutputStream; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/command/handler/ExecCommandAnsiHandler.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/exec/command/handler/ExecCommandAnsiHandler.java similarity index 91% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/command/handler/ExecCommandAnsiHandler.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/exec/command/handler/ExecCommandAnsiHandler.java index e9640e0c..7be56f3c 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/command/handler/ExecCommandAnsiHandler.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/exec/command/handler/ExecCommandAnsiHandler.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.exec.command.handler; +package org.dromara.visor.module.asset.handler.host.exec.command.handler; -import com.orion.lang.support.timeout.TimeoutChecker; -import com.orion.lang.support.timeout.TimeoutEndpoint; -import com.orion.lang.utils.Booleans; -import com.orion.lang.utils.ansi.AnsiAppender; -import com.orion.lang.utils.ansi.style.color.AnsiForeground; -import com.orion.lang.utils.time.Dates; -import com.orion.net.host.ssh.ExitCode; -import com.orion.visor.framework.common.constant.Const; -import com.orion.visor.module.asset.enums.ExecHostStatusEnum; -import com.orion.visor.module.asset.handler.host.exec.command.model.ExecCommandDTO; -import com.orion.visor.module.asset.handler.host.exec.command.model.ExecCommandHostDTO; +import cn.orionsec.kit.lang.support.timeout.TimeoutChecker; +import cn.orionsec.kit.lang.support.timeout.TimeoutEndpoint; +import cn.orionsec.kit.lang.utils.Booleans; +import cn.orionsec.kit.lang.utils.ansi.AnsiAppender; +import cn.orionsec.kit.lang.utils.ansi.style.color.AnsiForeground; +import cn.orionsec.kit.lang.utils.time.Dates; +import cn.orionsec.kit.net.host.ssh.ExitCode; +import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.module.asset.enums.ExecHostStatusEnum; +import org.dromara.visor.module.asset.handler.host.exec.command.model.ExecCommandDTO; +import org.dromara.visor.module.asset.handler.host.exec.command.model.ExecCommandHostDTO; /** * 命令执行器 ansi 日志输出 diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/command/handler/ExecCommandOriginHandler.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/exec/command/handler/ExecCommandOriginHandler.java similarity index 74% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/command/handler/ExecCommandOriginHandler.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/exec/command/handler/ExecCommandOriginHandler.java index 26cc036b..b00a817e 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/command/handler/ExecCommandOriginHandler.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/exec/command/handler/ExecCommandOriginHandler.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.exec.command.handler; +package org.dromara.visor.module.asset.handler.host.exec.command.handler; -import com.orion.lang.support.timeout.TimeoutChecker; -import com.orion.lang.support.timeout.TimeoutEndpoint; -import com.orion.visor.module.asset.handler.host.exec.command.model.ExecCommandDTO; -import com.orion.visor.module.asset.handler.host.exec.command.model.ExecCommandHostDTO; +import cn.orionsec.kit.lang.support.timeout.TimeoutChecker; +import cn.orionsec.kit.lang.support.timeout.TimeoutEndpoint; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.module.asset.handler.host.exec.command.model.ExecCommandDTO; +import org.dromara.visor.module.asset.handler.host.exec.command.model.ExecCommandHostDTO; /** * 命令执行器 原始日志输出 diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/command/handler/ExecTaskHandler.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/exec/command/handler/ExecTaskHandler.java similarity index 82% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/command/handler/ExecTaskHandler.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/exec/command/handler/ExecTaskHandler.java index ea3f97b9..b28779d7 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/command/handler/ExecTaskHandler.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/exec/command/handler/ExecTaskHandler.java @@ -13,33 +13,33 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.exec.command.handler; +package org.dromara.visor.module.asset.handler.host.exec.command.handler; -import com.orion.lang.support.timeout.TimeoutChecker; -import com.orion.lang.support.timeout.TimeoutCheckers; -import com.orion.lang.support.timeout.TimeoutEndpoint; -import com.orion.lang.utils.Booleans; -import com.orion.lang.utils.Threads; -import com.orion.lang.utils.collect.Lists; -import com.orion.lang.utils.io.Streams; -import com.orion.lang.utils.time.Dates; -import com.orion.net.host.ssh.ExitCode; -import com.orion.spring.SpringHolder; -import com.orion.visor.framework.common.constant.ExtraFieldConst; -import com.orion.visor.module.asset.dao.ExecLogDAO; -import com.orion.visor.module.asset.define.AssetThreadPools; -import com.orion.visor.module.asset.define.config.AppExecLogConfig; -import com.orion.visor.module.asset.define.message.ExecMessageDefine; -import com.orion.visor.module.asset.entity.domain.ExecLogDO; -import com.orion.visor.module.asset.enums.ExecHostStatusEnum; -import com.orion.visor.module.asset.enums.ExecStatusEnum; -import com.orion.visor.module.asset.handler.host.exec.command.manager.ExecTaskManager; -import com.orion.visor.module.asset.handler.host.exec.command.model.ExecCommandDTO; -import com.orion.visor.module.asset.handler.host.exec.command.model.ExecCommandHostDTO; -import com.orion.visor.module.infra.api.SystemMessageApi; -import com.orion.visor.module.infra.entity.dto.message.SystemMessageDTO; +import cn.orionsec.kit.lang.support.timeout.TimeoutChecker; +import cn.orionsec.kit.lang.support.timeout.TimeoutCheckers; +import cn.orionsec.kit.lang.support.timeout.TimeoutEndpoint; +import cn.orionsec.kit.lang.utils.Booleans; +import cn.orionsec.kit.lang.utils.Threads; +import cn.orionsec.kit.lang.utils.collect.Lists; +import cn.orionsec.kit.lang.utils.io.Streams; +import cn.orionsec.kit.lang.utils.time.Dates; +import cn.orionsec.kit.net.host.ssh.ExitCode; +import cn.orionsec.kit.spring.SpringHolder; import lombok.Getter; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.common.constant.ExtraFieldConst; +import org.dromara.visor.module.asset.dao.ExecLogDAO; +import org.dromara.visor.module.asset.define.AssetThreadPools; +import org.dromara.visor.module.asset.define.config.AppExecLogConfig; +import org.dromara.visor.module.asset.define.message.ExecMessageDefine; +import org.dromara.visor.module.asset.entity.domain.ExecLogDO; +import org.dromara.visor.module.asset.enums.ExecHostStatusEnum; +import org.dromara.visor.module.asset.enums.ExecStatusEnum; +import org.dromara.visor.module.asset.handler.host.exec.command.manager.ExecTaskManager; +import org.dromara.visor.module.asset.handler.host.exec.command.model.ExecCommandDTO; +import org.dromara.visor.module.asset.handler.host.exec.command.model.ExecCommandHostDTO; +import org.dromara.visor.module.infra.api.SystemMessageApi; +import org.dromara.visor.module.infra.entity.dto.message.SystemMessageDTO; import java.util.Date; import java.util.HashMap; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/command/handler/IExecCommandHandler.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/exec/command/handler/IExecCommandHandler.java similarity index 87% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/command/handler/IExecCommandHandler.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/exec/command/handler/IExecCommandHandler.java index 8254f74a..f8c9f51d 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/command/handler/IExecCommandHandler.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/exec/command/handler/IExecCommandHandler.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.exec.command.handler; +package org.dromara.visor.module.asset.handler.host.exec.command.handler; -import com.orion.lang.able.SafeCloseable; -import com.orion.visor.module.asset.enums.ExecHostStatusEnum; +import cn.orionsec.kit.lang.able.SafeCloseable; +import org.dromara.visor.module.asset.enums.ExecHostStatusEnum; /** * 命令执行器定义 diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/command/handler/IExecTaskHandler.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/exec/command/handler/IExecTaskHandler.java similarity index 89% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/command/handler/IExecTaskHandler.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/exec/command/handler/IExecTaskHandler.java index efebd9e0..34bc2fe2 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/command/handler/IExecTaskHandler.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/exec/command/handler/IExecTaskHandler.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.exec.command.handler; +package org.dromara.visor.module.asset.handler.host.exec.command.handler; -import com.orion.lang.able.SafeCloseable; +import cn.orionsec.kit.lang.able.SafeCloseable; import java.util.List; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/command/manager/ExecTaskManager.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/exec/command/manager/ExecTaskManager.java similarity index 90% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/command/manager/ExecTaskManager.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/exec/command/manager/ExecTaskManager.java index 5e02c147..60d478c0 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/command/manager/ExecTaskManager.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/exec/command/manager/ExecTaskManager.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.exec.command.manager; +package org.dromara.visor.module.asset.handler.host.exec.command.manager; -import com.orion.visor.module.asset.handler.host.exec.command.handler.IExecTaskHandler; +import org.dromara.visor.module.asset.handler.host.exec.command.handler.IExecTaskHandler; import org.springframework.stereotype.Component; import java.util.concurrent.ConcurrentHashMap; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/command/model/ExecCommandDTO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/exec/command/model/ExecCommandDTO.java similarity index 95% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/command/model/ExecCommandDTO.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/exec/command/model/ExecCommandDTO.java index 782ca4c4..f2d21282 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/command/model/ExecCommandDTO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/exec/command/model/ExecCommandDTO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.exec.command.model; +package org.dromara.visor.module.asset.handler.host.exec.command.model; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/command/model/ExecCommandHostDTO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/exec/command/model/ExecCommandHostDTO.java similarity index 95% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/command/model/ExecCommandHostDTO.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/exec/command/model/ExecCommandHostDTO.java index 2c7d6dbf..0812c837 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/command/model/ExecCommandHostDTO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/exec/command/model/ExecCommandHostDTO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.exec.command.model; +package org.dromara.visor.module.asset.handler.host.exec.command.model; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/job/ExecCommandJob.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/exec/job/ExecCommandJob.java similarity index 77% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/job/ExecCommandJob.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/exec/job/ExecCommandJob.java index 722064d3..18a6e1ee 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/job/ExecCommandJob.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/exec/job/ExecCommandJob.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.exec.job; +package org.dromara.visor.module.asset.handler.host.exec.job; -import com.orion.spring.SpringHolder; -import com.orion.visor.framework.biz.operator.log.core.utils.OperatorLogs; -import com.orion.visor.framework.common.constant.Const; -import com.orion.visor.framework.common.constant.FieldConst; -import com.orion.visor.module.asset.entity.request.exec.ExecJobTriggerRequest; -import com.orion.visor.module.asset.service.ExecJobService; +import cn.orionsec.kit.spring.SpringHolder; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; +import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.framework.common.constant.FieldConst; +import org.dromara.visor.module.asset.entity.request.exec.ExecJobTriggerRequest; +import org.dromara.visor.module.asset.service.ExecJobService; import org.quartz.Job; import org.quartz.JobExecutionContext; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/log/ExecLogTailHandler.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/exec/log/ExecLogTailHandler.java similarity index 82% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/log/ExecLogTailHandler.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/exec/log/ExecLogTailHandler.java index 1f18d1c2..2a2ebd6c 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/log/ExecLogTailHandler.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/exec/log/ExecLogTailHandler.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.exec.log; +package org.dromara.visor.module.asset.handler.host.exec.log; -import com.orion.lang.annotation.Keep; -import com.orion.visor.framework.common.constant.ExtraFieldConst; -import com.orion.visor.framework.common.file.FileClient; -import com.orion.visor.framework.websocket.core.utils.WebSockets; -import com.orion.visor.module.asset.define.AssetThreadPools; -import com.orion.visor.module.asset.entity.dto.ExecHostLogTailDTO; -import com.orion.visor.module.asset.entity.dto.ExecLogTailDTO; -import com.orion.visor.module.asset.handler.host.exec.log.constant.LogConst; -import com.orion.visor.module.asset.handler.host.exec.log.manager.ExecLogManager; -import com.orion.visor.module.asset.handler.host.exec.log.tracker.ExecLogTracker; +import cn.orionsec.kit.lang.annotation.Keep; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.common.constant.ExtraFieldConst; +import org.dromara.visor.framework.common.file.FileClient; +import org.dromara.visor.framework.websocket.core.utils.WebSockets; +import org.dromara.visor.module.asset.define.AssetThreadPools; +import org.dromara.visor.module.asset.entity.dto.ExecHostLogTailDTO; +import org.dromara.visor.module.asset.entity.dto.ExecLogTailDTO; +import org.dromara.visor.module.asset.handler.host.exec.log.constant.LogConst; +import org.dromara.visor.module.asset.handler.host.exec.log.manager.ExecLogManager; +import org.dromara.visor.module.asset.handler.host.exec.log.tracker.ExecLogTracker; import org.springframework.stereotype.Component; import org.springframework.web.socket.CloseStatus; import org.springframework.web.socket.TextMessage; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/log/constant/LogConst.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/exec/log/constant/LogConst.java similarity index 92% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/log/constant/LogConst.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/exec/log/constant/LogConst.java index 7747118c..827f4710 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/log/constant/LogConst.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/exec/log/constant/LogConst.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.exec.log.constant; +package org.dromara.visor.module.asset.handler.host.exec.log.constant; /** * 日志常量 diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/log/manager/ExecLogManager.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/exec/log/manager/ExecLogManager.java similarity index 91% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/log/manager/ExecLogManager.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/exec/log/manager/ExecLogManager.java index 5912901b..8fed5254 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/log/manager/ExecLogManager.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/exec/log/manager/ExecLogManager.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.exec.log.manager; +package org.dromara.visor.module.asset.handler.host.exec.log.manager; -import com.orion.lang.utils.Threads; -import com.orion.visor.framework.common.constant.Const; -import com.orion.visor.module.asset.handler.host.exec.log.tracker.IExecLogTracker; +import cn.orionsec.kit.lang.utils.Threads; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.module.asset.handler.host.exec.log.tracker.IExecLogTracker; import org.springframework.stereotype.Component; import java.util.List; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/log/tracker/ExecLogTracker.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/exec/log/tracker/ExecLogTracker.java similarity index 83% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/log/tracker/ExecLogTracker.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/exec/log/tracker/ExecLogTracker.java index a17cfed9..6c6ae814 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/log/tracker/ExecLogTracker.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/exec/log/tracker/ExecLogTracker.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.exec.log.tracker; +package org.dromara.visor.module.asset.handler.host.exec.log.tracker; -import com.orion.ext.tail.Tracker; -import com.orion.ext.tail.delay.DelayTrackerListener; -import com.orion.ext.tail.mode.FileNotFoundMode; -import com.orion.ext.tail.mode.FileOffsetMode; -import com.orion.spring.SpringHolder; -import com.orion.visor.framework.websocket.core.utils.WebSockets; -import com.orion.visor.module.asset.define.config.AppTrackerConfig; -import com.orion.visor.module.asset.entity.dto.ExecHostLogTailDTO; -import com.orion.visor.module.asset.handler.host.exec.log.constant.LogConst; +import cn.orionsec.kit.ext.tail.Tracker; +import cn.orionsec.kit.ext.tail.delay.DelayTrackerListener; +import cn.orionsec.kit.ext.tail.mode.FileNotFoundMode; +import cn.orionsec.kit.ext.tail.mode.FileOffsetMode; +import cn.orionsec.kit.spring.SpringHolder; import lombok.Getter; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.websocket.core.utils.WebSockets; +import org.dromara.visor.module.asset.define.config.AppTrackerConfig; +import org.dromara.visor.module.asset.entity.dto.ExecHostLogTailDTO; +import org.dromara.visor.module.asset.handler.host.exec.log.constant.LogConst; import org.springframework.web.socket.WebSocketSession; /** diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/log/tracker/IExecLogTracker.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/exec/log/tracker/IExecLogTracker.java similarity index 87% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/log/tracker/IExecLogTracker.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/exec/log/tracker/IExecLogTracker.java index 6a881ae3..47dd5816 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/log/tracker/IExecLogTracker.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/exec/log/tracker/IExecLogTracker.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.exec.log.tracker; +package org.dromara.visor.module.asset.handler.host.exec.log.tracker; -import com.orion.ext.tail.handler.DataHandler; -import com.orion.lang.able.SafeCloseable; +import cn.orionsec.kit.ext.tail.handler.DataHandler; +import cn.orionsec.kit.lang.able.SafeCloseable; /** * log tracker 定义 diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/extra/model/HostLabelExtraModel.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/extra/model/HostLabelExtraModel.java similarity index 88% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/extra/model/HostLabelExtraModel.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/extra/model/HostLabelExtraModel.java index 016cbd19..3129a66c 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/extra/model/HostLabelExtraModel.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/extra/model/HostLabelExtraModel.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.extra.model; +package org.dromara.visor.module.asset.handler.host.extra.model; -import com.orion.visor.framework.common.handler.data.model.GenericsDataModel; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.dromara.visor.framework.common.handler.data.model.GenericsDataModel; /** * 主机拓展信息 - 标签模型 diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/extra/model/HostSshExtraModel.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/extra/model/HostSshExtraModel.java similarity index 89% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/extra/model/HostSshExtraModel.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/extra/model/HostSshExtraModel.java index ff3ab45a..c5e9c6e2 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/extra/model/HostSshExtraModel.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/extra/model/HostSshExtraModel.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.extra.model; +package org.dromara.visor.module.asset.handler.host.extra.model; -import com.orion.visor.framework.common.handler.data.model.GenericsDataModel; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.dromara.visor.framework.common.handler.data.model.GenericsDataModel; /** * 主机拓展信息 - ssh 模型 diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/extra/strategy/HostLabelExtraStrategy.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/extra/strategy/HostLabelExtraStrategy.java similarity index 84% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/extra/strategy/HostLabelExtraStrategy.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/extra/strategy/HostLabelExtraStrategy.java index 0b1a2c96..f6c19678 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/extra/strategy/HostLabelExtraStrategy.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/extra/strategy/HostLabelExtraStrategy.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.extra.strategy; +package org.dromara.visor.module.asset.handler.host.extra.strategy; -import com.orion.visor.framework.common.constant.Const; -import com.orion.visor.framework.common.handler.data.strategy.AbstractGenericsDataStrategy; -import com.orion.visor.module.asset.handler.host.extra.model.HostLabelExtraModel; +import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.framework.common.handler.data.strategy.AbstractGenericsDataStrategy; +import org.dromara.visor.module.asset.handler.host.extra.model.HostLabelExtraModel; import org.springframework.stereotype.Component; /** diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/extra/strategy/HostSshExtraStrategy.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/extra/strategy/HostSshExtraStrategy.java similarity index 80% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/extra/strategy/HostSshExtraStrategy.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/extra/strategy/HostSshExtraStrategy.java index 0720feaa..9eb6f6ba 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/extra/strategy/HostSshExtraStrategy.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/extra/strategy/HostSshExtraStrategy.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.extra.strategy; +package org.dromara.visor.module.asset.handler.host.extra.strategy; -import com.orion.visor.framework.common.constant.ErrorMessage; -import com.orion.visor.framework.common.handler.data.strategy.AbstractGenericsDataStrategy; -import com.orion.visor.framework.common.utils.Valid; -import com.orion.visor.framework.security.core.utils.SecurityUtils; -import com.orion.visor.module.asset.dao.HostIdentityDAO; -import com.orion.visor.module.asset.dao.HostKeyDAO; -import com.orion.visor.module.asset.enums.HostExtraSshAuthTypeEnum; -import com.orion.visor.module.asset.handler.host.extra.model.HostSshExtraModel; -import com.orion.visor.module.infra.api.DataPermissionApi; -import com.orion.visor.module.infra.enums.DataPermissionTypeEnum; +import org.dromara.visor.framework.common.constant.ErrorMessage; +import org.dromara.visor.framework.common.handler.data.strategy.AbstractGenericsDataStrategy; +import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.framework.security.core.utils.SecurityUtils; +import org.dromara.visor.module.asset.dao.HostIdentityDAO; +import org.dromara.visor.module.asset.dao.HostKeyDAO; +import org.dromara.visor.module.asset.enums.HostExtraSshAuthTypeEnum; +import org.dromara.visor.module.asset.handler.host.extra.model.HostSshExtraModel; +import org.dromara.visor.module.infra.api.DataPermissionApi; +import org.dromara.visor.module.infra.enums.DataPermissionTypeEnum; import org.springframework.stereotype.Component; import javax.annotation.Resource; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/jsch/SessionMessage.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/jsch/SessionMessage.java similarity index 94% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/jsch/SessionMessage.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/jsch/SessionMessage.java index be90f668..2f2c750e 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/jsch/SessionMessage.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/jsch/SessionMessage.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.jsch; +package org.dromara.visor.module.asset.handler.host.jsch; /** * 连接消息 diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/jsch/SessionStores.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/jsch/SessionStores.java similarity index 88% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/jsch/SessionStores.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/jsch/SessionStores.java index 3bf24570..bbca6dbe 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/jsch/SessionStores.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/jsch/SessionStores.java @@ -13,20 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.jsch; +package org.dromara.visor.module.asset.handler.host.jsch; -import com.orion.lang.exception.AuthenticationException; -import com.orion.lang.exception.argument.InvalidArgumentException; -import com.orion.lang.utils.Exceptions; -import com.orion.lang.utils.Strings; -import com.orion.net.host.SessionHolder; -import com.orion.net.host.SessionLogger; -import com.orion.net.host.SessionStore; -import com.orion.visor.framework.common.constant.AppConst; -import com.orion.visor.framework.common.constant.Const; -import com.orion.visor.framework.common.utils.CryptoUtils; -import com.orion.visor.module.asset.entity.dto.TerminalConnectDTO; +import cn.orionsec.kit.lang.exception.AuthenticationException; +import cn.orionsec.kit.lang.exception.argument.InvalidArgumentException; +import cn.orionsec.kit.lang.utils.Exceptions; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.net.host.SessionHolder; +import cn.orionsec.kit.net.host.SessionLogger; +import cn.orionsec.kit.net.host.SessionStore; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.common.constant.AppConst; +import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.framework.common.utils.CryptoUtils; +import org.dromara.visor.module.asset.entity.dto.TerminalConnectDTO; import java.util.Optional; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/TerminalMessageDispatcher.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/TerminalMessageDispatcher.java similarity index 90% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/TerminalMessageDispatcher.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/TerminalMessageDispatcher.java index c8d53cf4..3c9fbd3b 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/TerminalMessageDispatcher.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/TerminalMessageDispatcher.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.terminal; +package org.dromara.visor.module.asset.handler.host.terminal; -import com.orion.visor.module.asset.define.AssetThreadPools; -import com.orion.visor.module.asset.handler.host.terminal.enums.InputTypeEnum; -import com.orion.visor.module.asset.handler.host.terminal.manager.TerminalManager; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.module.asset.define.AssetThreadPools; +import org.dromara.visor.module.asset.handler.host.terminal.enums.InputTypeEnum; +import org.dromara.visor.module.asset.handler.host.terminal.manager.TerminalManager; import org.springframework.stereotype.Component; import org.springframework.web.socket.CloseStatus; import org.springframework.web.socket.TextMessage; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/constant/TerminalMessage.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/constant/TerminalMessage.java similarity index 94% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/constant/TerminalMessage.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/constant/TerminalMessage.java index b0052458..0fd61a02 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/constant/TerminalMessage.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/constant/TerminalMessage.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.terminal.constant; +package org.dromara.visor.module.asset.handler.host.terminal.constant; /** * 终端信息常量 diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/enums/InputTypeEnum.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/enums/InputTypeEnum.java similarity index 95% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/enums/InputTypeEnum.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/enums/InputTypeEnum.java index d83b0059..4b0a3299 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/enums/InputTypeEnum.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/enums/InputTypeEnum.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.terminal.enums; +package org.dromara.visor.module.asset.handler.host.terminal.enums; +import cn.orionsec.kit.spring.SpringHolder; import com.alibaba.fastjson.JSONObject; -import com.orion.spring.SpringHolder; -import com.orion.visor.module.asset.handler.host.terminal.handler.*; -import com.orion.visor.module.asset.handler.host.terminal.model.TerminalBasePayload; -import com.orion.visor.module.asset.handler.host.terminal.model.request.*; import lombok.Getter; +import org.dromara.visor.module.asset.handler.host.terminal.handler.*; +import org.dromara.visor.module.asset.handler.host.terminal.model.TerminalBasePayload; +import org.dromara.visor.module.asset.handler.host.terminal.model.request.*; import org.springframework.stereotype.Component; import javax.annotation.PostConstruct; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/enums/OutputTypeEnum.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/enums/OutputTypeEnum.java similarity index 95% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/enums/OutputTypeEnum.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/enums/OutputTypeEnum.java index 71ac0887..457ae146 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/enums/OutputTypeEnum.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/enums/OutputTypeEnum.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.terminal.enums; +package org.dromara.visor.module.asset.handler.host.terminal.enums; -import com.orion.lang.utils.json.matcher.ReplacementFormatters; +import cn.orionsec.kit.lang.utils.json.matcher.ReplacementFormatters; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/handler/AbstractTerminalHandler.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/AbstractTerminalHandler.java similarity index 77% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/handler/AbstractTerminalHandler.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/AbstractTerminalHandler.java index 3b7119ea..2245a001 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/handler/AbstractTerminalHandler.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/AbstractTerminalHandler.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.terminal.handler; +package org.dromara.visor.module.asset.handler.host.terminal.handler; -import com.orion.visor.framework.biz.operator.log.core.model.OperatorLogModel; -import com.orion.visor.framework.biz.operator.log.core.service.OperatorLogFrameworkService; -import com.orion.visor.framework.biz.operator.log.core.utils.OperatorLogs; -import com.orion.visor.framework.common.constant.ErrorMessage; -import com.orion.visor.framework.websocket.core.utils.WebSockets; -import com.orion.visor.module.asset.handler.host.terminal.enums.OutputTypeEnum; -import com.orion.visor.module.asset.handler.host.terminal.manager.TerminalManager; -import com.orion.visor.module.asset.handler.host.terminal.model.TerminalBasePayload; -import com.orion.visor.module.asset.handler.host.terminal.model.TerminalConfig; -import com.orion.visor.module.asset.handler.host.terminal.session.ITerminalSession; -import com.orion.visor.module.asset.handler.host.terminal.utils.TerminalUtils; +import org.dromara.visor.framework.biz.operator.log.core.model.OperatorLogModel; +import org.dromara.visor.framework.biz.operator.log.core.service.OperatorLogFrameworkService; +import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; +import org.dromara.visor.framework.common.constant.ErrorMessage; +import org.dromara.visor.framework.websocket.core.utils.WebSockets; +import org.dromara.visor.module.asset.handler.host.terminal.enums.OutputTypeEnum; +import org.dromara.visor.module.asset.handler.host.terminal.manager.TerminalManager; +import org.dromara.visor.module.asset.handler.host.terminal.model.TerminalBasePayload; +import org.dromara.visor.module.asset.handler.host.terminal.model.TerminalConfig; +import org.dromara.visor.module.asset.handler.host.terminal.session.ITerminalSession; +import org.dromara.visor.module.asset.handler.host.terminal.utils.TerminalUtils; import org.springframework.web.socket.WebSocketSession; import javax.annotation.Resource; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/handler/ITerminalHandler.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/ITerminalHandler.java similarity index 86% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/handler/ITerminalHandler.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/ITerminalHandler.java index 4a7899af..b745a5d9 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/handler/ITerminalHandler.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/ITerminalHandler.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.terminal.handler; +package org.dromara.visor.module.asset.handler.host.terminal.handler; -import com.orion.visor.module.asset.handler.host.terminal.model.TerminalBasePayload; +import org.dromara.visor.module.asset.handler.host.terminal.model.TerminalBasePayload; import org.springframework.web.socket.WebSocketSession; /** diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/handler/SftpChangeModeHandler.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/SftpChangeModeHandler.java similarity index 78% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/handler/SftpChangeModeHandler.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/SftpChangeModeHandler.java index 57f10aea..60cc615e 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/handler/SftpChangeModeHandler.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/SftpChangeModeHandler.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.terminal.handler; +package org.dromara.visor.module.asset.handler.host.terminal.handler; -import com.orion.lang.utils.collect.Maps; -import com.orion.visor.framework.biz.operator.log.core.utils.OperatorLogs; -import com.orion.visor.framework.common.enums.BooleanBit; -import com.orion.visor.module.asset.define.operator.TerminalOperatorType; -import com.orion.visor.module.asset.handler.host.terminal.enums.OutputTypeEnum; -import com.orion.visor.module.asset.handler.host.terminal.model.request.SftpChangeModeRequest; -import com.orion.visor.module.asset.handler.host.terminal.model.response.SftpBaseResponse; -import com.orion.visor.module.asset.handler.host.terminal.session.ISftpSession; +import cn.orionsec.kit.lang.utils.collect.Maps; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; +import org.dromara.visor.framework.common.enums.BooleanBit; +import org.dromara.visor.module.asset.define.operator.TerminalOperatorType; +import org.dromara.visor.module.asset.handler.host.terminal.enums.OutputTypeEnum; +import org.dromara.visor.module.asset.handler.host.terminal.model.request.SftpChangeModeRequest; +import org.dromara.visor.module.asset.handler.host.terminal.model.response.SftpBaseResponse; +import org.dromara.visor.module.asset.handler.host.terminal.session.ISftpSession; import org.springframework.stereotype.Component; import org.springframework.web.socket.WebSocketSession; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/handler/SftpDownloadFlatDirectoryHandler.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/SftpDownloadFlatDirectoryHandler.java similarity index 79% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/handler/SftpDownloadFlatDirectoryHandler.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/SftpDownloadFlatDirectoryHandler.java index 2dd4e1ba..b2cc6315 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/handler/SftpDownloadFlatDirectoryHandler.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/SftpDownloadFlatDirectoryHandler.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.terminal.handler; +package org.dromara.visor.module.asset.handler.host.terminal.handler; +import cn.orionsec.kit.lang.utils.collect.Lists; import com.alibaba.fastjson.JSON; -import com.orion.lang.utils.collect.Lists; -import com.orion.visor.framework.common.enums.BooleanBit; -import com.orion.visor.module.asset.handler.host.terminal.enums.OutputTypeEnum; -import com.orion.visor.module.asset.handler.host.terminal.model.request.SftpDownloadFlatDirectoryRequest; -import com.orion.visor.module.asset.handler.host.terminal.model.response.SftpDownloadFlatDirectoryResponse; -import com.orion.visor.module.asset.handler.host.terminal.model.response.SftpFileVO; -import com.orion.visor.module.asset.handler.host.terminal.session.ISftpSession; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.common.enums.BooleanBit; +import org.dromara.visor.module.asset.handler.host.terminal.enums.OutputTypeEnum; +import org.dromara.visor.module.asset.handler.host.terminal.model.request.SftpDownloadFlatDirectoryRequest; +import org.dromara.visor.module.asset.handler.host.terminal.model.response.SftpDownloadFlatDirectoryResponse; +import org.dromara.visor.module.asset.handler.host.terminal.model.response.SftpFileVO; +import org.dromara.visor.module.asset.handler.host.terminal.session.ISftpSession; import org.springframework.stereotype.Component; import org.springframework.web.socket.WebSocketSession; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/handler/SftpGetContentHandler.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/SftpGetContentHandler.java similarity index 78% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/handler/SftpGetContentHandler.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/SftpGetContentHandler.java index 40ef3d17..58b45c75 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/handler/SftpGetContentHandler.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/SftpGetContentHandler.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.terminal.handler; +package org.dromara.visor.module.asset.handler.host.terminal.handler; -import com.orion.lang.id.UUIds; -import com.orion.visor.framework.common.enums.BooleanBit; -import com.orion.visor.framework.redis.core.utils.RedisStrings; -import com.orion.visor.module.asset.define.cache.TerminalCacheKeyDefine; -import com.orion.visor.module.asset.entity.dto.SftpGetContentCacheDTO; -import com.orion.visor.module.asset.handler.host.terminal.enums.OutputTypeEnum; -import com.orion.visor.module.asset.handler.host.terminal.model.request.SftpBaseRequest; -import com.orion.visor.module.asset.handler.host.terminal.model.response.SftpGetContentResponse; -import com.orion.visor.module.asset.handler.host.terminal.session.ISftpSession; +import cn.orionsec.kit.lang.id.UUIds; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.common.enums.BooleanBit; +import org.dromara.visor.framework.redis.core.utils.RedisStrings; +import org.dromara.visor.module.asset.define.cache.TerminalCacheKeyDefine; +import org.dromara.visor.module.asset.entity.dto.SftpGetContentCacheDTO; +import org.dromara.visor.module.asset.handler.host.terminal.enums.OutputTypeEnum; +import org.dromara.visor.module.asset.handler.host.terminal.model.request.SftpBaseRequest; +import org.dromara.visor.module.asset.handler.host.terminal.model.response.SftpGetContentResponse; +import org.dromara.visor.module.asset.handler.host.terminal.session.ISftpSession; import org.springframework.stereotype.Component; import org.springframework.web.socket.WebSocketSession; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/handler/SftpListHandler.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/SftpListHandler.java similarity index 80% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/handler/SftpListHandler.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/SftpListHandler.java index 60d7c0de..c1113d48 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/handler/SftpListHandler.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/SftpListHandler.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.terminal.handler; +package org.dromara.visor.module.asset.handler.host.terminal.handler; +import cn.orionsec.kit.lang.utils.collect.Lists; import com.alibaba.fastjson.JSON; -import com.orion.lang.utils.collect.Lists; -import com.orion.visor.framework.common.enums.BooleanBit; -import com.orion.visor.module.asset.handler.host.terminal.enums.OutputTypeEnum; -import com.orion.visor.module.asset.handler.host.terminal.model.request.SftpListRequest; -import com.orion.visor.module.asset.handler.host.terminal.model.response.SftpFileVO; -import com.orion.visor.module.asset.handler.host.terminal.model.response.SftpListResponse; -import com.orion.visor.module.asset.handler.host.terminal.session.ISftpSession; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.common.enums.BooleanBit; +import org.dromara.visor.module.asset.handler.host.terminal.enums.OutputTypeEnum; +import org.dromara.visor.module.asset.handler.host.terminal.model.request.SftpListRequest; +import org.dromara.visor.module.asset.handler.host.terminal.model.response.SftpFileVO; +import org.dromara.visor.module.asset.handler.host.terminal.model.response.SftpListResponse; +import org.dromara.visor.module.asset.handler.host.terminal.session.ISftpSession; import org.springframework.stereotype.Component; import org.springframework.web.socket.WebSocketSession; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/handler/SftpMakeDirectoryHandler.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/SftpMakeDirectoryHandler.java similarity index 78% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/handler/SftpMakeDirectoryHandler.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/SftpMakeDirectoryHandler.java index 7a58da44..83407448 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/handler/SftpMakeDirectoryHandler.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/SftpMakeDirectoryHandler.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.terminal.handler; +package org.dromara.visor.module.asset.handler.host.terminal.handler; -import com.orion.lang.utils.collect.Maps; -import com.orion.visor.framework.biz.operator.log.core.utils.OperatorLogs; -import com.orion.visor.framework.common.enums.BooleanBit; -import com.orion.visor.module.asset.define.operator.TerminalOperatorType; -import com.orion.visor.module.asset.handler.host.terminal.enums.OutputTypeEnum; -import com.orion.visor.module.asset.handler.host.terminal.model.request.SftpBaseRequest; -import com.orion.visor.module.asset.handler.host.terminal.model.response.SftpBaseResponse; -import com.orion.visor.module.asset.handler.host.terminal.session.ISftpSession; +import cn.orionsec.kit.lang.utils.collect.Maps; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; +import org.dromara.visor.framework.common.enums.BooleanBit; +import org.dromara.visor.module.asset.define.operator.TerminalOperatorType; +import org.dromara.visor.module.asset.handler.host.terminal.enums.OutputTypeEnum; +import org.dromara.visor.module.asset.handler.host.terminal.model.request.SftpBaseRequest; +import org.dromara.visor.module.asset.handler.host.terminal.model.response.SftpBaseResponse; +import org.dromara.visor.module.asset.handler.host.terminal.session.ISftpSession; import org.springframework.stereotype.Component; import org.springframework.web.socket.WebSocketSession; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/handler/SftpMoveHandler.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/SftpMoveHandler.java similarity index 78% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/handler/SftpMoveHandler.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/SftpMoveHandler.java index e24f3e74..86a768d3 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/handler/SftpMoveHandler.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/SftpMoveHandler.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.terminal.handler; +package org.dromara.visor.module.asset.handler.host.terminal.handler; -import com.orion.lang.utils.collect.Maps; -import com.orion.visor.framework.biz.operator.log.core.utils.OperatorLogs; -import com.orion.visor.framework.common.enums.BooleanBit; -import com.orion.visor.module.asset.define.operator.TerminalOperatorType; -import com.orion.visor.module.asset.handler.host.terminal.enums.OutputTypeEnum; -import com.orion.visor.module.asset.handler.host.terminal.model.request.SftpMoveRequest; -import com.orion.visor.module.asset.handler.host.terminal.model.response.SftpBaseResponse; -import com.orion.visor.module.asset.handler.host.terminal.session.ISftpSession; +import cn.orionsec.kit.lang.utils.collect.Maps; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; +import org.dromara.visor.framework.common.enums.BooleanBit; +import org.dromara.visor.module.asset.define.operator.TerminalOperatorType; +import org.dromara.visor.module.asset.handler.host.terminal.enums.OutputTypeEnum; +import org.dromara.visor.module.asset.handler.host.terminal.model.request.SftpMoveRequest; +import org.dromara.visor.module.asset.handler.host.terminal.model.response.SftpBaseResponse; +import org.dromara.visor.module.asset.handler.host.terminal.session.ISftpSession; import org.springframework.stereotype.Component; import org.springframework.web.socket.WebSocketSession; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/handler/SftpRemoveHandler.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/SftpRemoveHandler.java similarity index 78% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/handler/SftpRemoveHandler.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/SftpRemoveHandler.java index 294c9a29..30a1566a 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/handler/SftpRemoveHandler.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/SftpRemoveHandler.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.terminal.handler; +package org.dromara.visor.module.asset.handler.host.terminal.handler; -import com.orion.lang.utils.collect.Maps; -import com.orion.visor.framework.biz.operator.log.core.utils.OperatorLogs; -import com.orion.visor.framework.common.enums.BooleanBit; -import com.orion.visor.module.asset.define.operator.TerminalOperatorType; -import com.orion.visor.module.asset.handler.host.terminal.enums.OutputTypeEnum; -import com.orion.visor.module.asset.handler.host.terminal.model.request.SftpBaseRequest; -import com.orion.visor.module.asset.handler.host.terminal.model.response.SftpBaseResponse; -import com.orion.visor.module.asset.handler.host.terminal.session.ISftpSession; +import cn.orionsec.kit.lang.utils.collect.Maps; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; +import org.dromara.visor.framework.common.enums.BooleanBit; +import org.dromara.visor.module.asset.define.operator.TerminalOperatorType; +import org.dromara.visor.module.asset.handler.host.terminal.enums.OutputTypeEnum; +import org.dromara.visor.module.asset.handler.host.terminal.model.request.SftpBaseRequest; +import org.dromara.visor.module.asset.handler.host.terminal.model.response.SftpBaseResponse; +import org.dromara.visor.module.asset.handler.host.terminal.session.ISftpSession; import org.springframework.stereotype.Component; import org.springframework.web.socket.WebSocketSession; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/handler/SftpSetContentHandler.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/SftpSetContentHandler.java similarity index 75% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/handler/SftpSetContentHandler.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/SftpSetContentHandler.java index 6f3d4ec4..3e36a9ef 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/handler/SftpSetContentHandler.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/SftpSetContentHandler.java @@ -13,21 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.terminal.handler; +package org.dromara.visor.module.asset.handler.host.terminal.handler; -import com.orion.lang.id.UUIds; -import com.orion.lang.utils.collect.Maps; -import com.orion.visor.framework.biz.operator.log.core.utils.OperatorLogs; -import com.orion.visor.framework.common.enums.BooleanBit; -import com.orion.visor.framework.redis.core.utils.RedisStrings; -import com.orion.visor.module.asset.define.cache.TerminalCacheKeyDefine; -import com.orion.visor.module.asset.define.operator.TerminalOperatorType; -import com.orion.visor.module.asset.entity.dto.SftpSetContentCacheDTO; -import com.orion.visor.module.asset.handler.host.terminal.enums.OutputTypeEnum; -import com.orion.visor.module.asset.handler.host.terminal.model.request.SftpBaseRequest; -import com.orion.visor.module.asset.handler.host.terminal.model.response.SftpSetContentResponse; -import com.orion.visor.module.asset.handler.host.terminal.session.ISftpSession; +import cn.orionsec.kit.lang.id.UUIds; +import cn.orionsec.kit.lang.utils.collect.Maps; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; +import org.dromara.visor.framework.common.enums.BooleanBit; +import org.dromara.visor.framework.redis.core.utils.RedisStrings; +import org.dromara.visor.module.asset.define.cache.TerminalCacheKeyDefine; +import org.dromara.visor.module.asset.define.operator.TerminalOperatorType; +import org.dromara.visor.module.asset.entity.dto.SftpSetContentCacheDTO; +import org.dromara.visor.module.asset.handler.host.terminal.enums.OutputTypeEnum; +import org.dromara.visor.module.asset.handler.host.terminal.model.request.SftpBaseRequest; +import org.dromara.visor.module.asset.handler.host.terminal.model.response.SftpSetContentResponse; +import org.dromara.visor.module.asset.handler.host.terminal.session.ISftpSession; import org.springframework.stereotype.Component; import org.springframework.web.socket.WebSocketSession; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/handler/SftpTouchHandler.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/SftpTouchHandler.java similarity index 77% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/handler/SftpTouchHandler.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/SftpTouchHandler.java index cc5a1c5e..cc1459d7 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/handler/SftpTouchHandler.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/SftpTouchHandler.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.terminal.handler; +package org.dromara.visor.module.asset.handler.host.terminal.handler; -import com.orion.lang.utils.collect.Maps; -import com.orion.visor.framework.biz.operator.log.core.utils.OperatorLogs; -import com.orion.visor.framework.common.enums.BooleanBit; -import com.orion.visor.module.asset.define.operator.TerminalOperatorType; -import com.orion.visor.module.asset.handler.host.terminal.enums.OutputTypeEnum; -import com.orion.visor.module.asset.handler.host.terminal.model.request.SftpBaseRequest; -import com.orion.visor.module.asset.handler.host.terminal.model.response.SftpBaseResponse; -import com.orion.visor.module.asset.handler.host.terminal.session.ISftpSession; +import cn.orionsec.kit.lang.utils.collect.Maps; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; +import org.dromara.visor.framework.common.enums.BooleanBit; +import org.dromara.visor.module.asset.define.operator.TerminalOperatorType; +import org.dromara.visor.module.asset.handler.host.terminal.enums.OutputTypeEnum; +import org.dromara.visor.module.asset.handler.host.terminal.model.request.SftpBaseRequest; +import org.dromara.visor.module.asset.handler.host.terminal.model.response.SftpBaseResponse; +import org.dromara.visor.module.asset.handler.host.terminal.session.ISftpSession; import org.springframework.stereotype.Component; import org.springframework.web.socket.WebSocketSession; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/handler/SftpTruncateHandler.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/SftpTruncateHandler.java similarity index 78% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/handler/SftpTruncateHandler.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/SftpTruncateHandler.java index 386648e8..efc37181 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/handler/SftpTruncateHandler.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/SftpTruncateHandler.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.terminal.handler; +package org.dromara.visor.module.asset.handler.host.terminal.handler; -import com.orion.lang.utils.collect.Maps; -import com.orion.visor.framework.biz.operator.log.core.utils.OperatorLogs; -import com.orion.visor.framework.common.enums.BooleanBit; -import com.orion.visor.module.asset.define.operator.TerminalOperatorType; -import com.orion.visor.module.asset.handler.host.terminal.enums.OutputTypeEnum; -import com.orion.visor.module.asset.handler.host.terminal.model.request.SftpBaseRequest; -import com.orion.visor.module.asset.handler.host.terminal.model.response.SftpBaseResponse; -import com.orion.visor.module.asset.handler.host.terminal.session.ISftpSession; +import cn.orionsec.kit.lang.utils.collect.Maps; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; +import org.dromara.visor.framework.common.enums.BooleanBit; +import org.dromara.visor.module.asset.define.operator.TerminalOperatorType; +import org.dromara.visor.module.asset.handler.host.terminal.enums.OutputTypeEnum; +import org.dromara.visor.module.asset.handler.host.terminal.model.request.SftpBaseRequest; +import org.dromara.visor.module.asset.handler.host.terminal.model.response.SftpBaseResponse; +import org.dromara.visor.module.asset.handler.host.terminal.session.ISftpSession; import org.springframework.stereotype.Component; import org.springframework.web.socket.WebSocketSession; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/handler/SshInputHandler.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/SshInputHandler.java similarity index 84% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/handler/SshInputHandler.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/SshInputHandler.java index bb4d2f11..bbebf1df 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/handler/SshInputHandler.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/SshInputHandler.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.terminal.handler; +package org.dromara.visor.module.asset.handler.host.terminal.handler; -import com.orion.visor.module.asset.handler.host.terminal.model.request.SshInputRequest; -import com.orion.visor.module.asset.handler.host.terminal.session.ISshSession; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.module.asset.handler.host.terminal.model.request.SshInputRequest; +import org.dromara.visor.module.asset.handler.host.terminal.session.ISshSession; import org.springframework.stereotype.Component; import org.springframework.web.socket.WebSocketSession; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/handler/SshResizeHandler.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/SshResizeHandler.java similarity index 84% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/handler/SshResizeHandler.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/SshResizeHandler.java index 9c61e521..00063109 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/handler/SshResizeHandler.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/SshResizeHandler.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.terminal.handler; +package org.dromara.visor.module.asset.handler.host.terminal.handler; -import com.orion.visor.module.asset.handler.host.terminal.model.request.SshResizeRequest; -import com.orion.visor.module.asset.handler.host.terminal.session.ISshSession; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.module.asset.handler.host.terminal.model.request.SshResizeRequest; +import org.dromara.visor.module.asset.handler.host.terminal.session.ISshSession; import org.springframework.stereotype.Component; import org.springframework.web.socket.WebSocketSession; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/handler/TerminalCheckHandler.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/TerminalCheckHandler.java similarity index 80% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/handler/TerminalCheckHandler.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/TerminalCheckHandler.java index ec614d45..f41aef13 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/handler/TerminalCheckHandler.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/TerminalCheckHandler.java @@ -13,36 +13,36 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.terminal.handler; +package org.dromara.visor.module.asset.handler.host.terminal.handler; -import com.orion.lang.exception.DisabledException; -import com.orion.lang.exception.argument.InvalidArgumentException; -import com.orion.lang.utils.Exceptions; -import com.orion.lang.utils.collect.Maps; -import com.orion.visor.framework.biz.operator.log.core.model.OperatorLogModel; -import com.orion.visor.framework.biz.operator.log.core.service.OperatorLogFrameworkService; -import com.orion.visor.framework.biz.operator.log.core.utils.OperatorLogs; -import com.orion.visor.framework.common.constant.ErrorMessage; -import com.orion.visor.framework.common.constant.ExtraFieldConst; -import com.orion.visor.framework.common.enums.BooleanBit; -import com.orion.visor.framework.websocket.core.utils.WebSockets; -import com.orion.visor.module.asset.dao.HostDAO; -import com.orion.visor.module.asset.define.operator.TerminalOperatorType; -import com.orion.visor.module.asset.entity.domain.HostDO; -import com.orion.visor.module.asset.entity.domain.TerminalConnectLogDO; -import com.orion.visor.module.asset.entity.dto.TerminalConnectDTO; -import com.orion.visor.module.asset.entity.request.host.TerminalConnectLogCreateRequest; -import com.orion.visor.module.asset.enums.TerminalConnectStatusEnum; -import com.orion.visor.module.asset.enums.TerminalConnectTypeEnum; -import com.orion.visor.module.asset.handler.host.terminal.constant.TerminalMessage; -import com.orion.visor.module.asset.handler.host.terminal.enums.OutputTypeEnum; -import com.orion.visor.module.asset.handler.host.terminal.model.request.TerminalCheckRequest; -import com.orion.visor.module.asset.handler.host.terminal.model.response.TerminalCheckResponse; -import com.orion.visor.module.asset.handler.host.terminal.session.ITerminalSession; -import com.orion.visor.module.asset.handler.host.terminal.utils.TerminalUtils; -import com.orion.visor.module.asset.service.TerminalConnectLogService; -import com.orion.visor.module.asset.service.TerminalService; +import cn.orionsec.kit.lang.exception.DisabledException; +import cn.orionsec.kit.lang.exception.argument.InvalidArgumentException; +import cn.orionsec.kit.lang.utils.Exceptions; +import cn.orionsec.kit.lang.utils.collect.Maps; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.biz.operator.log.core.model.OperatorLogModel; +import org.dromara.visor.framework.biz.operator.log.core.service.OperatorLogFrameworkService; +import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; +import org.dromara.visor.framework.common.constant.ErrorMessage; +import org.dromara.visor.framework.common.constant.ExtraFieldConst; +import org.dromara.visor.framework.common.enums.BooleanBit; +import org.dromara.visor.framework.websocket.core.utils.WebSockets; +import org.dromara.visor.module.asset.dao.HostDAO; +import org.dromara.visor.module.asset.define.operator.TerminalOperatorType; +import org.dromara.visor.module.asset.entity.domain.HostDO; +import org.dromara.visor.module.asset.entity.domain.TerminalConnectLogDO; +import org.dromara.visor.module.asset.entity.dto.TerminalConnectDTO; +import org.dromara.visor.module.asset.entity.request.host.TerminalConnectLogCreateRequest; +import org.dromara.visor.module.asset.enums.TerminalConnectStatusEnum; +import org.dromara.visor.module.asset.enums.TerminalConnectTypeEnum; +import org.dromara.visor.module.asset.handler.host.terminal.constant.TerminalMessage; +import org.dromara.visor.module.asset.handler.host.terminal.enums.OutputTypeEnum; +import org.dromara.visor.module.asset.handler.host.terminal.model.request.TerminalCheckRequest; +import org.dromara.visor.module.asset.handler.host.terminal.model.response.TerminalCheckResponse; +import org.dromara.visor.module.asset.handler.host.terminal.session.ITerminalSession; +import org.dromara.visor.module.asset.handler.host.terminal.utils.TerminalUtils; +import org.dromara.visor.module.asset.service.TerminalConnectLogService; +import org.dromara.visor.module.asset.service.TerminalService; import org.springframework.stereotype.Component; import org.springframework.web.socket.WebSocketSession; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/handler/TerminalCloseHandler.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/TerminalCloseHandler.java similarity index 89% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/handler/TerminalCloseHandler.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/TerminalCloseHandler.java index 797522af..b2e7de06 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/handler/TerminalCloseHandler.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/TerminalCloseHandler.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.terminal.handler; +package org.dromara.visor.module.asset.handler.host.terminal.handler; -import com.orion.visor.module.asset.handler.host.terminal.model.TerminalBasePayload; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.module.asset.handler.host.terminal.model.TerminalBasePayload; import org.springframework.stereotype.Component; import org.springframework.web.socket.WebSocketSession; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/handler/TerminalConnectHandler.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/TerminalConnectHandler.java similarity index 77% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/handler/TerminalConnectHandler.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/TerminalConnectHandler.java index e24609a5..c67d76a6 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/handler/TerminalConnectHandler.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/TerminalConnectHandler.java @@ -13,33 +13,33 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.terminal.handler; +package org.dromara.visor.module.asset.handler.host.terminal.handler; -import com.orion.lang.exception.AuthenticationException; -import com.orion.lang.exception.TimeoutException; -import com.orion.lang.exception.argument.InvalidArgumentException; -import com.orion.lang.utils.Exceptions; -import com.orion.lang.utils.collect.Maps; -import com.orion.lang.utils.io.Streams; -import com.orion.net.host.SessionStore; -import com.orion.visor.framework.common.constant.ErrorMessage; -import com.orion.visor.framework.common.constant.ExtraFieldConst; -import com.orion.visor.framework.common.enums.BooleanBit; -import com.orion.visor.framework.websocket.core.utils.WebSockets; -import com.orion.visor.module.asset.entity.dto.TerminalConnectDTO; -import com.orion.visor.module.asset.enums.TerminalConnectStatusEnum; -import com.orion.visor.module.asset.enums.TerminalConnectTypeEnum; -import com.orion.visor.module.asset.handler.host.jsch.SessionStores; -import com.orion.visor.module.asset.handler.host.terminal.constant.TerminalMessage; -import com.orion.visor.module.asset.handler.host.terminal.enums.OutputTypeEnum; -import com.orion.visor.module.asset.handler.host.terminal.model.TerminalConfig; -import com.orion.visor.module.asset.handler.host.terminal.model.request.TerminalConnectRequest; -import com.orion.visor.module.asset.handler.host.terminal.model.response.TerminalConnectResponse; -import com.orion.visor.module.asset.handler.host.terminal.session.ITerminalSession; -import com.orion.visor.module.asset.handler.host.terminal.session.SftpSession; -import com.orion.visor.module.asset.handler.host.terminal.session.SshSession; -import com.orion.visor.module.asset.service.TerminalConnectLogService; +import cn.orionsec.kit.lang.exception.AuthenticationException; +import cn.orionsec.kit.lang.exception.TimeoutException; +import cn.orionsec.kit.lang.exception.argument.InvalidArgumentException; +import cn.orionsec.kit.lang.utils.Exceptions; +import cn.orionsec.kit.lang.utils.collect.Maps; +import cn.orionsec.kit.lang.utils.io.Streams; +import cn.orionsec.kit.net.host.SessionStore; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.common.constant.ErrorMessage; +import org.dromara.visor.framework.common.constant.ExtraFieldConst; +import org.dromara.visor.framework.common.enums.BooleanBit; +import org.dromara.visor.framework.websocket.core.utils.WebSockets; +import org.dromara.visor.module.asset.entity.dto.TerminalConnectDTO; +import org.dromara.visor.module.asset.enums.TerminalConnectStatusEnum; +import org.dromara.visor.module.asset.enums.TerminalConnectTypeEnum; +import org.dromara.visor.module.asset.handler.host.jsch.SessionStores; +import org.dromara.visor.module.asset.handler.host.terminal.constant.TerminalMessage; +import org.dromara.visor.module.asset.handler.host.terminal.enums.OutputTypeEnum; +import org.dromara.visor.module.asset.handler.host.terminal.model.TerminalConfig; +import org.dromara.visor.module.asset.handler.host.terminal.model.request.TerminalConnectRequest; +import org.dromara.visor.module.asset.handler.host.terminal.model.response.TerminalConnectResponse; +import org.dromara.visor.module.asset.handler.host.terminal.session.ITerminalSession; +import org.dromara.visor.module.asset.handler.host.terminal.session.SftpSession; +import org.dromara.visor.module.asset.handler.host.terminal.session.SshSession; +import org.dromara.visor.module.asset.service.TerminalConnectLogService; import org.springframework.stereotype.Component; import org.springframework.web.socket.WebSocketSession; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/handler/TerminalPingHandler.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/TerminalPingHandler.java similarity index 79% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/handler/TerminalPingHandler.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/TerminalPingHandler.java index 6a68fd2e..05c3ae41 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/handler/TerminalPingHandler.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/TerminalPingHandler.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.terminal.handler; +package org.dromara.visor.module.asset.handler.host.terminal.handler; -import com.orion.lang.utils.collect.Maps; -import com.orion.visor.module.asset.handler.host.terminal.enums.OutputTypeEnum; -import com.orion.visor.module.asset.handler.host.terminal.model.TerminalBasePayload; -import com.orion.visor.module.asset.handler.host.terminal.session.ITerminalSession; +import cn.orionsec.kit.lang.utils.collect.Maps; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.module.asset.handler.host.terminal.enums.OutputTypeEnum; +import org.dromara.visor.module.asset.handler.host.terminal.model.TerminalBasePayload; +import org.dromara.visor.module.asset.handler.host.terminal.session.ITerminalSession; import org.springframework.stereotype.Component; import org.springframework.web.socket.WebSocketSession; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/manager/TerminalManager.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/manager/TerminalManager.java similarity index 90% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/manager/TerminalManager.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/manager/TerminalManager.java index fb4913e6..11617fd7 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/manager/TerminalManager.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/manager/TerminalManager.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.terminal.manager; +package org.dromara.visor.module.asset.handler.host.terminal.manager; -import com.orion.lang.define.collect.MultiConcurrentHashMap; -import com.orion.lang.utils.collect.Maps; -import com.orion.lang.utils.io.Streams; -import com.orion.visor.module.asset.handler.host.terminal.session.ITerminalSession; +import cn.orionsec.kit.lang.define.collect.MultiConcurrentHashMap; +import cn.orionsec.kit.lang.utils.collect.Maps; +import cn.orionsec.kit.lang.utils.io.Streams; +import org.dromara.visor.module.asset.handler.host.terminal.session.ITerminalSession; import org.springframework.stereotype.Component; import java.util.Map; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/TerminalBasePayload.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/model/TerminalBasePayload.java similarity index 94% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/TerminalBasePayload.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/model/TerminalBasePayload.java index bf608f73..1eb415b4 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/TerminalBasePayload.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/model/TerminalBasePayload.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.terminal.model; +package org.dromara.visor.module.asset.handler.host.terminal.model; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/TerminalConfig.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/model/TerminalConfig.java similarity index 95% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/TerminalConfig.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/model/TerminalConfig.java index 3baffb68..00bd5de6 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/TerminalConfig.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/model/TerminalConfig.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.terminal.model; +package org.dromara.visor.module.asset.handler.host.terminal.model; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/request/SftpBaseRequest.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/model/request/SftpBaseRequest.java similarity index 87% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/request/SftpBaseRequest.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/model/request/SftpBaseRequest.java index 9cfc50dd..8f5c92fa 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/request/SftpBaseRequest.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/model/request/SftpBaseRequest.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.terminal.model.request; +package org.dromara.visor.module.asset.handler.host.terminal.model.request; -import com.orion.visor.module.asset.handler.host.terminal.model.TerminalBasePayload; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; +import org.dromara.visor.module.asset.handler.host.terminal.model.TerminalBasePayload; /** * sftp 基础请求 实体对象 diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/request/SftpChangeModeRequest.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/model/request/SftpChangeModeRequest.java similarity index 94% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/request/SftpChangeModeRequest.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/model/request/SftpChangeModeRequest.java index 30af5d2d..8b328c40 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/request/SftpChangeModeRequest.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/model/request/SftpChangeModeRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.terminal.model.request; +package org.dromara.visor.module.asset.handler.host.terminal.model.request; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/request/SftpDownloadFlatDirectoryRequest.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/model/request/SftpDownloadFlatDirectoryRequest.java similarity index 94% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/request/SftpDownloadFlatDirectoryRequest.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/model/request/SftpDownloadFlatDirectoryRequest.java index c2437e27..c61660b5 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/request/SftpDownloadFlatDirectoryRequest.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/model/request/SftpDownloadFlatDirectoryRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.terminal.model.request; +package org.dromara.visor.module.asset.handler.host.terminal.model.request; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/request/SftpListRequest.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/model/request/SftpListRequest.java similarity index 93% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/request/SftpListRequest.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/model/request/SftpListRequest.java index 22afde4d..e919ac7b 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/request/SftpListRequest.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/model/request/SftpListRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.terminal.model.request; +package org.dromara.visor.module.asset.handler.host.terminal.model.request; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/request/SftpMoveRequest.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/model/request/SftpMoveRequest.java similarity index 93% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/request/SftpMoveRequest.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/model/request/SftpMoveRequest.java index 0650d9aa..af38fcad 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/request/SftpMoveRequest.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/model/request/SftpMoveRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.terminal.model.request; +package org.dromara.visor.module.asset.handler.host.terminal.model.request; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/request/SshInputRequest.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/model/request/SshInputRequest.java similarity index 87% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/request/SshInputRequest.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/model/request/SshInputRequest.java index 43a5e97d..ce1ba898 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/request/SshInputRequest.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/model/request/SshInputRequest.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.terminal.model.request; +package org.dromara.visor.module.asset.handler.host.terminal.model.request; -import com.orion.visor.module.asset.handler.host.terminal.model.TerminalBasePayload; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; +import org.dromara.visor.module.asset.handler.host.terminal.model.TerminalBasePayload; /** * ssh 输入请求 实体对象 diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/request/SshResizeRequest.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/model/request/SshResizeRequest.java similarity index 88% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/request/SshResizeRequest.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/model/request/SshResizeRequest.java index a512063b..0d65b7d9 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/request/SshResizeRequest.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/model/request/SshResizeRequest.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.terminal.model.request; +package org.dromara.visor.module.asset.handler.host.terminal.model.request; -import com.orion.visor.module.asset.handler.host.terminal.model.TerminalBasePayload; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; +import org.dromara.visor.module.asset.handler.host.terminal.model.TerminalBasePayload; /** * ssh 修改大小请求 实体对象 diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/request/TerminalCheckRequest.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/model/request/TerminalCheckRequest.java similarity index 88% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/request/TerminalCheckRequest.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/model/request/TerminalCheckRequest.java index 1df7cf60..73b119e8 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/request/TerminalCheckRequest.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/model/request/TerminalCheckRequest.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.terminal.model.request; +package org.dromara.visor.module.asset.handler.host.terminal.model.request; -import com.orion.visor.module.asset.handler.host.terminal.model.TerminalBasePayload; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; +import org.dromara.visor.module.asset.handler.host.terminal.model.TerminalBasePayload; /** * 终端连接检查请求 实体对象 diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/request/TerminalConnectRequest.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/model/request/TerminalConnectRequest.java similarity index 88% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/request/TerminalConnectRequest.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/model/request/TerminalConnectRequest.java index fb81faff..51813134 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/request/TerminalConnectRequest.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/model/request/TerminalConnectRequest.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.terminal.model.request; +package org.dromara.visor.module.asset.handler.host.terminal.model.request; -import com.orion.visor.module.asset.handler.host.terminal.model.TerminalBasePayload; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; +import org.dromara.visor.module.asset.handler.host.terminal.model.TerminalBasePayload; /** * 终端连接请求 实体对象 diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/response/SftpBaseResponse.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/model/response/SftpBaseResponse.java similarity index 87% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/response/SftpBaseResponse.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/model/response/SftpBaseResponse.java index b550598c..6e49fc1e 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/response/SftpBaseResponse.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/model/response/SftpBaseResponse.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.terminal.model.response; +package org.dromara.visor.module.asset.handler.host.terminal.model.response; -import com.orion.visor.module.asset.handler.host.terminal.model.TerminalBasePayload; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; +import org.dromara.visor.module.asset.handler.host.terminal.model.TerminalBasePayload; /** * sftp 基础响应 实体对象 diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/response/SftpDownloadFlatDirectoryResponse.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/model/response/SftpDownloadFlatDirectoryResponse.java similarity index 94% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/response/SftpDownloadFlatDirectoryResponse.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/model/response/SftpDownloadFlatDirectoryResponse.java index 7ebbf268..3ebb1af9 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/response/SftpDownloadFlatDirectoryResponse.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/model/response/SftpDownloadFlatDirectoryResponse.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.terminal.model.response; +package org.dromara.visor.module.asset.handler.host.terminal.model.response; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/response/SftpFileVO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/model/response/SftpFileVO.java similarity index 95% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/response/SftpFileVO.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/model/response/SftpFileVO.java index 51f0e511..bcd58d57 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/response/SftpFileVO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/model/response/SftpFileVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.terminal.model.response; +package org.dromara.visor.module.asset.handler.host.terminal.model.response; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/response/SftpGetContentResponse.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/model/response/SftpGetContentResponse.java similarity index 93% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/response/SftpGetContentResponse.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/model/response/SftpGetContentResponse.java index 247f092f..d9fb1a16 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/response/SftpGetContentResponse.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/model/response/SftpGetContentResponse.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.terminal.model.response; +package org.dromara.visor.module.asset.handler.host.terminal.model.response; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/response/SftpListResponse.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/model/response/SftpListResponse.java similarity index 93% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/response/SftpListResponse.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/model/response/SftpListResponse.java index 5686f20f..1f72fa6e 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/response/SftpListResponse.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/model/response/SftpListResponse.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.terminal.model.response; +package org.dromara.visor.module.asset.handler.host.terminal.model.response; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/response/SftpSetContentResponse.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/model/response/SftpSetContentResponse.java similarity index 93% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/response/SftpSetContentResponse.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/model/response/SftpSetContentResponse.java index 26b398cb..e8c246e4 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/response/SftpSetContentResponse.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/model/response/SftpSetContentResponse.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.terminal.model.response; +package org.dromara.visor.module.asset.handler.host.terminal.model.response; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/response/SshOutputResponse.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/model/response/SshOutputResponse.java similarity index 87% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/response/SshOutputResponse.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/model/response/SshOutputResponse.java index 83d8dbaf..23d06a87 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/response/SshOutputResponse.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/model/response/SshOutputResponse.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.terminal.model.response; +package org.dromara.visor.module.asset.handler.host.terminal.model.response; -import com.orion.visor.module.asset.handler.host.terminal.model.TerminalBasePayload; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; +import org.dromara.visor.module.asset.handler.host.terminal.model.TerminalBasePayload; /** * ssh 输出响应 实体对象 diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/response/TerminalCheckResponse.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/model/response/TerminalCheckResponse.java similarity index 88% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/response/TerminalCheckResponse.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/model/response/TerminalCheckResponse.java index 2ae16fda..f5046b7f 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/response/TerminalCheckResponse.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/model/response/TerminalCheckResponse.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.terminal.model.response; +package org.dromara.visor.module.asset.handler.host.terminal.model.response; -import com.orion.visor.module.asset.handler.host.terminal.model.TerminalBasePayload; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; +import org.dromara.visor.module.asset.handler.host.terminal.model.TerminalBasePayload; /** * 终端连接检查响应 实体对象 diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/response/TerminalCloseResponse.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/model/response/TerminalCloseResponse.java similarity index 88% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/response/TerminalCloseResponse.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/model/response/TerminalCloseResponse.java index 0efdc158..c2b76dbc 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/response/TerminalCloseResponse.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/model/response/TerminalCloseResponse.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.terminal.model.response; +package org.dromara.visor.module.asset.handler.host.terminal.model.response; -import com.orion.visor.module.asset.handler.host.terminal.model.TerminalBasePayload; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; +import org.dromara.visor.module.asset.handler.host.terminal.model.TerminalBasePayload; /** * 终端连接关闭响应 实体对象 diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/response/TerminalConnectResponse.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/model/response/TerminalConnectResponse.java similarity index 88% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/response/TerminalConnectResponse.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/model/response/TerminalConnectResponse.java index e33602dc..bf575954 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/model/response/TerminalConnectResponse.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/model/response/TerminalConnectResponse.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.terminal.model.response; +package org.dromara.visor.module.asset.handler.host.terminal.model.response; -import com.orion.visor.module.asset.handler.host.terminal.model.TerminalBasePayload; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; +import org.dromara.visor.module.asset.handler.host.terminal.model.TerminalBasePayload; /** * 终端连接响应 实体对象 diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/session/ISftpSession.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/session/ISftpSession.java similarity index 93% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/session/ISftpSession.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/session/ISftpSession.java index b2e130aa..c5f49c09 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/session/ISftpSession.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/session/ISftpSession.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.terminal.session; +package org.dromara.visor.module.asset.handler.host.terminal.session; -import com.orion.visor.module.asset.handler.host.terminal.model.response.SftpFileVO; +import org.dromara.visor.module.asset.handler.host.terminal.model.response.SftpFileVO; import java.util.List; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/session/ISshSession.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/session/ISshSession.java similarity index 94% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/session/ISshSession.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/session/ISshSession.java index ca4b3a63..f208615b 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/session/ISshSession.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/session/ISshSession.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.terminal.session; +package org.dromara.visor.module.asset.handler.host.terminal.session; /** * ssh 会话定义 diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/session/ITerminalSession.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/session/ITerminalSession.java similarity index 86% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/session/ITerminalSession.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/session/ITerminalSession.java index a87d67dc..acfd6987 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/session/ITerminalSession.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/session/ITerminalSession.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.terminal.session; +package org.dromara.visor.module.asset.handler.host.terminal.session; -import com.orion.lang.able.SafeCloseable; -import com.orion.visor.module.asset.handler.host.terminal.model.TerminalConfig; +import cn.orionsec.kit.lang.able.SafeCloseable; +import org.dromara.visor.module.asset.handler.host.terminal.model.TerminalConfig; /** * 终端会话定义 diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/session/SftpSession.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/session/SftpSession.java similarity index 88% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/session/SftpSession.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/session/SftpSession.java index 392885cb..9b6dc677 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/session/SftpSession.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/session/SftpSession.java @@ -13,22 +13,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.terminal.session; +package org.dromara.visor.module.asset.handler.host.terminal.session; -import com.orion.lang.utils.Exceptions; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.io.FileType; -import com.orion.lang.utils.io.Files1; -import com.orion.lang.utils.io.Streams; -import com.orion.net.host.SessionStore; -import com.orion.net.host.sftp.SftpExecutor; -import com.orion.net.host.sftp.SftpFile; -import com.orion.visor.framework.common.constant.Const; -import com.orion.visor.framework.common.constant.ErrorMessage; -import com.orion.visor.framework.common.utils.Valid; -import com.orion.visor.module.asset.handler.host.terminal.model.TerminalConfig; -import com.orion.visor.module.asset.handler.host.terminal.model.response.SftpFileVO; +import cn.orionsec.kit.lang.utils.Exceptions; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.io.FileType; +import cn.orionsec.kit.lang.utils.io.Files1; +import cn.orionsec.kit.lang.utils.io.Streams; +import cn.orionsec.kit.net.host.SessionStore; +import cn.orionsec.kit.net.host.sftp.SftpExecutor; +import cn.orionsec.kit.net.host.sftp.SftpFile; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.framework.common.constant.ErrorMessage; +import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.module.asset.handler.host.terminal.model.TerminalConfig; +import org.dromara.visor.module.asset.handler.host.terminal.model.response.SftpFileVO; import org.springframework.web.socket.WebSocketSession; import java.io.InputStream; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/session/SshSession.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/session/SshSession.java similarity index 85% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/session/SshSession.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/session/SshSession.java index bb67f113..bab3c43a 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/session/SshSession.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/session/SshSession.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.terminal.session; +package org.dromara.visor.module.asset.handler.host.terminal.session; -import com.orion.lang.utils.io.Streams; -import com.orion.net.host.SessionStore; -import com.orion.net.host.ssh.shell.ShellExecutor; -import com.orion.visor.framework.common.constant.Const; -import com.orion.visor.framework.websocket.core.utils.WebSockets; -import com.orion.visor.module.asset.define.AssetThreadPools; -import com.orion.visor.module.asset.handler.host.terminal.enums.OutputTypeEnum; -import com.orion.visor.module.asset.handler.host.terminal.model.TerminalConfig; -import com.orion.visor.module.asset.handler.host.terminal.model.response.SshOutputResponse; +import cn.orionsec.kit.lang.utils.io.Streams; +import cn.orionsec.kit.net.host.SessionStore; +import cn.orionsec.kit.net.host.ssh.shell.ShellExecutor; import lombok.Getter; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.framework.websocket.core.utils.WebSockets; +import org.dromara.visor.module.asset.define.AssetThreadPools; +import org.dromara.visor.module.asset.handler.host.terminal.enums.OutputTypeEnum; +import org.dromara.visor.module.asset.handler.host.terminal.model.TerminalConfig; +import org.dromara.visor.module.asset.handler.host.terminal.model.response.SshOutputResponse; import org.springframework.web.socket.WebSocketSession; import java.io.BufferedInputStream; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/session/TerminalSession.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/session/TerminalSession.java similarity index 82% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/session/TerminalSession.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/session/TerminalSession.java index a1b7be9b..f97fb2c5 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/session/TerminalSession.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/session/TerminalSession.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.terminal.session; +package org.dromara.visor.module.asset.handler.host.terminal.session; -import com.orion.spring.SpringHolder; -import com.orion.visor.framework.common.enums.BooleanBit; -import com.orion.visor.framework.websocket.core.utils.WebSockets; -import com.orion.visor.module.asset.enums.TerminalConnectStatusEnum; -import com.orion.visor.module.asset.handler.host.terminal.constant.TerminalMessage; -import com.orion.visor.module.asset.handler.host.terminal.enums.OutputTypeEnum; -import com.orion.visor.module.asset.handler.host.terminal.model.TerminalConfig; -import com.orion.visor.module.asset.handler.host.terminal.model.response.TerminalCloseResponse; -import com.orion.visor.module.asset.service.TerminalConnectLogService; +import cn.orionsec.kit.spring.SpringHolder; import lombok.Getter; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.common.enums.BooleanBit; +import org.dromara.visor.framework.websocket.core.utils.WebSockets; +import org.dromara.visor.module.asset.enums.TerminalConnectStatusEnum; +import org.dromara.visor.module.asset.handler.host.terminal.constant.TerminalMessage; +import org.dromara.visor.module.asset.handler.host.terminal.enums.OutputTypeEnum; +import org.dromara.visor.module.asset.handler.host.terminal.model.TerminalConfig; +import org.dromara.visor.module.asset.handler.host.terminal.model.response.TerminalCloseResponse; +import org.dromara.visor.module.asset.service.TerminalConnectLogService; import org.springframework.web.socket.WebSocketSession; /** diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/utils/TerminalUtils.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/utils/TerminalUtils.java similarity index 86% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/utils/TerminalUtils.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/utils/TerminalUtils.java index ed1612ed..40a20fd1 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/utils/TerminalUtils.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/utils/TerminalUtils.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.terminal.utils; +package org.dromara.visor.module.asset.handler.host.terminal.utils; -import com.orion.visor.framework.biz.operator.log.core.model.OperatorLogModel; -import com.orion.visor.framework.biz.operator.log.core.utils.OperatorLogFiller; -import com.orion.visor.framework.common.constant.ExtraFieldConst; -import com.orion.visor.framework.websocket.core.utils.WebSockets; +import org.dromara.visor.framework.biz.operator.log.core.model.OperatorLogModel; +import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogFiller; +import org.dromara.visor.framework.common.constant.ExtraFieldConst; +import org.dromara.visor.framework.websocket.core.utils.WebSockets; import org.springframework.web.socket.WebSocketSession; import java.util.Map; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/transfer/TransferMessageDispatcher.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/transfer/TransferMessageDispatcher.java similarity index 86% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/transfer/TransferMessageDispatcher.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/transfer/TransferMessageDispatcher.java index e7653668..a0888571 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/transfer/TransferMessageDispatcher.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/transfer/TransferMessageDispatcher.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.transfer; +package org.dromara.visor.module.asset.handler.host.transfer; +import cn.orionsec.kit.lang.utils.io.Streams; import com.alibaba.fastjson.JSON; -import com.orion.lang.utils.io.Streams; -import com.orion.visor.module.asset.handler.host.transfer.handler.ITransferHandler; -import com.orion.visor.module.asset.handler.host.transfer.handler.TransferHandler; -import com.orion.visor.module.asset.handler.host.transfer.manager.TerminalTransferManager; -import com.orion.visor.module.asset.handler.host.transfer.model.TransferOperatorRequest; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.module.asset.handler.host.transfer.handler.ITransferHandler; +import org.dromara.visor.module.asset.handler.host.transfer.handler.TransferHandler; +import org.dromara.visor.module.asset.handler.host.transfer.manager.TerminalTransferManager; +import org.dromara.visor.module.asset.handler.host.transfer.model.TransferOperatorRequest; import org.springframework.stereotype.Component; import org.springframework.web.socket.BinaryMessage; import org.springframework.web.socket.CloseStatus; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/transfer/enums/TransferOperator.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/transfer/enums/TransferOperator.java similarity index 95% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/transfer/enums/TransferOperator.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/transfer/enums/TransferOperator.java index ccee357b..9c52917a 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/transfer/enums/TransferOperator.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/transfer/enums/TransferOperator.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.transfer.enums; +package org.dromara.visor.module.asset.handler.host.transfer.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/transfer/enums/TransferReceiver.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/transfer/enums/TransferReceiver.java similarity index 95% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/transfer/enums/TransferReceiver.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/transfer/enums/TransferReceiver.java index 44de4b38..cf16d146 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/transfer/enums/TransferReceiver.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/transfer/enums/TransferReceiver.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.transfer.enums; +package org.dromara.visor.module.asset.handler.host.transfer.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/transfer/enums/TransferType.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/transfer/enums/TransferType.java similarity index 94% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/transfer/enums/TransferType.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/transfer/enums/TransferType.java index dc931e39..8e8668b0 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/transfer/enums/TransferType.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/transfer/enums/TransferType.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.transfer.enums; +package org.dromara.visor.module.asset.handler.host.transfer.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/transfer/handler/ITransferHandler.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/transfer/handler/ITransferHandler.java similarity index 80% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/transfer/handler/ITransferHandler.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/transfer/handler/ITransferHandler.java index 1d11042a..d1dfd2e0 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/transfer/handler/ITransferHandler.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/transfer/handler/ITransferHandler.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.transfer.handler; +package org.dromara.visor.module.asset.handler.host.transfer.handler; -import com.orion.lang.able.SafeCloseable; -import com.orion.visor.module.asset.handler.host.transfer.model.TransferOperatorRequest; -import com.orion.visor.module.asset.handler.host.transfer.session.ITransferSession; +import cn.orionsec.kit.lang.able.SafeCloseable; +import org.dromara.visor.module.asset.handler.host.transfer.model.TransferOperatorRequest; +import org.dromara.visor.module.asset.handler.host.transfer.session.ITransferSession; /** * 传输处理器定义 diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/transfer/handler/TransferHandler.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/transfer/handler/TransferHandler.java similarity index 79% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/transfer/handler/TransferHandler.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/transfer/handler/TransferHandler.java index a02fb33f..0d1d3415 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/transfer/handler/TransferHandler.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/transfer/handler/TransferHandler.java @@ -13,27 +13,27 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.transfer.handler; +package org.dromara.visor.module.asset.handler.host.transfer.handler; -import com.orion.lang.id.UUIds; -import com.orion.lang.utils.io.Streams; -import com.orion.net.host.SessionStore; -import com.orion.spring.SpringHolder; -import com.orion.visor.framework.common.constant.ExtraFieldConst; -import com.orion.visor.framework.websocket.core.utils.WebSockets; -import com.orion.visor.module.asset.entity.dto.TerminalConnectDTO; -import com.orion.visor.module.asset.handler.host.jsch.SessionStores; -import com.orion.visor.module.asset.handler.host.transfer.enums.TransferOperator; -import com.orion.visor.module.asset.handler.host.transfer.enums.TransferReceiver; -import com.orion.visor.module.asset.handler.host.transfer.enums.TransferType; -import com.orion.visor.module.asset.handler.host.transfer.model.TerminalConnection; -import com.orion.visor.module.asset.handler.host.transfer.model.TransferOperatorRequest; -import com.orion.visor.module.asset.handler.host.transfer.session.DownloadSession; -import com.orion.visor.module.asset.handler.host.transfer.session.ITransferSession; -import com.orion.visor.module.asset.handler.host.transfer.session.UploadSession; -import com.orion.visor.module.asset.handler.host.transfer.utils.TransferUtils; -import com.orion.visor.module.asset.service.TerminalService; +import cn.orionsec.kit.lang.id.UUIds; +import cn.orionsec.kit.lang.utils.io.Streams; +import cn.orionsec.kit.net.host.SessionStore; +import cn.orionsec.kit.spring.SpringHolder; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.common.constant.ExtraFieldConst; +import org.dromara.visor.framework.websocket.core.utils.WebSockets; +import org.dromara.visor.module.asset.entity.dto.TerminalConnectDTO; +import org.dromara.visor.module.asset.handler.host.jsch.SessionStores; +import org.dromara.visor.module.asset.handler.host.transfer.enums.TransferOperator; +import org.dromara.visor.module.asset.handler.host.transfer.enums.TransferReceiver; +import org.dromara.visor.module.asset.handler.host.transfer.enums.TransferType; +import org.dromara.visor.module.asset.handler.host.transfer.model.TerminalConnection; +import org.dromara.visor.module.asset.handler.host.transfer.model.TransferOperatorRequest; +import org.dromara.visor.module.asset.handler.host.transfer.session.DownloadSession; +import org.dromara.visor.module.asset.handler.host.transfer.session.ITransferSession; +import org.dromara.visor.module.asset.handler.host.transfer.session.UploadSession; +import org.dromara.visor.module.asset.handler.host.transfer.utils.TransferUtils; +import org.dromara.visor.module.asset.service.TerminalService; import org.springframework.web.socket.WebSocketSession; import java.util.concurrent.ConcurrentHashMap; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/transfer/manager/TerminalTransferManager.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/transfer/manager/TerminalTransferManager.java similarity index 91% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/transfer/manager/TerminalTransferManager.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/transfer/manager/TerminalTransferManager.java index 8a4095d2..8c7d708b 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/transfer/manager/TerminalTransferManager.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/transfer/manager/TerminalTransferManager.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.transfer.manager; +package org.dromara.visor.module.asset.handler.host.transfer.manager; -import com.orion.visor.module.asset.handler.host.transfer.handler.ITransferHandler; +import org.dromara.visor.module.asset.handler.host.transfer.handler.ITransferHandler; import org.springframework.stereotype.Component; import java.util.concurrent.ConcurrentHashMap; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/transfer/model/SftpFileBackupParams.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/transfer/model/SftpFileBackupParams.java similarity index 94% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/transfer/model/SftpFileBackupParams.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/transfer/model/SftpFileBackupParams.java index 01098b33..d923521a 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/transfer/model/SftpFileBackupParams.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/transfer/model/SftpFileBackupParams.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.transfer.model; +package org.dromara.visor.module.asset.handler.host.transfer.model; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/transfer/model/TerminalConnection.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/transfer/model/TerminalConnection.java similarity index 85% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/transfer/model/TerminalConnection.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/transfer/model/TerminalConnection.java index 4923d6e1..2c06350e 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/transfer/model/TerminalConnection.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/transfer/model/TerminalConnection.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.transfer.model; +package org.dromara.visor.module.asset.handler.host.transfer.model; -import com.orion.net.host.SessionStore; -import com.orion.visor.module.asset.entity.dto.TerminalConnectDTO; +import cn.orionsec.kit.net.host.SessionStore; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.dromara.visor.module.asset.entity.dto.TerminalConnectDTO; /** * 终端连接信息 diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/transfer/model/TransferOperatorRequest.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/transfer/model/TransferOperatorRequest.java similarity index 94% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/transfer/model/TransferOperatorRequest.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/transfer/model/TransferOperatorRequest.java index 04547d4d..e46c8baf 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/transfer/model/TransferOperatorRequest.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/transfer/model/TransferOperatorRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.transfer.model; +package org.dromara.visor.module.asset.handler.host.transfer.model; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/transfer/model/TransferOperatorResponse.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/transfer/model/TransferOperatorResponse.java similarity index 95% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/transfer/model/TransferOperatorResponse.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/transfer/model/TransferOperatorResponse.java index 0b1bfa86..d4a57ef4 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/transfer/model/TransferOperatorResponse.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/transfer/model/TransferOperatorResponse.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.transfer.model; +package org.dromara.visor.module.asset.handler.host.transfer.model; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/transfer/session/DownloadSession.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/transfer/session/DownloadSession.java similarity index 86% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/transfer/session/DownloadSession.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/transfer/session/DownloadSession.java index a8d7d636..86df22ed 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/transfer/session/DownloadSession.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/transfer/session/DownloadSession.java @@ -13,23 +13,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.transfer.session; +package org.dromara.visor.module.asset.handler.host.transfer.session; -import com.orion.lang.define.wrapper.Ref; -import com.orion.lang.utils.Threads; -import com.orion.lang.utils.Valid; -import com.orion.lang.utils.io.Streams; -import com.orion.net.host.SessionStore; -import com.orion.net.host.sftp.SftpFile; -import com.orion.visor.framework.common.constant.Const; -import com.orion.visor.framework.common.constant.ErrorMessage; -import com.orion.visor.module.asset.define.AssetThreadPools; -import com.orion.visor.module.asset.define.operator.TerminalOperatorType; -import com.orion.visor.module.asset.entity.dto.TerminalConnectDTO; -import com.orion.visor.module.asset.handler.host.transfer.enums.TransferReceiver; -import com.orion.visor.module.asset.handler.host.transfer.model.TransferOperatorRequest; -import com.orion.visor.module.asset.handler.host.transfer.utils.TransferUtils; +import cn.orionsec.kit.lang.define.wrapper.Ref; +import cn.orionsec.kit.lang.utils.Threads; +import cn.orionsec.kit.lang.utils.Valid; +import cn.orionsec.kit.lang.utils.io.Streams; +import cn.orionsec.kit.net.host.SessionStore; +import cn.orionsec.kit.net.host.sftp.SftpFile; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.framework.common.constant.ErrorMessage; +import org.dromara.visor.module.asset.define.AssetThreadPools; +import org.dromara.visor.module.asset.define.operator.TerminalOperatorType; +import org.dromara.visor.module.asset.entity.dto.TerminalConnectDTO; +import org.dromara.visor.module.asset.handler.host.transfer.enums.TransferReceiver; +import org.dromara.visor.module.asset.handler.host.transfer.model.TransferOperatorRequest; +import org.dromara.visor.module.asset.handler.host.transfer.utils.TransferUtils; import org.springframework.web.servlet.mvc.method.annotation.StreamingResponseBody; import org.springframework.web.socket.WebSocketSession; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/transfer/session/ITransferSession.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/transfer/session/ITransferSession.java similarity index 89% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/transfer/session/ITransferSession.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/transfer/session/ITransferSession.java index 14305527..73b7e0c4 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/transfer/session/ITransferSession.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/transfer/session/ITransferSession.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.transfer.session; +package org.dromara.visor.module.asset.handler.host.transfer.session; -import com.orion.lang.able.SafeCloseable; -import com.orion.visor.module.asset.handler.host.transfer.model.TransferOperatorRequest; +import cn.orionsec.kit.lang.able.SafeCloseable; +import org.dromara.visor.module.asset.handler.host.transfer.model.TransferOperatorRequest; /** * 主机传输会话定义 diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/transfer/session/TransferSession.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/transfer/session/TransferSession.java similarity index 79% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/transfer/session/TransferSession.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/transfer/session/TransferSession.java index a875c183..00271dab 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/transfer/session/TransferSession.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/transfer/session/TransferSession.java @@ -13,26 +13,26 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.transfer.session; +package org.dromara.visor.module.asset.handler.host.transfer.session; -import com.orion.lang.exception.argument.InvalidArgumentException; -import com.orion.lang.utils.collect.Maps; -import com.orion.lang.utils.io.Streams; -import com.orion.net.host.SessionStore; -import com.orion.net.host.sftp.SftpExecutor; -import com.orion.spring.SpringHolder; -import com.orion.visor.framework.biz.operator.log.core.model.OperatorLogModel; -import com.orion.visor.framework.biz.operator.log.core.service.OperatorLogFrameworkService; -import com.orion.visor.framework.biz.operator.log.core.utils.OperatorLogs; -import com.orion.visor.module.asset.define.config.AppSftpConfig; -import com.orion.visor.module.asset.entity.dto.TerminalConnectDTO; -import com.orion.visor.module.asset.handler.host.terminal.utils.TerminalUtils; -import com.orion.visor.module.asset.handler.host.transfer.enums.TransferReceiver; -import com.orion.visor.module.asset.handler.host.transfer.model.TransferOperatorRequest; -import com.orion.visor.module.asset.handler.host.transfer.utils.TransferUtils; +import cn.orionsec.kit.lang.exception.argument.InvalidArgumentException; +import cn.orionsec.kit.lang.utils.collect.Maps; +import cn.orionsec.kit.lang.utils.io.Streams; +import cn.orionsec.kit.net.host.SessionStore; +import cn.orionsec.kit.net.host.sftp.SftpExecutor; +import cn.orionsec.kit.spring.SpringHolder; import lombok.Getter; import lombok.Setter; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.biz.operator.log.core.model.OperatorLogModel; +import org.dromara.visor.framework.biz.operator.log.core.service.OperatorLogFrameworkService; +import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; +import org.dromara.visor.module.asset.define.config.AppSftpConfig; +import org.dromara.visor.module.asset.entity.dto.TerminalConnectDTO; +import org.dromara.visor.module.asset.handler.host.terminal.utils.TerminalUtils; +import org.dromara.visor.module.asset.handler.host.transfer.enums.TransferReceiver; +import org.dromara.visor.module.asset.handler.host.transfer.model.TransferOperatorRequest; +import org.dromara.visor.module.asset.handler.host.transfer.utils.TransferUtils; import org.springframework.web.socket.WebSocketSession; import java.util.Map; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/transfer/session/UploadSession.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/transfer/session/UploadSession.java similarity index 82% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/transfer/session/UploadSession.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/transfer/session/UploadSession.java index 29bff62e..f12f0b69 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/transfer/session/UploadSession.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/transfer/session/UploadSession.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.transfer.session; +package org.dromara.visor.module.asset.handler.host.transfer.session; -import com.orion.lang.utils.io.Streams; -import com.orion.net.host.SessionStore; -import com.orion.visor.module.asset.define.operator.TerminalOperatorType; -import com.orion.visor.module.asset.entity.dto.TerminalConnectDTO; -import com.orion.visor.module.asset.handler.host.transfer.enums.TransferReceiver; -import com.orion.visor.module.asset.handler.host.transfer.model.TransferOperatorRequest; -import com.orion.visor.module.asset.handler.host.transfer.utils.TransferUtils; -import com.orion.visor.module.asset.utils.SftpUtils; +import cn.orionsec.kit.lang.utils.io.Streams; +import cn.orionsec.kit.net.host.SessionStore; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.module.asset.define.operator.TerminalOperatorType; +import org.dromara.visor.module.asset.entity.dto.TerminalConnectDTO; +import org.dromara.visor.module.asset.handler.host.transfer.enums.TransferReceiver; +import org.dromara.visor.module.asset.handler.host.transfer.model.TransferOperatorRequest; +import org.dromara.visor.module.asset.handler.host.transfer.utils.TransferUtils; +import org.dromara.visor.module.asset.utils.SftpUtils; import org.springframework.web.socket.WebSocketSession; import java.io.IOException; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/transfer/utils/TransferUtils.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/transfer/utils/TransferUtils.java similarity index 86% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/transfer/utils/TransferUtils.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/transfer/utils/TransferUtils.java index 2516fa56..831b1d76 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/transfer/utils/TransferUtils.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/transfer/utils/TransferUtils.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.transfer.utils; +package org.dromara.visor.module.asset.handler.host.transfer.utils; +import cn.orionsec.kit.lang.utils.Strings; import com.alibaba.fastjson.JSON; -import com.orion.lang.utils.Strings; -import com.orion.visor.framework.common.constant.ErrorMessage; -import com.orion.visor.framework.websocket.core.utils.WebSockets; -import com.orion.visor.module.asset.handler.host.transfer.enums.TransferReceiver; -import com.orion.visor.module.asset.handler.host.transfer.model.TransferOperatorResponse; import org.apache.catalina.connector.ClientAbortException; +import org.dromara.visor.framework.common.constant.ErrorMessage; +import org.dromara.visor.framework.websocket.core.utils.WebSockets; +import org.dromara.visor.module.asset.handler.host.transfer.enums.TransferReceiver; +import org.dromara.visor.module.asset.handler.host.transfer.model.TransferOperatorResponse; import org.springframework.web.socket.WebSocketSession; import java.util.function.Consumer; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/upload/FileUploadTasks.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/upload/FileUploadTasks.java similarity index 83% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/upload/FileUploadTasks.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/upload/FileUploadTasks.java index 800310bd..0e942881 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/upload/FileUploadTasks.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/upload/FileUploadTasks.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.upload; +package org.dromara.visor.module.asset.handler.host.upload; -import com.orion.visor.module.asset.define.AssetThreadPools; -import com.orion.visor.module.asset.handler.host.upload.task.FileUploadTask; +import org.dromara.visor.module.asset.define.AssetThreadPools; +import org.dromara.visor.module.asset.handler.host.upload.task.FileUploadTask; /** * 批量上传执行器 diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/upload/manager/FileUploadTaskManager.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/upload/manager/FileUploadTaskManager.java similarity index 90% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/upload/manager/FileUploadTaskManager.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/upload/manager/FileUploadTaskManager.java index 32d0fa0e..96decad8 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/upload/manager/FileUploadTaskManager.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/upload/manager/FileUploadTaskManager.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.upload.manager; +package org.dromara.visor.module.asset.handler.host.upload.manager; -import com.orion.visor.module.asset.handler.host.upload.task.IFileUploadTask; +import org.dromara.visor.module.asset.handler.host.upload.task.IFileUploadTask; import org.springframework.stereotype.Component; import java.util.concurrent.ConcurrentHashMap; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/upload/model/FileUploadFileItemDTO.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/upload/model/FileUploadFileItemDTO.java similarity index 95% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/upload/model/FileUploadFileItemDTO.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/upload/model/FileUploadFileItemDTO.java index f7750cfd..ab8c24ca 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/upload/model/FileUploadFileItemDTO.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/upload/model/FileUploadFileItemDTO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.upload.model; +package org.dromara.visor.module.asset.handler.host.upload.model; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/upload/task/FileUploadTask.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/upload/task/FileUploadTask.java similarity index 83% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/upload/task/FileUploadTask.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/upload/task/FileUploadTask.java index 7e7306ff..dd2a75ab 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/upload/task/FileUploadTask.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/upload/task/FileUploadTask.java @@ -13,30 +13,30 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.upload.task; +package org.dromara.visor.module.asset.handler.host.upload.task; -import com.orion.lang.utils.Threads; -import com.orion.lang.utils.io.Streams; -import com.orion.lang.utils.time.Dates; -import com.orion.spring.SpringHolder; -import com.orion.visor.framework.common.constant.ExtraFieldConst; -import com.orion.visor.module.asset.dao.UploadTaskDAO; -import com.orion.visor.module.asset.dao.UploadTaskFileDAO; -import com.orion.visor.module.asset.define.AssetThreadPools; -import com.orion.visor.module.asset.define.message.UploadMessageDefine; -import com.orion.visor.module.asset.entity.domain.UploadTaskDO; -import com.orion.visor.module.asset.entity.domain.UploadTaskFileDO; -import com.orion.visor.module.asset.enums.UploadTaskFileStatusEnum; -import com.orion.visor.module.asset.enums.UploadTaskStatusEnum; -import com.orion.visor.module.asset.handler.host.upload.manager.FileUploadTaskManager; -import com.orion.visor.module.asset.handler.host.upload.model.FileUploadFileItemDTO; -import com.orion.visor.module.asset.handler.host.upload.uploader.FileUploader; -import com.orion.visor.module.asset.handler.host.upload.uploader.IFileUploader; -import com.orion.visor.module.asset.service.UploadTaskService; -import com.orion.visor.module.infra.api.SystemMessageApi; -import com.orion.visor.module.infra.entity.dto.message.SystemMessageDTO; +import cn.orionsec.kit.lang.utils.Threads; +import cn.orionsec.kit.lang.utils.io.Streams; +import cn.orionsec.kit.lang.utils.time.Dates; +import cn.orionsec.kit.spring.SpringHolder; import lombok.Getter; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.common.constant.ExtraFieldConst; +import org.dromara.visor.module.asset.dao.UploadTaskDAO; +import org.dromara.visor.module.asset.dao.UploadTaskFileDAO; +import org.dromara.visor.module.asset.define.AssetThreadPools; +import org.dromara.visor.module.asset.define.message.UploadMessageDefine; +import org.dromara.visor.module.asset.entity.domain.UploadTaskDO; +import org.dromara.visor.module.asset.entity.domain.UploadTaskFileDO; +import org.dromara.visor.module.asset.enums.UploadTaskFileStatusEnum; +import org.dromara.visor.module.asset.enums.UploadTaskStatusEnum; +import org.dromara.visor.module.asset.handler.host.upload.manager.FileUploadTaskManager; +import org.dromara.visor.module.asset.handler.host.upload.model.FileUploadFileItemDTO; +import org.dromara.visor.module.asset.handler.host.upload.uploader.FileUploader; +import org.dromara.visor.module.asset.handler.host.upload.uploader.IFileUploader; +import org.dromara.visor.module.asset.service.UploadTaskService; +import org.dromara.visor.module.infra.api.SystemMessageApi; +import org.dromara.visor.module.infra.entity.dto.message.SystemMessageDTO; import java.util.*; import java.util.stream.Collectors; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/upload/task/IFileUploadTask.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/upload/task/IFileUploadTask.java similarity index 83% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/upload/task/IFileUploadTask.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/upload/task/IFileUploadTask.java index 5994dd50..40a5bbee 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/upload/task/IFileUploadTask.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/upload/task/IFileUploadTask.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.upload.task; +package org.dromara.visor.module.asset.handler.host.upload.task; -import com.orion.lang.able.SafeCloseable; -import com.orion.visor.module.asset.handler.host.upload.uploader.IFileUploader; +import cn.orionsec.kit.lang.able.SafeCloseable; +import org.dromara.visor.module.asset.handler.host.upload.uploader.IFileUploader; import java.util.List; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/upload/uploader/FileUploader.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/upload/uploader/FileUploader.java similarity index 88% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/upload/uploader/FileUploader.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/upload/uploader/FileUploader.java index 9fd9611e..a04e3395 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/upload/uploader/FileUploader.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/upload/uploader/FileUploader.java @@ -13,26 +13,26 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.upload.uploader; +package org.dromara.visor.module.asset.handler.host.upload.uploader; -import com.orion.lang.utils.io.Streams; -import com.orion.net.host.SessionStore; -import com.orion.net.host.sftp.SftpExecutor; -import com.orion.spring.SpringHolder; -import com.orion.visor.framework.common.constant.Const; -import com.orion.visor.framework.common.enums.EndpointDefine; -import com.orion.visor.framework.common.file.FileClient; -import com.orion.visor.module.asset.dao.UploadTaskFileDAO; -import com.orion.visor.module.asset.define.config.AppSftpConfig; -import com.orion.visor.module.asset.entity.domain.UploadTaskFileDO; -import com.orion.visor.module.asset.entity.dto.TerminalConnectDTO; -import com.orion.visor.module.asset.enums.UploadTaskFileStatusEnum; -import com.orion.visor.module.asset.handler.host.jsch.SessionStores; -import com.orion.visor.module.asset.handler.host.upload.model.FileUploadFileItemDTO; -import com.orion.visor.module.asset.service.TerminalService; -import com.orion.visor.module.asset.utils.SftpUtils; +import cn.orionsec.kit.lang.utils.io.Streams; +import cn.orionsec.kit.net.host.SessionStore; +import cn.orionsec.kit.net.host.sftp.SftpExecutor; +import cn.orionsec.kit.spring.SpringHolder; import lombok.Getter; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.framework.common.enums.EndpointDefine; +import org.dromara.visor.framework.common.file.FileClient; +import org.dromara.visor.module.asset.dao.UploadTaskFileDAO; +import org.dromara.visor.module.asset.define.config.AppSftpConfig; +import org.dromara.visor.module.asset.entity.domain.UploadTaskFileDO; +import org.dromara.visor.module.asset.entity.dto.TerminalConnectDTO; +import org.dromara.visor.module.asset.enums.UploadTaskFileStatusEnum; +import org.dromara.visor.module.asset.handler.host.jsch.SessionStores; +import org.dromara.visor.module.asset.handler.host.upload.model.FileUploadFileItemDTO; +import org.dromara.visor.module.asset.service.TerminalService; +import org.dromara.visor.module.asset.utils.SftpUtils; import java.io.InputStream; import java.io.OutputStream; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/upload/uploader/IFileUploader.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/upload/uploader/IFileUploader.java similarity index 83% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/upload/uploader/IFileUploader.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/upload/uploader/IFileUploader.java index 8343ebf1..5a7042e5 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/upload/uploader/IFileUploader.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/upload/uploader/IFileUploader.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.handler.host.upload.uploader; +package org.dromara.visor.module.asset.handler.host.upload.uploader; -import com.orion.lang.able.SafeCloseable; -import com.orion.visor.module.asset.handler.host.upload.model.FileUploadFileItemDTO; +import cn.orionsec.kit.lang.able.SafeCloseable; +import org.dromara.visor.module.asset.handler.host.upload.model.FileUploadFileItemDTO; import java.util.List; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/interceptor/ExecLogTailInterceptor.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/interceptor/ExecLogTailInterceptor.java similarity index 88% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/interceptor/ExecLogTailInterceptor.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/interceptor/ExecLogTailInterceptor.java index 6e33afee..03492fff 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/interceptor/ExecLogTailInterceptor.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/interceptor/ExecLogTailInterceptor.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.interceptor; +package org.dromara.visor.module.asset.interceptor; -import com.orion.lang.utils.Urls; -import com.orion.visor.framework.common.constant.ExtraFieldConst; -import com.orion.visor.module.asset.entity.dto.ExecLogTailDTO; -import com.orion.visor.module.asset.service.ExecLogService; +import cn.orionsec.kit.lang.utils.Urls; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.common.constant.ExtraFieldConst; +import org.dromara.visor.module.asset.entity.dto.ExecLogTailDTO; +import org.dromara.visor.module.asset.service.ExecLogService; import org.springframework.http.server.ServerHttpRequest; import org.springframework.http.server.ServerHttpResponse; import org.springframework.stereotype.Component; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/interceptor/TerminalAccessInterceptor.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/interceptor/TerminalAccessInterceptor.java similarity index 85% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/interceptor/TerminalAccessInterceptor.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/interceptor/TerminalAccessInterceptor.java index 9f70e9f5..96b6a4a0 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/interceptor/TerminalAccessInterceptor.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/interceptor/TerminalAccessInterceptor.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.interceptor; +package org.dromara.visor.module.asset.interceptor; -import com.orion.lang.utils.Urls; -import com.orion.visor.framework.common.constant.ExtraFieldConst; -import com.orion.visor.framework.common.meta.TraceIdHolder; -import com.orion.visor.framework.common.utils.Requests; -import com.orion.visor.module.asset.entity.dto.TerminalAccessDTO; -import com.orion.visor.module.asset.service.TerminalService; +import cn.orionsec.kit.lang.utils.Urls; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.common.constant.ExtraFieldConst; +import org.dromara.visor.framework.common.meta.TraceIdHolder; +import org.dromara.visor.framework.common.utils.Requests; +import org.dromara.visor.module.asset.entity.dto.TerminalAccessDTO; +import org.dromara.visor.module.asset.service.TerminalService; import org.springframework.http.server.ServerHttpRequest; import org.springframework.http.server.ServerHttpResponse; import org.springframework.stereotype.Component; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/interceptor/TerminalTransferInterceptor.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/interceptor/TerminalTransferInterceptor.java similarity index 85% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/interceptor/TerminalTransferInterceptor.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/interceptor/TerminalTransferInterceptor.java index 00cd1a90..69c393e3 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/interceptor/TerminalTransferInterceptor.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/interceptor/TerminalTransferInterceptor.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.interceptor; +package org.dromara.visor.module.asset.interceptor; -import com.orion.lang.utils.Urls; -import com.orion.visor.framework.common.constant.ExtraFieldConst; -import com.orion.visor.framework.common.meta.TraceIdHolder; -import com.orion.visor.framework.common.utils.Requests; -import com.orion.visor.module.asset.entity.dto.TerminalTransferDTO; -import com.orion.visor.module.asset.service.TerminalService; +import cn.orionsec.kit.lang.utils.Urls; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.common.constant.ExtraFieldConst; +import org.dromara.visor.framework.common.meta.TraceIdHolder; +import org.dromara.visor.framework.common.utils.Requests; +import org.dromara.visor.module.asset.entity.dto.TerminalTransferDTO; +import org.dromara.visor.module.asset.service.TerminalService; import org.springframework.http.server.ServerHttpRequest; import org.springframework.http.server.ServerHttpResponse; import org.springframework.stereotype.Component; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/AssetAuthorizedDataService.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/AssetAuthorizedDataService.java similarity index 81% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/AssetAuthorizedDataService.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/AssetAuthorizedDataService.java index 56315da0..e61b3a5a 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/AssetAuthorizedDataService.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/AssetAuthorizedDataService.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.service; +package org.dromara.visor.module.asset.service; -import com.orion.visor.module.asset.entity.request.asset.AssetAuthorizedDataQueryRequest; -import com.orion.visor.module.asset.entity.vo.AuthorizedHostWrapperVO; -import com.orion.visor.module.asset.entity.vo.HostIdentityVO; -import com.orion.visor.module.asset.entity.vo.HostKeyVO; -import com.orion.visor.module.asset.enums.HostTypeEnum; -import com.orion.visor.module.infra.enums.DataPermissionTypeEnum; +import org.dromara.visor.module.asset.entity.request.asset.AssetAuthorizedDataQueryRequest; +import org.dromara.visor.module.asset.entity.vo.AuthorizedHostWrapperVO; +import org.dromara.visor.module.asset.entity.vo.HostIdentityVO; +import org.dromara.visor.module.asset.entity.vo.HostKeyVO; +import org.dromara.visor.module.asset.enums.HostTypeEnum; +import org.dromara.visor.module.infra.enums.DataPermissionTypeEnum; import java.util.List; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/AssetDataGrantService.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/AssetDataGrantService.java similarity index 87% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/AssetDataGrantService.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/AssetDataGrantService.java index e277827c..21ca017b 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/AssetDataGrantService.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/AssetDataGrantService.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.service; +package org.dromara.visor.module.asset.service; -import com.orion.visor.module.asset.entity.request.asset.AssetDataGrantRequest; -import com.orion.visor.module.infra.enums.DataPermissionTypeEnum; +import org.dromara.visor.module.asset.entity.request.asset.AssetDataGrantRequest; +import org.dromara.visor.module.infra.enums.DataPermissionTypeEnum; /** * 资产模块 数据授权服务 diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/CommandSnippetGroupService.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/CommandSnippetGroupService.java similarity index 80% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/CommandSnippetGroupService.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/CommandSnippetGroupService.java index 95ead368..d9fe9c8c 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/CommandSnippetGroupService.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/CommandSnippetGroupService.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.service; +package org.dromara.visor.module.asset.service; -import com.orion.visor.module.asset.entity.request.command.CommandSnippetGroupCreateRequest; -import com.orion.visor.module.asset.entity.request.command.CommandSnippetGroupDeleteRequest; -import com.orion.visor.module.asset.entity.request.command.CommandSnippetGroupUpdateRequest; -import com.orion.visor.module.asset.entity.vo.CommandSnippetGroupVO; +import org.dromara.visor.module.asset.entity.request.command.CommandSnippetGroupCreateRequest; +import org.dromara.visor.module.asset.entity.request.command.CommandSnippetGroupDeleteRequest; +import org.dromara.visor.module.asset.entity.request.command.CommandSnippetGroupUpdateRequest; +import org.dromara.visor.module.asset.entity.vo.CommandSnippetGroupVO; import java.util.List; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/CommandSnippetService.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/CommandSnippetService.java similarity index 85% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/CommandSnippetService.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/CommandSnippetService.java index ca6c9561..89a71e92 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/CommandSnippetService.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/CommandSnippetService.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.service; +package org.dromara.visor.module.asset.service; -import com.orion.visor.module.asset.entity.request.command.CommandSnippetCreateRequest; -import com.orion.visor.module.asset.entity.request.command.CommandSnippetUpdateRequest; -import com.orion.visor.module.asset.entity.vo.CommandSnippetVO; -import com.orion.visor.module.asset.entity.vo.CommandSnippetWrapperVO; +import org.dromara.visor.module.asset.entity.request.command.CommandSnippetCreateRequest; +import org.dromara.visor.module.asset.entity.request.command.CommandSnippetUpdateRequest; +import org.dromara.visor.module.asset.entity.vo.CommandSnippetVO; +import org.dromara.visor.module.asset.entity.vo.CommandSnippetWrapperVO; import java.util.List; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/ExecCommandService.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/ExecCommandService.java similarity index 83% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/ExecCommandService.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/ExecCommandService.java index 7733ad7a..61e55b05 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/ExecCommandService.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/ExecCommandService.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.service; +package org.dromara.visor.module.asset.service; -import com.orion.visor.module.asset.entity.dto.ExecCommandExecDTO; -import com.orion.visor.module.asset.entity.request.exec.ExecCommandRequest; -import com.orion.visor.module.asset.entity.vo.ExecLogVO; +import org.dromara.visor.module.asset.entity.dto.ExecCommandExecDTO; +import org.dromara.visor.module.asset.entity.request.exec.ExecCommandRequest; +import org.dromara.visor.module.asset.entity.vo.ExecLogVO; /** * 批量执行服务 diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/ExecHostLogService.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/ExecHostLogService.java similarity index 92% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/ExecHostLogService.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/ExecHostLogService.java index d9e7a07f..be13c739 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/ExecHostLogService.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/ExecHostLogService.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.service; +package org.dromara.visor.module.asset.service; -import com.orion.visor.module.asset.entity.vo.ExecHostLogVO; +import org.dromara.visor.module.asset.entity.vo.ExecHostLogVO; import java.util.List; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/ExecJobHostService.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/ExecJobHostService.java similarity index 97% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/ExecJobHostService.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/ExecJobHostService.java index f3e35ec5..e5522f38 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/ExecJobHostService.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/ExecJobHostService.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.service; +package org.dromara.visor.module.asset.service; import java.util.List; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/ExecJobService.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/ExecJobService.java similarity index 91% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/ExecJobService.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/ExecJobService.java index 8ea5f40a..ad228cd1 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/ExecJobService.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/ExecJobService.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.service; +package org.dromara.visor.module.asset.service; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.visor.module.asset.entity.request.exec.*; -import com.orion.visor.module.asset.entity.vo.ExecJobVO; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import org.dromara.visor.module.asset.entity.request.exec.*; +import org.dromara.visor.module.asset.entity.vo.ExecJobVO; import java.util.List; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/ExecLogService.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/ExecLogService.java similarity index 86% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/ExecLogService.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/ExecLogService.java index bdd1392d..dac32091 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/ExecLogService.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/ExecLogService.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.service; +package org.dromara.visor.module.asset.service; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.visor.module.asset.entity.domain.ExecLogDO; -import com.orion.visor.module.asset.entity.dto.ExecLogTailDTO; -import com.orion.visor.module.asset.entity.request.exec.ExecLogClearRequest; -import com.orion.visor.module.asset.entity.request.exec.ExecLogQueryRequest; -import com.orion.visor.module.asset.entity.request.exec.ExecLogTailRequest; -import com.orion.visor.module.asset.entity.vo.ExecLogStatusVO; -import com.orion.visor.module.asset.entity.vo.ExecLogVO; +import org.dromara.visor.module.asset.entity.domain.ExecLogDO; +import org.dromara.visor.module.asset.entity.dto.ExecLogTailDTO; +import org.dromara.visor.module.asset.entity.request.exec.ExecLogClearRequest; +import org.dromara.visor.module.asset.entity.request.exec.ExecLogQueryRequest; +import org.dromara.visor.module.asset.entity.request.exec.ExecLogTailRequest; +import org.dromara.visor.module.asset.entity.vo.ExecLogStatusVO; +import org.dromara.visor.module.asset.entity.vo.ExecLogVO; import javax.servlet.http.HttpServletResponse; import java.util.List; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/ExecTemplateHostService.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/ExecTemplateHostService.java similarity index 97% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/ExecTemplateHostService.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/ExecTemplateHostService.java index 04111146..7becc27c 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/ExecTemplateHostService.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/ExecTemplateHostService.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.service; +package org.dromara.visor.module.asset.service; import java.util.List; import java.util.Map; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/ExecTemplateService.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/ExecTemplateService.java similarity index 82% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/ExecTemplateService.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/ExecTemplateService.java index b096be5a..3efb7295 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/ExecTemplateService.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/ExecTemplateService.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.service; +package org.dromara.visor.module.asset.service; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.visor.module.asset.entity.request.exec.ExecTemplateCreateRequest; -import com.orion.visor.module.asset.entity.request.exec.ExecTemplateQueryRequest; -import com.orion.visor.module.asset.entity.request.exec.ExecTemplateUpdateRequest; -import com.orion.visor.module.asset.entity.vo.ExecTemplateVO; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import org.dromara.visor.module.asset.entity.request.exec.ExecTemplateCreateRequest; +import org.dromara.visor.module.asset.entity.request.exec.ExecTemplateQueryRequest; +import org.dromara.visor.module.asset.entity.request.exec.ExecTemplateUpdateRequest; +import org.dromara.visor.module.asset.entity.vo.ExecTemplateVO; import java.util.List; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/HostConfigService.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/HostConfigService.java similarity index 87% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/HostConfigService.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/HostConfigService.java index 7444cc1e..829f04d5 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/HostConfigService.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/HostConfigService.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.service; +package org.dromara.visor.module.asset.service; -import com.orion.visor.framework.common.handler.data.model.GenericsDataModel; -import com.orion.visor.module.asset.entity.domain.HostDO; -import com.orion.visor.module.asset.enums.HostTypeEnum; +import org.dromara.visor.framework.common.handler.data.model.GenericsDataModel; +import org.dromara.visor.module.asset.entity.domain.HostDO; +import org.dromara.visor.module.asset.enums.HostTypeEnum; import java.util.List; import java.util.Map; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/HostExtraService.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/HostExtraService.java similarity index 82% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/HostExtraService.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/HostExtraService.java index 8c14c283..cb9bb236 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/HostExtraService.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/HostExtraService.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.service; +package org.dromara.visor.module.asset.service; -import com.orion.visor.framework.common.handler.data.model.GenericsDataModel; -import com.orion.visor.module.asset.entity.request.host.HostExtraQueryRequest; -import com.orion.visor.module.asset.entity.request.host.HostExtraUpdateRequest; -import com.orion.visor.module.asset.enums.HostExtraItemEnum; +import org.dromara.visor.framework.common.handler.data.model.GenericsDataModel; +import org.dromara.visor.module.asset.entity.request.host.HostExtraQueryRequest; +import org.dromara.visor.module.asset.entity.request.host.HostExtraUpdateRequest; +import org.dromara.visor.module.asset.enums.HostExtraItemEnum; import java.util.Map; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/HostGroupService.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/HostGroupService.java similarity index 81% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/HostGroupService.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/HostGroupService.java index 5b5ec6a9..ad936325 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/HostGroupService.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/HostGroupService.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.service; +package org.dromara.visor.module.asset.service; -import com.orion.visor.module.asset.entity.request.host.HostGroupRelUpdateRequest; -import com.orion.visor.module.asset.entity.vo.HostGroupTreeVO; -import com.orion.visor.module.infra.entity.dto.data.DataGroupCreateDTO; -import com.orion.visor.module.infra.entity.dto.data.DataGroupMoveDTO; -import com.orion.visor.module.infra.entity.dto.data.DataGroupRenameDTO; +import org.dromara.visor.module.asset.entity.request.host.HostGroupRelUpdateRequest; +import org.dromara.visor.module.asset.entity.vo.HostGroupTreeVO; +import org.dromara.visor.module.infra.entity.dto.data.DataGroupCreateDTO; +import org.dromara.visor.module.infra.entity.dto.data.DataGroupMoveDTO; +import org.dromara.visor.module.infra.entity.dto.data.DataGroupRenameDTO; import java.util.List; import java.util.Set; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/HostIdentityService.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/HostIdentityService.java similarity index 82% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/HostIdentityService.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/HostIdentityService.java index b8f73098..6ca81b40 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/HostIdentityService.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/HostIdentityService.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.service; +package org.dromara.visor.module.asset.service; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.visor.module.asset.entity.request.host.HostIdentityCreateRequest; -import com.orion.visor.module.asset.entity.request.host.HostIdentityQueryRequest; -import com.orion.visor.module.asset.entity.request.host.HostIdentityUpdateRequest; -import com.orion.visor.module.asset.entity.vo.HostIdentityVO; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import org.dromara.visor.module.asset.entity.request.host.HostIdentityCreateRequest; +import org.dromara.visor.module.asset.entity.request.host.HostIdentityQueryRequest; +import org.dromara.visor.module.asset.entity.request.host.HostIdentityUpdateRequest; +import org.dromara.visor.module.asset.entity.vo.HostIdentityVO; import java.util.List; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/HostKeyService.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/HostKeyService.java similarity index 81% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/HostKeyService.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/HostKeyService.java index 32515e80..c6dd4445 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/HostKeyService.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/HostKeyService.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.service; +package org.dromara.visor.module.asset.service; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.visor.module.asset.entity.domain.HostKeyDO; -import com.orion.visor.module.asset.entity.request.host.HostKeyCreateRequest; -import com.orion.visor.module.asset.entity.request.host.HostKeyQueryRequest; -import com.orion.visor.module.asset.entity.request.host.HostKeyUpdateRequest; -import com.orion.visor.module.asset.entity.vo.HostKeyVO; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import org.dromara.visor.module.asset.entity.domain.HostKeyDO; +import org.dromara.visor.module.asset.entity.request.host.HostKeyCreateRequest; +import org.dromara.visor.module.asset.entity.request.host.HostKeyQueryRequest; +import org.dromara.visor.module.asset.entity.request.host.HostKeyUpdateRequest; +import org.dromara.visor.module.asset.entity.vo.HostKeyVO; import java.util.List; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/HostService.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/HostService.java similarity index 89% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/HostService.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/HostService.java index 412193f1..592a8756 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/HostService.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/HostService.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.service; +package org.dromara.visor.module.asset.service; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.visor.module.asset.entity.domain.HostDO; -import com.orion.visor.module.asset.entity.request.host.*; -import com.orion.visor.module.asset.entity.vo.HostConfigVO; -import com.orion.visor.module.asset.entity.vo.HostVO; +import org.dromara.visor.module.asset.entity.domain.HostDO; +import org.dromara.visor.module.asset.entity.request.host.*; +import org.dromara.visor.module.asset.entity.vo.HostConfigVO; +import org.dromara.visor.module.asset.entity.vo.HostVO; import java.util.List; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/PathBookmarkGroupService.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/PathBookmarkGroupService.java similarity index 80% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/PathBookmarkGroupService.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/PathBookmarkGroupService.java index 5fef5d75..2e097526 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/PathBookmarkGroupService.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/PathBookmarkGroupService.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.service; +package org.dromara.visor.module.asset.service; -import com.orion.visor.module.asset.entity.request.path.PathBookmarkGroupCreateRequest; -import com.orion.visor.module.asset.entity.request.path.PathBookmarkGroupDeleteRequest; -import com.orion.visor.module.asset.entity.request.path.PathBookmarkGroupUpdateRequest; -import com.orion.visor.module.asset.entity.vo.PathBookmarkGroupVO; +import org.dromara.visor.module.asset.entity.request.path.PathBookmarkGroupCreateRequest; +import org.dromara.visor.module.asset.entity.request.path.PathBookmarkGroupDeleteRequest; +import org.dromara.visor.module.asset.entity.request.path.PathBookmarkGroupUpdateRequest; +import org.dromara.visor.module.asset.entity.vo.PathBookmarkGroupVO; import java.util.List; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/PathBookmarkService.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/PathBookmarkService.java similarity index 85% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/PathBookmarkService.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/PathBookmarkService.java index 8a02b2f7..ac99fdbd 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/PathBookmarkService.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/PathBookmarkService.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.service; +package org.dromara.visor.module.asset.service; -import com.orion.visor.module.asset.entity.request.path.PathBookmarkCreateRequest; -import com.orion.visor.module.asset.entity.request.path.PathBookmarkUpdateRequest; -import com.orion.visor.module.asset.entity.vo.PathBookmarkVO; -import com.orion.visor.module.asset.entity.vo.PathBookmarkWrapperVO; +import org.dromara.visor.module.asset.entity.request.path.PathBookmarkCreateRequest; +import org.dromara.visor.module.asset.entity.request.path.PathBookmarkUpdateRequest; +import org.dromara.visor.module.asset.entity.vo.PathBookmarkVO; +import org.dromara.visor.module.asset.entity.vo.PathBookmarkWrapperVO; import java.util.List; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/TerminalConnectLogService.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/TerminalConnectLogService.java similarity index 82% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/TerminalConnectLogService.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/TerminalConnectLogService.java index 036ed51e..4dfb9a42 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/TerminalConnectLogService.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/TerminalConnectLogService.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.service; +package org.dromara.visor.module.asset.service; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.visor.module.asset.entity.domain.TerminalConnectLogDO; -import com.orion.visor.module.asset.entity.request.host.TerminalConnectLogClearRequest; -import com.orion.visor.module.asset.entity.request.host.TerminalConnectLogCreateRequest; -import com.orion.visor.module.asset.entity.request.host.TerminalConnectLogQueryRequest; -import com.orion.visor.module.asset.entity.vo.TerminalConnectLogVO; -import com.orion.visor.module.asset.enums.TerminalConnectStatusEnum; -import com.orion.visor.module.asset.enums.TerminalConnectTypeEnum; +import org.dromara.visor.module.asset.entity.domain.TerminalConnectLogDO; +import org.dromara.visor.module.asset.entity.request.host.TerminalConnectLogClearRequest; +import org.dromara.visor.module.asset.entity.request.host.TerminalConnectLogCreateRequest; +import org.dromara.visor.module.asset.entity.request.host.TerminalConnectLogQueryRequest; +import org.dromara.visor.module.asset.entity.vo.TerminalConnectLogVO; +import org.dromara.visor.module.asset.enums.TerminalConnectStatusEnum; +import org.dromara.visor.module.asset.enums.TerminalConnectTypeEnum; import java.util.List; import java.util.Map; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/TerminalService.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/TerminalService.java similarity index 85% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/TerminalService.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/TerminalService.java index 980e9b7f..aaed144e 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/TerminalService.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/TerminalService.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.service; +package org.dromara.visor.module.asset.service; -import com.orion.visor.module.asset.entity.domain.HostDO; -import com.orion.visor.module.asset.entity.dto.TerminalAccessDTO; -import com.orion.visor.module.asset.entity.dto.TerminalConnectDTO; -import com.orion.visor.module.asset.entity.dto.TerminalTransferDTO; -import com.orion.visor.module.asset.entity.vo.TerminalThemeVO; +import org.dromara.visor.module.asset.entity.domain.HostDO; +import org.dromara.visor.module.asset.entity.dto.TerminalAccessDTO; +import org.dromara.visor.module.asset.entity.dto.TerminalConnectDTO; +import org.dromara.visor.module.asset.entity.dto.TerminalTransferDTO; +import org.dromara.visor.module.asset.entity.vo.TerminalThemeVO; import java.util.List; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/TerminalSftpService.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/TerminalSftpService.java similarity index 89% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/TerminalSftpService.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/TerminalSftpService.java index 54dff506..745d7943 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/TerminalSftpService.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/TerminalSftpService.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.service; +package org.dromara.visor.module.asset.service; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.visor.module.asset.entity.request.host.TerminalSftpLogQueryRequest; -import com.orion.visor.module.asset.entity.vo.TerminalSftpLogVO; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import org.dromara.visor.module.asset.entity.request.host.TerminalSftpLogQueryRequest; +import org.dromara.visor.module.asset.entity.vo.TerminalSftpLogVO; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.servlet.mvc.method.annotation.StreamingResponseBody; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/UploadTaskFileService.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/UploadTaskFileService.java similarity index 91% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/UploadTaskFileService.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/UploadTaskFileService.java index 0fe9bf26..a0da02db 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/UploadTaskFileService.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/UploadTaskFileService.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.service; +package org.dromara.visor.module.asset.service; -import com.orion.visor.module.asset.entity.vo.UploadTaskFileVO; +import org.dromara.visor.module.asset.entity.vo.UploadTaskFileVO; import java.util.List; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/UploadTaskService.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/UploadTaskService.java similarity index 80% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/UploadTaskService.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/UploadTaskService.java index ddf7bfc1..8d5a9118 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/UploadTaskService.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/UploadTaskService.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.service; +package org.dromara.visor.module.asset.service; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.visor.module.asset.entity.domain.UploadTaskDO; -import com.orion.visor.module.asset.entity.request.upload.UploadTaskClearRequest; -import com.orion.visor.module.asset.entity.request.upload.UploadTaskCreateRequest; -import com.orion.visor.module.asset.entity.request.upload.UploadTaskQueryRequest; -import com.orion.visor.module.asset.entity.request.upload.UploadTaskRequest; -import com.orion.visor.module.asset.entity.vo.UploadTaskCreateVO; -import com.orion.visor.module.asset.entity.vo.UploadTaskStatusVO; -import com.orion.visor.module.asset.entity.vo.UploadTaskVO; +import org.dromara.visor.module.asset.entity.domain.UploadTaskDO; +import org.dromara.visor.module.asset.entity.request.upload.UploadTaskClearRequest; +import org.dromara.visor.module.asset.entity.request.upload.UploadTaskCreateRequest; +import org.dromara.visor.module.asset.entity.request.upload.UploadTaskQueryRequest; +import org.dromara.visor.module.asset.entity.request.upload.UploadTaskRequest; +import org.dromara.visor.module.asset.entity.vo.UploadTaskCreateVO; +import org.dromara.visor.module.asset.entity.vo.UploadTaskStatusVO; +import org.dromara.visor.module.asset.entity.vo.UploadTaskVO; import java.util.List; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/AssetAuthorizedDataServiceImpl.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/AssetAuthorizedDataServiceImpl.java similarity index 88% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/AssetAuthorizedDataServiceImpl.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/AssetAuthorizedDataServiceImpl.java index f36115f7..5d0cd284 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/AssetAuthorizedDataServiceImpl.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/AssetAuthorizedDataServiceImpl.java @@ -13,32 +13,32 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.service.impl; +package org.dromara.visor.module.asset.service.impl; -import com.orion.lang.function.Functions; -import com.orion.lang.utils.collect.Lists; -import com.orion.lang.utils.collect.Maps; -import com.orion.visor.framework.common.constant.Const; -import com.orion.visor.framework.common.utils.TreeUtils; -import com.orion.visor.framework.common.utils.Valid; -import com.orion.visor.module.asset.convert.HostGroupConvert; -import com.orion.visor.module.asset.dao.HostDAO; -import com.orion.visor.module.asset.entity.request.asset.AssetAuthorizedDataQueryRequest; -import com.orion.visor.module.asset.entity.vo.*; -import com.orion.visor.module.asset.enums.HostExtraItemEnum; -import com.orion.visor.module.asset.enums.HostStatusEnum; -import com.orion.visor.module.asset.enums.HostTypeEnum; -import com.orion.visor.module.asset.handler.host.extra.model.HostLabelExtraModel; -import com.orion.visor.module.asset.service.AssetAuthorizedDataService; -import com.orion.visor.module.asset.service.HostIdentityService; -import com.orion.visor.module.asset.service.HostKeyService; -import com.orion.visor.module.asset.service.HostService; -import com.orion.visor.module.infra.api.*; -import com.orion.visor.module.infra.entity.dto.data.DataGroupDTO; -import com.orion.visor.module.infra.entity.dto.tag.TagDTO; -import com.orion.visor.module.infra.enums.*; +import cn.orionsec.kit.lang.function.Functions; +import cn.orionsec.kit.lang.utils.collect.Lists; +import cn.orionsec.kit.lang.utils.collect.Maps; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.framework.common.utils.TreeUtils; +import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.module.asset.convert.HostGroupConvert; +import org.dromara.visor.module.asset.dao.HostDAO; +import org.dromara.visor.module.asset.entity.request.asset.AssetAuthorizedDataQueryRequest; +import org.dromara.visor.module.asset.entity.vo.*; +import org.dromara.visor.module.asset.enums.HostExtraItemEnum; +import org.dromara.visor.module.asset.enums.HostStatusEnum; +import org.dromara.visor.module.asset.enums.HostTypeEnum; +import org.dromara.visor.module.asset.handler.host.extra.model.HostLabelExtraModel; +import org.dromara.visor.module.asset.service.AssetAuthorizedDataService; +import org.dromara.visor.module.asset.service.HostIdentityService; +import org.dromara.visor.module.asset.service.HostKeyService; +import org.dromara.visor.module.asset.service.HostService; +import org.dromara.visor.module.infra.api.*; +import org.dromara.visor.module.infra.entity.dto.data.DataGroupDTO; +import org.dromara.visor.module.infra.entity.dto.tag.TagDTO; +import org.dromara.visor.module.infra.enums.*; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/AssetDataGrantServiceImpl.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/AssetDataGrantServiceImpl.java similarity index 78% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/AssetDataGrantServiceImpl.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/AssetDataGrantServiceImpl.java index c76474d6..50a93161 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/AssetDataGrantServiceImpl.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/AssetDataGrantServiceImpl.java @@ -13,30 +13,30 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.service.impl; +package org.dromara.visor.module.asset.service.impl; -import com.orion.lang.utils.collect.Lists; -import com.orion.spring.SpringHolder; -import com.orion.visor.framework.biz.operator.log.core.utils.OperatorLogs; -import com.orion.visor.framework.common.constant.Const; -import com.orion.visor.framework.common.constant.ErrorMessage; -import com.orion.visor.framework.common.utils.Valid; -import com.orion.visor.module.asset.dao.HostIdentityDAO; -import com.orion.visor.module.asset.dao.HostKeyDAO; -import com.orion.visor.module.asset.entity.domain.HostIdentityDO; -import com.orion.visor.module.asset.entity.domain.HostKeyDO; -import com.orion.visor.module.asset.entity.request.asset.AssetDataGrantRequest; -import com.orion.visor.module.asset.service.AssetDataGrantService; -import com.orion.visor.module.infra.api.DataGroupApi; -import com.orion.visor.module.infra.api.DataPermissionApi; -import com.orion.visor.module.infra.api.SystemRoleApi; -import com.orion.visor.module.infra.api.SystemUserApi; -import com.orion.visor.module.infra.entity.dto.data.DataGroupDTO; -import com.orion.visor.module.infra.entity.dto.data.DataPermissionUpdateDTO; -import com.orion.visor.module.infra.entity.dto.role.SystemRoleDTO; -import com.orion.visor.module.infra.entity.dto.user.SystemUserDTO; -import com.orion.visor.module.infra.enums.DataPermissionTypeEnum; +import cn.orionsec.kit.lang.utils.collect.Lists; +import cn.orionsec.kit.spring.SpringHolder; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; +import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.framework.common.constant.ErrorMessage; +import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.module.asset.dao.HostIdentityDAO; +import org.dromara.visor.module.asset.dao.HostKeyDAO; +import org.dromara.visor.module.asset.entity.domain.HostIdentityDO; +import org.dromara.visor.module.asset.entity.domain.HostKeyDO; +import org.dromara.visor.module.asset.entity.request.asset.AssetDataGrantRequest; +import org.dromara.visor.module.asset.service.AssetDataGrantService; +import org.dromara.visor.module.infra.api.DataGroupApi; +import org.dromara.visor.module.infra.api.DataPermissionApi; +import org.dromara.visor.module.infra.api.SystemRoleApi; +import org.dromara.visor.module.infra.api.SystemUserApi; +import org.dromara.visor.module.infra.entity.dto.data.DataGroupDTO; +import org.dromara.visor.module.infra.entity.dto.data.DataPermissionUpdateDTO; +import org.dromara.visor.module.infra.entity.dto.role.SystemRoleDTO; +import org.dromara.visor.module.infra.entity.dto.user.SystemUserDTO; +import org.dromara.visor.module.infra.enums.DataPermissionTypeEnum; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/CommandSnippetGroupServiceImpl.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/CommandSnippetGroupServiceImpl.java similarity index 78% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/CommandSnippetGroupServiceImpl.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/CommandSnippetGroupServiceImpl.java index 2bcb453d..5c926fae 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/CommandSnippetGroupServiceImpl.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/CommandSnippetGroupServiceImpl.java @@ -13,30 +13,30 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.service.impl; +package org.dromara.visor.module.asset.service.impl; +import cn.orionsec.kit.lang.utils.Booleans; import com.alibaba.fastjson.JSON; -import com.orion.lang.utils.Booleans; -import com.orion.visor.framework.common.constant.Const; -import com.orion.visor.framework.common.constant.ErrorMessage; -import com.orion.visor.framework.common.utils.Valid; -import com.orion.visor.framework.security.core.utils.SecurityUtils; -import com.orion.visor.module.asset.convert.CommandSnippetGroupConvert; -import com.orion.visor.module.asset.dao.CommandSnippetDAO; -import com.orion.visor.module.asset.entity.domain.CommandSnippetDO; -import com.orion.visor.module.asset.entity.request.command.CommandSnippetGroupCreateRequest; -import com.orion.visor.module.asset.entity.request.command.CommandSnippetGroupDeleteRequest; -import com.orion.visor.module.asset.entity.request.command.CommandSnippetGroupUpdateRequest; -import com.orion.visor.module.asset.entity.vo.CommandSnippetGroupVO; -import com.orion.visor.module.asset.service.CommandSnippetGroupService; -import com.orion.visor.module.asset.service.CommandSnippetService; -import com.orion.visor.module.infra.api.DataGroupApi; -import com.orion.visor.module.infra.api.DataGroupUserApi; -import com.orion.visor.module.infra.entity.dto.data.DataGroupCreateDTO; -import com.orion.visor.module.infra.entity.dto.data.DataGroupDTO; -import com.orion.visor.module.infra.entity.dto.data.DataGroupRenameDTO; -import com.orion.visor.module.infra.enums.DataGroupTypeEnum; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.framework.common.constant.ErrorMessage; +import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.framework.security.core.utils.SecurityUtils; +import org.dromara.visor.module.asset.convert.CommandSnippetGroupConvert; +import org.dromara.visor.module.asset.dao.CommandSnippetDAO; +import org.dromara.visor.module.asset.entity.domain.CommandSnippetDO; +import org.dromara.visor.module.asset.entity.request.command.CommandSnippetGroupCreateRequest; +import org.dromara.visor.module.asset.entity.request.command.CommandSnippetGroupDeleteRequest; +import org.dromara.visor.module.asset.entity.request.command.CommandSnippetGroupUpdateRequest; +import org.dromara.visor.module.asset.entity.vo.CommandSnippetGroupVO; +import org.dromara.visor.module.asset.service.CommandSnippetGroupService; +import org.dromara.visor.module.asset.service.CommandSnippetService; +import org.dromara.visor.module.infra.api.DataGroupApi; +import org.dromara.visor.module.infra.api.DataGroupUserApi; +import org.dromara.visor.module.infra.entity.dto.data.DataGroupCreateDTO; +import org.dromara.visor.module.infra.entity.dto.data.DataGroupDTO; +import org.dromara.visor.module.infra.entity.dto.data.DataGroupRenameDTO; +import org.dromara.visor.module.infra.enums.DataGroupTypeEnum; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/CommandSnippetServiceImpl.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/CommandSnippetServiceImpl.java similarity index 86% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/CommandSnippetServiceImpl.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/CommandSnippetServiceImpl.java index 48cf2016..5a637f7c 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/CommandSnippetServiceImpl.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/CommandSnippetServiceImpl.java @@ -13,30 +13,30 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.service.impl; +package org.dromara.visor.module.asset.service.impl; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.orion.visor.framework.common.constant.ErrorMessage; -import com.orion.visor.framework.common.utils.Valid; -import com.orion.visor.framework.redis.core.utils.RedisMaps; -import com.orion.visor.framework.redis.core.utils.barrier.CacheBarriers; -import com.orion.visor.framework.security.core.utils.SecurityUtils; -import com.orion.visor.module.asset.convert.CommandSnippetConvert; -import com.orion.visor.module.asset.dao.CommandSnippetDAO; -import com.orion.visor.module.asset.define.cache.CommandSnippetCacheKeyDefine; -import com.orion.visor.module.asset.entity.domain.CommandSnippetDO; -import com.orion.visor.module.asset.entity.dto.CommandSnippetCacheDTO; -import com.orion.visor.module.asset.entity.request.command.CommandSnippetCreateRequest; -import com.orion.visor.module.asset.entity.request.command.CommandSnippetUpdateRequest; -import com.orion.visor.module.asset.entity.vo.CommandSnippetGroupVO; -import com.orion.visor.module.asset.entity.vo.CommandSnippetVO; -import com.orion.visor.module.asset.entity.vo.CommandSnippetWrapperVO; -import com.orion.visor.module.asset.service.CommandSnippetGroupService; -import com.orion.visor.module.asset.service.CommandSnippetService; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.common.constant.ErrorMessage; +import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.framework.redis.core.utils.RedisMaps; +import org.dromara.visor.framework.redis.core.utils.barrier.CacheBarriers; +import org.dromara.visor.framework.security.core.utils.SecurityUtils; +import org.dromara.visor.module.asset.convert.CommandSnippetConvert; +import org.dromara.visor.module.asset.dao.CommandSnippetDAO; +import org.dromara.visor.module.asset.define.cache.CommandSnippetCacheKeyDefine; +import org.dromara.visor.module.asset.entity.domain.CommandSnippetDO; +import org.dromara.visor.module.asset.entity.dto.CommandSnippetCacheDTO; +import org.dromara.visor.module.asset.entity.request.command.CommandSnippetCreateRequest; +import org.dromara.visor.module.asset.entity.request.command.CommandSnippetUpdateRequest; +import org.dromara.visor.module.asset.entity.vo.CommandSnippetGroupVO; +import org.dromara.visor.module.asset.entity.vo.CommandSnippetVO; +import org.dromara.visor.module.asset.entity.vo.CommandSnippetWrapperVO; +import org.dromara.visor.module.asset.service.CommandSnippetGroupService; +import org.dromara.visor.module.asset.service.CommandSnippetService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/ExecCommandServiceImpl.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/ExecCommandServiceImpl.java similarity index 83% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/ExecCommandServiceImpl.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/ExecCommandServiceImpl.java index 4c730783..543c7ae1 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/ExecCommandServiceImpl.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/ExecCommandServiceImpl.java @@ -13,52 +13,52 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.service.impl; +package org.dromara.visor.module.asset.service.impl; +import cn.orionsec.kit.lang.annotation.Keep; +import cn.orionsec.kit.lang.function.Functions; +import cn.orionsec.kit.lang.id.UUIds; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.collect.Lists; +import cn.orionsec.kit.lang.utils.collect.Maps; +import cn.orionsec.kit.lang.utils.json.matcher.NoMatchStrategy; +import cn.orionsec.kit.lang.utils.json.matcher.ReplacementFormatter; +import cn.orionsec.kit.lang.utils.json.matcher.ReplacementFormatters; +import cn.orionsec.kit.lang.utils.time.Dates; import com.alibaba.fastjson.JSON; -import com.orion.lang.annotation.Keep; -import com.orion.lang.function.Functions; -import com.orion.lang.id.UUIds; -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.json.matcher.NoMatchStrategy; -import com.orion.lang.utils.json.matcher.ReplacementFormatter; -import com.orion.lang.utils.json.matcher.ReplacementFormatters; -import com.orion.lang.utils.time.Dates; -import com.orion.visor.framework.biz.operator.log.core.utils.OperatorLogs; -import com.orion.visor.framework.common.constant.Const; -import com.orion.visor.framework.common.constant.ErrorMessage; -import com.orion.visor.framework.common.constant.FileConst; -import com.orion.visor.framework.common.enums.EndpointDefine; -import com.orion.visor.framework.common.file.FileClient; -import com.orion.visor.framework.common.security.LoginUser; -import com.orion.visor.framework.common.utils.PathUtils; -import com.orion.visor.framework.common.utils.Valid; -import com.orion.visor.framework.security.core.utils.SecurityUtils; -import com.orion.visor.module.asset.convert.ExecConvert; -import com.orion.visor.module.asset.convert.ExecHostLogConvert; -import com.orion.visor.module.asset.convert.ExecLogConvert; -import com.orion.visor.module.asset.dao.ExecHostLogDAO; -import com.orion.visor.module.asset.dao.ExecLogDAO; -import com.orion.visor.module.asset.dao.HostDAO; -import com.orion.visor.module.asset.entity.domain.ExecHostLogDO; -import com.orion.visor.module.asset.entity.domain.ExecLogDO; -import com.orion.visor.module.asset.entity.domain.HostDO; -import com.orion.visor.module.asset.entity.dto.ExecCommandExecDTO; -import com.orion.visor.module.asset.entity.dto.ExecParameterSchemaDTO; -import com.orion.visor.module.asset.entity.request.exec.ExecCommandRequest; -import com.orion.visor.module.asset.entity.vo.ExecHostLogVO; -import com.orion.visor.module.asset.entity.vo.ExecLogVO; -import com.orion.visor.module.asset.enums.*; -import com.orion.visor.module.asset.handler.host.config.model.HostSshConfigModel; -import com.orion.visor.module.asset.handler.host.exec.command.ExecTaskExecutors; -import com.orion.visor.module.asset.handler.host.exec.command.model.ExecCommandDTO; -import com.orion.visor.module.asset.handler.host.exec.command.model.ExecCommandHostDTO; -import com.orion.visor.module.asset.service.AssetAuthorizedDataService; -import com.orion.visor.module.asset.service.ExecCommandService; -import com.orion.visor.module.asset.service.HostConfigService; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; +import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.framework.common.constant.ErrorMessage; +import org.dromara.visor.framework.common.constant.FileConst; +import org.dromara.visor.framework.common.enums.EndpointDefine; +import org.dromara.visor.framework.common.file.FileClient; +import org.dromara.visor.framework.common.security.LoginUser; +import org.dromara.visor.framework.common.utils.PathUtils; +import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.framework.security.core.utils.SecurityUtils; +import org.dromara.visor.module.asset.convert.ExecConvert; +import org.dromara.visor.module.asset.convert.ExecHostLogConvert; +import org.dromara.visor.module.asset.convert.ExecLogConvert; +import org.dromara.visor.module.asset.dao.ExecHostLogDAO; +import org.dromara.visor.module.asset.dao.ExecLogDAO; +import org.dromara.visor.module.asset.dao.HostDAO; +import org.dromara.visor.module.asset.entity.domain.ExecHostLogDO; +import org.dromara.visor.module.asset.entity.domain.ExecLogDO; +import org.dromara.visor.module.asset.entity.domain.HostDO; +import org.dromara.visor.module.asset.entity.dto.ExecCommandExecDTO; +import org.dromara.visor.module.asset.entity.dto.ExecParameterSchemaDTO; +import org.dromara.visor.module.asset.entity.request.exec.ExecCommandRequest; +import org.dromara.visor.module.asset.entity.vo.ExecHostLogVO; +import org.dromara.visor.module.asset.entity.vo.ExecLogVO; +import org.dromara.visor.module.asset.enums.*; +import org.dromara.visor.module.asset.handler.host.config.model.HostSshConfigModel; +import org.dromara.visor.module.asset.handler.host.exec.command.ExecTaskExecutors; +import org.dromara.visor.module.asset.handler.host.exec.command.model.ExecCommandDTO; +import org.dromara.visor.module.asset.handler.host.exec.command.model.ExecCommandHostDTO; +import org.dromara.visor.module.asset.service.AssetAuthorizedDataService; +import org.dromara.visor.module.asset.service.ExecCommandService; +import org.dromara.visor.module.asset.service.HostConfigService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/ExecHostLogServiceImpl.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/ExecHostLogServiceImpl.java similarity index 79% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/ExecHostLogServiceImpl.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/ExecHostLogServiceImpl.java index 62d535cc..df13b7e9 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/ExecHostLogServiceImpl.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/ExecHostLogServiceImpl.java @@ -13,22 +13,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.service.impl; +package org.dromara.visor.module.asset.service.impl; +import cn.orionsec.kit.lang.utils.collect.Lists; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.lang.utils.collect.Lists; -import com.orion.visor.framework.biz.operator.log.core.utils.OperatorLogs; -import com.orion.visor.framework.common.constant.ErrorMessage; -import com.orion.visor.framework.common.utils.Valid; -import com.orion.visor.module.asset.convert.ExecHostLogConvert; -import com.orion.visor.module.asset.dao.ExecHostLogDAO; -import com.orion.visor.module.asset.entity.domain.ExecHostLogDO; -import com.orion.visor.module.asset.entity.vo.ExecHostLogVO; -import com.orion.visor.module.asset.handler.host.exec.command.handler.IExecCommandHandler; -import com.orion.visor.module.asset.handler.host.exec.command.handler.IExecTaskHandler; -import com.orion.visor.module.asset.handler.host.exec.command.manager.ExecTaskManager; -import com.orion.visor.module.asset.service.ExecHostLogService; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; +import org.dromara.visor.framework.common.constant.ErrorMessage; +import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.module.asset.convert.ExecHostLogConvert; +import org.dromara.visor.module.asset.dao.ExecHostLogDAO; +import org.dromara.visor.module.asset.entity.domain.ExecHostLogDO; +import org.dromara.visor.module.asset.entity.vo.ExecHostLogVO; +import org.dromara.visor.module.asset.handler.host.exec.command.handler.IExecCommandHandler; +import org.dromara.visor.module.asset.handler.host.exec.command.handler.IExecTaskHandler; +import org.dromara.visor.module.asset.handler.host.exec.command.manager.ExecTaskManager; +import org.dromara.visor.module.asset.service.ExecHostLogService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/ExecJobHostServiceImpl.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/ExecJobHostServiceImpl.java similarity index 90% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/ExecJobHostServiceImpl.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/ExecJobHostServiceImpl.java index 6b1e04cd..c1e51876 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/ExecJobHostServiceImpl.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/ExecJobHostServiceImpl.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.service.impl; +package org.dromara.visor.module.asset.service.impl; -import com.orion.visor.module.asset.dao.ExecJobHostDAO; -import com.orion.visor.module.asset.entity.domain.ExecJobHostDO; -import com.orion.visor.module.asset.service.ExecJobHostService; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.module.asset.dao.ExecJobHostDAO; +import org.dromara.visor.module.asset.entity.domain.ExecJobHostDO; +import org.dromara.visor.module.asset.service.ExecJobHostService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/ExecJobServiceImpl.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/ExecJobServiceImpl.java similarity index 87% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/ExecJobServiceImpl.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/ExecJobServiceImpl.java index 7971b460..344c8669 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/ExecJobServiceImpl.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/ExecJobServiceImpl.java @@ -13,43 +13,43 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.service.impl; +package org.dromara.visor.module.asset.service.impl; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import cn.orionsec.kit.lang.utils.Booleans; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.collect.Lists; +import cn.orionsec.kit.lang.utils.time.cron.Cron; 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.Booleans; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.collect.Lists; -import com.orion.lang.utils.time.cron.Cron; -import com.orion.visor.framework.biz.operator.log.core.utils.OperatorLogs; -import com.orion.visor.framework.common.constant.Const; -import com.orion.visor.framework.common.constant.ErrorMessage; -import com.orion.visor.framework.common.utils.Valid; -import com.orion.visor.framework.job.core.utils.QuartzUtils; -import com.orion.visor.framework.security.core.utils.SecurityUtils; -import com.orion.visor.module.asset.convert.ExecJobConvert; -import com.orion.visor.module.asset.convert.HostConvert; -import com.orion.visor.module.asset.dao.ExecJobDAO; -import com.orion.visor.module.asset.dao.ExecLogDAO; -import com.orion.visor.module.asset.dao.HostDAO; -import com.orion.visor.module.asset.entity.domain.ExecJobDO; -import com.orion.visor.module.asset.entity.domain.ExecLogDO; -import com.orion.visor.module.asset.entity.dto.ExecCommandExecDTO; -import com.orion.visor.module.asset.entity.request.exec.*; -import com.orion.visor.module.asset.entity.vo.ExecJobVO; -import com.orion.visor.module.asset.entity.vo.ExecLogVO; -import com.orion.visor.module.asset.entity.vo.HostBaseVO; -import com.orion.visor.module.asset.enums.ExecJobStatusEnum; -import com.orion.visor.module.asset.enums.ExecSourceEnum; -import com.orion.visor.module.asset.enums.HostTypeEnum; -import com.orion.visor.module.asset.enums.ScriptExecEnum; -import com.orion.visor.module.asset.handler.host.exec.job.ExecCommandJob; -import com.orion.visor.module.asset.service.AssetAuthorizedDataService; -import com.orion.visor.module.asset.service.ExecCommandService; -import com.orion.visor.module.asset.service.ExecJobHostService; -import com.orion.visor.module.asset.service.ExecJobService; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; +import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.framework.common.constant.ErrorMessage; +import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.framework.job.core.utils.QuartzUtils; +import org.dromara.visor.framework.security.core.utils.SecurityUtils; +import org.dromara.visor.module.asset.convert.ExecJobConvert; +import org.dromara.visor.module.asset.convert.HostConvert; +import org.dromara.visor.module.asset.dao.ExecJobDAO; +import org.dromara.visor.module.asset.dao.ExecLogDAO; +import org.dromara.visor.module.asset.dao.HostDAO; +import org.dromara.visor.module.asset.entity.domain.ExecJobDO; +import org.dromara.visor.module.asset.entity.domain.ExecLogDO; +import org.dromara.visor.module.asset.entity.dto.ExecCommandExecDTO; +import org.dromara.visor.module.asset.entity.request.exec.*; +import org.dromara.visor.module.asset.entity.vo.ExecJobVO; +import org.dromara.visor.module.asset.entity.vo.ExecLogVO; +import org.dromara.visor.module.asset.entity.vo.HostBaseVO; +import org.dromara.visor.module.asset.enums.ExecJobStatusEnum; +import org.dromara.visor.module.asset.enums.ExecSourceEnum; +import org.dromara.visor.module.asset.enums.HostTypeEnum; +import org.dromara.visor.module.asset.enums.ScriptExecEnum; +import org.dromara.visor.module.asset.handler.host.exec.job.ExecCommandJob; +import org.dromara.visor.module.asset.service.AssetAuthorizedDataService; +import org.dromara.visor.module.asset.service.ExecCommandService; +import org.dromara.visor.module.asset.service.ExecJobHostService; +import org.dromara.visor.module.asset.service.ExecJobService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/ExecLogServiceImpl.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/ExecLogServiceImpl.java similarity index 86% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/ExecLogServiceImpl.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/ExecLogServiceImpl.java index e149c2f1..61cee068 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/ExecLogServiceImpl.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/ExecLogServiceImpl.java @@ -13,57 +13,57 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.service.impl; +package org.dromara.visor.module.asset.service.impl; +import cn.orionsec.kit.lang.annotation.Keep; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import cn.orionsec.kit.lang.id.UUIds; +import cn.orionsec.kit.lang.utils.Arrays1; +import cn.orionsec.kit.lang.utils.Objects1; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.collect.Lists; +import cn.orionsec.kit.lang.utils.io.Files1; +import cn.orionsec.kit.lang.utils.io.Streams; +import cn.orionsec.kit.spring.SpringHolder; +import cn.orionsec.kit.web.servlet.web.Servlets; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.lang.annotation.Keep; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.lang.id.UUIds; -import com.orion.lang.utils.Arrays1; -import com.orion.lang.utils.Objects1; -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.spring.SpringHolder; -import com.orion.visor.framework.biz.operator.log.core.utils.OperatorLogs; -import com.orion.visor.framework.common.constant.Const; -import com.orion.visor.framework.common.constant.ErrorMessage; -import com.orion.visor.framework.common.constant.FileConst; -import com.orion.visor.framework.common.enums.EndpointDefine; -import com.orion.visor.framework.common.file.FileClient; -import com.orion.visor.framework.common.utils.SqlUtils; -import com.orion.visor.framework.common.utils.Valid; -import com.orion.visor.framework.redis.core.utils.RedisStrings; -import com.orion.visor.framework.security.core.utils.SecurityUtils; -import com.orion.visor.module.asset.convert.ExecHostLogConvert; -import com.orion.visor.module.asset.convert.ExecLogConvert; -import com.orion.visor.module.asset.dao.ExecHostLogDAO; -import com.orion.visor.module.asset.dao.ExecLogDAO; -import com.orion.visor.module.asset.define.cache.ExecCacheKeyDefine; -import com.orion.visor.module.asset.entity.domain.ExecHostLogDO; -import com.orion.visor.module.asset.entity.domain.ExecLogDO; -import com.orion.visor.module.asset.entity.dto.ExecHostLogTailDTO; -import com.orion.visor.module.asset.entity.dto.ExecLogTailDTO; -import com.orion.visor.module.asset.entity.request.exec.ExecLogClearRequest; -import com.orion.visor.module.asset.entity.request.exec.ExecLogQueryRequest; -import com.orion.visor.module.asset.entity.request.exec.ExecLogTailRequest; -import com.orion.visor.module.asset.entity.vo.ExecHostLogVO; -import com.orion.visor.module.asset.entity.vo.ExecLogStatusVO; -import com.orion.visor.module.asset.entity.vo.ExecLogVO; -import com.orion.visor.module.asset.enums.ExecHostStatusEnum; -import com.orion.visor.module.asset.enums.ExecStatusEnum; -import com.orion.visor.module.asset.enums.HostTypeEnum; -import com.orion.visor.module.asset.handler.host.config.model.HostSshConfigModel; -import com.orion.visor.module.asset.handler.host.exec.command.handler.IExecCommandHandler; -import com.orion.visor.module.asset.handler.host.exec.command.handler.IExecTaskHandler; -import com.orion.visor.module.asset.handler.host.exec.command.manager.ExecTaskManager; -import com.orion.visor.module.asset.service.ExecHostLogService; -import com.orion.visor.module.asset.service.ExecLogService; -import com.orion.visor.module.asset.service.HostConfigService; -import com.orion.web.servlet.web.Servlets; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; +import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.framework.common.constant.ErrorMessage; +import org.dromara.visor.framework.common.constant.FileConst; +import org.dromara.visor.framework.common.enums.EndpointDefine; +import org.dromara.visor.framework.common.file.FileClient; +import org.dromara.visor.framework.common.utils.SqlUtils; +import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.framework.redis.core.utils.RedisStrings; +import org.dromara.visor.framework.security.core.utils.SecurityUtils; +import org.dromara.visor.module.asset.convert.ExecHostLogConvert; +import org.dromara.visor.module.asset.convert.ExecLogConvert; +import org.dromara.visor.module.asset.dao.ExecHostLogDAO; +import org.dromara.visor.module.asset.dao.ExecLogDAO; +import org.dromara.visor.module.asset.define.cache.ExecCacheKeyDefine; +import org.dromara.visor.module.asset.entity.domain.ExecHostLogDO; +import org.dromara.visor.module.asset.entity.domain.ExecLogDO; +import org.dromara.visor.module.asset.entity.dto.ExecHostLogTailDTO; +import org.dromara.visor.module.asset.entity.dto.ExecLogTailDTO; +import org.dromara.visor.module.asset.entity.request.exec.ExecLogClearRequest; +import org.dromara.visor.module.asset.entity.request.exec.ExecLogQueryRequest; +import org.dromara.visor.module.asset.entity.request.exec.ExecLogTailRequest; +import org.dromara.visor.module.asset.entity.vo.ExecHostLogVO; +import org.dromara.visor.module.asset.entity.vo.ExecLogStatusVO; +import org.dromara.visor.module.asset.entity.vo.ExecLogVO; +import org.dromara.visor.module.asset.enums.ExecHostStatusEnum; +import org.dromara.visor.module.asset.enums.ExecStatusEnum; +import org.dromara.visor.module.asset.enums.HostTypeEnum; +import org.dromara.visor.module.asset.handler.host.config.model.HostSshConfigModel; +import org.dromara.visor.module.asset.handler.host.exec.command.handler.IExecCommandHandler; +import org.dromara.visor.module.asset.handler.host.exec.command.handler.IExecTaskHandler; +import org.dromara.visor.module.asset.handler.host.exec.command.manager.ExecTaskManager; +import org.dromara.visor.module.asset.service.ExecHostLogService; +import org.dromara.visor.module.asset.service.ExecLogService; +import org.dromara.visor.module.asset.service.HostConfigService; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/ExecTemplateHostServiceImpl.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/ExecTemplateHostServiceImpl.java similarity index 94% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/ExecTemplateHostServiceImpl.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/ExecTemplateHostServiceImpl.java index f7c8d18e..362dd7c6 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/ExecTemplateHostServiceImpl.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/ExecTemplateHostServiceImpl.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.service.impl; +package org.dromara.visor.module.asset.service.impl; +import cn.orionsec.kit.lang.function.Functions; +import cn.orionsec.kit.lang.utils.collect.Lists; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.lang.function.Functions; -import com.orion.lang.utils.collect.Lists; -import com.orion.visor.module.asset.dao.ExecTemplateHostDAO; -import com.orion.visor.module.asset.entity.domain.ExecTemplateHostDO; -import com.orion.visor.module.asset.service.ExecTemplateHostService; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.module.asset.dao.ExecTemplateHostDAO; +import org.dromara.visor.module.asset.entity.domain.ExecTemplateHostDO; +import org.dromara.visor.module.asset.service.ExecTemplateHostService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/ExecTemplateServiceImpl.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/ExecTemplateServiceImpl.java similarity index 84% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/ExecTemplateServiceImpl.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/ExecTemplateServiceImpl.java index ef3c82ac..5f48502e 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/ExecTemplateServiceImpl.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/ExecTemplateServiceImpl.java @@ -13,30 +13,30 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.service.impl; +package org.dromara.visor.module.asset.service.impl; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import cn.orionsec.kit.lang.utils.collect.Lists; 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.collect.Lists; -import com.orion.visor.framework.biz.operator.log.core.utils.OperatorLogs; -import com.orion.visor.framework.common.constant.Const; -import com.orion.visor.framework.common.constant.ErrorMessage; -import com.orion.visor.framework.common.utils.Valid; -import com.orion.visor.framework.security.core.utils.SecurityUtils; -import com.orion.visor.module.asset.convert.ExecTemplateConvert; -import com.orion.visor.module.asset.dao.ExecTemplateDAO; -import com.orion.visor.module.asset.entity.domain.ExecTemplateDO; -import com.orion.visor.module.asset.entity.request.exec.ExecTemplateCreateRequest; -import com.orion.visor.module.asset.entity.request.exec.ExecTemplateQueryRequest; -import com.orion.visor.module.asset.entity.request.exec.ExecTemplateUpdateRequest; -import com.orion.visor.module.asset.entity.vo.ExecTemplateVO; -import com.orion.visor.module.asset.enums.HostTypeEnum; -import com.orion.visor.module.asset.enums.ScriptExecEnum; -import com.orion.visor.module.asset.service.AssetAuthorizedDataService; -import com.orion.visor.module.asset.service.ExecTemplateHostService; -import com.orion.visor.module.asset.service.ExecTemplateService; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; +import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.framework.common.constant.ErrorMessage; +import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.framework.security.core.utils.SecurityUtils; +import org.dromara.visor.module.asset.convert.ExecTemplateConvert; +import org.dromara.visor.module.asset.dao.ExecTemplateDAO; +import org.dromara.visor.module.asset.entity.domain.ExecTemplateDO; +import org.dromara.visor.module.asset.entity.request.exec.ExecTemplateCreateRequest; +import org.dromara.visor.module.asset.entity.request.exec.ExecTemplateQueryRequest; +import org.dromara.visor.module.asset.entity.request.exec.ExecTemplateUpdateRequest; +import org.dromara.visor.module.asset.entity.vo.ExecTemplateVO; +import org.dromara.visor.module.asset.enums.HostTypeEnum; +import org.dromara.visor.module.asset.enums.ScriptExecEnum; +import org.dromara.visor.module.asset.service.AssetAuthorizedDataService; +import org.dromara.visor.module.asset.service.ExecTemplateHostService; +import org.dromara.visor.module.asset.service.ExecTemplateService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/HostConfigServiceImpl.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostConfigServiceImpl.java similarity index 81% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/HostConfigServiceImpl.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostConfigServiceImpl.java index 2ebc4f76..1422bc16 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/HostConfigServiceImpl.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostConfigServiceImpl.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.service.impl; +package org.dromara.visor.module.asset.service.impl; -import com.orion.lang.function.Functions; -import com.orion.visor.framework.common.constant.ErrorMessage; -import com.orion.visor.framework.common.handler.data.model.GenericsDataModel; -import com.orion.visor.framework.common.utils.Valid; -import com.orion.visor.module.asset.dao.HostDAO; -import com.orion.visor.module.asset.entity.domain.HostDO; -import com.orion.visor.module.asset.enums.HostStatusEnum; -import com.orion.visor.module.asset.enums.HostTypeEnum; -import com.orion.visor.module.asset.handler.host.config.model.HostSshConfigModel; -import com.orion.visor.module.asset.service.HostConfigService; +import cn.orionsec.kit.lang.function.Functions; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.common.constant.ErrorMessage; +import org.dromara.visor.framework.common.handler.data.model.GenericsDataModel; +import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.module.asset.dao.HostDAO; +import org.dromara.visor.module.asset.entity.domain.HostDO; +import org.dromara.visor.module.asset.enums.HostStatusEnum; +import org.dromara.visor.module.asset.enums.HostTypeEnum; +import org.dromara.visor.module.asset.handler.host.config.model.HostSshConfigModel; +import org.dromara.visor.module.asset.service.HostConfigService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/HostExtraServiceImpl.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostExtraServiceImpl.java similarity index 85% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/HostExtraServiceImpl.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostExtraServiceImpl.java index 1bce1fcb..df2a8adb 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/HostExtraServiceImpl.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostExtraServiceImpl.java @@ -13,23 +13,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.service.impl; +package org.dromara.visor.module.asset.service.impl; -import com.orion.lang.function.Functions; -import com.orion.lang.utils.collect.Maps; -import com.orion.visor.framework.common.handler.data.model.GenericsDataModel; -import com.orion.visor.framework.common.handler.data.strategy.GenericsDataStrategy; -import com.orion.visor.framework.common.utils.Valid; -import com.orion.visor.framework.security.core.utils.SecurityUtils; -import com.orion.visor.module.asset.entity.request.host.HostExtraQueryRequest; -import com.orion.visor.module.asset.entity.request.host.HostExtraUpdateRequest; -import com.orion.visor.module.asset.enums.HostExtraItemEnum; -import com.orion.visor.module.asset.service.HostExtraService; -import com.orion.visor.module.infra.api.DataExtraApi; -import com.orion.visor.module.infra.entity.dto.data.DataExtraDTO; -import com.orion.visor.module.infra.entity.dto.data.DataExtraQueryDTO; -import com.orion.visor.module.infra.entity.dto.data.DataExtraSetDTO; -import com.orion.visor.module.infra.enums.DataExtraTypeEnum; +import cn.orionsec.kit.lang.function.Functions; +import cn.orionsec.kit.lang.utils.collect.Maps; +import org.dromara.visor.framework.common.handler.data.model.GenericsDataModel; +import org.dromara.visor.framework.common.handler.data.strategy.GenericsDataStrategy; +import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.framework.security.core.utils.SecurityUtils; +import org.dromara.visor.module.asset.entity.request.host.HostExtraQueryRequest; +import org.dromara.visor.module.asset.entity.request.host.HostExtraUpdateRequest; +import org.dromara.visor.module.asset.enums.HostExtraItemEnum; +import org.dromara.visor.module.asset.service.HostExtraService; +import org.dromara.visor.module.infra.api.DataExtraApi; +import org.dromara.visor.module.infra.entity.dto.data.DataExtraDTO; +import org.dromara.visor.module.infra.entity.dto.data.DataExtraQueryDTO; +import org.dromara.visor.module.infra.entity.dto.data.DataExtraSetDTO; +import org.dromara.visor.module.infra.enums.DataExtraTypeEnum; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/HostGroupServiceImpl.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostGroupServiceImpl.java similarity index 73% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/HostGroupServiceImpl.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostGroupServiceImpl.java index 30c1c9a7..57e75560 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/HostGroupServiceImpl.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostGroupServiceImpl.java @@ -13,21 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.service.impl; +package org.dromara.visor.module.asset.service.impl; -import com.orion.visor.module.asset.convert.HostGroupConvert; -import com.orion.visor.module.asset.entity.request.host.HostGroupRelUpdateRequest; -import com.orion.visor.module.asset.entity.vo.HostGroupTreeVO; -import com.orion.visor.module.asset.service.HostGroupService; -import com.orion.visor.module.infra.api.DataGroupApi; -import com.orion.visor.module.infra.api.DataGroupRelApi; -import com.orion.visor.module.infra.api.DataPermissionApi; -import com.orion.visor.module.infra.entity.dto.data.DataGroupCreateDTO; -import com.orion.visor.module.infra.entity.dto.data.DataGroupDTO; -import com.orion.visor.module.infra.entity.dto.data.DataGroupMoveDTO; -import com.orion.visor.module.infra.entity.dto.data.DataGroupRenameDTO; -import com.orion.visor.module.infra.enums.DataGroupTypeEnum; -import com.orion.visor.module.infra.enums.DataPermissionTypeEnum; +import org.dromara.visor.module.asset.convert.HostGroupConvert; +import org.dromara.visor.module.asset.entity.request.host.HostGroupRelUpdateRequest; +import org.dromara.visor.module.asset.entity.vo.HostGroupTreeVO; +import org.dromara.visor.module.asset.service.HostGroupService; +import org.dromara.visor.module.infra.api.DataGroupApi; +import org.dromara.visor.module.infra.api.DataGroupRelApi; +import org.dromara.visor.module.infra.api.DataPermissionApi; +import org.dromara.visor.module.infra.entity.dto.data.DataGroupCreateDTO; +import org.dromara.visor.module.infra.entity.dto.data.DataGroupDTO; +import org.dromara.visor.module.infra.entity.dto.data.DataGroupMoveDTO; +import org.dromara.visor.module.infra.entity.dto.data.DataGroupRenameDTO; +import org.dromara.visor.module.infra.enums.DataGroupTypeEnum; +import org.dromara.visor.module.infra.enums.DataPermissionTypeEnum; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/HostIdentityServiceImpl.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostIdentityServiceImpl.java similarity index 84% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/HostIdentityServiceImpl.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostIdentityServiceImpl.java index 6078c7be..9b4753dd 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/HostIdentityServiceImpl.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostIdentityServiceImpl.java @@ -13,42 +13,42 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.service.impl; +package org.dromara.visor.module.asset.service.impl; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.collect.Lists; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.collect.Lists; -import com.orion.visor.framework.biz.operator.log.core.utils.OperatorLogs; -import com.orion.visor.framework.common.constant.Const; -import com.orion.visor.framework.common.constant.ErrorMessage; -import com.orion.visor.framework.common.security.PasswordModifier; -import com.orion.visor.framework.common.utils.CryptoUtils; -import com.orion.visor.framework.common.utils.Valid; -import com.orion.visor.framework.redis.core.utils.RedisMaps; -import com.orion.visor.framework.redis.core.utils.RedisUtils; -import com.orion.visor.framework.redis.core.utils.barrier.CacheBarriers; -import com.orion.visor.module.asset.convert.HostIdentityConvert; -import com.orion.visor.module.asset.dao.HostDAO; -import com.orion.visor.module.asset.dao.HostIdentityDAO; -import com.orion.visor.module.asset.dao.HostKeyDAO; -import com.orion.visor.module.asset.define.cache.HostCacheKeyDefine; -import com.orion.visor.module.asset.entity.domain.HostIdentityDO; -import com.orion.visor.module.asset.entity.domain.HostKeyDO; -import com.orion.visor.module.asset.entity.dto.HostIdentityCacheDTO; -import com.orion.visor.module.asset.entity.request.host.HostIdentityCreateRequest; -import com.orion.visor.module.asset.entity.request.host.HostIdentityQueryRequest; -import com.orion.visor.module.asset.entity.request.host.HostIdentityUpdateRequest; -import com.orion.visor.module.asset.entity.vo.HostIdentityVO; -import com.orion.visor.module.asset.enums.HostIdentityTypeEnum; -import com.orion.visor.module.asset.service.HostIdentityService; -import com.orion.visor.module.infra.api.DataExtraApi; -import com.orion.visor.module.infra.api.DataPermissionApi; -import com.orion.visor.module.infra.enums.DataPermissionTypeEnum; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; +import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.framework.common.constant.ErrorMessage; +import org.dromara.visor.framework.common.security.PasswordModifier; +import org.dromara.visor.framework.common.utils.CryptoUtils; +import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.framework.redis.core.utils.RedisMaps; +import org.dromara.visor.framework.redis.core.utils.RedisUtils; +import org.dromara.visor.framework.redis.core.utils.barrier.CacheBarriers; +import org.dromara.visor.module.asset.convert.HostIdentityConvert; +import org.dromara.visor.module.asset.dao.HostDAO; +import org.dromara.visor.module.asset.dao.HostIdentityDAO; +import org.dromara.visor.module.asset.dao.HostKeyDAO; +import org.dromara.visor.module.asset.define.cache.HostCacheKeyDefine; +import org.dromara.visor.module.asset.entity.domain.HostIdentityDO; +import org.dromara.visor.module.asset.entity.domain.HostKeyDO; +import org.dromara.visor.module.asset.entity.dto.HostIdentityCacheDTO; +import org.dromara.visor.module.asset.entity.request.host.HostIdentityCreateRequest; +import org.dromara.visor.module.asset.entity.request.host.HostIdentityQueryRequest; +import org.dromara.visor.module.asset.entity.request.host.HostIdentityUpdateRequest; +import org.dromara.visor.module.asset.entity.vo.HostIdentityVO; +import org.dromara.visor.module.asset.enums.HostIdentityTypeEnum; +import org.dromara.visor.module.asset.service.HostIdentityService; +import org.dromara.visor.module.infra.api.DataExtraApi; +import org.dromara.visor.module.infra.api.DataPermissionApi; +import org.dromara.visor.module.infra.enums.DataPermissionTypeEnum; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/HostKeyServiceImpl.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostKeyServiceImpl.java similarity index 83% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/HostKeyServiceImpl.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostKeyServiceImpl.java index 574d1c99..f9f3b035 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/HostKeyServiceImpl.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostKeyServiceImpl.java @@ -13,38 +13,38 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.service.impl; +package org.dromara.visor.module.asset.service.impl; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.collect.Lists; 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.visor.framework.biz.operator.log.core.utils.OperatorLogs; -import com.orion.visor.framework.common.constant.Const; -import com.orion.visor.framework.common.constant.ErrorMessage; -import com.orion.visor.framework.common.security.PasswordModifier; -import com.orion.visor.framework.common.utils.CryptoUtils; -import com.orion.visor.framework.common.utils.Valid; -import com.orion.visor.framework.redis.core.utils.RedisMaps; -import com.orion.visor.framework.redis.core.utils.RedisUtils; -import com.orion.visor.framework.redis.core.utils.barrier.CacheBarriers; -import com.orion.visor.module.asset.convert.HostKeyConvert; -import com.orion.visor.module.asset.dao.HostDAO; -import com.orion.visor.module.asset.dao.HostIdentityDAO; -import com.orion.visor.module.asset.dao.HostKeyDAO; -import com.orion.visor.module.asset.define.cache.HostCacheKeyDefine; -import com.orion.visor.module.asset.entity.domain.HostKeyDO; -import com.orion.visor.module.asset.entity.dto.HostKeyCacheDTO; -import com.orion.visor.module.asset.entity.request.host.HostKeyCreateRequest; -import com.orion.visor.module.asset.entity.request.host.HostKeyQueryRequest; -import com.orion.visor.module.asset.entity.request.host.HostKeyUpdateRequest; -import com.orion.visor.module.asset.entity.vo.HostKeyVO; -import com.orion.visor.module.asset.service.HostKeyService; -import com.orion.visor.module.infra.api.DataExtraApi; -import com.orion.visor.module.infra.api.DataPermissionApi; -import com.orion.visor.module.infra.enums.DataPermissionTypeEnum; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; +import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.framework.common.constant.ErrorMessage; +import org.dromara.visor.framework.common.security.PasswordModifier; +import org.dromara.visor.framework.common.utils.CryptoUtils; +import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.framework.redis.core.utils.RedisMaps; +import org.dromara.visor.framework.redis.core.utils.RedisUtils; +import org.dromara.visor.framework.redis.core.utils.barrier.CacheBarriers; +import org.dromara.visor.module.asset.convert.HostKeyConvert; +import org.dromara.visor.module.asset.dao.HostDAO; +import org.dromara.visor.module.asset.dao.HostIdentityDAO; +import org.dromara.visor.module.asset.dao.HostKeyDAO; +import org.dromara.visor.module.asset.define.cache.HostCacheKeyDefine; +import org.dromara.visor.module.asset.entity.domain.HostKeyDO; +import org.dromara.visor.module.asset.entity.dto.HostKeyCacheDTO; +import org.dromara.visor.module.asset.entity.request.host.HostKeyCreateRequest; +import org.dromara.visor.module.asset.entity.request.host.HostKeyQueryRequest; +import org.dromara.visor.module.asset.entity.request.host.HostKeyUpdateRequest; +import org.dromara.visor.module.asset.entity.vo.HostKeyVO; +import org.dromara.visor.module.asset.service.HostKeyService; +import org.dromara.visor.module.infra.api.DataExtraApi; +import org.dromara.visor.module.infra.api.DataPermissionApi; +import org.dromara.visor.module.infra.enums.DataPermissionTypeEnum; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/HostServiceImpl.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostServiceImpl.java similarity index 87% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/HostServiceImpl.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostServiceImpl.java index 4e5c97a6..2d3de5c0 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/HostServiceImpl.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostServiceImpl.java @@ -13,46 +13,46 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.service.impl; +package org.dromara.visor.module.asset.service.impl; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import cn.orionsec.kit.lang.utils.Booleans; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.collect.Lists; +import cn.orionsec.kit.spring.SpringHolder; 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.Booleans; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.collect.Lists; -import com.orion.spring.SpringHolder; -import com.orion.visor.framework.biz.operator.log.core.utils.OperatorLogs; -import com.orion.visor.framework.common.constant.Const; -import com.orion.visor.framework.common.constant.ErrorMessage; -import com.orion.visor.framework.common.handler.data.model.GenericsDataModel; -import com.orion.visor.framework.common.utils.Valid; -import com.orion.visor.framework.redis.core.utils.RedisMaps; -import com.orion.visor.framework.redis.core.utils.barrier.CacheBarriers; -import com.orion.visor.module.asset.convert.HostConvert; -import com.orion.visor.module.asset.dao.HostDAO; -import com.orion.visor.module.asset.define.cache.HostCacheKeyDefine; -import com.orion.visor.module.asset.entity.domain.HostDO; -import com.orion.visor.module.asset.entity.dto.HostCacheDTO; -import com.orion.visor.module.asset.entity.request.host.*; -import com.orion.visor.module.asset.entity.vo.HostConfigVO; -import com.orion.visor.module.asset.entity.vo.HostVO; -import com.orion.visor.module.asset.enums.HostStatusEnum; -import com.orion.visor.module.asset.enums.HostTypeEnum; -import com.orion.visor.module.asset.service.ExecJobHostService; -import com.orion.visor.module.asset.service.ExecTemplateHostService; -import com.orion.visor.module.asset.service.HostService; -import com.orion.visor.module.infra.api.DataExtraApi; -import com.orion.visor.module.infra.api.DataGroupRelApi; -import com.orion.visor.module.infra.api.FavoriteApi; -import com.orion.visor.module.infra.api.TagRelApi; -import com.orion.visor.module.infra.entity.dto.tag.TagDTO; -import com.orion.visor.module.infra.enums.DataExtraTypeEnum; -import com.orion.visor.module.infra.enums.DataGroupTypeEnum; -import com.orion.visor.module.infra.enums.FavoriteTypeEnum; -import com.orion.visor.module.infra.enums.TagTypeEnum; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; +import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.framework.common.constant.ErrorMessage; +import org.dromara.visor.framework.common.handler.data.model.GenericsDataModel; +import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.framework.redis.core.utils.RedisMaps; +import org.dromara.visor.framework.redis.core.utils.barrier.CacheBarriers; +import org.dromara.visor.module.asset.convert.HostConvert; +import org.dromara.visor.module.asset.dao.HostDAO; +import org.dromara.visor.module.asset.define.cache.HostCacheKeyDefine; +import org.dromara.visor.module.asset.entity.domain.HostDO; +import org.dromara.visor.module.asset.entity.dto.HostCacheDTO; +import org.dromara.visor.module.asset.entity.request.host.*; +import org.dromara.visor.module.asset.entity.vo.HostConfigVO; +import org.dromara.visor.module.asset.entity.vo.HostVO; +import org.dromara.visor.module.asset.enums.HostStatusEnum; +import org.dromara.visor.module.asset.enums.HostTypeEnum; +import org.dromara.visor.module.asset.service.ExecJobHostService; +import org.dromara.visor.module.asset.service.ExecTemplateHostService; +import org.dromara.visor.module.asset.service.HostService; +import org.dromara.visor.module.infra.api.DataExtraApi; +import org.dromara.visor.module.infra.api.DataGroupRelApi; +import org.dromara.visor.module.infra.api.FavoriteApi; +import org.dromara.visor.module.infra.api.TagRelApi; +import org.dromara.visor.module.infra.entity.dto.tag.TagDTO; +import org.dromara.visor.module.infra.enums.DataExtraTypeEnum; +import org.dromara.visor.module.infra.enums.DataGroupTypeEnum; +import org.dromara.visor.module.infra.enums.FavoriteTypeEnum; +import org.dromara.visor.module.infra.enums.TagTypeEnum; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/PathBookmarkGroupServiceImpl.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/PathBookmarkGroupServiceImpl.java similarity index 78% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/PathBookmarkGroupServiceImpl.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/PathBookmarkGroupServiceImpl.java index 165f1bac..91d0913c 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/PathBookmarkGroupServiceImpl.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/PathBookmarkGroupServiceImpl.java @@ -13,30 +13,30 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.service.impl; +package org.dromara.visor.module.asset.service.impl; +import cn.orionsec.kit.lang.utils.Booleans; import com.alibaba.fastjson.JSON; -import com.orion.lang.utils.Booleans; -import com.orion.visor.framework.common.constant.Const; -import com.orion.visor.framework.common.constant.ErrorMessage; -import com.orion.visor.framework.common.utils.Valid; -import com.orion.visor.framework.security.core.utils.SecurityUtils; -import com.orion.visor.module.asset.convert.PathBookmarkGroupConvert; -import com.orion.visor.module.asset.dao.PathBookmarkDAO; -import com.orion.visor.module.asset.entity.domain.PathBookmarkDO; -import com.orion.visor.module.asset.entity.request.path.PathBookmarkGroupCreateRequest; -import com.orion.visor.module.asset.entity.request.path.PathBookmarkGroupDeleteRequest; -import com.orion.visor.module.asset.entity.request.path.PathBookmarkGroupUpdateRequest; -import com.orion.visor.module.asset.entity.vo.PathBookmarkGroupVO; -import com.orion.visor.module.asset.service.PathBookmarkGroupService; -import com.orion.visor.module.asset.service.PathBookmarkService; -import com.orion.visor.module.infra.api.DataGroupApi; -import com.orion.visor.module.infra.api.DataGroupUserApi; -import com.orion.visor.module.infra.entity.dto.data.DataGroupCreateDTO; -import com.orion.visor.module.infra.entity.dto.data.DataGroupDTO; -import com.orion.visor.module.infra.entity.dto.data.DataGroupRenameDTO; -import com.orion.visor.module.infra.enums.DataGroupTypeEnum; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.framework.common.constant.ErrorMessage; +import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.framework.security.core.utils.SecurityUtils; +import org.dromara.visor.module.asset.convert.PathBookmarkGroupConvert; +import org.dromara.visor.module.asset.dao.PathBookmarkDAO; +import org.dromara.visor.module.asset.entity.domain.PathBookmarkDO; +import org.dromara.visor.module.asset.entity.request.path.PathBookmarkGroupCreateRequest; +import org.dromara.visor.module.asset.entity.request.path.PathBookmarkGroupDeleteRequest; +import org.dromara.visor.module.asset.entity.request.path.PathBookmarkGroupUpdateRequest; +import org.dromara.visor.module.asset.entity.vo.PathBookmarkGroupVO; +import org.dromara.visor.module.asset.service.PathBookmarkGroupService; +import org.dromara.visor.module.asset.service.PathBookmarkService; +import org.dromara.visor.module.infra.api.DataGroupApi; +import org.dromara.visor.module.infra.api.DataGroupUserApi; +import org.dromara.visor.module.infra.entity.dto.data.DataGroupCreateDTO; +import org.dromara.visor.module.infra.entity.dto.data.DataGroupDTO; +import org.dromara.visor.module.infra.entity.dto.data.DataGroupRenameDTO; +import org.dromara.visor.module.infra.enums.DataGroupTypeEnum; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/PathBookmarkServiceImpl.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/PathBookmarkServiceImpl.java similarity index 86% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/PathBookmarkServiceImpl.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/PathBookmarkServiceImpl.java index 733b82bf..e17381ee 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/PathBookmarkServiceImpl.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/PathBookmarkServiceImpl.java @@ -13,30 +13,30 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.service.impl; +package org.dromara.visor.module.asset.service.impl; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.orion.visor.framework.common.constant.ErrorMessage; -import com.orion.visor.framework.common.utils.Valid; -import com.orion.visor.framework.redis.core.utils.RedisMaps; -import com.orion.visor.framework.redis.core.utils.barrier.CacheBarriers; -import com.orion.visor.framework.security.core.utils.SecurityUtils; -import com.orion.visor.module.asset.convert.PathBookmarkConvert; -import com.orion.visor.module.asset.dao.PathBookmarkDAO; -import com.orion.visor.module.asset.define.cache.PathBookmarkCacheKeyDefine; -import com.orion.visor.module.asset.entity.domain.PathBookmarkDO; -import com.orion.visor.module.asset.entity.dto.PathBookmarkCacheDTO; -import com.orion.visor.module.asset.entity.request.path.PathBookmarkCreateRequest; -import com.orion.visor.module.asset.entity.request.path.PathBookmarkUpdateRequest; -import com.orion.visor.module.asset.entity.vo.PathBookmarkGroupVO; -import com.orion.visor.module.asset.entity.vo.PathBookmarkVO; -import com.orion.visor.module.asset.entity.vo.PathBookmarkWrapperVO; -import com.orion.visor.module.asset.service.PathBookmarkGroupService; -import com.orion.visor.module.asset.service.PathBookmarkService; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.common.constant.ErrorMessage; +import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.framework.redis.core.utils.RedisMaps; +import org.dromara.visor.framework.redis.core.utils.barrier.CacheBarriers; +import org.dromara.visor.framework.security.core.utils.SecurityUtils; +import org.dromara.visor.module.asset.convert.PathBookmarkConvert; +import org.dromara.visor.module.asset.dao.PathBookmarkDAO; +import org.dromara.visor.module.asset.define.cache.PathBookmarkCacheKeyDefine; +import org.dromara.visor.module.asset.entity.domain.PathBookmarkDO; +import org.dromara.visor.module.asset.entity.dto.PathBookmarkCacheDTO; +import org.dromara.visor.module.asset.entity.request.path.PathBookmarkCreateRequest; +import org.dromara.visor.module.asset.entity.request.path.PathBookmarkUpdateRequest; +import org.dromara.visor.module.asset.entity.vo.PathBookmarkGroupVO; +import org.dromara.visor.module.asset.entity.vo.PathBookmarkVO; +import org.dromara.visor.module.asset.entity.vo.PathBookmarkWrapperVO; +import org.dromara.visor.module.asset.service.PathBookmarkGroupService; +import org.dromara.visor.module.asset.service.PathBookmarkService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/TerminalConnectLogServiceImpl.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/TerminalConnectLogServiceImpl.java similarity index 85% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/TerminalConnectLogServiceImpl.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/TerminalConnectLogServiceImpl.java index 1c0f3f3c..096eefe2 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/TerminalConnectLogServiceImpl.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/TerminalConnectLogServiceImpl.java @@ -13,34 +13,34 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.service.impl; +package org.dromara.visor.module.asset.service.impl; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import cn.orionsec.kit.lang.utils.Arrays1; +import cn.orionsec.kit.lang.utils.collect.Lists; 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.Arrays1; -import com.orion.lang.utils.collect.Lists; -import com.orion.visor.framework.biz.operator.log.core.utils.OperatorLogs; -import com.orion.visor.framework.common.constant.Const; -import com.orion.visor.framework.common.constant.ErrorMessage; -import com.orion.visor.framework.common.utils.SqlUtils; -import com.orion.visor.framework.common.utils.Valid; -import com.orion.visor.framework.security.core.utils.SecurityUtils; -import com.orion.visor.module.asset.convert.TerminalConnectLogConvert; -import com.orion.visor.module.asset.dao.TerminalConnectLogDAO; -import com.orion.visor.module.asset.entity.domain.TerminalConnectLogDO; -import com.orion.visor.module.asset.entity.dto.TerminalConnectLogExtraDTO; -import com.orion.visor.module.asset.entity.request.host.TerminalConnectLogClearRequest; -import com.orion.visor.module.asset.entity.request.host.TerminalConnectLogCreateRequest; -import com.orion.visor.module.asset.entity.request.host.TerminalConnectLogQueryRequest; -import com.orion.visor.module.asset.entity.vo.TerminalConnectLogVO; -import com.orion.visor.module.asset.enums.TerminalConnectStatusEnum; -import com.orion.visor.module.asset.enums.TerminalConnectTypeEnum; -import com.orion.visor.module.asset.handler.host.terminal.manager.TerminalManager; -import com.orion.visor.module.asset.handler.host.terminal.model.TerminalConfig; -import com.orion.visor.module.asset.handler.host.terminal.session.ITerminalSession; -import com.orion.visor.module.asset.service.TerminalConnectLogService; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; +import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.framework.common.constant.ErrorMessage; +import org.dromara.visor.framework.common.utils.SqlUtils; +import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.framework.security.core.utils.SecurityUtils; +import org.dromara.visor.module.asset.convert.TerminalConnectLogConvert; +import org.dromara.visor.module.asset.dao.TerminalConnectLogDAO; +import org.dromara.visor.module.asset.entity.domain.TerminalConnectLogDO; +import org.dromara.visor.module.asset.entity.dto.TerminalConnectLogExtraDTO; +import org.dromara.visor.module.asset.entity.request.host.TerminalConnectLogClearRequest; +import org.dromara.visor.module.asset.entity.request.host.TerminalConnectLogCreateRequest; +import org.dromara.visor.module.asset.entity.request.host.TerminalConnectLogQueryRequest; +import org.dromara.visor.module.asset.entity.vo.TerminalConnectLogVO; +import org.dromara.visor.module.asset.enums.TerminalConnectStatusEnum; +import org.dromara.visor.module.asset.enums.TerminalConnectTypeEnum; +import org.dromara.visor.module.asset.handler.host.terminal.manager.TerminalManager; +import org.dromara.visor.module.asset.handler.host.terminal.model.TerminalConfig; +import org.dromara.visor.module.asset.handler.host.terminal.session.ITerminalSession; +import org.dromara.visor.module.asset.service.TerminalConnectLogService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/TerminalServiceImpl.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/TerminalServiceImpl.java similarity index 86% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/TerminalServiceImpl.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/TerminalServiceImpl.java index 93bb23db..c5a1e1f6 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/TerminalServiceImpl.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/TerminalServiceImpl.java @@ -13,37 +13,37 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.service.impl; +package org.dromara.visor.module.asset.service.impl; +import cn.orionsec.kit.lang.id.UUIds; import com.alibaba.fastjson.JSONObject; -import com.orion.lang.id.UUIds; -import com.orion.visor.framework.common.constant.ErrorMessage; -import com.orion.visor.framework.common.constant.ExtraFieldConst; -import com.orion.visor.framework.common.security.LoginUser; -import com.orion.visor.framework.common.utils.Valid; -import com.orion.visor.framework.redis.core.utils.RedisStrings; -import com.orion.visor.framework.security.core.utils.SecurityUtils; -import com.orion.visor.module.asset.dao.HostDAO; -import com.orion.visor.module.asset.dao.HostIdentityDAO; -import com.orion.visor.module.asset.dao.HostKeyDAO; -import com.orion.visor.module.asset.define.cache.TerminalCacheKeyDefine; -import com.orion.visor.module.asset.entity.domain.HostDO; -import com.orion.visor.module.asset.entity.domain.HostIdentityDO; -import com.orion.visor.module.asset.entity.domain.HostKeyDO; -import com.orion.visor.module.asset.entity.dto.TerminalAccessDTO; -import com.orion.visor.module.asset.entity.dto.TerminalConnectDTO; -import com.orion.visor.module.asset.entity.dto.TerminalTransferDTO; -import com.orion.visor.module.asset.entity.vo.TerminalThemeVO; -import com.orion.visor.module.asset.enums.*; -import com.orion.visor.module.asset.handler.host.config.model.HostSshConfigModel; -import com.orion.visor.module.asset.handler.host.extra.model.HostSshExtraModel; -import com.orion.visor.module.asset.service.HostConfigService; -import com.orion.visor.module.asset.service.HostExtraService; -import com.orion.visor.module.asset.service.TerminalService; -import com.orion.visor.module.infra.api.DataPermissionApi; -import com.orion.visor.module.infra.api.DictValueApi; -import com.orion.visor.module.infra.enums.DataPermissionTypeEnum; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.common.constant.ErrorMessage; +import org.dromara.visor.framework.common.constant.ExtraFieldConst; +import org.dromara.visor.framework.common.security.LoginUser; +import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.framework.redis.core.utils.RedisStrings; +import org.dromara.visor.framework.security.core.utils.SecurityUtils; +import org.dromara.visor.module.asset.dao.HostDAO; +import org.dromara.visor.module.asset.dao.HostIdentityDAO; +import org.dromara.visor.module.asset.dao.HostKeyDAO; +import org.dromara.visor.module.asset.define.cache.TerminalCacheKeyDefine; +import org.dromara.visor.module.asset.entity.domain.HostDO; +import org.dromara.visor.module.asset.entity.domain.HostIdentityDO; +import org.dromara.visor.module.asset.entity.domain.HostKeyDO; +import org.dromara.visor.module.asset.entity.dto.TerminalAccessDTO; +import org.dromara.visor.module.asset.entity.dto.TerminalConnectDTO; +import org.dromara.visor.module.asset.entity.dto.TerminalTransferDTO; +import org.dromara.visor.module.asset.entity.vo.TerminalThemeVO; +import org.dromara.visor.module.asset.enums.*; +import org.dromara.visor.module.asset.handler.host.config.model.HostSshConfigModel; +import org.dromara.visor.module.asset.handler.host.extra.model.HostSshExtraModel; +import org.dromara.visor.module.asset.service.HostConfigService; +import org.dromara.visor.module.asset.service.HostExtraService; +import org.dromara.visor.module.asset.service.TerminalService; +import org.dromara.visor.module.infra.api.DataPermissionApi; +import org.dromara.visor.module.infra.api.DictValueApi; +import org.dromara.visor.module.infra.enums.DataPermissionTypeEnum; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/TerminalSftpServiceImpl.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/TerminalSftpServiceImpl.java similarity index 78% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/TerminalSftpServiceImpl.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/TerminalSftpServiceImpl.java index abb4e612..c7483611 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/TerminalSftpServiceImpl.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/TerminalSftpServiceImpl.java @@ -13,44 +13,44 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.service.impl; +package org.dromara.visor.module.asset.service.impl; +import cn.orionsec.kit.lang.constant.StandardContentType; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import cn.orionsec.kit.lang.define.wrapper.HttpWrapper; +import cn.orionsec.kit.lang.utils.Arrays1; +import cn.orionsec.kit.lang.utils.Exceptions; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.Valid; +import cn.orionsec.kit.lang.utils.io.Files1; +import cn.orionsec.kit.lang.utils.io.Streams; +import cn.orionsec.kit.net.host.SessionStore; +import cn.orionsec.kit.net.host.sftp.SftpExecutor; +import cn.orionsec.kit.web.servlet.web.Servlets; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.orion.lang.constant.StandardContentType; -import com.orion.lang.define.wrapper.DataGrid; -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.Valid; -import com.orion.lang.utils.io.Files1; -import com.orion.lang.utils.io.Streams; -import com.orion.net.host.SessionStore; -import com.orion.net.host.sftp.SftpExecutor; -import com.orion.visor.framework.biz.operator.log.core.utils.OperatorLogs; -import com.orion.visor.framework.common.constant.Const; -import com.orion.visor.framework.common.constant.ErrorMessage; -import com.orion.visor.framework.common.constant.ExtraFieldConst; -import com.orion.visor.framework.redis.core.utils.RedisStrings; -import com.orion.visor.framework.security.core.utils.SecurityUtils; -import com.orion.visor.module.asset.convert.TerminalSftpLogConvert; -import com.orion.visor.module.asset.define.cache.TerminalCacheKeyDefine; -import com.orion.visor.module.asset.define.operator.TerminalOperatorType; -import com.orion.visor.module.asset.entity.dto.SftpGetContentCacheDTO; -import com.orion.visor.module.asset.entity.dto.SftpSetContentCacheDTO; -import com.orion.visor.module.asset.entity.dto.TerminalConnectDTO; -import com.orion.visor.module.asset.entity.request.host.TerminalSftpLogQueryRequest; -import com.orion.visor.module.asset.entity.vo.TerminalSftpLogVO; -import com.orion.visor.module.asset.handler.host.jsch.SessionStores; -import com.orion.visor.module.asset.handler.host.transfer.manager.TerminalTransferManager; -import com.orion.visor.module.asset.handler.host.transfer.session.DownloadSession; -import com.orion.visor.module.asset.service.TerminalService; -import com.orion.visor.module.asset.service.TerminalSftpService; -import com.orion.visor.module.infra.api.OperatorLogApi; -import com.orion.visor.module.infra.entity.dto.operator.OperatorLogQueryDTO; -import com.orion.web.servlet.web.Servlets; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; +import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.framework.common.constant.ErrorMessage; +import org.dromara.visor.framework.common.constant.ExtraFieldConst; +import org.dromara.visor.framework.redis.core.utils.RedisStrings; +import org.dromara.visor.framework.security.core.utils.SecurityUtils; +import org.dromara.visor.module.asset.convert.TerminalSftpLogConvert; +import org.dromara.visor.module.asset.define.cache.TerminalCacheKeyDefine; +import org.dromara.visor.module.asset.define.operator.TerminalOperatorType; +import org.dromara.visor.module.asset.entity.dto.SftpGetContentCacheDTO; +import org.dromara.visor.module.asset.entity.dto.SftpSetContentCacheDTO; +import org.dromara.visor.module.asset.entity.dto.TerminalConnectDTO; +import org.dromara.visor.module.asset.entity.request.host.TerminalSftpLogQueryRequest; +import org.dromara.visor.module.asset.entity.vo.TerminalSftpLogVO; +import org.dromara.visor.module.asset.handler.host.jsch.SessionStores; +import org.dromara.visor.module.asset.handler.host.transfer.manager.TerminalTransferManager; +import org.dromara.visor.module.asset.handler.host.transfer.session.DownloadSession; +import org.dromara.visor.module.asset.service.TerminalService; +import org.dromara.visor.module.asset.service.TerminalSftpService; +import org.dromara.visor.module.infra.api.OperatorLogApi; +import org.dromara.visor.module.infra.entity.dto.operator.OperatorLogQueryDTO; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.servlet.mvc.method.annotation.StreamingResponseBody; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/UploadTaskFileServiceImpl.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/UploadTaskFileServiceImpl.java similarity index 86% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/UploadTaskFileServiceImpl.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/UploadTaskFileServiceImpl.java index d3478968..02fa558b 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/UploadTaskFileServiceImpl.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/UploadTaskFileServiceImpl.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.service.impl; +package org.dromara.visor.module.asset.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.visor.module.asset.convert.UploadTaskFileConvert; -import com.orion.visor.module.asset.dao.UploadTaskFileDAO; -import com.orion.visor.module.asset.entity.domain.UploadTaskFileDO; -import com.orion.visor.module.asset.entity.vo.UploadTaskFileVO; -import com.orion.visor.module.asset.service.UploadTaskFileService; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.module.asset.convert.UploadTaskFileConvert; +import org.dromara.visor.module.asset.dao.UploadTaskFileDAO; +import org.dromara.visor.module.asset.entity.domain.UploadTaskFileDO; +import org.dromara.visor.module.asset.entity.vo.UploadTaskFileVO; +import org.dromara.visor.module.asset.service.UploadTaskFileService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/UploadTaskServiceImpl.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/UploadTaskServiceImpl.java similarity index 87% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/UploadTaskServiceImpl.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/UploadTaskServiceImpl.java index 9953eaad..372747b5 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/UploadTaskServiceImpl.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/UploadTaskServiceImpl.java @@ -13,58 +13,58 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.service.impl; +package org.dromara.visor.module.asset.service.impl; +import cn.orionsec.kit.lang.annotation.Keep; +import cn.orionsec.kit.lang.define.collect.MultiHashMap; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import cn.orionsec.kit.lang.utils.Arrays1; +import cn.orionsec.kit.lang.utils.Booleans; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.Threads; +import cn.orionsec.kit.lang.utils.collect.Lists; +import cn.orionsec.kit.lang.utils.collect.Maps; +import cn.orionsec.kit.lang.utils.io.Files1; +import cn.orionsec.kit.lang.utils.time.Dates; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.lang.annotation.Keep; -import com.orion.lang.define.collect.MultiHashMap; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.lang.utils.Arrays1; -import com.orion.lang.utils.Booleans; -import com.orion.lang.utils.Strings; -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.io.Files1; -import com.orion.lang.utils.time.Dates; -import com.orion.visor.framework.biz.operator.log.core.utils.OperatorLogs; -import com.orion.visor.framework.common.constant.Const; -import com.orion.visor.framework.common.constant.ErrorMessage; -import com.orion.visor.framework.common.constant.ExtraFieldConst; -import com.orion.visor.framework.common.enums.EndpointDefine; -import com.orion.visor.framework.common.file.FileClient; -import com.orion.visor.framework.common.security.LoginUser; -import com.orion.visor.framework.common.utils.PathUtils; -import com.orion.visor.framework.common.utils.SqlUtils; -import com.orion.visor.framework.common.utils.Valid; -import com.orion.visor.framework.mybatis.core.query.Conditions; -import com.orion.visor.framework.security.core.utils.SecurityUtils; -import com.orion.visor.module.asset.convert.HostConvert; -import com.orion.visor.module.asset.convert.UploadTaskConvert; -import com.orion.visor.module.asset.convert.UploadTaskFileConvert; -import com.orion.visor.module.asset.dao.HostDAO; -import com.orion.visor.module.asset.dao.UploadTaskDAO; -import com.orion.visor.module.asset.dao.UploadTaskFileDAO; -import com.orion.visor.module.asset.entity.domain.HostDO; -import com.orion.visor.module.asset.entity.domain.UploadTaskDO; -import com.orion.visor.module.asset.entity.domain.UploadTaskFileDO; -import com.orion.visor.module.asset.entity.dto.UploadTaskExtraDTO; -import com.orion.visor.module.asset.entity.request.upload.*; -import com.orion.visor.module.asset.entity.vo.*; -import com.orion.visor.module.asset.enums.*; -import com.orion.visor.module.asset.handler.host.config.model.HostSshConfigModel; -import com.orion.visor.module.asset.handler.host.upload.FileUploadTasks; -import com.orion.visor.module.asset.handler.host.upload.manager.FileUploadTaskManager; -import com.orion.visor.module.asset.handler.host.upload.model.FileUploadFileItemDTO; -import com.orion.visor.module.asset.handler.host.upload.task.IFileUploadTask; -import com.orion.visor.module.asset.handler.host.upload.uploader.IFileUploader; -import com.orion.visor.module.asset.service.AssetAuthorizedDataService; -import com.orion.visor.module.asset.service.HostConfigService; -import com.orion.visor.module.asset.service.UploadTaskFileService; -import com.orion.visor.module.asset.service.UploadTaskService; -import com.orion.visor.module.infra.api.FileUploadApi; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; +import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.framework.common.constant.ErrorMessage; +import org.dromara.visor.framework.common.constant.ExtraFieldConst; +import org.dromara.visor.framework.common.enums.EndpointDefine; +import org.dromara.visor.framework.common.file.FileClient; +import org.dromara.visor.framework.common.security.LoginUser; +import org.dromara.visor.framework.common.utils.PathUtils; +import org.dromara.visor.framework.common.utils.SqlUtils; +import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.framework.mybatis.core.query.Conditions; +import org.dromara.visor.framework.security.core.utils.SecurityUtils; +import org.dromara.visor.module.asset.convert.HostConvert; +import org.dromara.visor.module.asset.convert.UploadTaskConvert; +import org.dromara.visor.module.asset.convert.UploadTaskFileConvert; +import org.dromara.visor.module.asset.dao.HostDAO; +import org.dromara.visor.module.asset.dao.UploadTaskDAO; +import org.dromara.visor.module.asset.dao.UploadTaskFileDAO; +import org.dromara.visor.module.asset.entity.domain.HostDO; +import org.dromara.visor.module.asset.entity.domain.UploadTaskDO; +import org.dromara.visor.module.asset.entity.domain.UploadTaskFileDO; +import org.dromara.visor.module.asset.entity.dto.UploadTaskExtraDTO; +import org.dromara.visor.module.asset.entity.request.upload.*; +import org.dromara.visor.module.asset.entity.vo.*; +import org.dromara.visor.module.asset.enums.*; +import org.dromara.visor.module.asset.handler.host.config.model.HostSshConfigModel; +import org.dromara.visor.module.asset.handler.host.upload.FileUploadTasks; +import org.dromara.visor.module.asset.handler.host.upload.manager.FileUploadTaskManager; +import org.dromara.visor.module.asset.handler.host.upload.model.FileUploadFileItemDTO; +import org.dromara.visor.module.asset.handler.host.upload.task.IFileUploadTask; +import org.dromara.visor.module.asset.handler.host.upload.uploader.IFileUploader; +import org.dromara.visor.module.asset.service.AssetAuthorizedDataService; +import org.dromara.visor.module.asset.service.HostConfigService; +import org.dromara.visor.module.asset.service.UploadTaskFileService; +import org.dromara.visor.module.asset.service.UploadTaskService; +import org.dromara.visor.module.infra.api.FileUploadApi; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/task/CommandSnippetGroupAutoClearTask.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/task/CommandSnippetGroupAutoClearTask.java similarity index 89% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/task/CommandSnippetGroupAutoClearTask.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/task/CommandSnippetGroupAutoClearTask.java index 33a4b818..fe311044 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/task/CommandSnippetGroupAutoClearTask.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/task/CommandSnippetGroupAutoClearTask.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.task; +package org.dromara.visor.module.asset.task; -import com.orion.visor.framework.common.utils.LockerUtils; -import com.orion.visor.module.asset.service.CommandSnippetGroupService; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.common.utils.LockerUtils; +import org.dromara.visor.module.asset.service.CommandSnippetGroupService; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/task/ExecLogFileAutoClearTask.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/task/ExecLogFileAutoClearTask.java similarity index 83% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/task/ExecLogFileAutoClearTask.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/task/ExecLogFileAutoClearTask.java index 22e47ce3..2435c352 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/task/ExecLogFileAutoClearTask.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/task/ExecLogFileAutoClearTask.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.task; +package org.dromara.visor.module.asset.task; -import com.orion.lang.utils.time.Dates; -import com.orion.visor.framework.common.utils.LockerUtils; -import com.orion.visor.module.asset.define.config.AppExecLogAutoClearConfig; -import com.orion.visor.module.asset.entity.request.exec.ExecLogClearRequest; -import com.orion.visor.module.asset.enums.ExecStatusEnum; -import com.orion.visor.module.asset.service.ExecLogService; +import cn.orionsec.kit.lang.utils.time.Dates; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.common.utils.LockerUtils; +import org.dromara.visor.module.asset.define.config.AppExecLogAutoClearConfig; +import org.dromara.visor.module.asset.entity.request.exec.ExecLogClearRequest; +import org.dromara.visor.module.asset.enums.ExecStatusEnum; +import org.dromara.visor.module.asset.service.ExecLogService; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/task/PathBookmarkGroupAutoClearTask.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/task/PathBookmarkGroupAutoClearTask.java similarity index 89% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/task/PathBookmarkGroupAutoClearTask.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/task/PathBookmarkGroupAutoClearTask.java index dea95a46..21eae7f2 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/task/PathBookmarkGroupAutoClearTask.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/task/PathBookmarkGroupAutoClearTask.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.task; +package org.dromara.visor.module.asset.task; -import com.orion.visor.framework.common.utils.LockerUtils; -import com.orion.visor.module.asset.service.PathBookmarkGroupService; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.common.utils.LockerUtils; +import org.dromara.visor.module.asset.service.PathBookmarkGroupService; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/task/TerminalConnectLogAutoClearTask.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/task/TerminalConnectLogAutoClearTask.java similarity index 83% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/task/TerminalConnectLogAutoClearTask.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/task/TerminalConnectLogAutoClearTask.java index fff5c481..917c96ed 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/task/TerminalConnectLogAutoClearTask.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/task/TerminalConnectLogAutoClearTask.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.task; +package org.dromara.visor.module.asset.task; -import com.orion.lang.utils.time.Dates; -import com.orion.visor.framework.common.utils.LockerUtils; -import com.orion.visor.module.asset.define.config.AppTerminalConnectLogAutoClearConfig; -import com.orion.visor.module.asset.entity.request.host.TerminalConnectLogClearRequest; -import com.orion.visor.module.asset.enums.TerminalConnectStatusEnum; -import com.orion.visor.module.asset.service.TerminalConnectLogService; +import cn.orionsec.kit.lang.utils.time.Dates; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.common.utils.LockerUtils; +import org.dromara.visor.module.asset.define.config.AppTerminalConnectLogAutoClearConfig; +import org.dromara.visor.module.asset.entity.request.host.TerminalConnectLogClearRequest; +import org.dromara.visor.module.asset.enums.TerminalConnectStatusEnum; +import org.dromara.visor.module.asset.service.TerminalConnectLogService; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/utils/SftpUtils.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/utils/SftpUtils.java similarity index 81% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/utils/SftpUtils.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/utils/SftpUtils.java index 394ae935..58a9d0f6 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/utils/SftpUtils.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/utils/SftpUtils.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.utils; +package org.dromara.visor.module.asset.utils; +import cn.orionsec.kit.lang.utils.Booleans; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.net.host.sftp.SftpExecutor; +import cn.orionsec.kit.net.host.sftp.SftpFile; import com.alibaba.fastjson.JSON; -import com.orion.lang.utils.Booleans; -import com.orion.lang.utils.Strings; -import com.orion.net.host.sftp.SftpExecutor; -import com.orion.net.host.sftp.SftpFile; -import com.orion.visor.module.asset.define.config.AppSftpConfig; -import com.orion.visor.module.asset.handler.host.transfer.model.SftpFileBackupParams; +import org.dromara.visor.module.asset.define.config.AppSftpConfig; +import org.dromara.visor.module.asset.handler.host.transfer.model.SftpFileBackupParams; /** * sftp 工具类 diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/META-INF/additional-spring-configuration-metadata.json index 273b96d7..8db87d6b 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -2,28 +2,28 @@ "groups": [ { "name": "app.tracker", - "type": "com.orion.visor.module.asset.define.config.AppTrackerConfig", - "sourceType": "com.orion.visor.module.asset.define.config.AppTrackerConfig" + "type": "org.dromara.visor.module.asset.define.config.AppTrackerConfig", + "sourceType": "org.dromara.visor.module.asset.define.config.AppTrackerConfig" }, { "name": "app.sftp", - "type": "com.orion.visor.module.asset.define.config.AppSftpConfig", - "sourceType": "com.orion.visor.module.asset.define.config.AppSftpConfig" + "type": "org.dromara.visor.module.asset.define.config.AppSftpConfig", + "sourceType": "org.dromara.visor.module.asset.define.config.AppSftpConfig" }, { "name": "app.exec-log", - "type": "com.orion.visor.module.asset.define.config.AppExecLogConfig", - "sourceType": "com.orion.visor.module.asset.define.config.AppExecLogConfig" + "type": "org.dromara.visor.module.asset.define.config.AppExecLogConfig", + "sourceType": "org.dromara.visor.module.asset.define.config.AppExecLogConfig" }, { "name": "app.auto-clear.exec-log", - "type": "com.orion.visor.module.asset.define.config.AppExecLogAutoClearConfig", - "sourceType": "com.orion.visor.module.asset.define.config.AppExecLogAutoClearConfig" + "type": "org.dromara.visor.module.asset.define.config.AppExecLogAutoClearConfig", + "sourceType": "org.dromara.visor.module.asset.define.config.AppExecLogAutoClearConfig" }, { "name": "app.auto-clear.terminal-connect-log", - "type": "com.orion.visor.module.asset.define.config.AppTerminalConnectLogAutoClearConfig", - "sourceType": "com.orion.visor.module.asset.define.config.AppTerminalConnectLogAutoClearConfig" + "type": "org.dromara.visor.module.asset.define.config.AppTerminalConnectLogAutoClearConfig", + "sourceType": "org.dromara.visor.module.asset.define.config.AppTerminalConnectLogAutoClearConfig" } ], "properties": [ diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/CommandSnippetMapper.xml b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/CommandSnippetMapper.xml index 567280f1..b41d6800 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/CommandSnippetMapper.xml +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/CommandSnippetMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/ExecHostLogMapper.xml b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/ExecHostLogMapper.xml index 6478fba1..22b5bb30 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/ExecHostLogMapper.xml +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/ExecHostLogMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/ExecJobHostMapper.xml b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/ExecJobHostMapper.xml index 7a86be2b..371eadf5 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/ExecJobHostMapper.xml +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/ExecJobHostMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/ExecJobMapper.xml b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/ExecJobMapper.xml index fbd48d55..a6605473 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/ExecJobMapper.xml +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/ExecJobMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/ExecLogMapper.xml b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/ExecLogMapper.xml index ed3e88b3..2c49b99d 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/ExecLogMapper.xml +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/ExecLogMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/ExecTemplateHostMapper.xml b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/ExecTemplateHostMapper.xml index c703de7d..b0b64f00 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/ExecTemplateHostMapper.xml +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/ExecTemplateHostMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/ExecTemplateMapper.xml b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/ExecTemplateMapper.xml index ebf6093c..a18fb081 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/ExecTemplateMapper.xml +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/ExecTemplateMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/HostIdentityMapper.xml b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/HostIdentityMapper.xml index 2fb777aa..a69ca9f9 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/HostIdentityMapper.xml +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/HostIdentityMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/HostKeyMapper.xml b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/HostKeyMapper.xml index ea6a85f0..8bf10dd6 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/HostKeyMapper.xml +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/HostKeyMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/HostMapper.xml b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/HostMapper.xml index bf8241c6..73718447 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/HostMapper.xml +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/HostMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/PathBookmarkMapper.xml b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/PathBookmarkMapper.xml index ddfd3736..0ad6ada9 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/PathBookmarkMapper.xml +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/PathBookmarkMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/TerminalConnectLogMapper.xml b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/TerminalConnectLogMapper.xml index 7ebe3c0f..bc9f23f4 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/TerminalConnectLogMapper.xml +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/TerminalConnectLogMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/UploadTaskFileMapper.xml b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/UploadTaskFileMapper.xml index 60d8fa41..0ea35696 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/UploadTaskFileMapper.xml +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/UploadTaskFileMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/UploadTaskMapper.xml b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/UploadTaskMapper.xml index 9fc91942..89c45d2e 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/UploadTaskMapper.xml +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/UploadTaskMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/test/java/com/orion/visor/module/asset/api/impl/.gitkeep b/orion-visor-module-asset/orion-visor-module-asset-service/src/test/java/org/dromara/visor/module/asset/api/impl/.gitkeep similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/test/java/com/orion/visor/module/asset/api/impl/.gitkeep rename to orion-visor-module-asset/orion-visor-module-asset-service/src/test/java/org/dromara/visor/module/asset/api/impl/.gitkeep diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/test/java/com/orion/visor/module/asset/meta/TerminalThemeGenerator.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/test/java/org/dromara/visor/module/asset/meta/TerminalThemeGenerator.java similarity index 96% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/test/java/com/orion/visor/module/asset/meta/TerminalThemeGenerator.java rename to orion-visor-module-asset/orion-visor-module-asset-service/src/test/java/org/dromara/visor/module/asset/meta/TerminalThemeGenerator.java index db66bb28..ff5bb9d3 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/test/java/com/orion/visor/module/asset/meta/TerminalThemeGenerator.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/test/java/org/dromara/visor/module/asset/meta/TerminalThemeGenerator.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.asset.meta; +package org.dromara.visor.module.asset.meta; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.annotation.JSONField; import com.alibaba.fastjson.serializer.ValueFilter; -import com.orion.lang.utils.Colors; -import com.orion.lang.utils.collect.Lists; -import com.orion.lang.utils.io.FileReaders; -import com.orion.lang.utils.io.Files1; +import cn.orionsec.kit.lang.utils.Colors; +import cn.orionsec.kit.lang.utils.collect.Lists; +import cn.orionsec.kit.lang.utils.io.FileReaders; +import cn.orionsec.kit.lang.utils.io.Files1; import lombok.Data; import java.io.File; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/test/java/com/orion/visor/module/asset/service/impl/.gitkeep b/orion-visor-module-asset/orion-visor-module-asset-service/src/test/java/org/dromara/visor/module/asset/service/impl/.gitkeep similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/test/java/com/orion/visor/module/asset/service/impl/.gitkeep rename to orion-visor-module-asset/orion-visor-module-asset-service/src/test/java/org/dromara/visor/module/asset/service/impl/.gitkeep diff --git a/orion-visor-module-asset/pom.xml b/orion-visor-module-asset/pom.xml index e9d7fbe0..60587567 100644 --- a/orion-visor-module-asset/pom.xml +++ b/orion-visor-module-asset/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - com.orion.visor + org.dromara.visor orion-visor ${revision} diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/pom.xml b/orion-visor-module-infra/orion-visor-module-infra-provider/pom.xml index 3c70a8e8..a86edb47 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-provider/pom.xml +++ b/orion-visor-module-infra/orion-visor-module-infra-provider/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - com.orion.visor + org.dromara.visor orion-visor-module-infra ${revision} @@ -17,7 +17,7 @@ - com.orion.visor + org.dromara.visor orion-visor-framework-common diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/api/AuthenticationApi.java b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/AuthenticationApi.java similarity index 90% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/api/AuthenticationApi.java rename to orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/AuthenticationApi.java index 93771cc9..7af27398 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/api/AuthenticationApi.java +++ b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/AuthenticationApi.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.api; +package org.dromara.visor.module.infra.api; -import com.orion.visor.module.infra.entity.dto.user.SystemUserAuthDTO; +import org.dromara.visor.module.infra.entity.dto.user.SystemUserAuthDTO; /** * 认证服务实现 diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/api/DataExtraApi.java b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/DataExtraApi.java similarity index 93% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/api/DataExtraApi.java rename to orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/DataExtraApi.java index e93b933b..4660b9f3 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/api/DataExtraApi.java +++ b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/DataExtraApi.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.api; +package org.dromara.visor.module.infra.api; -import com.orion.visor.module.infra.entity.dto.data.DataExtraDTO; -import com.orion.visor.module.infra.entity.dto.data.DataExtraQueryDTO; -import com.orion.visor.module.infra.entity.dto.data.DataExtraSetDTO; -import com.orion.visor.module.infra.enums.DataExtraTypeEnum; +import org.dromara.visor.module.infra.entity.dto.data.DataExtraDTO; +import org.dromara.visor.module.infra.entity.dto.data.DataExtraQueryDTO; +import org.dromara.visor.module.infra.entity.dto.data.DataExtraSetDTO; +import org.dromara.visor.module.infra.enums.DataExtraTypeEnum; import java.util.List; import java.util.Map; diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/api/DataGroupApi.java b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/DataGroupApi.java similarity index 84% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/api/DataGroupApi.java rename to orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/DataGroupApi.java index da3ffe79..fcbd49b3 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/api/DataGroupApi.java +++ b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/DataGroupApi.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.api; +package org.dromara.visor.module.infra.api; -import com.orion.visor.module.infra.entity.dto.data.DataGroupCreateDTO; -import com.orion.visor.module.infra.entity.dto.data.DataGroupDTO; -import com.orion.visor.module.infra.entity.dto.data.DataGroupMoveDTO; -import com.orion.visor.module.infra.entity.dto.data.DataGroupRenameDTO; -import com.orion.visor.module.infra.enums.DataGroupTypeEnum; +import org.dromara.visor.module.infra.entity.dto.data.DataGroupCreateDTO; +import org.dromara.visor.module.infra.entity.dto.data.DataGroupDTO; +import org.dromara.visor.module.infra.entity.dto.data.DataGroupMoveDTO; +import org.dromara.visor.module.infra.entity.dto.data.DataGroupRenameDTO; +import org.dromara.visor.module.infra.enums.DataGroupTypeEnum; import java.util.List; diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/api/DataGroupRelApi.java b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/DataGroupRelApi.java similarity index 96% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/api/DataGroupRelApi.java rename to orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/DataGroupRelApi.java index 67d1f5bc..8997022a 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/api/DataGroupRelApi.java +++ b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/DataGroupRelApi.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.api; +package org.dromara.visor.module.infra.api; -import com.orion.visor.module.infra.enums.DataGroupTypeEnum; +import org.dromara.visor.module.infra.enums.DataGroupTypeEnum; import java.util.List; import java.util.Map; diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/api/DataGroupUserApi.java b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/DataGroupUserApi.java similarity index 87% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/api/DataGroupUserApi.java rename to orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/DataGroupUserApi.java index f871dead..46fd2842 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/api/DataGroupUserApi.java +++ b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/DataGroupUserApi.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.api; +package org.dromara.visor.module.infra.api; -import com.orion.visor.module.infra.entity.dto.data.DataGroupCreateDTO; -import com.orion.visor.module.infra.entity.dto.data.DataGroupDTO; -import com.orion.visor.module.infra.enums.DataGroupTypeEnum; +import org.dromara.visor.module.infra.entity.dto.data.DataGroupCreateDTO; +import org.dromara.visor.module.infra.entity.dto.data.DataGroupDTO; +import org.dromara.visor.module.infra.enums.DataGroupTypeEnum; import java.util.List; diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/api/DataGroupUserRelApi.java b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/DataGroupUserRelApi.java similarity index 96% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/api/DataGroupUserRelApi.java rename to orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/DataGroupUserRelApi.java index 4fa99340..6682f1d9 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/api/DataGroupUserRelApi.java +++ b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/DataGroupUserRelApi.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.api; +package org.dromara.visor.module.infra.api; -import com.orion.visor.module.infra.enums.DataGroupTypeEnum; +import org.dromara.visor.module.infra.enums.DataGroupTypeEnum; import java.util.List; import java.util.Map; diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/api/DataPermissionApi.java b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/DataPermissionApi.java similarity index 93% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/api/DataPermissionApi.java rename to orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/DataPermissionApi.java index ae2ad329..1495249f 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/api/DataPermissionApi.java +++ b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/DataPermissionApi.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.api; +package org.dromara.visor.module.infra.api; -import com.orion.visor.module.infra.entity.dto.data.DataPermissionUpdateDTO; -import com.orion.visor.module.infra.enums.DataPermissionTypeEnum; +import org.dromara.visor.module.infra.entity.dto.data.DataPermissionUpdateDTO; +import org.dromara.visor.module.infra.enums.DataPermissionTypeEnum; import java.util.List; diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/api/DictValueApi.java b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/DictValueApi.java similarity index 96% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/api/DictValueApi.java rename to orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/DictValueApi.java index 5bf1b4b5..4b6d923f 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/api/DictValueApi.java +++ b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/DictValueApi.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.api; +package org.dromara.visor.module.infra.api; import com.alibaba.fastjson.JSONObject; diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/api/FavoriteApi.java b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/FavoriteApi.java similarity index 93% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/api/FavoriteApi.java rename to orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/FavoriteApi.java index 20d171a7..75ecf264 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/api/FavoriteApi.java +++ b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/FavoriteApi.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.api; +package org.dromara.visor.module.infra.api; -import com.orion.visor.module.infra.enums.FavoriteTypeEnum; +import org.dromara.visor.module.infra.enums.FavoriteTypeEnum; import java.util.List; import java.util.concurrent.Future; diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/api/FileUploadApi.java b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/FileUploadApi.java similarity index 95% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/api/FileUploadApi.java rename to orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/FileUploadApi.java index 167f76c7..5df40e5c 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/api/FileUploadApi.java +++ b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/FileUploadApi.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.api; +package org.dromara.visor.module.infra.api; /** * 文件上传 对外服务类 diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/api/HistoryValueApi.java b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/HistoryValueApi.java similarity index 87% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/api/HistoryValueApi.java rename to orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/HistoryValueApi.java index 5daf779e..1eba5615 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/api/HistoryValueApi.java +++ b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/HistoryValueApi.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.api; +package org.dromara.visor.module.infra.api; -import com.orion.visor.module.infra.entity.dto.history.HistoryValueCreateDTO; -import com.orion.visor.module.infra.entity.dto.history.HistoryValueDTO; -import com.orion.visor.module.infra.enums.HistoryValueTypeEnum; +import org.dromara.visor.module.infra.entity.dto.history.HistoryValueCreateDTO; +import org.dromara.visor.module.infra.entity.dto.history.HistoryValueDTO; +import org.dromara.visor.module.infra.enums.HistoryValueTypeEnum; import java.util.List; diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/api/OperatorLogApi.java b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/OperatorLogApi.java similarity index 82% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/api/OperatorLogApi.java rename to orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/OperatorLogApi.java index d0e19454..2d78c0f1 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/api/OperatorLogApi.java +++ b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/OperatorLogApi.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.api; +package org.dromara.visor.module.infra.api; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.visor.module.infra.entity.dto.operator.OperatorLogDTO; -import com.orion.visor.module.infra.entity.dto.operator.OperatorLogQueryDTO; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import org.dromara.visor.module.infra.entity.dto.operator.OperatorLogDTO; +import org.dromara.visor.module.infra.entity.dto.operator.OperatorLogQueryDTO; import java.util.List; diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/api/PermissionApi.java b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/PermissionApi.java similarity index 97% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/api/PermissionApi.java rename to orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/PermissionApi.java index 3509996d..4950a9ab 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/api/PermissionApi.java +++ b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/PermissionApi.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.api; +package org.dromara.visor.module.infra.api; import java.util.List; diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/api/SystemMessageApi.java b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/SystemMessageApi.java similarity index 78% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/api/SystemMessageApi.java rename to orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/SystemMessageApi.java index 6ff8bd90..70d502a7 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/api/SystemMessageApi.java +++ b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/SystemMessageApi.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.api; +package org.dromara.visor.module.infra.api; -import com.orion.visor.module.infra.define.SystemMessageDefine; -import com.orion.visor.module.infra.entity.dto.message.SystemMessageCreateDTO; -import com.orion.visor.module.infra.entity.dto.message.SystemMessageDTO; -import com.orion.visor.module.infra.enums.MessageClassifyEnum; +import org.dromara.visor.module.infra.define.SystemMessageDefine; +import org.dromara.visor.module.infra.entity.dto.message.SystemMessageCreateDTO; +import org.dromara.visor.module.infra.entity.dto.message.SystemMessageDTO; +import org.dromara.visor.module.infra.enums.MessageClassifyEnum; /** * 系统消息 对外服务类 diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/api/SystemRoleApi.java b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/SystemRoleApi.java similarity index 88% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/api/SystemRoleApi.java rename to orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/SystemRoleApi.java index 65e68aad..b8a81ea2 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/api/SystemRoleApi.java +++ b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/SystemRoleApi.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.api; +package org.dromara.visor.module.infra.api; -import com.orion.visor.module.infra.entity.dto.role.SystemRoleDTO; +import org.dromara.visor.module.infra.entity.dto.role.SystemRoleDTO; /** * 角色服务 diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/api/SystemUserApi.java b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/SystemUserApi.java similarity index 91% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/api/SystemUserApi.java rename to orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/SystemUserApi.java index 7a2482f3..a3dba99f 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/api/SystemUserApi.java +++ b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/SystemUserApi.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.api; +package org.dromara.visor.module.infra.api; -import com.orion.visor.module.infra.entity.dto.user.SystemUserDTO; +import org.dromara.visor.module.infra.entity.dto.user.SystemUserDTO; /** * 用户服务 diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/api/TagRelApi.java b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/TagRelApi.java similarity index 93% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/api/TagRelApi.java rename to orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/TagRelApi.java index 4e70c3fe..d27872f5 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/api/TagRelApi.java +++ b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/TagRelApi.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.api; +package org.dromara.visor.module.infra.api; -import com.orion.visor.module.infra.entity.dto.tag.TagDTO; -import com.orion.visor.module.infra.enums.TagTypeEnum; +import org.dromara.visor.module.infra.entity.dto.tag.TagDTO; +import org.dromara.visor.module.infra.enums.TagTypeEnum; import java.util.List; import java.util.concurrent.Future; diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/constant/DataExtraItems.java b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/constant/DataExtraItems.java similarity index 94% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/constant/DataExtraItems.java rename to orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/constant/DataExtraItems.java index 3802720a..bd1f3aae 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/constant/DataExtraItems.java +++ b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/constant/DataExtraItems.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.constant; +package org.dromara.visor.module.infra.constant; /** * 数据额外字段常量 diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/define/RoleDefine.java b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/define/RoleDefine.java similarity index 96% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/define/RoleDefine.java rename to orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/define/RoleDefine.java index 3aad1741..0841837a 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/define/RoleDefine.java +++ b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/define/RoleDefine.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.define; +package org.dromara.visor.module.infra.define; import java.util.Collection; diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/define/SystemMessageDefine.java b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/define/SystemMessageDefine.java similarity index 89% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/define/SystemMessageDefine.java rename to orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/define/SystemMessageDefine.java index 713a11a8..90cea3f6 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/define/SystemMessageDefine.java +++ b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/define/SystemMessageDefine.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.define; +package org.dromara.visor.module.infra.define; -import com.orion.lang.utils.Strings; -import com.orion.visor.module.infra.enums.MessageClassifyEnum; +import cn.orionsec.kit.lang.utils.Strings; +import org.dromara.visor.module.infra.enums.MessageClassifyEnum; import java.util.Map; diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/entity/dto/data/DataExtraDTO.java b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/data/DataExtraDTO.java similarity index 96% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/entity/dto/data/DataExtraDTO.java rename to orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/data/DataExtraDTO.java index 23164d26..416621b8 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/entity/dto/data/DataExtraDTO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/data/DataExtraDTO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.dto.data; +package org.dromara.visor.module.infra.entity.dto.data; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/entity/dto/data/DataExtraQueryDTO.java b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/data/DataExtraQueryDTO.java similarity index 96% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/entity/dto/data/DataExtraQueryDTO.java rename to orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/data/DataExtraQueryDTO.java index 5555a4ab..5418bfb4 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/entity/dto/data/DataExtraQueryDTO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/data/DataExtraQueryDTO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.dto.data; +package org.dromara.visor.module.infra.entity.dto.data; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/entity/dto/data/DataExtraSetDTO.java b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/data/DataExtraSetDTO.java similarity index 96% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/entity/dto/data/DataExtraSetDTO.java rename to orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/data/DataExtraSetDTO.java index f04449d4..d0e79e8e 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/entity/dto/data/DataExtraSetDTO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/data/DataExtraSetDTO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.dto.data; +package org.dromara.visor.module.infra.entity.dto.data; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/entity/dto/data/DataGroupCreateDTO.java b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/data/DataGroupCreateDTO.java similarity index 96% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/entity/dto/data/DataGroupCreateDTO.java rename to orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/data/DataGroupCreateDTO.java index b11352a0..2a239f94 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/entity/dto/data/DataGroupCreateDTO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/data/DataGroupCreateDTO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.dto.data; +package org.dromara.visor.module.infra.entity.dto.data; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/entity/dto/data/DataGroupDTO.java b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/data/DataGroupDTO.java similarity index 93% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/entity/dto/data/DataGroupDTO.java rename to orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/data/DataGroupDTO.java index 0554ec23..e2796c23 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/entity/dto/data/DataGroupDTO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/data/DataGroupDTO.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.dto.data; +package org.dromara.visor.module.infra.entity.dto.data; -import com.orion.visor.framework.common.entity.TreeNode; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.dromara.visor.framework.common.entity.TreeNode; import java.io.Serializable; import java.util.List; diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/entity/dto/data/DataGroupMoveDTO.java b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/data/DataGroupMoveDTO.java similarity index 96% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/entity/dto/data/DataGroupMoveDTO.java rename to orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/data/DataGroupMoveDTO.java index 1e5dcd75..7d24fe6b 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/entity/dto/data/DataGroupMoveDTO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/data/DataGroupMoveDTO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.dto.data; +package org.dromara.visor.module.infra.entity.dto.data; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/entity/dto/data/DataGroupRenameDTO.java b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/data/DataGroupRenameDTO.java similarity index 96% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/entity/dto/data/DataGroupRenameDTO.java rename to orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/data/DataGroupRenameDTO.java index 2aa9ea2d..ce967eec 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/entity/dto/data/DataGroupRenameDTO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/data/DataGroupRenameDTO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.dto.data; +package org.dromara.visor.module.infra.entity.dto.data; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/entity/dto/data/DataPermissionUpdateDTO.java b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/data/DataPermissionUpdateDTO.java similarity index 96% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/entity/dto/data/DataPermissionUpdateDTO.java rename to orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/data/DataPermissionUpdateDTO.java index 1ce3b67e..8ee9ccac 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/entity/dto/data/DataPermissionUpdateDTO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/data/DataPermissionUpdateDTO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.dto.data; +package org.dromara.visor.module.infra.entity.dto.data; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/entity/dto/history/HistoryValueCreateDTO.java b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/history/HistoryValueCreateDTO.java similarity index 96% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/entity/dto/history/HistoryValueCreateDTO.java rename to orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/history/HistoryValueCreateDTO.java index 0f1c74db..f722f3f5 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/entity/dto/history/HistoryValueCreateDTO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/history/HistoryValueCreateDTO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.dto.history; +package org.dromara.visor.module.infra.entity.dto.history; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/entity/dto/history/HistoryValueDTO.java b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/history/HistoryValueDTO.java similarity index 96% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/entity/dto/history/HistoryValueDTO.java rename to orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/history/HistoryValueDTO.java index d88a49b7..d30f807d 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/entity/dto/history/HistoryValueDTO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/history/HistoryValueDTO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.dto.history; +package org.dromara.visor.module.infra.entity.dto.history; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/entity/dto/message/SystemMessageCreateDTO.java b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/message/SystemMessageCreateDTO.java similarity index 97% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/entity/dto/message/SystemMessageCreateDTO.java rename to orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/message/SystemMessageCreateDTO.java index b2ddfec3..73654129 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/entity/dto/message/SystemMessageCreateDTO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/message/SystemMessageCreateDTO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.dto.message; +package org.dromara.visor.module.infra.entity.dto.message; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/entity/dto/message/SystemMessageDTO.java b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/message/SystemMessageDTO.java similarity index 96% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/entity/dto/message/SystemMessageDTO.java rename to orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/message/SystemMessageDTO.java index 6d5fa87e..43849190 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/entity/dto/message/SystemMessageDTO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/message/SystemMessageDTO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.dto.message; +package org.dromara.visor.module.infra.entity.dto.message; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/entity/dto/operator/OperatorLogDTO.java b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/operator/OperatorLogDTO.java similarity index 97% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/entity/dto/operator/OperatorLogDTO.java rename to orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/operator/OperatorLogDTO.java index 6fc43434..928aa21a 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/entity/dto/operator/OperatorLogDTO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/operator/OperatorLogDTO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.dto.operator; +package org.dromara.visor.module.infra.entity.dto.operator; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/entity/dto/operator/OperatorLogQueryDTO.java b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/operator/OperatorLogQueryDTO.java similarity index 94% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/entity/dto/operator/OperatorLogQueryDTO.java rename to orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/operator/OperatorLogQueryDTO.java index 7f9b3b72..ec068ec3 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/entity/dto/operator/OperatorLogQueryDTO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/operator/OperatorLogQueryDTO.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.dto.operator; +package org.dromara.visor.module.infra.entity.dto.operator; -import com.orion.visor.framework.common.entity.PageRequest; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import org.dromara.visor.framework.common.entity.PageRequest; import javax.validation.constraints.Size; import java.util.Date; diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/entity/dto/role/SystemRoleDTO.java b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/role/SystemRoleDTO.java similarity index 96% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/entity/dto/role/SystemRoleDTO.java rename to orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/role/SystemRoleDTO.java index fd14d38a..c6134777 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/entity/dto/role/SystemRoleDTO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/role/SystemRoleDTO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.dto.role; +package org.dromara.visor.module.infra.entity.dto.role; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/entity/dto/tag/TagDTO.java b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/tag/TagDTO.java similarity index 95% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/entity/dto/tag/TagDTO.java rename to orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/tag/TagDTO.java index bd8d1a4d..9db00e16 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/entity/dto/tag/TagDTO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/tag/TagDTO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.dto.tag; +package org.dromara.visor.module.infra.entity.dto.tag; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/entity/dto/user/SystemUserAuthDTO.java b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/user/SystemUserAuthDTO.java similarity index 96% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/entity/dto/user/SystemUserAuthDTO.java rename to orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/user/SystemUserAuthDTO.java index d211e93f..7a3c0c30 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/entity/dto/user/SystemUserAuthDTO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/user/SystemUserAuthDTO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.dto.user; +package org.dromara.visor.module.infra.entity.dto.user; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/entity/dto/user/SystemUserDTO.java b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/user/SystemUserDTO.java similarity index 96% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/entity/dto/user/SystemUserDTO.java rename to orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/user/SystemUserDTO.java index 72433b3e..2c86a9e6 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/entity/dto/user/SystemUserDTO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/user/SystemUserDTO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.dto.user; +package org.dromara.visor.module.infra.entity.dto.user; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/enums/DataExtraTypeEnum.java b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/enums/DataExtraTypeEnum.java similarity index 96% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/enums/DataExtraTypeEnum.java rename to orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/enums/DataExtraTypeEnum.java index ba984116..4c9457a3 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/enums/DataExtraTypeEnum.java +++ b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/enums/DataExtraTypeEnum.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.enums; +package org.dromara.visor.module.infra.enums; /** * 数据拓展类型 diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/enums/DataGroupTypeEnum.java b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/enums/DataGroupTypeEnum.java similarity index 96% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/enums/DataGroupTypeEnum.java rename to orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/enums/DataGroupTypeEnum.java index 6eae9d1b..a8942751 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/enums/DataGroupTypeEnum.java +++ b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/enums/DataGroupTypeEnum.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.enums; +package org.dromara.visor.module.infra.enums; /** * 数据分组类型 diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/enums/DataPermissionTypeEnum.java b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/enums/DataPermissionTypeEnum.java similarity index 97% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/enums/DataPermissionTypeEnum.java rename to orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/enums/DataPermissionTypeEnum.java index afe4eb3f..79076b80 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/enums/DataPermissionTypeEnum.java +++ b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/enums/DataPermissionTypeEnum.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.enums; +package org.dromara.visor.module.infra.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/enums/FavoriteTypeEnum.java b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/enums/FavoriteTypeEnum.java similarity index 96% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/enums/FavoriteTypeEnum.java rename to orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/enums/FavoriteTypeEnum.java index 325d561a..d202c4fe 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/enums/FavoriteTypeEnum.java +++ b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/enums/FavoriteTypeEnum.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.enums; +package org.dromara.visor.module.infra.enums; /** * 收藏类型 枚举 diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/enums/HistoryValueTypeEnum.java b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/enums/HistoryValueTypeEnum.java similarity index 96% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/enums/HistoryValueTypeEnum.java rename to orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/enums/HistoryValueTypeEnum.java index 8a1533dd..4756daea 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/enums/HistoryValueTypeEnum.java +++ b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/enums/HistoryValueTypeEnum.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.enums; +package org.dromara.visor.module.infra.enums; /** * 历史值类型 枚举 diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/enums/MessageClassifyEnum.java b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/enums/MessageClassifyEnum.java similarity index 94% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/enums/MessageClassifyEnum.java rename to orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/enums/MessageClassifyEnum.java index 79552ac5..537ead66 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/enums/MessageClassifyEnum.java +++ b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/enums/MessageClassifyEnum.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.enums; +package org.dromara.visor.module.infra.enums; /** * 消息分类 diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/enums/TagTypeEnum.java b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/enums/TagTypeEnum.java similarity index 96% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/enums/TagTypeEnum.java rename to orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/enums/TagTypeEnum.java index 6bf8cf67..b8f9a54a 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/com/orion/visor/module/infra/enums/TagTypeEnum.java +++ b/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/enums/TagTypeEnum.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.enums; +package org.dromara.visor.module.infra.enums; /** * 收藏类型 枚举 diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/pom.xml b/orion-visor-module-infra/orion-visor-module-infra-service/pom.xml index a0196e61..5af269eb 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/pom.xml +++ b/orion-visor-module-infra/orion-visor-module-infra-service/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - com.orion.visor + org.dromara.visor orion-visor-module-infra ${revision} @@ -17,81 +17,81 @@ - com.orion.visor + org.dromara.visor orion-visor-framework-common - com.orion.visor + org.dromara.visor orion-visor-module-infra-provider ${revision} - com.orion.visor + org.dromara.visor orion-visor-module-asset-provider ${revision} - com.orion.visor + org.dromara.visor orion-visor-spring-boot-starter-web - com.orion.visor + org.dromara.visor orion-visor-spring-boot-starter-websocket - com.orion.visor + org.dromara.visor orion-visor-spring-boot-starter-log - com.orion.visor + org.dromara.visor orion-visor-spring-boot-starter-biz-operator-log - com.orion.visor + org.dromara.visor orion-visor-spring-boot-starter-desensitize - com.orion.visor + org.dromara.visor orion-visor-spring-boot-starter-security - com.orion.visor + org.dromara.visor orion-visor-spring-boot-starter-redis - com.orion.visor + org.dromara.visor orion-visor-spring-boot-starter-mybatis - com.orion.visor + org.dromara.visor orion-visor-spring-boot-starter-storage - com.orion.visor + org.dromara.visor orion-visor-spring-boot-starter-test diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/api/impl/AuthenticationApiImpl.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/AuthenticationApiImpl.java similarity index 82% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/api/impl/AuthenticationApiImpl.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/AuthenticationApiImpl.java index b8fc4274..03fa8f9d 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/api/impl/AuthenticationApiImpl.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/AuthenticationApiImpl.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.api.impl; +package org.dromara.visor.module.infra.api.impl; -import com.orion.visor.framework.common.constant.ErrorMessage; -import com.orion.visor.framework.common.utils.Valid; -import com.orion.visor.module.infra.api.AuthenticationApi; -import com.orion.visor.module.infra.entity.domain.SystemUserDO; -import com.orion.visor.module.infra.entity.dto.user.SystemUserAuthDTO; -import com.orion.visor.module.infra.service.AuthenticationService; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.common.constant.ErrorMessage; +import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.module.infra.api.AuthenticationApi; +import org.dromara.visor.module.infra.entity.domain.SystemUserDO; +import org.dromara.visor.module.infra.entity.dto.user.SystemUserAuthDTO; +import org.dromara.visor.module.infra.service.AuthenticationService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/api/impl/DataExtraApiImpl.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataExtraApiImpl.java similarity index 86% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/api/impl/DataExtraApiImpl.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataExtraApiImpl.java index 2c16bfe9..df21ddcb 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/api/impl/DataExtraApiImpl.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataExtraApiImpl.java @@ -13,21 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.api.impl; +package org.dromara.visor.module.infra.api.impl; -import com.orion.visor.framework.common.utils.Valid; -import com.orion.visor.module.infra.api.DataExtraApi; -import com.orion.visor.module.infra.convert.DataExtraProviderConvert; -import com.orion.visor.module.infra.dao.DataExtraDAO; -import com.orion.visor.module.infra.entity.domain.DataExtraDO; -import com.orion.visor.module.infra.entity.dto.data.DataExtraDTO; -import com.orion.visor.module.infra.entity.dto.data.DataExtraQueryDTO; -import com.orion.visor.module.infra.entity.dto.data.DataExtraSetDTO; -import com.orion.visor.module.infra.entity.request.data.DataExtraQueryRequest; -import com.orion.visor.module.infra.entity.request.data.DataExtraSetRequest; -import com.orion.visor.module.infra.enums.DataExtraTypeEnum; -import com.orion.visor.module.infra.service.DataExtraService; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.module.infra.api.DataExtraApi; +import org.dromara.visor.module.infra.convert.DataExtraProviderConvert; +import org.dromara.visor.module.infra.dao.DataExtraDAO; +import org.dromara.visor.module.infra.entity.domain.DataExtraDO; +import org.dromara.visor.module.infra.entity.dto.data.DataExtraDTO; +import org.dromara.visor.module.infra.entity.dto.data.DataExtraQueryDTO; +import org.dromara.visor.module.infra.entity.dto.data.DataExtraSetDTO; +import org.dromara.visor.module.infra.entity.request.data.DataExtraQueryRequest; +import org.dromara.visor.module.infra.entity.request.data.DataExtraSetRequest; +import org.dromara.visor.module.infra.enums.DataExtraTypeEnum; +import org.dromara.visor.module.infra.service.DataExtraService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/api/impl/DataGroupApiImpl.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataGroupApiImpl.java similarity index 73% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/api/impl/DataGroupApiImpl.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataGroupApiImpl.java index 6b25bf88..4571a818 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/api/impl/DataGroupApiImpl.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataGroupApiImpl.java @@ -13,25 +13,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.api.impl; +package org.dromara.visor.module.infra.api.impl; -import com.orion.visor.framework.common.constant.Const; -import com.orion.visor.framework.common.utils.Valid; -import com.orion.visor.module.infra.api.DataGroupApi; -import com.orion.visor.module.infra.convert.DataGroupProviderConvert; -import com.orion.visor.module.infra.dao.DataGroupDAO; -import com.orion.visor.module.infra.entity.domain.DataGroupDO; -import com.orion.visor.module.infra.entity.dto.DataGroupCacheDTO; -import com.orion.visor.module.infra.entity.dto.data.DataGroupCreateDTO; -import com.orion.visor.module.infra.entity.dto.data.DataGroupDTO; -import com.orion.visor.module.infra.entity.dto.data.DataGroupMoveDTO; -import com.orion.visor.module.infra.entity.dto.data.DataGroupRenameDTO; -import com.orion.visor.module.infra.entity.request.data.DataGroupCreateRequest; -import com.orion.visor.module.infra.entity.request.data.DataGroupMoveRequest; -import com.orion.visor.module.infra.entity.request.data.DataGroupRenameRequest; -import com.orion.visor.module.infra.enums.DataGroupTypeEnum; -import com.orion.visor.module.infra.service.DataGroupService; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.module.infra.api.DataGroupApi; +import org.dromara.visor.module.infra.convert.DataGroupProviderConvert; +import org.dromara.visor.module.infra.dao.DataGroupDAO; +import org.dromara.visor.module.infra.entity.domain.DataGroupDO; +import org.dromara.visor.module.infra.entity.dto.DataGroupCacheDTO; +import org.dromara.visor.module.infra.entity.dto.data.DataGroupCreateDTO; +import org.dromara.visor.module.infra.entity.dto.data.DataGroupDTO; +import org.dromara.visor.module.infra.entity.dto.data.DataGroupMoveDTO; +import org.dromara.visor.module.infra.entity.dto.data.DataGroupRenameDTO; +import org.dromara.visor.module.infra.entity.request.data.DataGroupCreateRequest; +import org.dromara.visor.module.infra.entity.request.data.DataGroupMoveRequest; +import org.dromara.visor.module.infra.entity.request.data.DataGroupRenameRequest; +import org.dromara.visor.module.infra.enums.DataGroupTypeEnum; +import org.dromara.visor.module.infra.service.DataGroupService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/api/impl/DataGroupRelApiImpl.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataGroupRelApiImpl.java similarity index 89% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/api/impl/DataGroupRelApiImpl.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataGroupRelApiImpl.java index 3f898666..93b2d96f 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/api/impl/DataGroupRelApiImpl.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataGroupRelApiImpl.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.api.impl; +package org.dromara.visor.module.infra.api.impl; -import com.orion.visor.framework.common.constant.Const; -import com.orion.visor.framework.common.utils.Valid; -import com.orion.visor.module.infra.api.DataGroupRelApi; -import com.orion.visor.module.infra.entity.domain.DataGroupRelDO; -import com.orion.visor.module.infra.entity.dto.DataGroupRelCacheDTO; -import com.orion.visor.module.infra.enums.DataGroupTypeEnum; -import com.orion.visor.module.infra.service.DataGroupRelService; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.module.infra.api.DataGroupRelApi; +import org.dromara.visor.module.infra.entity.domain.DataGroupRelDO; +import org.dromara.visor.module.infra.entity.dto.DataGroupRelCacheDTO; +import org.dromara.visor.module.infra.enums.DataGroupTypeEnum; +import org.dromara.visor.module.infra.service.DataGroupRelService; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/api/impl/DataGroupUserApiImpl.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataGroupUserApiImpl.java similarity index 76% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/api/impl/DataGroupUserApiImpl.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataGroupUserApiImpl.java index c752d0a8..5a344102 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/api/impl/DataGroupUserApiImpl.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataGroupUserApiImpl.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.api.impl; +package org.dromara.visor.module.infra.api.impl; -import com.orion.visor.framework.common.utils.Valid; -import com.orion.visor.module.infra.api.DataGroupUserApi; -import com.orion.visor.module.infra.convert.DataGroupProviderConvert; -import com.orion.visor.module.infra.entity.dto.DataGroupCacheDTO; -import com.orion.visor.module.infra.entity.dto.data.DataGroupCreateDTO; -import com.orion.visor.module.infra.entity.dto.data.DataGroupDTO; -import com.orion.visor.module.infra.entity.request.data.DataGroupCreateRequest; -import com.orion.visor.module.infra.enums.DataGroupTypeEnum; -import com.orion.visor.module.infra.service.DataGroupService; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.module.infra.api.DataGroupUserApi; +import org.dromara.visor.module.infra.convert.DataGroupProviderConvert; +import org.dromara.visor.module.infra.entity.dto.DataGroupCacheDTO; +import org.dromara.visor.module.infra.entity.dto.data.DataGroupCreateDTO; +import org.dromara.visor.module.infra.entity.dto.data.DataGroupDTO; +import org.dromara.visor.module.infra.entity.request.data.DataGroupCreateRequest; +import org.dromara.visor.module.infra.enums.DataGroupTypeEnum; +import org.dromara.visor.module.infra.service.DataGroupService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/api/impl/DataGroupUserRelApiImpl.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataGroupUserRelApiImpl.java similarity index 89% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/api/impl/DataGroupUserRelApiImpl.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataGroupUserRelApiImpl.java index f4bb1d7a..21b1a622 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/api/impl/DataGroupUserRelApiImpl.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataGroupUserRelApiImpl.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.api.impl; +package org.dromara.visor.module.infra.api.impl; -import com.orion.visor.framework.common.utils.Valid; -import com.orion.visor.module.infra.api.DataGroupUserRelApi; -import com.orion.visor.module.infra.entity.domain.DataGroupRelDO; -import com.orion.visor.module.infra.entity.dto.DataGroupRelCacheDTO; -import com.orion.visor.module.infra.enums.DataGroupTypeEnum; -import com.orion.visor.module.infra.service.DataGroupRelService; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.module.infra.api.DataGroupUserRelApi; +import org.dromara.visor.module.infra.entity.domain.DataGroupRelDO; +import org.dromara.visor.module.infra.entity.dto.DataGroupRelCacheDTO; +import org.dromara.visor.module.infra.enums.DataGroupTypeEnum; +import org.dromara.visor.module.infra.service.DataGroupRelService; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/api/impl/DataPermissionApiImpl.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataPermissionApiImpl.java similarity index 85% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/api/impl/DataPermissionApiImpl.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataPermissionApiImpl.java index 89828c37..4c967b88 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/api/impl/DataPermissionApiImpl.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataPermissionApiImpl.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.api.impl; +package org.dromara.visor.module.infra.api.impl; -import com.orion.visor.framework.common.utils.Valid; -import com.orion.visor.module.infra.api.DataPermissionApi; -import com.orion.visor.module.infra.convert.DataPermissionProviderConvert; -import com.orion.visor.module.infra.entity.dto.data.DataPermissionUpdateDTO; -import com.orion.visor.module.infra.entity.request.data.DataPermissionUpdateRequest; -import com.orion.visor.module.infra.enums.DataPermissionTypeEnum; -import com.orion.visor.module.infra.service.DataPermissionService; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.module.infra.api.DataPermissionApi; +import org.dromara.visor.module.infra.convert.DataPermissionProviderConvert; +import org.dromara.visor.module.infra.entity.dto.data.DataPermissionUpdateDTO; +import org.dromara.visor.module.infra.entity.request.data.DataPermissionUpdateRequest; +import org.dromara.visor.module.infra.enums.DataPermissionTypeEnum; +import org.dromara.visor.module.infra.service.DataPermissionService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/api/impl/DictValueApiImpl.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DictValueApiImpl.java similarity index 89% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/api/impl/DictValueApiImpl.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DictValueApiImpl.java index 5e02f35d..9a34e496 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/api/impl/DictValueApiImpl.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DictValueApiImpl.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.api.impl; +package org.dromara.visor.module.infra.api.impl; import com.alibaba.fastjson.JSONObject; -import com.orion.visor.module.infra.api.DictValueApi; -import com.orion.visor.module.infra.service.DictValueService; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.module.infra.api.DictValueApi; +import org.dromara.visor.module.infra.service.DictValueService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/api/impl/FavoriteApiImpl.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/FavoriteApiImpl.java similarity index 84% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/api/impl/FavoriteApiImpl.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/FavoriteApiImpl.java index d278d6a7..d0ff8aad 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/api/impl/FavoriteApiImpl.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/FavoriteApiImpl.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.api.impl; +package org.dromara.visor.module.infra.api.impl; -import com.orion.visor.framework.common.utils.Valid; -import com.orion.visor.module.infra.api.FavoriteApi; -import com.orion.visor.module.infra.dao.FavoriteDAO; -import com.orion.visor.module.infra.entity.request.favorite.FavoriteQueryRequest; -import com.orion.visor.module.infra.enums.FavoriteTypeEnum; -import com.orion.visor.module.infra.service.FavoriteService; +import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.module.infra.api.FavoriteApi; +import org.dromara.visor.module.infra.dao.FavoriteDAO; +import org.dromara.visor.module.infra.entity.request.favorite.FavoriteQueryRequest; +import org.dromara.visor.module.infra.enums.FavoriteTypeEnum; +import org.dromara.visor.module.infra.service.FavoriteService; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/api/impl/FileUploadApiImpl.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/FileUploadApiImpl.java similarity index 87% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/api/impl/FileUploadApiImpl.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/FileUploadApiImpl.java index 556d5596..8b2e6ef9 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/api/impl/FileUploadApiImpl.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/FileUploadApiImpl.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.api.impl; +package org.dromara.visor.module.infra.api.impl; -import com.orion.visor.module.infra.api.FileUploadApi; -import com.orion.visor.module.infra.service.FileUploadService; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.module.infra.api.FileUploadApi; +import org.dromara.visor.module.infra.service.FileUploadService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/api/impl/HistoryValueApiImpl.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/HistoryValueApiImpl.java similarity index 79% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/api/impl/HistoryValueApiImpl.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/HistoryValueApiImpl.java index ac2ac5fd..89a6b033 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/api/impl/HistoryValueApiImpl.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/HistoryValueApiImpl.java @@ -13,20 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.api.impl; +package org.dromara.visor.module.infra.api.impl; import com.alibaba.fastjson.JSON; -import com.orion.visor.framework.common.constant.ErrorMessage; -import com.orion.visor.framework.common.utils.Valid; -import com.orion.visor.module.infra.api.HistoryValueApi; -import com.orion.visor.module.infra.convert.HistoryValueProviderConvert; -import com.orion.visor.module.infra.entity.domain.HistoryValueDO; -import com.orion.visor.module.infra.entity.dto.history.HistoryValueCreateDTO; -import com.orion.visor.module.infra.entity.dto.history.HistoryValueDTO; -import com.orion.visor.module.infra.entity.request.history.HistoryValueCreateRequest; -import com.orion.visor.module.infra.enums.HistoryValueTypeEnum; -import com.orion.visor.module.infra.service.HistoryValueService; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.common.constant.ErrorMessage; +import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.module.infra.api.HistoryValueApi; +import org.dromara.visor.module.infra.convert.HistoryValueProviderConvert; +import org.dromara.visor.module.infra.entity.domain.HistoryValueDO; +import org.dromara.visor.module.infra.entity.dto.history.HistoryValueCreateDTO; +import org.dromara.visor.module.infra.entity.dto.history.HistoryValueDTO; +import org.dromara.visor.module.infra.entity.request.history.HistoryValueCreateRequest; +import org.dromara.visor.module.infra.enums.HistoryValueTypeEnum; +import org.dromara.visor.module.infra.service.HistoryValueService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/api/impl/OperatorLogApiImpl.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/OperatorLogApiImpl.java similarity index 82% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/api/impl/OperatorLogApiImpl.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/OperatorLogApiImpl.java index 59ba21f8..89cabb86 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/api/impl/OperatorLogApiImpl.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/OperatorLogApiImpl.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.api.impl; +package org.dromara.visor.module.infra.api.impl; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.visor.framework.common.utils.Valid; -import com.orion.visor.module.infra.api.OperatorLogApi; -import com.orion.visor.module.infra.convert.OperatorLogProviderConvert; -import com.orion.visor.module.infra.dao.OperatorLogDAO; -import com.orion.visor.module.infra.entity.domain.OperatorLogDO; -import com.orion.visor.module.infra.entity.dto.operator.OperatorLogDTO; -import com.orion.visor.module.infra.entity.dto.operator.OperatorLogQueryDTO; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.module.infra.api.OperatorLogApi; +import org.dromara.visor.module.infra.convert.OperatorLogProviderConvert; +import org.dromara.visor.module.infra.dao.OperatorLogDAO; +import org.dromara.visor.module.infra.entity.domain.OperatorLogDO; +import org.dromara.visor.module.infra.entity.dto.operator.OperatorLogDTO; +import org.dromara.visor.module.infra.entity.dto.operator.OperatorLogQueryDTO; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/api/impl/PermissionApiImpl.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/PermissionApiImpl.java similarity index 90% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/api/impl/PermissionApiImpl.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/PermissionApiImpl.java index 93470dff..af9b1397 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/api/impl/PermissionApiImpl.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/PermissionApiImpl.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.api.impl; +package org.dromara.visor.module.infra.api.impl; -import com.orion.visor.module.infra.api.PermissionApi; -import com.orion.visor.module.infra.service.PermissionService; +import org.dromara.visor.module.infra.api.PermissionApi; +import org.dromara.visor.module.infra.service.PermissionService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/api/impl/SystemMessageApiImpl.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/SystemMessageApiImpl.java similarity index 75% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/api/impl/SystemMessageApiImpl.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/SystemMessageApiImpl.java index 2cbf105f..004c5dbf 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/api/impl/SystemMessageApiImpl.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/SystemMessageApiImpl.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.api.impl; +package org.dromara.visor.module.infra.api.impl; -import com.orion.visor.framework.common.utils.Valid; -import com.orion.visor.module.infra.api.SystemMessageApi; -import com.orion.visor.module.infra.convert.SystemMessageProviderConvert; -import com.orion.visor.module.infra.define.SystemMessageDefine; -import com.orion.visor.module.infra.entity.dto.message.SystemMessageCreateDTO; -import com.orion.visor.module.infra.entity.dto.message.SystemMessageDTO; -import com.orion.visor.module.infra.entity.request.message.SystemMessageCreateRequest; -import com.orion.visor.module.infra.enums.MessageClassifyEnum; -import com.orion.visor.module.infra.service.SystemMessageService; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.module.infra.api.SystemMessageApi; +import org.dromara.visor.module.infra.convert.SystemMessageProviderConvert; +import org.dromara.visor.module.infra.define.SystemMessageDefine; +import org.dromara.visor.module.infra.entity.dto.message.SystemMessageCreateDTO; +import org.dromara.visor.module.infra.entity.dto.message.SystemMessageDTO; +import org.dromara.visor.module.infra.entity.request.message.SystemMessageCreateRequest; +import org.dromara.visor.module.infra.enums.MessageClassifyEnum; +import org.dromara.visor.module.infra.service.SystemMessageService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/api/impl/SystemRoleApiImpl.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/SystemRoleApiImpl.java similarity index 76% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/api/impl/SystemRoleApiImpl.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/SystemRoleApiImpl.java index 5380e775..5840ca3e 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/api/impl/SystemRoleApiImpl.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/SystemRoleApiImpl.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.api.impl; +package org.dromara.visor.module.infra.api.impl; -import com.orion.visor.module.infra.api.SystemRoleApi; -import com.orion.visor.module.infra.convert.SystemRoleProviderConvert; -import com.orion.visor.module.infra.dao.SystemRoleDAO; -import com.orion.visor.module.infra.entity.domain.SystemRoleDO; -import com.orion.visor.module.infra.entity.dto.role.SystemRoleDTO; +import org.dromara.visor.module.infra.api.SystemRoleApi; +import org.dromara.visor.module.infra.convert.SystemRoleProviderConvert; +import org.dromara.visor.module.infra.dao.SystemRoleDAO; +import org.dromara.visor.module.infra.entity.domain.SystemRoleDO; +import org.dromara.visor.module.infra.entity.dto.role.SystemRoleDTO; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/api/impl/SystemUserApiImpl.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/SystemUserApiImpl.java similarity index 83% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/api/impl/SystemUserApiImpl.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/SystemUserApiImpl.java index d97cf575..a99f8bec 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/api/impl/SystemUserApiImpl.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/SystemUserApiImpl.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.api.impl; +package org.dromara.visor.module.infra.api.impl; -import com.orion.visor.module.infra.api.SystemUserApi; -import com.orion.visor.module.infra.convert.SystemUserProviderConvert; -import com.orion.visor.module.infra.dao.SystemUserDAO; -import com.orion.visor.module.infra.entity.domain.SystemUserDO; -import com.orion.visor.module.infra.entity.dto.user.SystemUserDTO; +import org.dromara.visor.module.infra.api.SystemUserApi; +import org.dromara.visor.module.infra.convert.SystemUserProviderConvert; +import org.dromara.visor.module.infra.dao.SystemUserDAO; +import org.dromara.visor.module.infra.entity.domain.SystemUserDO; +import org.dromara.visor.module.infra.entity.dto.user.SystemUserDTO; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/api/impl/TagRelApiImpl.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/TagRelApiImpl.java similarity index 84% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/api/impl/TagRelApiImpl.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/TagRelApiImpl.java index c339554c..5c19bee3 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/api/impl/TagRelApiImpl.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/TagRelApiImpl.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.api.impl; +package org.dromara.visor.module.infra.api.impl; -import com.orion.lang.utils.collect.Lists; -import com.orion.visor.framework.common.utils.Valid; -import com.orion.visor.module.infra.api.TagRelApi; -import com.orion.visor.module.infra.convert.TagProviderConvert; -import com.orion.visor.module.infra.entity.dto.TagCacheDTO; -import com.orion.visor.module.infra.entity.dto.tag.TagDTO; -import com.orion.visor.module.infra.enums.TagTypeEnum; -import com.orion.visor.module.infra.service.TagRelService; +import cn.orionsec.kit.lang.utils.collect.Lists; +import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.module.infra.api.TagRelApi; +import org.dromara.visor.module.infra.convert.TagProviderConvert; +import org.dromara.visor.module.infra.entity.dto.TagCacheDTO; +import org.dromara.visor.module.infra.entity.dto.tag.TagDTO; +import org.dromara.visor.module.infra.enums.TagTypeEnum; +import org.dromara.visor.module.infra.service.TagRelService; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/configuration/InfraWebSocketConfiguration.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/configuration/InfraWebSocketConfiguration.java similarity index 89% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/configuration/InfraWebSocketConfiguration.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/configuration/InfraWebSocketConfiguration.java index bbfe9d26..6487b0f1 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/configuration/InfraWebSocketConfiguration.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/configuration/InfraWebSocketConfiguration.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.configuration; +package org.dromara.visor.module.infra.configuration; -import com.orion.visor.module.infra.handler.upload.FileUploadMessageDispatcher; -import com.orion.visor.module.infra.interceptor.FileUploadInterceptor; +import org.dromara.visor.module.infra.handler.upload.FileUploadMessageDispatcher; +import org.dromara.visor.module.infra.interceptor.FileUploadInterceptor; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; import org.springframework.web.socket.config.annotation.WebSocketConfigurer; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/AuthenticationController.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/AuthenticationController.java similarity index 76% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/AuthenticationController.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/AuthenticationController.java index e0c9eeaa..1d138f22 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/AuthenticationController.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/AuthenticationController.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.controller; +package org.dromara.visor.module.infra.controller; -import com.orion.visor.framework.biz.operator.log.core.annotation.OperatorLog; -import com.orion.visor.framework.log.core.annotation.IgnoreLog; -import com.orion.visor.framework.log.core.enums.IgnoreLogMode; -import com.orion.visor.framework.web.core.annotation.RestWrapper; -import com.orion.visor.module.infra.define.operator.AuthenticationOperatorType; -import com.orion.visor.module.infra.entity.request.user.UserLoginRequest; -import com.orion.visor.module.infra.entity.vo.UserLoginVO; -import com.orion.visor.module.infra.service.AuthenticationService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.biz.operator.log.core.annotation.OperatorLog; +import org.dromara.visor.framework.log.core.annotation.IgnoreLog; +import org.dromara.visor.framework.log.core.enums.IgnoreLogMode; +import org.dromara.visor.framework.web.core.annotation.RestWrapper; +import org.dromara.visor.module.infra.define.operator.AuthenticationOperatorType; +import org.dromara.visor.module.infra.entity.request.user.UserLoginRequest; +import org.dromara.visor.module.infra.entity.vo.UserLoginVO; +import org.dromara.visor.module.infra.service.AuthenticationService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/DictKeyController.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/DictKeyController.java similarity index 80% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/DictKeyController.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/DictKeyController.java index afc5b4e0..d44294f1 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/DictKeyController.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/DictKeyController.java @@ -13,24 +13,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.controller; +package org.dromara.visor.module.infra.controller; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.visor.framework.biz.operator.log.core.annotation.OperatorLog; -import com.orion.visor.framework.log.core.annotation.IgnoreLog; -import com.orion.visor.framework.log.core.enums.IgnoreLogMode; -import com.orion.visor.framework.web.core.annotation.DemoDisableApi; -import com.orion.visor.framework.web.core.annotation.RestWrapper; -import com.orion.visor.module.infra.define.operator.DictKeyOperatorType; -import com.orion.visor.module.infra.entity.request.dict.DictKeyCreateRequest; -import com.orion.visor.module.infra.entity.request.dict.DictKeyQueryRequest; -import com.orion.visor.module.infra.entity.request.dict.DictKeyUpdateRequest; -import com.orion.visor.module.infra.entity.vo.DictKeyVO; -import com.orion.visor.module.infra.service.DictKeyService; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.biz.operator.log.core.annotation.OperatorLog; +import org.dromara.visor.framework.log.core.annotation.IgnoreLog; +import org.dromara.visor.framework.log.core.enums.IgnoreLogMode; +import org.dromara.visor.framework.web.core.annotation.DemoDisableApi; +import org.dromara.visor.framework.web.core.annotation.RestWrapper; +import org.dromara.visor.module.infra.define.operator.DictKeyOperatorType; +import org.dromara.visor.module.infra.entity.request.dict.DictKeyCreateRequest; +import org.dromara.visor.module.infra.entity.request.dict.DictKeyQueryRequest; +import org.dromara.visor.module.infra.entity.request.dict.DictKeyUpdateRequest; +import org.dromara.visor.module.infra.entity.vo.DictKeyVO; +import org.dromara.visor.module.infra.service.DictKeyService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/DictValueController.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/DictValueController.java similarity index 79% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/DictValueController.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/DictValueController.java index 09090e2e..36fee16c 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/DictValueController.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/DictValueController.java @@ -13,27 +13,27 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.controller; +package org.dromara.visor.module.infra.controller; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; import com.alibaba.fastjson.JSONObject; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.visor.framework.biz.operator.log.core.annotation.OperatorLog; -import com.orion.visor.framework.common.validator.group.Page; -import com.orion.visor.framework.log.core.annotation.IgnoreLog; -import com.orion.visor.framework.log.core.enums.IgnoreLogMode; -import com.orion.visor.framework.web.core.annotation.DemoDisableApi; -import com.orion.visor.framework.web.core.annotation.RestWrapper; -import com.orion.visor.module.infra.define.operator.DictValueOperatorType; -import com.orion.visor.module.infra.entity.request.dict.DictValueCreateRequest; -import com.orion.visor.module.infra.entity.request.dict.DictValueQueryRequest; -import com.orion.visor.module.infra.entity.request.dict.DictValueRollbackRequest; -import com.orion.visor.module.infra.entity.request.dict.DictValueUpdateRequest; -import com.orion.visor.module.infra.entity.vo.DictValueVO; -import com.orion.visor.module.infra.service.DictValueService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.biz.operator.log.core.annotation.OperatorLog; +import org.dromara.visor.framework.common.validator.group.Page; +import org.dromara.visor.framework.log.core.annotation.IgnoreLog; +import org.dromara.visor.framework.log.core.enums.IgnoreLogMode; +import org.dromara.visor.framework.web.core.annotation.DemoDisableApi; +import org.dromara.visor.framework.web.core.annotation.RestWrapper; +import org.dromara.visor.module.infra.define.operator.DictValueOperatorType; +import org.dromara.visor.module.infra.entity.request.dict.DictValueCreateRequest; +import org.dromara.visor.module.infra.entity.request.dict.DictValueQueryRequest; +import org.dromara.visor.module.infra.entity.request.dict.DictValueRollbackRequest; +import org.dromara.visor.module.infra.entity.request.dict.DictValueUpdateRequest; +import org.dromara.visor.module.infra.entity.vo.DictValueVO; +import org.dromara.visor.module.infra.service.DictValueService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/ExpressionController.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/ExpressionController.java similarity index 81% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/ExpressionController.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/ExpressionController.java index a723de23..49fe0406 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/ExpressionController.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/ExpressionController.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.controller; +package org.dromara.visor.module.infra.controller; -import com.orion.lang.utils.collect.Lists; -import com.orion.lang.utils.time.Dates; -import com.orion.lang.utils.time.cron.Cron; -import com.orion.lang.utils.time.cron.CronSupport; -import com.orion.visor.framework.web.core.annotation.RestWrapper; -import com.orion.visor.module.infra.entity.request.exoression.CronNextRequest; -import com.orion.visor.module.infra.entity.vo.CronNextVO; +import cn.orionsec.kit.lang.utils.collect.Lists; +import cn.orionsec.kit.lang.utils.time.Dates; +import cn.orionsec.kit.lang.utils.time.cron.Cron; +import cn.orionsec.kit.lang.utils.time.cron.CronSupport; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.web.core.annotation.RestWrapper; +import org.dromara.visor.module.infra.entity.request.exoression.CronNextRequest; +import org.dromara.visor.module.infra.entity.vo.CronNextVO; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/FavoriteController.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/FavoriteController.java similarity index 87% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/FavoriteController.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/FavoriteController.java index 7954450a..3e026040 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/FavoriteController.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/FavoriteController.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.controller; +package org.dromara.visor.module.infra.controller; -import com.orion.visor.framework.web.core.annotation.RestWrapper; -import com.orion.visor.module.infra.entity.request.favorite.FavoriteOperatorRequest; -import com.orion.visor.module.infra.service.FavoriteService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.web.core.annotation.RestWrapper; +import org.dromara.visor.module.infra.entity.request.favorite.FavoriteOperatorRequest; +import org.dromara.visor.module.infra.service.FavoriteService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/HistoryValueController.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/HistoryValueController.java similarity index 76% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/HistoryValueController.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/HistoryValueController.java index 8c5c6d5d..418a23ad 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/HistoryValueController.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/HistoryValueController.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.controller; +package org.dromara.visor.module.infra.controller; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.visor.framework.common.validator.group.Page; -import com.orion.visor.framework.log.core.annotation.IgnoreLog; -import com.orion.visor.framework.log.core.enums.IgnoreLogMode; -import com.orion.visor.framework.web.core.annotation.RestWrapper; -import com.orion.visor.module.infra.entity.request.history.HistoryValueQueryRequest; -import com.orion.visor.module.infra.entity.vo.HistoryValueVO; -import com.orion.visor.module.infra.service.HistoryValueService; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.common.validator.group.Page; +import org.dromara.visor.framework.log.core.annotation.IgnoreLog; +import org.dromara.visor.framework.log.core.enums.IgnoreLogMode; +import org.dromara.visor.framework.web.core.annotation.RestWrapper; +import org.dromara.visor.module.infra.entity.request.history.HistoryValueQueryRequest; +import org.dromara.visor.module.infra.entity.vo.HistoryValueVO; +import org.dromara.visor.module.infra.service.HistoryValueService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PostMapping; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/MineController.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/MineController.java similarity index 72% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/MineController.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/MineController.java index dd54fb8d..3f44e765 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/MineController.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/MineController.java @@ -13,28 +13,28 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.controller; +package org.dromara.visor.module.infra.controller; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.visor.framework.biz.operator.log.core.annotation.OperatorLog; -import com.orion.visor.framework.common.validator.group.Page; -import com.orion.visor.framework.log.core.annotation.IgnoreLog; -import com.orion.visor.framework.log.core.enums.IgnoreLogMode; -import com.orion.visor.framework.web.core.annotation.DemoDisableApi; -import com.orion.visor.framework.web.core.annotation.RestWrapper; -import com.orion.visor.module.infra.define.operator.AuthenticationOperatorType; -import com.orion.visor.module.infra.entity.request.operator.OperatorLogQueryRequest; -import com.orion.visor.module.infra.entity.request.user.SystemUserUpdateRequest; -import com.orion.visor.module.infra.entity.request.user.UserSessionOfflineRequest; -import com.orion.visor.module.infra.entity.request.user.UserUpdatePasswordRequest; -import com.orion.visor.module.infra.entity.vo.LoginHistoryVO; -import com.orion.visor.module.infra.entity.vo.OperatorLogVO; -import com.orion.visor.module.infra.entity.vo.SystemUserVO; -import com.orion.visor.module.infra.entity.vo.UserSessionVO; -import com.orion.visor.module.infra.service.MineService; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.biz.operator.log.core.annotation.OperatorLog; +import org.dromara.visor.framework.common.validator.group.Page; +import org.dromara.visor.framework.log.core.annotation.IgnoreLog; +import org.dromara.visor.framework.log.core.enums.IgnoreLogMode; +import org.dromara.visor.framework.web.core.annotation.DemoDisableApi; +import org.dromara.visor.framework.web.core.annotation.RestWrapper; +import org.dromara.visor.module.infra.define.operator.AuthenticationOperatorType; +import org.dromara.visor.module.infra.entity.request.operator.OperatorLogQueryRequest; +import org.dromara.visor.module.infra.entity.request.user.SystemUserUpdateRequest; +import org.dromara.visor.module.infra.entity.request.user.UserSessionOfflineRequest; +import org.dromara.visor.module.infra.entity.request.user.UserUpdatePasswordRequest; +import org.dromara.visor.module.infra.entity.vo.LoginHistoryVO; +import org.dromara.visor.module.infra.entity.vo.OperatorLogVO; +import org.dromara.visor.module.infra.entity.vo.SystemUserVO; +import org.dromara.visor.module.infra.entity.vo.UserSessionVO; +import org.dromara.visor.module.infra.service.MineService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/OperatorLogController.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/OperatorLogController.java similarity index 77% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/OperatorLogController.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/OperatorLogController.java index 02d35a00..d042d9e2 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/OperatorLogController.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/OperatorLogController.java @@ -13,23 +13,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.controller; +package org.dromara.visor.module.infra.controller; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.visor.framework.biz.operator.log.core.annotation.OperatorLog; -import com.orion.visor.framework.common.validator.group.Page; -import com.orion.visor.framework.log.core.annotation.IgnoreLog; -import com.orion.visor.framework.log.core.enums.IgnoreLogMode; -import com.orion.visor.framework.web.core.annotation.RestWrapper; -import com.orion.visor.module.infra.define.operator.OperatorLogOperatorType; -import com.orion.visor.module.infra.entity.request.operator.OperatorLogClearRequest; -import com.orion.visor.module.infra.entity.request.operator.OperatorLogQueryRequest; -import com.orion.visor.module.infra.entity.vo.OperatorLogVO; -import com.orion.visor.module.infra.service.OperatorLogService; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.biz.operator.log.core.annotation.OperatorLog; +import org.dromara.visor.framework.common.validator.group.Page; +import org.dromara.visor.framework.log.core.annotation.IgnoreLog; +import org.dromara.visor.framework.log.core.enums.IgnoreLogMode; +import org.dromara.visor.framework.web.core.annotation.RestWrapper; +import org.dromara.visor.module.infra.define.operator.OperatorLogOperatorType; +import org.dromara.visor.module.infra.entity.request.operator.OperatorLogClearRequest; +import org.dromara.visor.module.infra.entity.request.operator.OperatorLogQueryRequest; +import org.dromara.visor.module.infra.entity.vo.OperatorLogVO; +import org.dromara.visor.module.infra.service.OperatorLogService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/PreferenceController.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/PreferenceController.java similarity index 86% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/PreferenceController.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/PreferenceController.java index 5e4ac02c..c0b894cb 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/PreferenceController.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/PreferenceController.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.controller; +package org.dromara.visor.module.infra.controller; -import com.orion.visor.framework.log.core.annotation.IgnoreLog; -import com.orion.visor.framework.web.core.annotation.RestWrapper; -import com.orion.visor.module.infra.entity.request.preference.PreferenceUpdatePartialRequest; -import com.orion.visor.module.infra.entity.request.preference.PreferenceUpdateRequest; -import com.orion.visor.module.infra.service.PreferenceService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.log.core.annotation.IgnoreLog; +import org.dromara.visor.framework.web.core.annotation.RestWrapper; +import org.dromara.visor.module.infra.entity.request.preference.PreferenceUpdatePartialRequest; +import org.dromara.visor.module.infra.entity.request.preference.PreferenceUpdateRequest; +import org.dromara.visor.module.infra.service.PreferenceService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/SystemMenuController.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/SystemMenuController.java similarity index 79% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/SystemMenuController.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/SystemMenuController.java index 349303c3..3cde8f96 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/SystemMenuController.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/SystemMenuController.java @@ -13,24 +13,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.controller; +package org.dromara.visor.module.infra.controller; -import com.orion.visor.framework.biz.operator.log.core.annotation.OperatorLog; -import com.orion.visor.framework.log.core.annotation.IgnoreLog; -import com.orion.visor.framework.log.core.enums.IgnoreLogMode; -import com.orion.visor.framework.web.core.annotation.DemoDisableApi; -import com.orion.visor.framework.web.core.annotation.RestWrapper; -import com.orion.visor.module.infra.define.operator.SystemMenuOperatorType; -import com.orion.visor.module.infra.entity.request.menu.SystemMenuCreateRequest; -import com.orion.visor.module.infra.entity.request.menu.SystemMenuQueryRequest; -import com.orion.visor.module.infra.entity.request.menu.SystemMenuUpdateRequest; -import com.orion.visor.module.infra.entity.request.menu.SystemMenuUpdateStatusRequest; -import com.orion.visor.module.infra.entity.vo.SystemMenuVO; -import com.orion.visor.module.infra.service.SystemMenuService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.biz.operator.log.core.annotation.OperatorLog; +import org.dromara.visor.framework.log.core.annotation.IgnoreLog; +import org.dromara.visor.framework.log.core.enums.IgnoreLogMode; +import org.dromara.visor.framework.web.core.annotation.DemoDisableApi; +import org.dromara.visor.framework.web.core.annotation.RestWrapper; +import org.dromara.visor.module.infra.define.operator.SystemMenuOperatorType; +import org.dromara.visor.module.infra.entity.request.menu.SystemMenuCreateRequest; +import org.dromara.visor.module.infra.entity.request.menu.SystemMenuQueryRequest; +import org.dromara.visor.module.infra.entity.request.menu.SystemMenuUpdateRequest; +import org.dromara.visor.module.infra.entity.request.menu.SystemMenuUpdateStatusRequest; +import org.dromara.visor.module.infra.entity.vo.SystemMenuVO; +import org.dromara.visor.module.infra.service.SystemMenuService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/SystemMessageController.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/SystemMessageController.java similarity index 86% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/SystemMessageController.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/SystemMessageController.java index 722f6c36..d02c9d4d 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/SystemMessageController.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/SystemMessageController.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.controller; +package org.dromara.visor.module.infra.controller; -import com.orion.visor.framework.common.validator.group.Page; -import com.orion.visor.framework.log.core.annotation.IgnoreLog; -import com.orion.visor.framework.log.core.enums.IgnoreLogMode; -import com.orion.visor.framework.web.core.annotation.RestWrapper; -import com.orion.visor.module.infra.entity.request.message.SystemMessageQueryRequest; -import com.orion.visor.module.infra.entity.vo.SystemMessageVO; -import com.orion.visor.module.infra.service.SystemMessageService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.common.validator.group.Page; +import org.dromara.visor.framework.log.core.annotation.IgnoreLog; +import org.dromara.visor.framework.log.core.enums.IgnoreLogMode; +import org.dromara.visor.framework.web.core.annotation.RestWrapper; +import org.dromara.visor.module.infra.entity.request.message.SystemMessageQueryRequest; +import org.dromara.visor.module.infra.entity.vo.SystemMessageVO; +import org.dromara.visor.module.infra.service.SystemMessageService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/SystemRoleController.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/SystemRoleController.java similarity index 79% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/SystemRoleController.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/SystemRoleController.java index 94880ddc..41edc63f 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/SystemRoleController.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/SystemRoleController.java @@ -13,28 +13,28 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.controller; +package org.dromara.visor.module.infra.controller; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.visor.framework.biz.operator.log.core.annotation.OperatorLog; -import com.orion.visor.framework.common.validator.group.Page; -import com.orion.visor.framework.log.core.annotation.IgnoreLog; -import com.orion.visor.framework.log.core.enums.IgnoreLogMode; -import com.orion.visor.framework.web.core.annotation.DemoDisableApi; -import com.orion.visor.framework.web.core.annotation.RestWrapper; -import com.orion.visor.module.infra.define.operator.SystemRoleOperatorType; -import com.orion.visor.module.infra.entity.request.menu.SystemRoleGrantMenuRequest; -import com.orion.visor.module.infra.entity.request.role.SystemRoleCreateRequest; -import com.orion.visor.module.infra.entity.request.role.SystemRoleQueryRequest; -import com.orion.visor.module.infra.entity.request.role.SystemRoleStatusRequest; -import com.orion.visor.module.infra.entity.request.role.SystemRoleUpdateRequest; -import com.orion.visor.module.infra.entity.vo.SystemRoleVO; -import com.orion.visor.module.infra.service.SystemRoleMenuService; -import com.orion.visor.module.infra.service.SystemRoleService; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.biz.operator.log.core.annotation.OperatorLog; +import org.dromara.visor.framework.common.validator.group.Page; +import org.dromara.visor.framework.log.core.annotation.IgnoreLog; +import org.dromara.visor.framework.log.core.enums.IgnoreLogMode; +import org.dromara.visor.framework.web.core.annotation.DemoDisableApi; +import org.dromara.visor.framework.web.core.annotation.RestWrapper; +import org.dromara.visor.module.infra.define.operator.SystemRoleOperatorType; +import org.dromara.visor.module.infra.entity.request.menu.SystemRoleGrantMenuRequest; +import org.dromara.visor.module.infra.entity.request.role.SystemRoleCreateRequest; +import org.dromara.visor.module.infra.entity.request.role.SystemRoleQueryRequest; +import org.dromara.visor.module.infra.entity.request.role.SystemRoleStatusRequest; +import org.dromara.visor.module.infra.entity.request.role.SystemRoleUpdateRequest; +import org.dromara.visor.module.infra.entity.vo.SystemRoleVO; +import org.dromara.visor.module.infra.service.SystemRoleMenuService; +import org.dromara.visor.module.infra.service.SystemRoleService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/SystemSettingController.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/SystemSettingController.java similarity index 77% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/SystemSettingController.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/SystemSettingController.java index e68072be..1ad73af2 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/SystemSettingController.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/SystemSettingController.java @@ -13,22 +13,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.controller; +package org.dromara.visor.module.infra.controller; -import com.orion.visor.framework.biz.operator.log.core.annotation.OperatorLog; -import com.orion.visor.framework.log.core.annotation.IgnoreLog; -import com.orion.visor.framework.log.core.enums.IgnoreLogMode; -import com.orion.visor.framework.web.core.annotation.DemoDisableApi; -import com.orion.visor.framework.web.core.annotation.RestWrapper; -import com.orion.visor.module.infra.define.operator.SystemSettingOperatorType; -import com.orion.visor.module.infra.entity.request.system.SystemSettingUpdatePartialRequest; -import com.orion.visor.module.infra.entity.request.system.SystemSettingUpdateRequest; -import com.orion.visor.module.infra.entity.vo.AppInfoVO; -import com.orion.visor.module.infra.service.SystemSettingService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.biz.operator.log.core.annotation.OperatorLog; +import org.dromara.visor.framework.log.core.annotation.IgnoreLog; +import org.dromara.visor.framework.log.core.enums.IgnoreLogMode; +import org.dromara.visor.framework.web.core.annotation.DemoDisableApi; +import org.dromara.visor.framework.web.core.annotation.RestWrapper; +import org.dromara.visor.module.infra.define.operator.SystemSettingOperatorType; +import org.dromara.visor.module.infra.entity.request.system.SystemSettingUpdatePartialRequest; +import org.dromara.visor.module.infra.entity.request.system.SystemSettingUpdateRequest; +import org.dromara.visor.module.infra.entity.vo.AppInfoVO; +import org.dromara.visor.module.infra.service.SystemSettingService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/SystemUserController.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/SystemUserController.java similarity index 86% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/SystemUserController.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/SystemUserController.java index beb092b7..affb5561 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/SystemUserController.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/SystemUserController.java @@ -13,29 +13,29 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.controller; +package org.dromara.visor.module.infra.controller; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.lang.utils.collect.Lists; -import com.orion.visor.framework.biz.operator.log.core.annotation.OperatorLog; -import com.orion.visor.framework.common.validator.group.Page; -import com.orion.visor.framework.log.core.annotation.IgnoreLog; -import com.orion.visor.framework.log.core.enums.IgnoreLogMode; -import com.orion.visor.framework.web.core.annotation.DemoDisableApi; -import com.orion.visor.framework.web.core.annotation.RestWrapper; -import com.orion.visor.module.infra.define.operator.SystemUserOperatorType; -import com.orion.visor.module.infra.entity.request.user.*; -import com.orion.visor.module.infra.entity.vo.LoginHistoryVO; -import com.orion.visor.module.infra.entity.vo.SystemUserVO; -import com.orion.visor.module.infra.entity.vo.UserSessionVO; -import com.orion.visor.module.infra.service.OperatorLogService; -import com.orion.visor.module.infra.service.SystemUserManagementService; -import com.orion.visor.module.infra.service.SystemUserRoleService; -import com.orion.visor.module.infra.service.SystemUserService; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import cn.orionsec.kit.lang.utils.collect.Lists; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.biz.operator.log.core.annotation.OperatorLog; +import org.dromara.visor.framework.common.validator.group.Page; +import org.dromara.visor.framework.log.core.annotation.IgnoreLog; +import org.dromara.visor.framework.log.core.enums.IgnoreLogMode; +import org.dromara.visor.framework.web.core.annotation.DemoDisableApi; +import org.dromara.visor.framework.web.core.annotation.RestWrapper; +import org.dromara.visor.module.infra.define.operator.SystemUserOperatorType; +import org.dromara.visor.module.infra.entity.request.user.*; +import org.dromara.visor.module.infra.entity.vo.LoginHistoryVO; +import org.dromara.visor.module.infra.entity.vo.SystemUserVO; +import org.dromara.visor.module.infra.entity.vo.UserSessionVO; +import org.dromara.visor.module.infra.service.OperatorLogService; +import org.dromara.visor.module.infra.service.SystemUserManagementService; +import org.dromara.visor.module.infra.service.SystemUserRoleService; +import org.dromara.visor.module.infra.service.SystemUserService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/TagController.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/TagController.java similarity index 82% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/TagController.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/TagController.java index 985339ac..f3cd961c 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/TagController.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/TagController.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.controller; +package org.dromara.visor.module.infra.controller; -import com.orion.visor.framework.log.core.annotation.IgnoreLog; -import com.orion.visor.framework.log.core.enums.IgnoreLogMode; -import com.orion.visor.framework.web.core.annotation.RestWrapper; -import com.orion.visor.module.infra.entity.request.tag.TagCreateRequest; -import com.orion.visor.module.infra.entity.vo.TagVO; -import com.orion.visor.module.infra.service.TagService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.log.core.annotation.IgnoreLog; +import org.dromara.visor.framework.log.core.enums.IgnoreLogMode; +import org.dromara.visor.framework.web.core.annotation.RestWrapper; +import org.dromara.visor.module.infra.entity.request.tag.TagCreateRequest; +import org.dromara.visor.module.infra.entity.vo.TagVO; +import org.dromara.visor.module.infra.service.TagService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/TipsController.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/TipsController.java similarity index 90% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/TipsController.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/TipsController.java index 28165068..cc23a449 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/TipsController.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/TipsController.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.controller; +package org.dromara.visor.module.infra.controller; -import com.orion.visor.framework.web.core.annotation.RestWrapper; -import com.orion.visor.module.infra.service.TipsService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.web.core.annotation.RestWrapper; +import org.dromara.visor.module.infra.service.TipsService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/UserPermissionController.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/UserPermissionController.java similarity index 83% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/UserPermissionController.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/UserPermissionController.java index c52bb571..f915238f 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/UserPermissionController.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/UserPermissionController.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.controller; +package org.dromara.visor.module.infra.controller; -import com.orion.visor.framework.log.core.annotation.IgnoreLog; -import com.orion.visor.framework.log.core.enums.IgnoreLogMode; -import com.orion.visor.framework.web.core.annotation.RestWrapper; -import com.orion.visor.module.infra.entity.vo.SystemMenuVO; -import com.orion.visor.module.infra.entity.vo.UserPermissionVO; -import com.orion.visor.module.infra.service.UserPermissionService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.log.core.annotation.IgnoreLog; +import org.dromara.visor.framework.log.core.enums.IgnoreLogMode; +import org.dromara.visor.framework.web.core.annotation.RestWrapper; +import org.dromara.visor.module.infra.entity.vo.SystemMenuVO; +import org.dromara.visor.module.infra.entity.vo.UserPermissionVO; +import org.dromara.visor.module.infra.service.UserPermissionService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/convert/DataExtraProviderConvert.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/DataExtraProviderConvert.java similarity index 70% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/convert/DataExtraProviderConvert.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/DataExtraProviderConvert.java index bad4c535..8c1c0535 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/convert/DataExtraProviderConvert.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/DataExtraProviderConvert.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.convert; +package org.dromara.visor.module.infra.convert; -import com.orion.visor.module.infra.entity.domain.DataExtraDO; -import com.orion.visor.module.infra.entity.dto.data.DataExtraDTO; -import com.orion.visor.module.infra.entity.dto.data.DataExtraQueryDTO; -import com.orion.visor.module.infra.entity.dto.data.DataExtraSetDTO; -import com.orion.visor.module.infra.entity.request.data.DataExtraQueryRequest; -import com.orion.visor.module.infra.entity.request.data.DataExtraSetRequest; +import org.dromara.visor.module.infra.entity.domain.DataExtraDO; +import org.dromara.visor.module.infra.entity.dto.data.DataExtraDTO; +import org.dromara.visor.module.infra.entity.dto.data.DataExtraQueryDTO; +import org.dromara.visor.module.infra.entity.dto.data.DataExtraSetDTO; +import org.dromara.visor.module.infra.entity.request.data.DataExtraQueryRequest; +import org.dromara.visor.module.infra.entity.request.data.DataExtraSetRequest; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/convert/DataGroupConvert.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/DataGroupConvert.java similarity index 76% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/convert/DataGroupConvert.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/DataGroupConvert.java index 45d411dc..69861bc2 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/convert/DataGroupConvert.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/DataGroupConvert.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.convert; +package org.dromara.visor.module.infra.convert; -import com.orion.visor.module.infra.entity.domain.DataGroupDO; -import com.orion.visor.module.infra.entity.dto.DataGroupCacheDTO; -import com.orion.visor.module.infra.entity.request.data.DataGroupCreateRequest; -import com.orion.visor.module.infra.entity.request.data.DataGroupRenameRequest; +import org.dromara.visor.module.infra.entity.domain.DataGroupDO; +import org.dromara.visor.module.infra.entity.dto.DataGroupCacheDTO; +import org.dromara.visor.module.infra.entity.request.data.DataGroupCreateRequest; +import org.dromara.visor.module.infra.entity.request.data.DataGroupRenameRequest; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/convert/DataGroupProviderConvert.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/DataGroupProviderConvert.java similarity index 66% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/convert/DataGroupProviderConvert.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/DataGroupProviderConvert.java index c5b8867c..e9fa3a24 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/convert/DataGroupProviderConvert.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/DataGroupProviderConvert.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.convert; +package org.dromara.visor.module.infra.convert; -import com.orion.visor.module.infra.entity.domain.DataGroupDO; -import com.orion.visor.module.infra.entity.dto.DataGroupCacheDTO; -import com.orion.visor.module.infra.entity.dto.data.DataGroupCreateDTO; -import com.orion.visor.module.infra.entity.dto.data.DataGroupDTO; -import com.orion.visor.module.infra.entity.dto.data.DataGroupMoveDTO; -import com.orion.visor.module.infra.entity.dto.data.DataGroupRenameDTO; -import com.orion.visor.module.infra.entity.request.data.DataGroupCreateRequest; -import com.orion.visor.module.infra.entity.request.data.DataGroupMoveRequest; -import com.orion.visor.module.infra.entity.request.data.DataGroupRenameRequest; +import org.dromara.visor.module.infra.entity.domain.DataGroupDO; +import org.dromara.visor.module.infra.entity.dto.DataGroupCacheDTO; +import org.dromara.visor.module.infra.entity.dto.data.DataGroupCreateDTO; +import org.dromara.visor.module.infra.entity.dto.data.DataGroupDTO; +import org.dromara.visor.module.infra.entity.dto.data.DataGroupMoveDTO; +import org.dromara.visor.module.infra.entity.dto.data.DataGroupRenameDTO; +import org.dromara.visor.module.infra.entity.request.data.DataGroupCreateRequest; +import org.dromara.visor.module.infra.entity.request.data.DataGroupMoveRequest; +import org.dromara.visor.module.infra.entity.request.data.DataGroupRenameRequest; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/convert/DataGroupRelConvert.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/DataGroupRelConvert.java similarity index 84% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/convert/DataGroupRelConvert.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/DataGroupRelConvert.java index e8925ea1..8b4af2d7 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/convert/DataGroupRelConvert.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/DataGroupRelConvert.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.convert; +package org.dromara.visor.module.infra.convert; -import com.orion.visor.module.infra.entity.domain.DataGroupRelDO; -import com.orion.visor.module.infra.entity.dto.DataGroupRelCacheDTO; +import org.dromara.visor.module.infra.entity.domain.DataGroupRelDO; +import org.dromara.visor.module.infra.entity.dto.DataGroupRelCacheDTO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/convert/DataPermissionConvert.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/DataPermissionConvert.java similarity index 83% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/convert/DataPermissionConvert.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/DataPermissionConvert.java index 1500f1f1..b9ff200c 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/convert/DataPermissionConvert.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/DataPermissionConvert.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.convert; +package org.dromara.visor.module.infra.convert; -import com.orion.visor.module.infra.entity.domain.DataPermissionDO; -import com.orion.visor.module.infra.entity.request.data.DataPermissionUpdateRequest; +import org.dromara.visor.module.infra.entity.domain.DataPermissionDO; +import org.dromara.visor.module.infra.entity.request.data.DataPermissionUpdateRequest; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/convert/DataPermissionProviderConvert.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/DataPermissionProviderConvert.java similarity index 83% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/convert/DataPermissionProviderConvert.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/DataPermissionProviderConvert.java index e016b460..9cdef2e1 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/convert/DataPermissionProviderConvert.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/DataPermissionProviderConvert.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.convert; +package org.dromara.visor.module.infra.convert; -import com.orion.visor.module.infra.entity.dto.data.DataPermissionUpdateDTO; -import com.orion.visor.module.infra.entity.request.data.DataPermissionUpdateRequest; +import org.dromara.visor.module.infra.entity.dto.data.DataPermissionUpdateDTO; +import org.dromara.visor.module.infra.entity.request.data.DataPermissionUpdateRequest; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/convert/DictKeyConvert.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/DictKeyConvert.java similarity index 75% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/convert/DictKeyConvert.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/DictKeyConvert.java index 437e578c..c142600f 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/convert/DictKeyConvert.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/DictKeyConvert.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.convert; +package org.dromara.visor.module.infra.convert; -import com.orion.visor.module.infra.entity.domain.DictKeyDO; -import com.orion.visor.module.infra.entity.dto.DictKeyCacheDTO; -import com.orion.visor.module.infra.entity.request.dict.DictKeyCreateRequest; -import com.orion.visor.module.infra.entity.request.dict.DictKeyUpdateRequest; -import com.orion.visor.module.infra.entity.vo.DictKeyVO; +import org.dromara.visor.module.infra.entity.domain.DictKeyDO; +import org.dromara.visor.module.infra.entity.dto.DictKeyCacheDTO; +import org.dromara.visor.module.infra.entity.request.dict.DictKeyCreateRequest; +import org.dromara.visor.module.infra.entity.request.dict.DictKeyUpdateRequest; +import org.dromara.visor.module.infra.entity.vo.DictKeyVO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/convert/DictValueConvert.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/DictValueConvert.java similarity index 74% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/convert/DictValueConvert.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/DictValueConvert.java index bcd6b548..24f176a4 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/convert/DictValueConvert.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/DictValueConvert.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.convert; +package org.dromara.visor.module.infra.convert; -import com.orion.visor.module.infra.entity.domain.DictValueDO; -import com.orion.visor.module.infra.entity.request.dict.DictValueCreateRequest; -import com.orion.visor.module.infra.entity.request.dict.DictValueQueryRequest; -import com.orion.visor.module.infra.entity.request.dict.DictValueUpdateRequest; -import com.orion.visor.module.infra.entity.vo.DictValueVO; +import org.dromara.visor.module.infra.entity.domain.DictValueDO; +import org.dromara.visor.module.infra.entity.request.dict.DictValueCreateRequest; +import org.dromara.visor.module.infra.entity.request.dict.DictValueQueryRequest; +import org.dromara.visor.module.infra.entity.request.dict.DictValueUpdateRequest; +import org.dromara.visor.module.infra.entity.vo.DictValueVO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/convert/FavoriteConvert.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/FavoriteConvert.java similarity index 75% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/convert/FavoriteConvert.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/FavoriteConvert.java index b475119e..fdc03ea1 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/convert/FavoriteConvert.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/FavoriteConvert.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.convert; +package org.dromara.visor.module.infra.convert; -import com.orion.visor.module.infra.entity.domain.FavoriteDO; -import com.orion.visor.module.infra.entity.request.favorite.FavoriteOperatorRequest; -import com.orion.visor.module.infra.entity.request.favorite.FavoriteQueryRequest; -import com.orion.visor.module.infra.entity.vo.FavoriteVO; +import org.dromara.visor.module.infra.entity.domain.FavoriteDO; +import org.dromara.visor.module.infra.entity.request.favorite.FavoriteOperatorRequest; +import org.dromara.visor.module.infra.entity.request.favorite.FavoriteQueryRequest; +import org.dromara.visor.module.infra.entity.vo.FavoriteVO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/convert/HistoryValueConvert.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/HistoryValueConvert.java similarity index 77% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/convert/HistoryValueConvert.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/HistoryValueConvert.java index 61d1ef3b..5884c37f 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/convert/HistoryValueConvert.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/HistoryValueConvert.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.convert; +package org.dromara.visor.module.infra.convert; -import com.orion.visor.module.infra.entity.domain.HistoryValueDO; -import com.orion.visor.module.infra.entity.request.history.HistoryValueCreateRequest; -import com.orion.visor.module.infra.entity.request.history.HistoryValueQueryRequest; -import com.orion.visor.module.infra.entity.vo.HistoryValueVO; +import org.dromara.visor.module.infra.entity.domain.HistoryValueDO; +import org.dromara.visor.module.infra.entity.request.history.HistoryValueCreateRequest; +import org.dromara.visor.module.infra.entity.request.history.HistoryValueQueryRequest; +import org.dromara.visor.module.infra.entity.vo.HistoryValueVO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/convert/HistoryValueProviderConvert.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/HistoryValueProviderConvert.java similarity index 77% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/convert/HistoryValueProviderConvert.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/HistoryValueProviderConvert.java index a482ff36..f3acb987 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/convert/HistoryValueProviderConvert.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/HistoryValueProviderConvert.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.convert; +package org.dromara.visor.module.infra.convert; -import com.orion.visor.module.infra.entity.domain.HistoryValueDO; -import com.orion.visor.module.infra.entity.dto.history.HistoryValueCreateDTO; -import com.orion.visor.module.infra.entity.dto.history.HistoryValueDTO; -import com.orion.visor.module.infra.entity.request.history.HistoryValueCreateRequest; +import org.dromara.visor.module.infra.entity.domain.HistoryValueDO; +import org.dromara.visor.module.infra.entity.dto.history.HistoryValueCreateDTO; +import org.dromara.visor.module.infra.entity.dto.history.HistoryValueDTO; +import org.dromara.visor.module.infra.entity.request.history.HistoryValueCreateRequest; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/convert/OperatorLogConvert.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/OperatorLogConvert.java similarity index 74% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/convert/OperatorLogConvert.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/OperatorLogConvert.java index 9eca154a..bd0ca544 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/convert/OperatorLogConvert.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/OperatorLogConvert.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.convert; +package org.dromara.visor.module.infra.convert; -import com.orion.visor.framework.biz.operator.log.core.model.OperatorLogModel; -import com.orion.visor.module.infra.entity.domain.OperatorLogDO; -import com.orion.visor.module.infra.entity.request.operator.OperatorLogQueryRequest; -import com.orion.visor.module.infra.entity.vo.LoginHistoryVO; -import com.orion.visor.module.infra.entity.vo.OperatorLogVO; +import org.dromara.visor.framework.biz.operator.log.core.model.OperatorLogModel; +import org.dromara.visor.module.infra.entity.domain.OperatorLogDO; +import org.dromara.visor.module.infra.entity.request.operator.OperatorLogQueryRequest; +import org.dromara.visor.module.infra.entity.vo.LoginHistoryVO; +import org.dromara.visor.module.infra.entity.vo.OperatorLogVO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/convert/OperatorLogProviderConvert.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/OperatorLogProviderConvert.java similarity index 84% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/convert/OperatorLogProviderConvert.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/OperatorLogProviderConvert.java index 21cb0dbf..9a9f7903 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/convert/OperatorLogProviderConvert.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/OperatorLogProviderConvert.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.convert; +package org.dromara.visor.module.infra.convert; -import com.orion.visor.module.infra.entity.domain.OperatorLogDO; -import com.orion.visor.module.infra.entity.dto.operator.OperatorLogDTO; +import org.dromara.visor.module.infra.entity.domain.OperatorLogDO; +import org.dromara.visor.module.infra.entity.dto.operator.OperatorLogDTO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/convert/SystemMenuConvert.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/SystemMenuConvert.java similarity index 83% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/convert/SystemMenuConvert.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/SystemMenuConvert.java index 046bd6cb..f95f2bab 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/convert/SystemMenuConvert.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/SystemMenuConvert.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.convert; +package org.dromara.visor.module.infra.convert; -import com.orion.visor.module.infra.entity.domain.SystemMenuDO; -import com.orion.visor.module.infra.entity.dto.SystemMenuCacheDTO; -import com.orion.visor.module.infra.entity.request.menu.*; -import com.orion.visor.module.infra.entity.vo.SystemMenuVO; +import org.dromara.visor.module.infra.entity.domain.SystemMenuDO; +import org.dromara.visor.module.infra.entity.dto.SystemMenuCacheDTO; +import org.dromara.visor.module.infra.entity.request.menu.*; +import org.dromara.visor.module.infra.entity.vo.SystemMenuVO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/convert/SystemMessageConvert.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/SystemMessageConvert.java similarity index 77% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/convert/SystemMessageConvert.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/SystemMessageConvert.java index 16785bf3..3e0b6fd3 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/convert/SystemMessageConvert.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/SystemMessageConvert.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.convert; +package org.dromara.visor.module.infra.convert; -import com.orion.visor.module.infra.entity.domain.SystemMessageDO; -import com.orion.visor.module.infra.entity.request.message.SystemMessageCreateRequest; -import com.orion.visor.module.infra.entity.request.message.SystemMessageQueryRequest; -import com.orion.visor.module.infra.entity.vo.SystemMessageVO; +import org.dromara.visor.module.infra.entity.domain.SystemMessageDO; +import org.dromara.visor.module.infra.entity.request.message.SystemMessageCreateRequest; +import org.dromara.visor.module.infra.entity.request.message.SystemMessageQueryRequest; +import org.dromara.visor.module.infra.entity.vo.SystemMessageVO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/convert/SystemMessageProviderConvert.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/SystemMessageProviderConvert.java similarity index 83% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/convert/SystemMessageProviderConvert.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/SystemMessageProviderConvert.java index a28ec86a..990d3a05 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/convert/SystemMessageProviderConvert.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/SystemMessageProviderConvert.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.convert; +package org.dromara.visor.module.infra.convert; -import com.orion.visor.module.infra.entity.dto.message.SystemMessageCreateDTO; -import com.orion.visor.module.infra.entity.request.message.SystemMessageCreateRequest; +import org.dromara.visor.module.infra.entity.dto.message.SystemMessageCreateDTO; +import org.dromara.visor.module.infra.entity.request.message.SystemMessageCreateRequest; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/convert/SystemRoleConvert.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/SystemRoleConvert.java similarity index 71% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/convert/SystemRoleConvert.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/SystemRoleConvert.java index 141913cd..ac5a0dee 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/convert/SystemRoleConvert.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/SystemRoleConvert.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.convert; +package org.dromara.visor.module.infra.convert; -import com.orion.visor.module.infra.entity.domain.SystemRoleDO; -import com.orion.visor.module.infra.entity.request.role.SystemRoleCreateRequest; -import com.orion.visor.module.infra.entity.request.role.SystemRoleQueryRequest; -import com.orion.visor.module.infra.entity.request.role.SystemRoleStatusRequest; -import com.orion.visor.module.infra.entity.request.role.SystemRoleUpdateRequest; -import com.orion.visor.module.infra.entity.vo.SystemRoleVO; +import org.dromara.visor.module.infra.entity.domain.SystemRoleDO; +import org.dromara.visor.module.infra.entity.request.role.SystemRoleCreateRequest; +import org.dromara.visor.module.infra.entity.request.role.SystemRoleQueryRequest; +import org.dromara.visor.module.infra.entity.request.role.SystemRoleStatusRequest; +import org.dromara.visor.module.infra.entity.request.role.SystemRoleUpdateRequest; +import org.dromara.visor.module.infra.entity.vo.SystemRoleVO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/convert/SystemRoleProviderConvert.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/SystemRoleProviderConvert.java similarity index 84% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/convert/SystemRoleProviderConvert.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/SystemRoleProviderConvert.java index 00e8d7a8..4c990a22 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/convert/SystemRoleProviderConvert.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/SystemRoleProviderConvert.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.convert; +package org.dromara.visor.module.infra.convert; -import com.orion.visor.module.infra.entity.domain.SystemRoleDO; -import com.orion.visor.module.infra.entity.dto.role.SystemRoleDTO; +import org.dromara.visor.module.infra.entity.domain.SystemRoleDO; +import org.dromara.visor.module.infra.entity.dto.role.SystemRoleDTO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/convert/SystemSettingConvert.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/SystemSettingConvert.java similarity index 84% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/convert/SystemSettingConvert.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/SystemSettingConvert.java index a8fd6d4f..629d49a9 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/convert/SystemSettingConvert.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/SystemSettingConvert.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.convert; +package org.dromara.visor.module.infra.convert; -import com.orion.visor.module.infra.entity.domain.SystemSettingDO; -import com.orion.visor.module.infra.entity.request.system.SystemSettingUpdateRequest; +import org.dromara.visor.module.infra.entity.domain.SystemSettingDO; +import org.dromara.visor.module.infra.entity.request.system.SystemSettingUpdateRequest; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.factory.Mappers; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/convert/SystemUserConvert.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/SystemUserConvert.java similarity index 78% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/convert/SystemUserConvert.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/SystemUserConvert.java index 374bfd6c..4e5fea63 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/convert/SystemUserConvert.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/SystemUserConvert.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.convert; +package org.dromara.visor.module.infra.convert; -import com.orion.visor.framework.common.security.LoginUser; -import com.orion.visor.module.infra.entity.domain.SystemUserDO; -import com.orion.visor.module.infra.entity.dto.UserInfoDTO; -import com.orion.visor.module.infra.entity.request.user.*; -import com.orion.visor.module.infra.entity.vo.SystemUserVO; -import com.orion.visor.module.infra.entity.vo.UserCollectInfoVO; +import org.dromara.visor.framework.common.security.LoginUser; +import org.dromara.visor.module.infra.entity.domain.SystemUserDO; +import org.dromara.visor.module.infra.entity.dto.UserInfoDTO; +import org.dromara.visor.module.infra.entity.request.user.*; +import org.dromara.visor.module.infra.entity.vo.SystemUserVO; +import org.dromara.visor.module.infra.entity.vo.UserCollectInfoVO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/convert/SystemUserProviderConvert.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/SystemUserProviderConvert.java similarity index 84% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/convert/SystemUserProviderConvert.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/SystemUserProviderConvert.java index a99d2ee9..868f573c 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/convert/SystemUserProviderConvert.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/SystemUserProviderConvert.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.convert; +package org.dromara.visor.module.infra.convert; -import com.orion.visor.module.infra.entity.domain.SystemUserDO; -import com.orion.visor.module.infra.entity.dto.user.SystemUserDTO; +import org.dromara.visor.module.infra.entity.domain.SystemUserDO; +import org.dromara.visor.module.infra.entity.dto.user.SystemUserDTO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/convert/TagConvert.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/TagConvert.java similarity index 76% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/convert/TagConvert.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/TagConvert.java index c801c7e3..3ef110bd 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/convert/TagConvert.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/TagConvert.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.convert; +package org.dromara.visor.module.infra.convert; -import com.orion.visor.module.infra.entity.domain.TagDO; -import com.orion.visor.module.infra.entity.dto.TagCacheDTO; -import com.orion.visor.module.infra.entity.request.tag.TagCreateRequest; -import com.orion.visor.module.infra.entity.request.tag.TagQueryRequest; -import com.orion.visor.module.infra.entity.vo.TagVO; +import org.dromara.visor.module.infra.entity.domain.TagDO; +import org.dromara.visor.module.infra.entity.dto.TagCacheDTO; +import org.dromara.visor.module.infra.entity.request.tag.TagCreateRequest; +import org.dromara.visor.module.infra.entity.request.tag.TagQueryRequest; +import org.dromara.visor.module.infra.entity.vo.TagVO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/convert/TagProviderConvert.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/TagProviderConvert.java similarity index 85% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/convert/TagProviderConvert.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/TagProviderConvert.java index 59dc8bf0..f66902b7 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/convert/TagProviderConvert.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/TagProviderConvert.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.convert; +package org.dromara.visor.module.infra.convert; -import com.orion.visor.module.infra.entity.dto.TagCacheDTO; -import com.orion.visor.module.infra.entity.dto.tag.TagDTO; +import org.dromara.visor.module.infra.entity.dto.TagCacheDTO; +import org.dromara.visor.module.infra.entity.dto.tag.TagDTO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/convert/TagRelConvert.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/TagRelConvert.java similarity index 83% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/convert/TagRelConvert.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/TagRelConvert.java index 455d2bbe..bbb2a1b0 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/convert/TagRelConvert.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/TagRelConvert.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.convert; +package org.dromara.visor.module.infra.convert; -import com.orion.visor.module.infra.entity.domain.TagRelDO; -import com.orion.visor.module.infra.entity.dto.TagCacheDTO; -import com.orion.visor.module.infra.entity.request.tag.TagRelQueryRequest; +import org.dromara.visor.module.infra.entity.domain.TagRelDO; +import org.dromara.visor.module.infra.entity.dto.TagCacheDTO; +import org.dromara.visor.module.infra.entity.request.tag.TagRelQueryRequest; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.factory.Mappers; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/dao/DataExtraDAO.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/DataExtraDAO.java similarity index 94% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/dao/DataExtraDAO.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/DataExtraDAO.java index 912adca6..b02946be 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/dao/DataExtraDAO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/DataExtraDAO.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.dao; +package org.dromara.visor.module.infra.dao; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.visor.framework.mybatis.core.mapper.IMapper; -import com.orion.visor.module.infra.entity.domain.DataExtraDO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import org.dromara.visor.framework.mybatis.core.mapper.IMapper; +import org.dromara.visor.module.infra.entity.domain.DataExtraDO; import java.util.List; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/dao/DataGroupDAO.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/DataGroupDAO.java similarity index 92% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/dao/DataGroupDAO.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/DataGroupDAO.java index cea770bd..7bb667ee 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/dao/DataGroupDAO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/DataGroupDAO.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.dao; +package org.dromara.visor.module.infra.dao; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.visor.framework.mybatis.core.mapper.IMapper; -import com.orion.visor.module.infra.entity.domain.DataGroupDO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import org.dromara.visor.framework.mybatis.core.mapper.IMapper; +import org.dromara.visor.module.infra.entity.domain.DataGroupDO; import java.util.List; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/dao/DataGroupRelDAO.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/DataGroupRelDAO.java similarity index 90% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/dao/DataGroupRelDAO.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/DataGroupRelDAO.java index ec25ccc5..b742ca86 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/dao/DataGroupRelDAO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/DataGroupRelDAO.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.dao; +package org.dromara.visor.module.infra.dao; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.visor.framework.mybatis.core.mapper.IMapper; -import com.orion.visor.module.infra.entity.domain.DataGroupRelDO; import org.apache.ibatis.annotations.Mapper; +import org.dromara.visor.framework.mybatis.core.mapper.IMapper; +import org.dromara.visor.module.infra.entity.domain.DataGroupRelDO; import java.util.List; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/dao/DataPermissionDAO.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/DataPermissionDAO.java similarity index 89% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/dao/DataPermissionDAO.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/DataPermissionDAO.java index 163c32ab..401b4f79 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/dao/DataPermissionDAO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/DataPermissionDAO.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.dao; +package org.dromara.visor.module.infra.dao; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.visor.framework.mybatis.core.mapper.IMapper; -import com.orion.visor.module.infra.entity.domain.DataPermissionDO; import org.apache.ibatis.annotations.Mapper; +import org.dromara.visor.framework.mybatis.core.mapper.IMapper; +import org.dromara.visor.module.infra.entity.domain.DataPermissionDO; /** * 数据权限 Mapper 接口 diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/dao/DictKeyDAO.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/DictKeyDAO.java similarity index 84% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/dao/DictKeyDAO.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/DictKeyDAO.java index d97ca096..f8ae2100 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/dao/DictKeyDAO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/DictKeyDAO.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.dao; +package org.dromara.visor.module.infra.dao; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.visor.framework.common.constant.Const; -import com.orion.visor.framework.mybatis.core.mapper.IMapper; -import com.orion.visor.module.infra.entity.domain.DictKeyDO; import org.apache.ibatis.annotations.Mapper; +import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.framework.mybatis.core.mapper.IMapper; +import org.dromara.visor.module.infra.entity.domain.DictKeyDO; /** * 字典配置项 Mapper 接口 diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/dao/DictValueDAO.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/DictValueDAO.java similarity index 83% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/dao/DictValueDAO.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/DictValueDAO.java index a26b4aed..dd1f46e2 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/dao/DictValueDAO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/DictValueDAO.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.dao; +package org.dromara.visor.module.infra.dao; -import com.orion.visor.framework.mybatis.core.mapper.IMapper; -import com.orion.visor.module.infra.entity.domain.DictValueDO; import org.apache.ibatis.annotations.Mapper; +import org.dromara.visor.framework.mybatis.core.mapper.IMapper; +import org.dromara.visor.module.infra.entity.domain.DictValueDO; /** * 字典配置值 Mapper 接口 diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/dao/FavoriteDAO.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/FavoriteDAO.java similarity index 94% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/dao/FavoriteDAO.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/FavoriteDAO.java index c75d29b9..476f5a30 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/dao/FavoriteDAO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/FavoriteDAO.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.dao; +package org.dromara.visor.module.infra.dao; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.visor.framework.mybatis.core.mapper.IMapper; -import com.orion.visor.module.infra.entity.domain.FavoriteDO; import org.apache.ibatis.annotations.Mapper; +import org.dromara.visor.framework.mybatis.core.mapper.IMapper; +import org.dromara.visor.module.infra.entity.domain.FavoriteDO; import java.util.List; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/dao/HistoryValueDAO.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/HistoryValueDAO.java similarity index 91% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/dao/HistoryValueDAO.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/HistoryValueDAO.java index f48a6bc7..b7f3c5b5 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/dao/HistoryValueDAO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/HistoryValueDAO.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.dao; +package org.dromara.visor.module.infra.dao; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.visor.framework.mybatis.core.mapper.IMapper; -import com.orion.visor.module.infra.entity.domain.HistoryValueDO; import org.apache.ibatis.annotations.Mapper; +import org.dromara.visor.framework.mybatis.core.mapper.IMapper; +import org.dromara.visor.module.infra.entity.domain.HistoryValueDO; import java.util.List; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/dao/OperatorLogDAO.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/OperatorLogDAO.java similarity index 90% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/dao/OperatorLogDAO.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/OperatorLogDAO.java index b6b6c785..e4ba819c 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/dao/OperatorLogDAO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/OperatorLogDAO.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.dao; +package org.dromara.visor.module.infra.dao; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.visor.framework.mybatis.core.mapper.IMapper; -import com.orion.visor.module.infra.entity.domain.OperatorLogDO; import org.apache.ibatis.annotations.Mapper; +import org.dromara.visor.framework.mybatis.core.mapper.IMapper; +import org.dromara.visor.module.infra.entity.domain.OperatorLogDO; import java.util.List; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/dao/PreferenceDAO.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/PreferenceDAO.java similarity index 85% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/dao/PreferenceDAO.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/PreferenceDAO.java index ccb33ff0..31f70b2a 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/dao/PreferenceDAO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/PreferenceDAO.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.dao; +package org.dromara.visor.module.infra.dao; -import com.orion.visor.framework.mybatis.core.mapper.IMapper; -import com.orion.visor.framework.mybatis.core.query.Conditions; -import com.orion.visor.module.infra.entity.domain.PreferenceDO; import org.apache.ibatis.annotations.Mapper; +import org.dromara.visor.framework.mybatis.core.mapper.IMapper; +import org.dromara.visor.framework.mybatis.core.query.Conditions; +import org.dromara.visor.module.infra.entity.domain.PreferenceDO; import java.util.List; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/dao/SystemMenuDAO.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/SystemMenuDAO.java similarity index 83% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/dao/SystemMenuDAO.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/SystemMenuDAO.java index 07ec5670..3b263820 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/dao/SystemMenuDAO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/SystemMenuDAO.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.dao; +package org.dromara.visor.module.infra.dao; -import com.orion.visor.framework.mybatis.core.mapper.IMapper; -import com.orion.visor.module.infra.entity.domain.SystemMenuDO; import org.apache.ibatis.annotations.Mapper; +import org.dromara.visor.framework.mybatis.core.mapper.IMapper; +import org.dromara.visor.module.infra.entity.domain.SystemMenuDO; /** * 菜单 Mapper 接口 diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/dao/SystemMessageDAO.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/SystemMessageDAO.java similarity index 83% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/dao/SystemMessageDAO.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/SystemMessageDAO.java index 0e537a6b..3f6a666c 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/dao/SystemMessageDAO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/SystemMessageDAO.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.dao; +package org.dromara.visor.module.infra.dao; -import com.orion.visor.framework.mybatis.core.mapper.IMapper; -import com.orion.visor.module.infra.entity.domain.SystemMessageDO; -import com.orion.visor.module.infra.entity.po.SystemMessageCountPO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import org.dromara.visor.framework.mybatis.core.mapper.IMapper; +import org.dromara.visor.module.infra.entity.domain.SystemMessageDO; +import org.dromara.visor.module.infra.entity.po.SystemMessageCountPO; import java.util.List; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/dao/SystemRoleDAO.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/SystemRoleDAO.java similarity index 93% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/dao/SystemRoleDAO.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/SystemRoleDAO.java index fb82bd6c..85dce7f4 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/dao/SystemRoleDAO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/SystemRoleDAO.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.dao; +package org.dromara.visor.module.infra.dao; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.visor.framework.mybatis.core.mapper.IMapper; -import com.orion.visor.module.infra.entity.domain.SystemRoleDO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import org.dromara.visor.framework.mybatis.core.mapper.IMapper; +import org.dromara.visor.module.infra.entity.domain.SystemRoleDO; import java.util.Collection; import java.util.List; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/dao/SystemRoleMenuDAO.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/SystemRoleMenuDAO.java similarity index 90% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/dao/SystemRoleMenuDAO.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/SystemRoleMenuDAO.java index ccad9bef..28d3aa8d 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/dao/SystemRoleMenuDAO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/SystemRoleMenuDAO.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.dao; +package org.dromara.visor.module.infra.dao; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.visor.framework.mybatis.core.mapper.IMapper; -import com.orion.visor.module.infra.entity.domain.SystemRoleMenuDO; import org.apache.ibatis.annotations.Mapper; +import org.dromara.visor.framework.mybatis.core.mapper.IMapper; +import org.dromara.visor.module.infra.entity.domain.SystemRoleMenuDO; import java.util.List; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/dao/SystemSettingDAO.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/SystemSettingDAO.java similarity index 83% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/dao/SystemSettingDAO.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/SystemSettingDAO.java index 52e4a138..a6983e4c 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/dao/SystemSettingDAO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/SystemSettingDAO.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.dao; +package org.dromara.visor.module.infra.dao; -import com.orion.visor.framework.mybatis.core.mapper.IMapper; -import com.orion.visor.module.infra.entity.domain.SystemSettingDO; import org.apache.ibatis.annotations.Mapper; +import org.dromara.visor.framework.mybatis.core.mapper.IMapper; +import org.dromara.visor.module.infra.entity.domain.SystemSettingDO; /** * 系统设置 Mapper 接口 diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/dao/SystemUserDAO.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/SystemUserDAO.java similarity index 83% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/dao/SystemUserDAO.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/SystemUserDAO.java index 3f8aa2fb..ccd45b53 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/dao/SystemUserDAO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/SystemUserDAO.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.dao; +package org.dromara.visor.module.infra.dao; -import com.orion.visor.framework.mybatis.core.mapper.IMapper; -import com.orion.visor.module.infra.entity.domain.SystemUserDO; import org.apache.ibatis.annotations.Mapper; +import org.dromara.visor.framework.mybatis.core.mapper.IMapper; +import org.dromara.visor.module.infra.entity.domain.SystemUserDO; /** * 用户 Mapper 接口 diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/dao/SystemUserRoleDAO.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/SystemUserRoleDAO.java similarity index 95% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/dao/SystemUserRoleDAO.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/SystemUserRoleDAO.java index 51bcdf93..e8bae1f4 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/dao/SystemUserRoleDAO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/SystemUserRoleDAO.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.dao; +package org.dromara.visor.module.infra.dao; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.visor.framework.mybatis.core.mapper.IMapper; -import com.orion.visor.module.infra.entity.domain.SystemUserRoleDO; import org.apache.ibatis.annotations.Mapper; +import org.dromara.visor.framework.mybatis.core.mapper.IMapper; +import org.dromara.visor.module.infra.entity.domain.SystemUserRoleDO; import java.util.List; import java.util.stream.Collectors; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/dao/TagDAO.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/TagDAO.java similarity index 86% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/dao/TagDAO.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/TagDAO.java index dc9a4f6c..96877ad3 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/dao/TagDAO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/TagDAO.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.dao; +package org.dromara.visor.module.infra.dao; -import com.orion.visor.framework.mybatis.core.mapper.IMapper; -import com.orion.visor.module.infra.entity.domain.TagDO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import org.dromara.visor.framework.mybatis.core.mapper.IMapper; +import org.dromara.visor.module.infra.entity.domain.TagDO; import java.util.List; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/dao/TagRelDAO.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/TagRelDAO.java similarity index 92% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/dao/TagRelDAO.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/TagRelDAO.java index 4e185d14..dd57861d 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/dao/TagRelDAO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/TagRelDAO.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.dao; +package org.dromara.visor.module.infra.dao; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.visor.framework.mybatis.core.mapper.IMapper; -import com.orion.visor.module.infra.entity.domain.TagRelDO; import org.apache.ibatis.annotations.Mapper; +import org.dromara.visor.framework.mybatis.core.mapper.IMapper; +import org.dromara.visor.module.infra.entity.domain.TagRelDO; import java.util.List; import java.util.stream.Collectors; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/define/cache/DataExtraCacheKeyDefine.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/DataExtraCacheKeyDefine.java similarity index 82% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/define/cache/DataExtraCacheKeyDefine.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/DataExtraCacheKeyDefine.java index e5983d4c..4f3ca3c0 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/define/cache/DataExtraCacheKeyDefine.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/DataExtraCacheKeyDefine.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.define.cache; +package org.dromara.visor.module.infra.define.cache; -import com.orion.lang.define.cache.key.CacheKeyBuilder; -import com.orion.lang.define.cache.key.CacheKeyDefine; -import com.orion.lang.define.cache.key.struct.RedisCacheStruct; +import cn.orionsec.kit.lang.define.cache.key.CacheKeyBuilder; +import cn.orionsec.kit.lang.define.cache.key.CacheKeyDefine; +import cn.orionsec.kit.lang.define.cache.key.struct.RedisCacheStruct; import java.util.concurrent.TimeUnit; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/define/cache/DataGroupCacheKeyDefine.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/DataGroupCacheKeyDefine.java similarity index 84% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/define/cache/DataGroupCacheKeyDefine.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/DataGroupCacheKeyDefine.java index 55c807b4..6b6baa79 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/define/cache/DataGroupCacheKeyDefine.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/DataGroupCacheKeyDefine.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.define.cache; +package org.dromara.visor.module.infra.define.cache; -import com.orion.lang.define.cache.key.CacheKeyBuilder; -import com.orion.lang.define.cache.key.CacheKeyDefine; -import com.orion.lang.define.cache.key.struct.RedisCacheStruct; -import com.orion.visor.module.infra.entity.dto.DataGroupCacheDTO; -import com.orion.visor.module.infra.entity.dto.DataGroupRelCacheDTO; +import cn.orionsec.kit.lang.define.cache.key.CacheKeyBuilder; +import cn.orionsec.kit.lang.define.cache.key.CacheKeyDefine; +import cn.orionsec.kit.lang.define.cache.key.struct.RedisCacheStruct; +import org.dromara.visor.module.infra.entity.dto.DataGroupCacheDTO; +import org.dromara.visor.module.infra.entity.dto.DataGroupRelCacheDTO; import java.util.concurrent.TimeUnit; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/define/cache/DataPermissionCacheKeyDefine.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/DataPermissionCacheKeyDefine.java similarity index 82% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/define/cache/DataPermissionCacheKeyDefine.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/DataPermissionCacheKeyDefine.java index ce357a97..c3405bd8 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/define/cache/DataPermissionCacheKeyDefine.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/DataPermissionCacheKeyDefine.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.define.cache; +package org.dromara.visor.module.infra.define.cache; -import com.orion.lang.define.cache.key.CacheKeyBuilder; -import com.orion.lang.define.cache.key.CacheKeyDefine; -import com.orion.lang.define.cache.key.struct.RedisCacheStruct; +import cn.orionsec.kit.lang.define.cache.key.CacheKeyBuilder; +import cn.orionsec.kit.lang.define.cache.key.CacheKeyDefine; +import cn.orionsec.kit.lang.define.cache.key.struct.RedisCacheStruct; import java.util.concurrent.TimeUnit; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/define/cache/DictCacheKeyDefine.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/DictCacheKeyDefine.java similarity index 84% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/define/cache/DictCacheKeyDefine.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/DictCacheKeyDefine.java index 6217739c..c54802bc 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/define/cache/DictCacheKeyDefine.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/DictCacheKeyDefine.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.define.cache; +package org.dromara.visor.module.infra.define.cache; +import cn.orionsec.kit.lang.define.cache.key.CacheKeyBuilder; +import cn.orionsec.kit.lang.define.cache.key.CacheKeyDefine; +import cn.orionsec.kit.lang.define.cache.key.struct.RedisCacheStruct; import com.alibaba.fastjson.JSONObject; -import com.orion.lang.define.cache.key.CacheKeyBuilder; -import com.orion.lang.define.cache.key.CacheKeyDefine; -import com.orion.lang.define.cache.key.struct.RedisCacheStruct; -import com.orion.visor.module.infra.entity.dto.DictKeyCacheDTO; +import org.dromara.visor.module.infra.entity.dto.DictKeyCacheDTO; import java.util.concurrent.TimeUnit; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/define/cache/FavoriteCacheKeyDefine.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/FavoriteCacheKeyDefine.java similarity index 81% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/define/cache/FavoriteCacheKeyDefine.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/FavoriteCacheKeyDefine.java index 709a1f1e..0574ad75 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/define/cache/FavoriteCacheKeyDefine.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/FavoriteCacheKeyDefine.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.define.cache; +package org.dromara.visor.module.infra.define.cache; -import com.orion.lang.define.cache.key.CacheKeyBuilder; -import com.orion.lang.define.cache.key.CacheKeyDefine; -import com.orion.lang.define.cache.key.struct.RedisCacheStruct; +import cn.orionsec.kit.lang.define.cache.key.CacheKeyBuilder; +import cn.orionsec.kit.lang.define.cache.key.CacheKeyDefine; +import cn.orionsec.kit.lang.define.cache.key.struct.RedisCacheStruct; import java.util.concurrent.TimeUnit; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/define/cache/FileUploadCacheKeyDefine.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/FileUploadCacheKeyDefine.java similarity index 78% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/define/cache/FileUploadCacheKeyDefine.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/FileUploadCacheKeyDefine.java index 2a83568e..367c172b 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/define/cache/FileUploadCacheKeyDefine.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/FileUploadCacheKeyDefine.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.define.cache; +package org.dromara.visor.module.infra.define.cache; -import com.orion.lang.define.cache.key.CacheKeyBuilder; -import com.orion.lang.define.cache.key.CacheKeyDefine; -import com.orion.lang.define.cache.key.struct.RedisCacheStruct; -import com.orion.visor.module.infra.entity.dto.FileUploadTokenDTO; +import cn.orionsec.kit.lang.define.cache.key.CacheKeyBuilder; +import cn.orionsec.kit.lang.define.cache.key.CacheKeyDefine; +import cn.orionsec.kit.lang.define.cache.key.struct.RedisCacheStruct; +import org.dromara.visor.module.infra.entity.dto.FileUploadTokenDTO; import java.util.concurrent.TimeUnit; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/define/cache/PreferenceCacheKeyDefine.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/PreferenceCacheKeyDefine.java similarity index 79% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/define/cache/PreferenceCacheKeyDefine.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/PreferenceCacheKeyDefine.java index 46890fd6..3fc760d1 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/define/cache/PreferenceCacheKeyDefine.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/PreferenceCacheKeyDefine.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.define.cache; +package org.dromara.visor.module.infra.define.cache; -import com.orion.lang.define.cache.key.CacheKeyBuilder; -import com.orion.lang.define.cache.key.CacheKeyDefine; -import com.orion.lang.define.cache.key.struct.RedisCacheStruct; -import com.orion.lang.define.wrapper.Ref; +import cn.orionsec.kit.lang.define.cache.key.CacheKeyBuilder; +import cn.orionsec.kit.lang.define.cache.key.CacheKeyDefine; +import cn.orionsec.kit.lang.define.cache.key.struct.RedisCacheStruct; +import cn.orionsec.kit.lang.define.wrapper.Ref; import java.util.concurrent.TimeUnit; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/define/cache/SystemSettingKeyDefine.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/SystemSettingKeyDefine.java similarity index 78% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/define/cache/SystemSettingKeyDefine.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/SystemSettingKeyDefine.java index 170d4f9e..4965daed 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/define/cache/SystemSettingKeyDefine.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/SystemSettingKeyDefine.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.define.cache; +package org.dromara.visor.module.infra.define.cache; -import com.orion.lang.define.cache.key.CacheKeyBuilder; -import com.orion.lang.define.cache.key.CacheKeyDefine; -import com.orion.lang.define.cache.key.struct.RedisCacheStruct; -import com.orion.lang.define.wrapper.Ref; +import cn.orionsec.kit.lang.define.cache.key.CacheKeyBuilder; +import cn.orionsec.kit.lang.define.cache.key.CacheKeyDefine; +import cn.orionsec.kit.lang.define.cache.key.struct.RedisCacheStruct; +import cn.orionsec.kit.lang.define.wrapper.Ref; import java.util.concurrent.TimeUnit; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/define/cache/TagCacheKeyDefine.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/TagCacheKeyDefine.java similarity index 81% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/define/cache/TagCacheKeyDefine.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/TagCacheKeyDefine.java index edfa0e0e..783f65be 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/define/cache/TagCacheKeyDefine.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/TagCacheKeyDefine.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.define.cache; +package org.dromara.visor.module.infra.define.cache; -import com.orion.lang.define.cache.key.CacheKeyBuilder; -import com.orion.lang.define.cache.key.CacheKeyDefine; -import com.orion.lang.define.cache.key.struct.RedisCacheStruct; -import com.orion.visor.module.infra.entity.dto.TagCacheDTO; +import cn.orionsec.kit.lang.define.cache.key.CacheKeyBuilder; +import cn.orionsec.kit.lang.define.cache.key.CacheKeyDefine; +import cn.orionsec.kit.lang.define.cache.key.struct.RedisCacheStruct; +import org.dromara.visor.module.infra.entity.dto.TagCacheDTO; import java.util.concurrent.TimeUnit; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/define/cache/TipsCacheKeyDefine.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/TipsCacheKeyDefine.java similarity index 81% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/define/cache/TipsCacheKeyDefine.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/TipsCacheKeyDefine.java index 00ea4939..6d3fc2d6 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/define/cache/TipsCacheKeyDefine.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/TipsCacheKeyDefine.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.define.cache; +package org.dromara.visor.module.infra.define.cache; -import com.orion.lang.define.cache.key.CacheKeyBuilder; -import com.orion.lang.define.cache.key.CacheKeyDefine; -import com.orion.lang.define.cache.key.struct.RedisCacheStruct; +import cn.orionsec.kit.lang.define.cache.key.CacheKeyBuilder; +import cn.orionsec.kit.lang.define.cache.key.CacheKeyDefine; +import cn.orionsec.kit.lang.define.cache.key.struct.RedisCacheStruct; import java.util.concurrent.TimeUnit; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/define/cache/UserCacheKeyDefine.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/UserCacheKeyDefine.java similarity index 83% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/define/cache/UserCacheKeyDefine.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/UserCacheKeyDefine.java index 68942d23..9821a905 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/define/cache/UserCacheKeyDefine.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/UserCacheKeyDefine.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.define.cache; +package org.dromara.visor.module.infra.define.cache; -import com.orion.lang.define.cache.key.CacheKeyBuilder; -import com.orion.lang.define.cache.key.CacheKeyDefine; -import com.orion.lang.define.cache.key.struct.RedisCacheStruct; -import com.orion.visor.framework.common.security.LoginUser; -import com.orion.visor.module.infra.entity.dto.LoginTokenDTO; -import com.orion.visor.module.infra.entity.dto.UserInfoDTO; +import cn.orionsec.kit.lang.define.cache.key.CacheKeyBuilder; +import cn.orionsec.kit.lang.define.cache.key.CacheKeyDefine; +import cn.orionsec.kit.lang.define.cache.key.struct.RedisCacheStruct; +import org.dromara.visor.framework.common.security.LoginUser; +import org.dromara.visor.module.infra.entity.dto.LoginTokenDTO; +import org.dromara.visor.module.infra.entity.dto.UserInfoDTO; import java.util.concurrent.TimeUnit; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/define/config/AppAuthenticationConfig.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/config/AppAuthenticationConfig.java similarity index 96% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/define/config/AppAuthenticationConfig.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/config/AppAuthenticationConfig.java index 715940c7..dca4d3db 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/define/config/AppAuthenticationConfig.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/config/AppAuthenticationConfig.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.define.config; +package org.dromara.visor.module.infra.define.config; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/define/message/SystemUserMessageDefine.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/message/SystemUserMessageDefine.java similarity index 90% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/define/message/SystemUserMessageDefine.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/message/SystemUserMessageDefine.java index c3c6a698..1bba00c8 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/define/message/SystemUserMessageDefine.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/message/SystemUserMessageDefine.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.define.message; +package org.dromara.visor.module.infra.define.message; -import com.orion.visor.module.infra.define.SystemMessageDefine; -import com.orion.visor.module.infra.enums.MessageClassifyEnum; import lombok.Getter; +import org.dromara.visor.module.infra.define.SystemMessageDefine; +import org.dromara.visor.module.infra.enums.MessageClassifyEnum; /** * 用户 系统消息定义 diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/define/operator/AuthenticationOperatorType.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/operator/AuthenticationOperatorType.java similarity index 65% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/define/operator/AuthenticationOperatorType.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/operator/AuthenticationOperatorType.java index 8f2ca5a2..07f1cdba 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/define/operator/AuthenticationOperatorType.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/operator/AuthenticationOperatorType.java @@ -13,13 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.define.operator; +package org.dromara.visor.module.infra.define.operator; -import com.orion.visor.framework.biz.operator.log.core.annotation.Module; -import com.orion.visor.framework.biz.operator.log.core.factory.InitializingOperatorTypes; -import com.orion.visor.framework.biz.operator.log.core.model.OperatorType; - -import static com.orion.visor.framework.biz.operator.log.core.enums.OperatorRiskLevel.L; +import org.dromara.visor.framework.biz.operator.log.core.annotation.Module; +import org.dromara.visor.framework.biz.operator.log.core.enums.OperatorRiskLevel; +import org.dromara.visor.framework.biz.operator.log.core.factory.InitializingOperatorTypes; +import org.dromara.visor.framework.biz.operator.log.core.model.OperatorType; /** * 认证服务 操作日志类型 @@ -40,9 +39,9 @@ public class AuthenticationOperatorType extends InitializingOperatorTypes { @Override public OperatorType[] types() { return new OperatorType[]{ - new OperatorType(L, LOGIN, "登录系统"), - new OperatorType(L, LOGOUT, "登出系统"), - new OperatorType(L, UPDATE_PASSWORD, "修改密码"), + new OperatorType(OperatorRiskLevel.L, LOGIN, "登录系统"), + new OperatorType(OperatorRiskLevel.L, LOGOUT, "登出系统"), + new OperatorType(OperatorRiskLevel.L, UPDATE_PASSWORD, "修改密码"), }; } diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/define/operator/DictKeyOperatorType.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/operator/DictKeyOperatorType.java similarity index 61% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/define/operator/DictKeyOperatorType.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/operator/DictKeyOperatorType.java index 7c7ffcdc..25a5570d 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/define/operator/DictKeyOperatorType.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/operator/DictKeyOperatorType.java @@ -13,13 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.define.operator; +package org.dromara.visor.module.infra.define.operator; -import com.orion.visor.framework.biz.operator.log.core.annotation.Module; -import com.orion.visor.framework.biz.operator.log.core.factory.InitializingOperatorTypes; -import com.orion.visor.framework.biz.operator.log.core.model.OperatorType; - -import static com.orion.visor.framework.biz.operator.log.core.enums.OperatorRiskLevel.*; +import org.dromara.visor.framework.biz.operator.log.core.annotation.Module; +import org.dromara.visor.framework.biz.operator.log.core.enums.OperatorRiskLevel; +import org.dromara.visor.framework.biz.operator.log.core.factory.InitializingOperatorTypes; +import org.dromara.visor.framework.biz.operator.log.core.model.OperatorType; /** * 字典配置项 操作日志类型 @@ -40,9 +39,9 @@ public class DictKeyOperatorType extends InitializingOperatorTypes { @Override public OperatorType[] types() { return new OperatorType[]{ - new OperatorType(L, CREATE, "创建字典配置项 ${keyName}"), - new OperatorType(M, UPDATE, "更新字典配置项 ${keyName}"), - new OperatorType(H, DELETE, "删除字典配置项 ${keyName}"), + new OperatorType(OperatorRiskLevel.L, CREATE, "创建字典配置项 ${keyName}"), + new OperatorType(OperatorRiskLevel.M, UPDATE, "更新字典配置项 ${keyName}"), + new OperatorType(OperatorRiskLevel.H, DELETE, "删除字典配置项 ${keyName}"), }; } diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/define/operator/DictValueOperatorType.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/operator/DictValueOperatorType.java similarity index 59% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/define/operator/DictValueOperatorType.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/operator/DictValueOperatorType.java index 3096ca8c..78bd2538 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/define/operator/DictValueOperatorType.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/operator/DictValueOperatorType.java @@ -13,13 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.define.operator; +package org.dromara.visor.module.infra.define.operator; -import com.orion.visor.framework.biz.operator.log.core.annotation.Module; -import com.orion.visor.framework.biz.operator.log.core.factory.InitializingOperatorTypes; -import com.orion.visor.framework.biz.operator.log.core.model.OperatorType; - -import static com.orion.visor.framework.biz.operator.log.core.enums.OperatorRiskLevel.*; +import org.dromara.visor.framework.biz.operator.log.core.annotation.Module; +import org.dromara.visor.framework.biz.operator.log.core.enums.OperatorRiskLevel; +import org.dromara.visor.framework.biz.operator.log.core.factory.InitializingOperatorTypes; +import org.dromara.visor.framework.biz.operator.log.core.model.OperatorType; /** * 字典配置值 操作日志类型 @@ -40,9 +39,9 @@ public class DictValueOperatorType extends InitializingOperatorTypes { @Override public OperatorType[] types() { return new OperatorType[]{ - new OperatorType(L, CREATE, "创建字典配置值 ${keyName} - ${label} | ${value}"), - new OperatorType(M, UPDATE, "更新字典配置值 ${keyName} - ${label} | ${value}"), - new OperatorType(H, DELETE, "删除字典配置值 ${value}"), + new OperatorType(OperatorRiskLevel.L, CREATE, "创建字典配置值 ${keyName} - ${label} | ${value}"), + new OperatorType(OperatorRiskLevel.M, UPDATE, "更新字典配置值 ${keyName} - ${label} | ${value}"), + new OperatorType(OperatorRiskLevel.H, DELETE, "删除字典配置值 ${value}"), }; } diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/define/operator/OperatorLogOperatorType.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/operator/OperatorLogOperatorType.java similarity index 64% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/define/operator/OperatorLogOperatorType.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/operator/OperatorLogOperatorType.java index e36c7af1..50002752 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/define/operator/OperatorLogOperatorType.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/operator/OperatorLogOperatorType.java @@ -13,13 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.define.operator; +package org.dromara.visor.module.infra.define.operator; -import com.orion.visor.framework.biz.operator.log.core.annotation.Module; -import com.orion.visor.framework.biz.operator.log.core.factory.InitializingOperatorTypes; -import com.orion.visor.framework.biz.operator.log.core.model.OperatorType; - -import static com.orion.visor.framework.biz.operator.log.core.enums.OperatorRiskLevel.H; +import org.dromara.visor.framework.biz.operator.log.core.annotation.Module; +import org.dromara.visor.framework.biz.operator.log.core.enums.OperatorRiskLevel; +import org.dromara.visor.framework.biz.operator.log.core.factory.InitializingOperatorTypes; +import org.dromara.visor.framework.biz.operator.log.core.model.OperatorType; /** * 操作日志 操作日志类型 @@ -38,8 +37,8 @@ public class OperatorLogOperatorType extends InitializingOperatorTypes { @Override public OperatorType[] types() { return new OperatorType[]{ - new OperatorType(H, DELETE, "删除操作日志 ${count} 条"), - new OperatorType(H, CLEAR, "清空操作日志 ${count} 条"), + new OperatorType(OperatorRiskLevel.H, DELETE, "删除操作日志 ${count} 条"), + new OperatorType(OperatorRiskLevel.H, CLEAR, "清空操作日志 ${count} 条"), }; } diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/define/operator/SystemMenuOperatorType.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/operator/SystemMenuOperatorType.java similarity index 60% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/define/operator/SystemMenuOperatorType.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/operator/SystemMenuOperatorType.java index 19e73352..e36c14a2 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/define/operator/SystemMenuOperatorType.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/operator/SystemMenuOperatorType.java @@ -13,13 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.define.operator; +package org.dromara.visor.module.infra.define.operator; -import com.orion.visor.framework.biz.operator.log.core.annotation.Module; -import com.orion.visor.framework.biz.operator.log.core.factory.InitializingOperatorTypes; -import com.orion.visor.framework.biz.operator.log.core.model.OperatorType; - -import static com.orion.visor.framework.biz.operator.log.core.enums.OperatorRiskLevel.*; +import org.dromara.visor.framework.biz.operator.log.core.annotation.Module; +import org.dromara.visor.framework.biz.operator.log.core.enums.OperatorRiskLevel; +import org.dromara.visor.framework.biz.operator.log.core.factory.InitializingOperatorTypes; +import org.dromara.visor.framework.biz.operator.log.core.model.OperatorType; /** * 系统菜单 操作日志类型 @@ -42,10 +41,10 @@ public class SystemMenuOperatorType extends InitializingOperatorTypes { @Override public OperatorType[] types() { return new OperatorType[]{ - new OperatorType(L, CREATE, "创建菜单 ${name}"), - new OperatorType(L, UPDATE, "修改菜单 ${name}"), - new OperatorType(M, UPDATE_STATUS, "修改菜单状态 ${name} - ${label}"), - new OperatorType(H, DELETE, "删除菜单 ${name}"), + new OperatorType(OperatorRiskLevel.L, CREATE, "创建菜单 ${name}"), + new OperatorType(OperatorRiskLevel.L, UPDATE, "修改菜单 ${name}"), + new OperatorType(OperatorRiskLevel.M, UPDATE_STATUS, "修改菜单状态 ${name} - ${label}"), + new OperatorType(OperatorRiskLevel.H, DELETE, "删除菜单 ${name}"), }; } diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/define/operator/SystemRoleOperatorType.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/operator/SystemRoleOperatorType.java similarity index 57% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/define/operator/SystemRoleOperatorType.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/operator/SystemRoleOperatorType.java index 6522106b..07e9d102 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/define/operator/SystemRoleOperatorType.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/operator/SystemRoleOperatorType.java @@ -13,13 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.define.operator; +package org.dromara.visor.module.infra.define.operator; -import com.orion.visor.framework.biz.operator.log.core.annotation.Module; -import com.orion.visor.framework.biz.operator.log.core.factory.InitializingOperatorTypes; -import com.orion.visor.framework.biz.operator.log.core.model.OperatorType; - -import static com.orion.visor.framework.biz.operator.log.core.enums.OperatorRiskLevel.*; +import org.dromara.visor.framework.biz.operator.log.core.annotation.Module; +import org.dromara.visor.framework.biz.operator.log.core.enums.OperatorRiskLevel; +import org.dromara.visor.framework.biz.operator.log.core.factory.InitializingOperatorTypes; +import org.dromara.visor.framework.biz.operator.log.core.model.OperatorType; /** * 系统角色 操作日志类型 @@ -44,11 +43,11 @@ public class SystemRoleOperatorType extends InitializingOperatorTypes { @Override public OperatorType[] types() { return new OperatorType[]{ - new OperatorType(L, CREATE, "创建角色 ${name}(${code})"), - new OperatorType(M, UPDATE, "修改角色 ${name}(${code})"), - new OperatorType(M, UPDATE_STATUS, "修改角色状态 ${name}(${code}) - ${statusName}"), - new OperatorType(H, DELETE, "删除角色 ${name}(${code})"), - new OperatorType(M, GRANT_MENU, "分配角色菜单 ${name}(${code})"), + new OperatorType(OperatorRiskLevel.L, CREATE, "创建角色 ${name}(${code})"), + new OperatorType(OperatorRiskLevel.M, UPDATE, "修改角色 ${name}(${code})"), + new OperatorType(OperatorRiskLevel.M, UPDATE_STATUS, "修改角色状态 ${name}(${code}) - ${statusName}"), + new OperatorType(OperatorRiskLevel.H, DELETE, "删除角色 ${name}(${code})"), + new OperatorType(OperatorRiskLevel.M, GRANT_MENU, "分配角色菜单 ${name}(${code})"), }; } diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/define/operator/SystemSettingOperatorType.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/operator/SystemSettingOperatorType.java similarity index 76% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/define/operator/SystemSettingOperatorType.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/operator/SystemSettingOperatorType.java index 554af243..e4329b79 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/define/operator/SystemSettingOperatorType.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/operator/SystemSettingOperatorType.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.define.operator; +package org.dromara.visor.module.infra.define.operator; -import com.orion.visor.framework.biz.operator.log.core.annotation.Module; -import com.orion.visor.framework.biz.operator.log.core.factory.InitializingOperatorTypes; -import com.orion.visor.framework.biz.operator.log.core.model.OperatorType; +import org.dromara.visor.framework.biz.operator.log.core.annotation.Module; +import org.dromara.visor.framework.biz.operator.log.core.factory.InitializingOperatorTypes; +import org.dromara.visor.framework.biz.operator.log.core.model.OperatorType; -import static com.orion.visor.framework.biz.operator.log.core.enums.OperatorRiskLevel.M; +import static org.dromara.visor.framework.biz.operator.log.core.enums.OperatorRiskLevel.M; /** * 系统设置 操作日志类型 diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/define/operator/SystemUserOperatorType.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/operator/SystemUserOperatorType.java similarity index 55% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/define/operator/SystemUserOperatorType.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/operator/SystemUserOperatorType.java index af27f98b..184661b3 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/define/operator/SystemUserOperatorType.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/operator/SystemUserOperatorType.java @@ -13,13 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.define.operator; +package org.dromara.visor.module.infra.define.operator; -import com.orion.visor.framework.biz.operator.log.core.annotation.Module; -import com.orion.visor.framework.biz.operator.log.core.factory.InitializingOperatorTypes; -import com.orion.visor.framework.biz.operator.log.core.model.OperatorType; - -import static com.orion.visor.framework.biz.operator.log.core.enums.OperatorRiskLevel.*; +import org.dromara.visor.framework.biz.operator.log.core.annotation.Module; +import org.dromara.visor.framework.biz.operator.log.core.enums.OperatorRiskLevel; +import org.dromara.visor.framework.biz.operator.log.core.factory.InitializingOperatorTypes; +import org.dromara.visor.framework.biz.operator.log.core.model.OperatorType; /** * 系统用户 操作日志类型 @@ -48,13 +47,13 @@ public class SystemUserOperatorType extends InitializingOperatorTypes { @Override public OperatorType[] types() { return new OperatorType[]{ - new OperatorType(L, CREATE, "创建用户 ${username}"), - new OperatorType(M, UPDATE, "修改用户 ${username}"), - new OperatorType(M, UPDATE_STATUS, "修改用户状态 ${username} - ${statusName}"), - new OperatorType(M, GRANT_ROLE, "分配用户角色 ${username}"), - new OperatorType(H, RESET_PASSWORD, "重置用户密码 ${username}"), - new OperatorType(H, DELETE, "删除用户 ${username}"), - new OperatorType(M, OFFLINE, "下线用户会话 ${username}"), + new OperatorType(OperatorRiskLevel.L, CREATE, "创建用户 ${username}"), + new OperatorType(OperatorRiskLevel.M, UPDATE, "修改用户 ${username}"), + new OperatorType(OperatorRiskLevel.M, UPDATE_STATUS, "修改用户状态 ${username} - ${statusName}"), + new OperatorType(OperatorRiskLevel.M, GRANT_ROLE, "分配用户角色 ${username}"), + new OperatorType(OperatorRiskLevel.H, RESET_PASSWORD, "重置用户密码 ${username}"), + new OperatorType(OperatorRiskLevel.H, DELETE, "删除用户 ${username}"), + new OperatorType(OperatorRiskLevel.M, OFFLINE, "下线用户会话 ${username}"), }; } diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/domain/DataExtraDO.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/DataExtraDO.java similarity index 94% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/domain/DataExtraDO.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/DataExtraDO.java index ed76bcb5..63837122 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/domain/DataExtraDO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/DataExtraDO.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.domain; +package org.dromara.visor.module.infra.entity.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.orion.visor.framework.mybatis.core.domain.BaseDO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import org.dromara.visor.framework.mybatis.core.domain.BaseDO; /** * 数据拓展信息 实体对象 diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/domain/DataGroupDO.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/DataGroupDO.java similarity index 94% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/domain/DataGroupDO.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/DataGroupDO.java index 5765193d..bc6b168a 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/domain/DataGroupDO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/DataGroupDO.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.domain; +package org.dromara.visor.module.infra.entity.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.orion.visor.framework.mybatis.core.domain.BaseDO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import org.dromara.visor.framework.mybatis.core.domain.BaseDO; /** * 数据分组 实体对象 diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/domain/DataGroupRelDO.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/DataGroupRelDO.java similarity index 94% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/domain/DataGroupRelDO.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/DataGroupRelDO.java index 00072844..37d9b548 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/domain/DataGroupRelDO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/DataGroupRelDO.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.domain; +package org.dromara.visor.module.infra.entity.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.orion.visor.framework.mybatis.core.domain.BaseDO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import org.dromara.visor.framework.mybatis.core.domain.BaseDO; /** * 数据分组关联 实体对象 diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/domain/DataPermissionDO.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/DataPermissionDO.java similarity index 94% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/domain/DataPermissionDO.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/DataPermissionDO.java index 93a6c1b0..a5a60471 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/domain/DataPermissionDO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/DataPermissionDO.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.domain; +package org.dromara.visor.module.infra.entity.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.orion.visor.framework.mybatis.core.domain.BaseDO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import org.dromara.visor.framework.mybatis.core.domain.BaseDO; /** * 数据权限 实体对象 diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/domain/DictKeyDO.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/DictKeyDO.java similarity index 94% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/domain/DictKeyDO.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/DictKeyDO.java index 6458deea..75d575c8 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/domain/DictKeyDO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/DictKeyDO.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.domain; +package org.dromara.visor.module.infra.entity.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.orion.visor.framework.mybatis.core.domain.BaseDO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import org.dromara.visor.framework.mybatis.core.domain.BaseDO; /** * 字典配置项 实体对象 diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/domain/DictValueDO.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/DictValueDO.java similarity index 94% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/domain/DictValueDO.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/DictValueDO.java index 198ca4b7..6b0e25fa 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/domain/DictValueDO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/DictValueDO.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.domain; +package org.dromara.visor.module.infra.entity.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.orion.visor.framework.mybatis.core.domain.BaseDO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import org.dromara.visor.framework.mybatis.core.domain.BaseDO; /** * 字典配置值 实体对象 diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/domain/FavoriteDO.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/FavoriteDO.java similarity index 93% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/domain/FavoriteDO.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/FavoriteDO.java index 7e41b582..7e384cae 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/domain/FavoriteDO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/FavoriteDO.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.domain; +package org.dromara.visor.module.infra.entity.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.orion.visor.framework.mybatis.core.domain.BaseDO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import org.dromara.visor.framework.mybatis.core.domain.BaseDO; /** * 收藏 实体对象 diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/domain/HistoryValueDO.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/HistoryValueDO.java similarity index 94% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/domain/HistoryValueDO.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/HistoryValueDO.java index 29250bb3..cca5d20b 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/domain/HistoryValueDO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/HistoryValueDO.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.domain; +package org.dromara.visor.module.infra.entity.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.orion.visor.framework.mybatis.core.domain.BaseDO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import org.dromara.visor.framework.mybatis.core.domain.BaseDO; import java.util.Date; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/domain/OperatorLogDO.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/OperatorLogDO.java similarity index 96% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/domain/OperatorLogDO.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/OperatorLogDO.java index a324a1b0..7ae649ab 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/domain/OperatorLogDO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/OperatorLogDO.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.domain; +package org.dromara.visor.module.infra.entity.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.orion.visor.framework.mybatis.core.domain.BaseDO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import org.dromara.visor.framework.mybatis.core.domain.BaseDO; import java.util.Date; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/domain/PreferenceDO.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/PreferenceDO.java similarity index 93% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/domain/PreferenceDO.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/PreferenceDO.java index 95b07ebc..d8e5ecb3 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/domain/PreferenceDO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/PreferenceDO.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.domain; +package org.dromara.visor.module.infra.entity.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.orion.visor.framework.mybatis.core.domain.BaseDO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import org.dromara.visor.framework.mybatis.core.domain.BaseDO; /** * 用户偏好 实体对象 diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/domain/SystemMenuDO.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemMenuDO.java similarity index 95% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/domain/SystemMenuDO.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemMenuDO.java index 838c5e11..5b730232 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/domain/SystemMenuDO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemMenuDO.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.domain; +package org.dromara.visor.module.infra.entity.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.orion.visor.framework.mybatis.core.domain.BaseDO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import org.dromara.visor.framework.mybatis.core.domain.BaseDO; /** * 菜单 实体对象 diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/domain/SystemMessageDO.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemMessageDO.java similarity index 95% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/domain/SystemMessageDO.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemMessageDO.java index b6fde8b5..a182f78e 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/domain/SystemMessageDO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemMessageDO.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.domain; +package org.dromara.visor.module.infra.entity.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.orion.visor.framework.mybatis.core.domain.BaseDO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import org.dromara.visor.framework.mybatis.core.domain.BaseDO; /** * 系统消息 实体对象 diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/domain/SystemRoleDO.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemRoleDO.java similarity index 93% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/domain/SystemRoleDO.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemRoleDO.java index 67804a32..3bcde1aa 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/domain/SystemRoleDO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemRoleDO.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.domain; +package org.dromara.visor.module.infra.entity.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.orion.visor.framework.mybatis.core.domain.BaseDO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import org.dromara.visor.framework.mybatis.core.domain.BaseDO; /** * 角色 实体对象 diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/domain/SystemRoleMenuDO.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemRoleMenuDO.java similarity index 93% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/domain/SystemRoleMenuDO.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemRoleMenuDO.java index c33271a5..ff71beba 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/domain/SystemRoleMenuDO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemRoleMenuDO.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.domain; +package org.dromara.visor.module.infra.entity.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.orion.visor.framework.mybatis.core.domain.BaseDO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import org.dromara.visor.framework.mybatis.core.domain.BaseDO; /** * 角色菜单关联 实体对象 diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/domain/SystemSettingDO.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemSettingDO.java similarity index 93% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/domain/SystemSettingDO.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemSettingDO.java index 3611000f..143fa7e8 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/domain/SystemSettingDO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemSettingDO.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.domain; +package org.dromara.visor.module.infra.entity.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.orion.visor.framework.mybatis.core.domain.BaseDO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import org.dromara.visor.framework.mybatis.core.domain.BaseDO; /** * 系统设置 实体对象 diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/domain/SystemUserDO.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemUserDO.java similarity index 95% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/domain/SystemUserDO.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemUserDO.java index 3b34076f..c4644954 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/domain/SystemUserDO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemUserDO.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.domain; +package org.dromara.visor.module.infra.entity.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.orion.visor.framework.mybatis.core.domain.BaseDO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import org.dromara.visor.framework.mybatis.core.domain.BaseDO; import java.util.Date; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/domain/SystemUserRoleDO.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemUserRoleDO.java similarity index 93% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/domain/SystemUserRoleDO.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemUserRoleDO.java index 984dcb0e..ec3ebee8 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/domain/SystemUserRoleDO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemUserRoleDO.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.domain; +package org.dromara.visor.module.infra.entity.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.orion.visor.framework.mybatis.core.domain.BaseDO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import org.dromara.visor.framework.mybatis.core.domain.BaseDO; /** * 用户角色关联 实体对象 diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/domain/TagDO.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/TagDO.java similarity index 93% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/domain/TagDO.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/TagDO.java index d26f79aa..8e5d7d57 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/domain/TagDO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/TagDO.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.domain; +package org.dromara.visor.module.infra.entity.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.orion.visor.framework.mybatis.core.domain.BaseDO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import org.dromara.visor.framework.mybatis.core.domain.BaseDO; /** * 标签枚举 实体对象 diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/domain/TagRelDO.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/TagRelDO.java similarity index 93% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/domain/TagRelDO.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/TagRelDO.java index 065e835c..892fbb41 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/domain/TagRelDO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/TagRelDO.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.domain; +package org.dromara.visor.module.infra.entity.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.orion.visor.framework.mybatis.core.domain.BaseDO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import org.dromara.visor.framework.mybatis.core.domain.BaseDO; /** * 标签引用 实体对象 diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/dto/DataGroupCacheDTO.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/DataGroupCacheDTO.java similarity index 89% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/dto/DataGroupCacheDTO.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/DataGroupCacheDTO.java index e76ca627..5dfac218 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/dto/DataGroupCacheDTO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/DataGroupCacheDTO.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.dto; +package org.dromara.visor.module.infra.entity.dto; -import com.orion.lang.define.cache.key.model.LongCacheIdModel; -import com.orion.visor.framework.common.entity.TreeNode; +import cn.orionsec.kit.lang.define.cache.key.model.LongCacheIdModel; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.dromara.visor.framework.common.entity.TreeNode; import java.io.Serializable; import java.util.List; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/dto/DataGroupRelCacheDTO.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/DataGroupRelCacheDTO.java similarity index 92% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/dto/DataGroupRelCacheDTO.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/DataGroupRelCacheDTO.java index 9a57584f..0650d330 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/dto/DataGroupRelCacheDTO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/DataGroupRelCacheDTO.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.dto; +package org.dromara.visor.module.infra.entity.dto; -import com.orion.lang.define.cache.key.model.LongCacheIdModel; +import cn.orionsec.kit.lang.define.cache.key.model.LongCacheIdModel; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/dto/DictKeyCacheDTO.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/DictKeyCacheDTO.java similarity index 92% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/dto/DictKeyCacheDTO.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/DictKeyCacheDTO.java index d57596be..d451de40 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/dto/DictKeyCacheDTO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/DictKeyCacheDTO.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.dto; +package org.dromara.visor.module.infra.entity.dto; -import com.orion.lang.define.cache.key.model.LongCacheIdModel; +import cn.orionsec.kit.lang.define.cache.key.model.LongCacheIdModel; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/dto/DictKeyExtraSchemaDTO.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/DictKeyExtraSchemaDTO.java similarity index 95% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/dto/DictKeyExtraSchemaDTO.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/DictKeyExtraSchemaDTO.java index 06714b01..230cbbbc 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/dto/DictKeyExtraSchemaDTO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/DictKeyExtraSchemaDTO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.dto; +package org.dromara.visor.module.infra.entity.dto; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/dto/FileUploadTokenDTO.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/FileUploadTokenDTO.java similarity index 96% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/dto/FileUploadTokenDTO.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/FileUploadTokenDTO.java index 1982ab52..47393a6a 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/dto/FileUploadTokenDTO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/FileUploadTokenDTO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.dto; +package org.dromara.visor.module.infra.entity.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/dto/LoginTokenDTO.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/LoginTokenDTO.java similarity index 89% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/dto/LoginTokenDTO.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/LoginTokenDTO.java index 91c90b56..ae15ceea 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/dto/LoginTokenDTO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/LoginTokenDTO.java @@ -13,12 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.dto; +package org.dromara.visor.module.infra.entity.dto; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.dromara.visor.module.infra.enums.LoginTokenStatusEnum; /** * 登录 token 缓存 @@ -41,7 +42,7 @@ public class LoginTokenDTO { /** * token 状态 * - * @see com.orion.visor.module.infra.enums.LoginTokenStatusEnum + * @see LoginTokenStatusEnum */ private Integer status; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/dto/LoginTokenIdentityDTO.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/LoginTokenIdentityDTO.java similarity index 91% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/dto/LoginTokenIdentityDTO.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/LoginTokenIdentityDTO.java index 6721ed79..050f6c9c 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/dto/LoginTokenIdentityDTO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/LoginTokenIdentityDTO.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.dto; +package org.dromara.visor.module.infra.entity.dto; -import com.orion.visor.framework.common.entity.RequestIdentity; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import org.dromara.visor.framework.common.entity.RequestIdentity; /** * 身份信息 diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/dto/SystemMenuCacheDTO.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/SystemMenuCacheDTO.java similarity index 97% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/dto/SystemMenuCacheDTO.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/SystemMenuCacheDTO.java index eefe6d13..ce2a9818 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/dto/SystemMenuCacheDTO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/SystemMenuCacheDTO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.dto; +package org.dromara.visor.module.infra.entity.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/dto/TagCacheDTO.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/TagCacheDTO.java similarity index 91% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/dto/TagCacheDTO.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/TagCacheDTO.java index 9a7e668b..1b6f3ba4 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/dto/TagCacheDTO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/TagCacheDTO.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.dto; +package org.dromara.visor.module.infra.entity.dto; -import com.orion.lang.define.cache.key.model.LongCacheIdModel; +import cn.orionsec.kit.lang.define.cache.key.model.LongCacheIdModel; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/dto/UserInfoDTO.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/UserInfoDTO.java similarity index 93% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/dto/UserInfoDTO.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/UserInfoDTO.java index cca0b429..c7e5eccd 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/dto/UserInfoDTO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/UserInfoDTO.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.dto; +package org.dromara.visor.module.infra.entity.dto; -import com.orion.lang.define.cache.key.model.LongCacheIdModel; +import cn.orionsec.kit.lang.define.cache.key.model.LongCacheIdModel; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/po/SystemMessageCountPO.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/po/SystemMessageCountPO.java similarity index 96% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/po/SystemMessageCountPO.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/po/SystemMessageCountPO.java index 6ed38238..67f61ab0 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/po/SystemMessageCountPO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/po/SystemMessageCountPO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.po; +package org.dromara.visor.module.infra.entity.po; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/data/DataExtraQueryRequest.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/data/DataExtraQueryRequest.java similarity index 96% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/data/DataExtraQueryRequest.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/data/DataExtraQueryRequest.java index 953c31d5..cc2d16be 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/data/DataExtraQueryRequest.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/data/DataExtraQueryRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.request.data; +package org.dromara.visor.module.infra.entity.request.data; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/data/DataExtraSetRequest.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/data/DataExtraSetRequest.java similarity index 96% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/data/DataExtraSetRequest.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/data/DataExtraSetRequest.java index 9626de26..856b4619 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/data/DataExtraSetRequest.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/data/DataExtraSetRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.request.data; +package org.dromara.visor.module.infra.entity.request.data; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/data/DataGroupCreateRequest.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/data/DataGroupCreateRequest.java similarity index 96% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/data/DataGroupCreateRequest.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/data/DataGroupCreateRequest.java index 83790896..6221e5d2 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/data/DataGroupCreateRequest.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/data/DataGroupCreateRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.request.data; +package org.dromara.visor.module.infra.entity.request.data; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/data/DataGroupMoveRequest.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/data/DataGroupMoveRequest.java similarity index 95% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/data/DataGroupMoveRequest.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/data/DataGroupMoveRequest.java index 0d2cbfbd..6fd5dd44 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/data/DataGroupMoveRequest.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/data/DataGroupMoveRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.request.data; +package org.dromara.visor.module.infra.entity.request.data; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/data/DataGroupRenameRequest.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/data/DataGroupRenameRequest.java similarity index 95% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/data/DataGroupRenameRequest.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/data/DataGroupRenameRequest.java index 32b1809c..5852c3c3 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/data/DataGroupRenameRequest.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/data/DataGroupRenameRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.request.data; +package org.dromara.visor.module.infra.entity.request.data; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/data/DataPermissionUpdateRequest.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/data/DataPermissionUpdateRequest.java similarity index 96% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/data/DataPermissionUpdateRequest.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/data/DataPermissionUpdateRequest.java index df46e647..bd18f258 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/data/DataPermissionUpdateRequest.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/data/DataPermissionUpdateRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.request.data; +package org.dromara.visor.module.infra.entity.request.data; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/dict/DictKeyCreateRequest.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictKeyCreateRequest.java similarity index 93% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/dict/DictKeyCreateRequest.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictKeyCreateRequest.java index df2f6f18..8b9d383d 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/dict/DictKeyCreateRequest.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictKeyCreateRequest.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.request.dict; +package org.dromara.visor.module.infra.entity.request.dict; -import com.orion.visor.framework.common.constant.ValidConst; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.dromara.visor.framework.common.constant.ValidConst; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Pattern; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/dict/DictKeyQueryRequest.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictKeyQueryRequest.java similarity index 92% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/dict/DictKeyQueryRequest.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictKeyQueryRequest.java index 77e9949a..2d94eda8 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/dict/DictKeyQueryRequest.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictKeyQueryRequest.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.request.dict; +package org.dromara.visor.module.infra.entity.request.dict; -import com.orion.visor.framework.common.entity.PageRequest; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import org.dromara.visor.framework.common.entity.PageRequest; import javax.validation.constraints.Size; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/dict/DictKeyUpdateRequest.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictKeyUpdateRequest.java similarity index 93% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/dict/DictKeyUpdateRequest.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictKeyUpdateRequest.java index 9daa738e..c415d049 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/dict/DictKeyUpdateRequest.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictKeyUpdateRequest.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.request.dict; +package org.dromara.visor.module.infra.entity.request.dict; -import com.orion.visor.framework.common.constant.ValidConst; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.dromara.visor.framework.common.constant.ValidConst; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/dict/DictValueCreateRequest.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictValueCreateRequest.java similarity index 96% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/dict/DictValueCreateRequest.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictValueCreateRequest.java index 2b9b2bcf..3a830659 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/dict/DictValueCreateRequest.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictValueCreateRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.request.dict; +package org.dromara.visor.module.infra.entity.request.dict; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/dict/DictValueQueryRequest.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictValueQueryRequest.java similarity index 92% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/dict/DictValueQueryRequest.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictValueQueryRequest.java index 3b3c5ad5..82db88fb 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/dict/DictValueQueryRequest.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictValueQueryRequest.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.request.dict; +package org.dromara.visor.module.infra.entity.request.dict; -import com.orion.visor.framework.common.entity.PageRequest; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import org.dromara.visor.framework.common.entity.PageRequest; import javax.validation.constraints.Size; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/dict/DictValueRollbackRequest.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictValueRollbackRequest.java similarity index 95% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/dict/DictValueRollbackRequest.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictValueRollbackRequest.java index 665f6871..83531fed 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/dict/DictValueRollbackRequest.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictValueRollbackRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.request.dict; +package org.dromara.visor.module.infra.entity.request.dict; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/dict/DictValueUpdateRequest.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictValueUpdateRequest.java similarity index 96% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/dict/DictValueUpdateRequest.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictValueUpdateRequest.java index d5303b7a..792ea28d 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/dict/DictValueUpdateRequest.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictValueUpdateRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.request.dict; +package org.dromara.visor.module.infra.entity.request.dict; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/exoression/CronNextRequest.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/exoression/CronNextRequest.java similarity index 95% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/exoression/CronNextRequest.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/exoression/CronNextRequest.java index 8506d7c4..62d5caf2 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/exoression/CronNextRequest.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/exoression/CronNextRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.request.exoression; +package org.dromara.visor.module.infra.entity.request.exoression; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/favorite/FavoriteOperatorRequest.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/favorite/FavoriteOperatorRequest.java similarity index 95% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/favorite/FavoriteOperatorRequest.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/favorite/FavoriteOperatorRequest.java index 6a442113..46289c1f 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/favorite/FavoriteOperatorRequest.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/favorite/FavoriteOperatorRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.request.favorite; +package org.dromara.visor.module.infra.entity.request.favorite; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/favorite/FavoriteQueryRequest.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/favorite/FavoriteQueryRequest.java similarity index 90% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/favorite/FavoriteQueryRequest.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/favorite/FavoriteQueryRequest.java index 3b229b8c..5ae5b524 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/favorite/FavoriteQueryRequest.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/favorite/FavoriteQueryRequest.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.request.favorite; +package org.dromara.visor.module.infra.entity.request.favorite; -import com.orion.visor.framework.common.entity.PageRequest; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import org.dromara.visor.framework.common.entity.PageRequest; /** * 收藏 查询请求对象 diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/history/HistoryValueCreateRequest.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/history/HistoryValueCreateRequest.java similarity index 96% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/history/HistoryValueCreateRequest.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/history/HistoryValueCreateRequest.java index c2a2d420..4cb1b553 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/history/HistoryValueCreateRequest.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/history/HistoryValueCreateRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.request.history; +package org.dromara.visor.module.infra.entity.request.history; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/history/HistoryValueQueryRequest.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/history/HistoryValueQueryRequest.java similarity index 92% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/history/HistoryValueQueryRequest.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/history/HistoryValueQueryRequest.java index 452388da..21093c08 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/history/HistoryValueQueryRequest.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/history/HistoryValueQueryRequest.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.request.history; +package org.dromara.visor.module.infra.entity.request.history; -import com.orion.visor.framework.common.entity.PageRequest; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import org.dromara.visor.framework.common.entity.PageRequest; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/menu/SystemMenuCreateRequest.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/menu/SystemMenuCreateRequest.java similarity index 97% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/menu/SystemMenuCreateRequest.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/menu/SystemMenuCreateRequest.java index f13be687..bb00ed40 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/menu/SystemMenuCreateRequest.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/menu/SystemMenuCreateRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.request.menu; +package org.dromara.visor.module.infra.entity.request.menu; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/menu/SystemMenuQueryRequest.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/menu/SystemMenuQueryRequest.java similarity index 95% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/menu/SystemMenuQueryRequest.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/menu/SystemMenuQueryRequest.java index 53c64b5a..84aa7112 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/menu/SystemMenuQueryRequest.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/menu/SystemMenuQueryRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.request.menu; +package org.dromara.visor.module.infra.entity.request.menu; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/menu/SystemMenuUpdateRequest.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/menu/SystemMenuUpdateRequest.java similarity index 97% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/menu/SystemMenuUpdateRequest.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/menu/SystemMenuUpdateRequest.java index ae5a5978..7cfebbef 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/menu/SystemMenuUpdateRequest.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/menu/SystemMenuUpdateRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.request.menu; +package org.dromara.visor.module.infra.entity.request.menu; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/menu/SystemMenuUpdateStatusRequest.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/menu/SystemMenuUpdateStatusRequest.java similarity index 95% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/menu/SystemMenuUpdateStatusRequest.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/menu/SystemMenuUpdateStatusRequest.java index 1a2247fc..623c1fe1 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/menu/SystemMenuUpdateStatusRequest.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/menu/SystemMenuUpdateStatusRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.request.menu; +package org.dromara.visor.module.infra.entity.request.menu; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/menu/SystemMenuValidFunctionRequest.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/menu/SystemMenuValidFunctionRequest.java similarity index 96% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/menu/SystemMenuValidFunctionRequest.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/menu/SystemMenuValidFunctionRequest.java index 780b2fd3..f912df97 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/menu/SystemMenuValidFunctionRequest.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/menu/SystemMenuValidFunctionRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.request.menu; +package org.dromara.visor.module.infra.entity.request.menu; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/menu/SystemMenuValidMenuRequest.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/menu/SystemMenuValidMenuRequest.java similarity index 97% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/menu/SystemMenuValidMenuRequest.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/menu/SystemMenuValidMenuRequest.java index cc64396e..de6b4639 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/menu/SystemMenuValidMenuRequest.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/menu/SystemMenuValidMenuRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.request.menu; +package org.dromara.visor.module.infra.entity.request.menu; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/menu/SystemRoleGrantMenuRequest.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/menu/SystemRoleGrantMenuRequest.java similarity index 96% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/menu/SystemRoleGrantMenuRequest.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/menu/SystemRoleGrantMenuRequest.java index 46d383fa..7bd68f32 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/menu/SystemRoleGrantMenuRequest.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/menu/SystemRoleGrantMenuRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.request.menu; +package org.dromara.visor.module.infra.entity.request.menu; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/message/SystemMessageCreateRequest.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/message/SystemMessageCreateRequest.java similarity index 97% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/message/SystemMessageCreateRequest.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/message/SystemMessageCreateRequest.java index e8b81147..e553e211 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/message/SystemMessageCreateRequest.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/message/SystemMessageCreateRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.request.message; +package org.dromara.visor.module.infra.entity.request.message; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/message/SystemMessageQueryRequest.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/message/SystemMessageQueryRequest.java similarity index 91% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/message/SystemMessageQueryRequest.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/message/SystemMessageQueryRequest.java index 0b72263e..3ee7a9b8 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/message/SystemMessageQueryRequest.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/message/SystemMessageQueryRequest.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.request.message; +package org.dromara.visor.module.infra.entity.request.message; -import com.orion.visor.framework.common.entity.PageRequest; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import org.dromara.visor.framework.common.entity.PageRequest; /** * 系统消息 查询请求对象 diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/operator/OperatorLogClearRequest.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/operator/OperatorLogClearRequest.java similarity index 91% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/operator/OperatorLogClearRequest.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/operator/OperatorLogClearRequest.java index fab2d83e..751285b8 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/operator/OperatorLogClearRequest.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/operator/OperatorLogClearRequest.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.request.operator; +package org.dromara.visor.module.infra.entity.request.operator; -import com.orion.visor.framework.common.entity.DataClearRequest; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; +import org.dromara.visor.framework.common.entity.DataClearRequest; import javax.validation.constraints.Max; import javax.validation.constraints.Min; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/operator/OperatorLogQueryRequest.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/operator/OperatorLogQueryRequest.java similarity index 93% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/operator/OperatorLogQueryRequest.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/operator/OperatorLogQueryRequest.java index 66299036..93300f3a 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/operator/OperatorLogQueryRequest.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/operator/OperatorLogQueryRequest.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.request.operator; +package org.dromara.visor.module.infra.entity.request.operator; import com.fasterxml.jackson.annotation.JsonFormat; -import com.orion.visor.framework.common.entity.PageRequest; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import org.dromara.visor.framework.common.entity.PageRequest; import javax.validation.constraints.Size; import java.util.Date; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/preference/PreferenceUpdatePartialRequest.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/preference/PreferenceUpdatePartialRequest.java similarity index 95% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/preference/PreferenceUpdatePartialRequest.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/preference/PreferenceUpdatePartialRequest.java index 0dfba2e1..ee1d516f 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/preference/PreferenceUpdatePartialRequest.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/preference/PreferenceUpdatePartialRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.request.preference; +package org.dromara.visor.module.infra.entity.request.preference; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/preference/PreferenceUpdateRequest.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/preference/PreferenceUpdateRequest.java similarity index 95% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/preference/PreferenceUpdateRequest.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/preference/PreferenceUpdateRequest.java index d9e7f24f..c46b709e 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/preference/PreferenceUpdateRequest.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/preference/PreferenceUpdateRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.request.preference; +package org.dromara.visor.module.infra.entity.request.preference; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/role/SystemRoleCreateRequest.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/role/SystemRoleCreateRequest.java similarity index 96% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/role/SystemRoleCreateRequest.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/role/SystemRoleCreateRequest.java index f559a201..76129cc4 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/role/SystemRoleCreateRequest.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/role/SystemRoleCreateRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.request.role; +package org.dromara.visor.module.infra.entity.request.role; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/role/SystemRoleQueryRequest.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/role/SystemRoleQueryRequest.java similarity index 92% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/role/SystemRoleQueryRequest.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/role/SystemRoleQueryRequest.java index 732e8190..af8a289b 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/role/SystemRoleQueryRequest.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/role/SystemRoleQueryRequest.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.request.role; +package org.dromara.visor.module.infra.entity.request.role; -import com.orion.visor.framework.common.entity.PageRequest; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import org.dromara.visor.framework.common.entity.PageRequest; import javax.validation.constraints.Size; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/role/SystemRoleStatusRequest.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/role/SystemRoleStatusRequest.java similarity index 95% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/role/SystemRoleStatusRequest.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/role/SystemRoleStatusRequest.java index 20cc47b8..71a844ad 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/role/SystemRoleStatusRequest.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/role/SystemRoleStatusRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.request.role; +package org.dromara.visor.module.infra.entity.request.role; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/role/SystemRoleUpdateRequest.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/role/SystemRoleUpdateRequest.java similarity index 96% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/role/SystemRoleUpdateRequest.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/role/SystemRoleUpdateRequest.java index 3717847f..78cb92ec 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/role/SystemRoleUpdateRequest.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/role/SystemRoleUpdateRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.request.role; +package org.dromara.visor.module.infra.entity.request.role; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/system/SystemSettingUpdatePartialRequest.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/system/SystemSettingUpdatePartialRequest.java similarity index 96% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/system/SystemSettingUpdatePartialRequest.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/system/SystemSettingUpdatePartialRequest.java index e11e4a86..c4c1d9b6 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/system/SystemSettingUpdatePartialRequest.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/system/SystemSettingUpdatePartialRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.request.system; +package org.dromara.visor.module.infra.entity.request.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/system/SystemSettingUpdateRequest.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/system/SystemSettingUpdateRequest.java similarity index 96% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/system/SystemSettingUpdateRequest.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/system/SystemSettingUpdateRequest.java index 8deb7a8d..573aea38 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/system/SystemSettingUpdateRequest.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/system/SystemSettingUpdateRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.request.system; +package org.dromara.visor.module.infra.entity.request.system; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/tag/TagCreateRequest.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/tag/TagCreateRequest.java similarity index 96% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/tag/TagCreateRequest.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/tag/TagCreateRequest.java index ddf52672..0b134b84 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/tag/TagCreateRequest.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/tag/TagCreateRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.request.tag; +package org.dromara.visor.module.infra.entity.request.tag; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/tag/TagQueryRequest.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/tag/TagQueryRequest.java similarity index 90% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/tag/TagQueryRequest.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/tag/TagQueryRequest.java index 2c6c03c2..6d5a827e 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/tag/TagQueryRequest.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/tag/TagQueryRequest.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.request.tag; +package org.dromara.visor.module.infra.entity.request.tag; -import com.orion.visor.framework.common.entity.PageRequest; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import org.dromara.visor.framework.common.entity.PageRequest; import javax.validation.constraints.Size; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/tag/TagRelQueryRequest.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/tag/TagRelQueryRequest.java similarity index 92% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/tag/TagRelQueryRequest.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/tag/TagRelQueryRequest.java index 25f33307..38859038 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/tag/TagRelQueryRequest.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/tag/TagRelQueryRequest.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.request.tag; +package org.dromara.visor.module.infra.entity.request.tag; -import com.orion.visor.framework.common.entity.PageRequest; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import org.dromara.visor.framework.common.entity.PageRequest; import javax.validation.constraints.Size; import java.util.Collection; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/tag/TagUpdateRequest.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/tag/TagUpdateRequest.java similarity index 96% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/tag/TagUpdateRequest.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/tag/TagUpdateRequest.java index d54a569d..73df3e7a 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/tag/TagUpdateRequest.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/tag/TagUpdateRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.request.tag; +package org.dromara.visor.module.infra.entity.request.tag; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/user/SystemUserCreateRequest.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/SystemUserCreateRequest.java similarity index 93% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/user/SystemUserCreateRequest.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/SystemUserCreateRequest.java index a9ca17aa..dee895c2 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/user/SystemUserCreateRequest.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/SystemUserCreateRequest.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.request.user; +package org.dromara.visor.module.infra.entity.request.user; -import com.orion.visor.framework.common.constant.ValidConst; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.dromara.visor.framework.common.constant.ValidConst; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Pattern; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/user/SystemUserQueryRequest.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/SystemUserQueryRequest.java similarity index 92% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/user/SystemUserQueryRequest.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/SystemUserQueryRequest.java index 1a7a6090..5c97e7a3 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/user/SystemUserQueryRequest.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/SystemUserQueryRequest.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.request.user; +package org.dromara.visor.module.infra.entity.request.user; -import com.orion.visor.framework.common.entity.PageRequest; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import org.dromara.visor.framework.common.entity.PageRequest; import javax.validation.constraints.Size; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/user/SystemUserUpdateRequest.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/SystemUserUpdateRequest.java similarity index 96% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/user/SystemUserUpdateRequest.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/SystemUserUpdateRequest.java index a39389f3..2fb7538c 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/user/SystemUserUpdateRequest.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/SystemUserUpdateRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.request.user; +package org.dromara.visor.module.infra.entity.request.user; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/user/SystemUserUpdateRoleRequest.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/SystemUserUpdateRoleRequest.java similarity index 95% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/user/SystemUserUpdateRoleRequest.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/SystemUserUpdateRoleRequest.java index 84b7b205..de79cea8 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/user/SystemUserUpdateRoleRequest.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/SystemUserUpdateRoleRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.request.user; +package org.dromara.visor.module.infra.entity.request.user; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/user/SystemUserUpdateStatusRequest.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/SystemUserUpdateStatusRequest.java similarity index 95% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/user/SystemUserUpdateStatusRequest.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/SystemUserUpdateStatusRequest.java index d3811408..17e9a140 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/user/SystemUserUpdateStatusRequest.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/SystemUserUpdateStatusRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.request.user; +package org.dromara.visor.module.infra.entity.request.user; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/user/UserLoginRequest.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/UserLoginRequest.java similarity index 94% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/user/UserLoginRequest.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/UserLoginRequest.java index a57cd9c2..efbde498 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/user/UserLoginRequest.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/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.visor.module.infra.entity.request.user; +package org.dromara.visor.module.infra.entity.request.user; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/user/UserResetPasswordRequest.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/UserResetPasswordRequest.java similarity index 95% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/user/UserResetPasswordRequest.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/UserResetPasswordRequest.java index 0fcedc06..dcc09af6 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/user/UserResetPasswordRequest.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/UserResetPasswordRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.request.user; +package org.dromara.visor.module.infra.entity.request.user; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/user/UserSessionOfflineRequest.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/UserSessionOfflineRequest.java similarity index 95% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/user/UserSessionOfflineRequest.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/UserSessionOfflineRequest.java index 227577e4..4b45970a 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/user/UserSessionOfflineRequest.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/UserSessionOfflineRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.request.user; +package org.dromara.visor.module.infra.entity.request.user; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/user/UserUpdatePasswordRequest.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/UserUpdatePasswordRequest.java similarity index 95% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/user/UserUpdatePasswordRequest.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/UserUpdatePasswordRequest.java index 143322af..ad69516e 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/user/UserUpdatePasswordRequest.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/UserUpdatePasswordRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.request.user; +package org.dromara.visor.module.infra.entity.request.user; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/vo/AppInfoVO.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/AppInfoVO.java similarity index 96% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/vo/AppInfoVO.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/AppInfoVO.java index 76636b55..649daa67 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/vo/AppInfoVO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/AppInfoVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.vo; +package org.dromara.visor.module.infra.entity.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/vo/CronNextVO.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/CronNextVO.java similarity index 96% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/vo/CronNextVO.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/CronNextVO.java index 2b194dec..bee06dca 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/vo/CronNextVO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/CronNextVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.vo; +package org.dromara.visor.module.infra.entity.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/vo/DataGroupVO.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/DataGroupVO.java similarity index 96% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/vo/DataGroupVO.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/DataGroupVO.java index 0963d461..3cc0157f 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/vo/DataGroupVO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/DataGroupVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.vo; +package org.dromara.visor.module.infra.entity.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/vo/DictKeyVO.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/DictKeyVO.java similarity index 96% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/vo/DictKeyVO.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/DictKeyVO.java index 8611a871..44203712 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/vo/DictKeyVO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/DictKeyVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.vo; +package org.dromara.visor.module.infra.entity.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/vo/DictValueEnumVO.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/DictValueEnumVO.java similarity index 97% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/vo/DictValueEnumVO.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/DictValueEnumVO.java index d1963d10..a16f57ff 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/vo/DictValueEnumVO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/DictValueEnumVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.vo; +package org.dromara.visor.module.infra.entity.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/vo/DictValueVO.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/DictValueVO.java similarity index 97% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/vo/DictValueVO.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/DictValueVO.java index fe35529c..0b4b5b71 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/vo/DictValueVO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/DictValueVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.vo; +package org.dromara.visor.module.infra.entity.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/vo/FavoriteVO.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/FavoriteVO.java similarity index 96% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/vo/FavoriteVO.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/FavoriteVO.java index 0f18af5c..97cacd5e 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/vo/FavoriteVO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/FavoriteVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.vo; +package org.dromara.visor.module.infra.entity.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/vo/HistoryValueVO.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/HistoryValueVO.java similarity index 96% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/vo/HistoryValueVO.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/HistoryValueVO.java index 60ef74b9..42494706 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/vo/HistoryValueVO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/HistoryValueVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.vo; +package org.dromara.visor.module.infra.entity.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/vo/LoginHistoryVO.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/LoginHistoryVO.java similarity index 97% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/vo/LoginHistoryVO.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/LoginHistoryVO.java index 36e0ee6a..41110102 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/vo/LoginHistoryVO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/LoginHistoryVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.vo; +package org.dromara.visor.module.infra.entity.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/vo/OperatorLogVO.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/OperatorLogVO.java similarity index 98% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/vo/OperatorLogVO.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/OperatorLogVO.java index 65677ff6..129f545a 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/vo/OperatorLogVO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/OperatorLogVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.vo; +package org.dromara.visor.module.infra.entity.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/vo/SystemMenuVO.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/SystemMenuVO.java similarity index 97% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/vo/SystemMenuVO.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/SystemMenuVO.java index 4c731046..c0cf4356 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/vo/SystemMenuVO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/SystemMenuVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.vo; +package org.dromara.visor.module.infra.entity.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/vo/SystemMessageVO.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/SystemMessageVO.java similarity index 97% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/vo/SystemMessageVO.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/SystemMessageVO.java index b10384da..9c489ac4 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/vo/SystemMessageVO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/SystemMessageVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.vo; +package org.dromara.visor.module.infra.entity.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/vo/SystemRoleVO.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/SystemRoleVO.java similarity index 97% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/vo/SystemRoleVO.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/SystemRoleVO.java index f0e4dd33..5e958569 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/vo/SystemRoleVO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/SystemRoleVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.vo; +package org.dromara.visor.module.infra.entity.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/vo/SystemUserVO.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/SystemUserVO.java similarity index 97% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/vo/SystemUserVO.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/SystemUserVO.java index faad0ec0..c7397608 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/vo/SystemUserVO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/SystemUserVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.vo; +package org.dromara.visor.module.infra.entity.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/vo/TagVO.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/TagVO.java similarity index 96% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/vo/TagVO.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/TagVO.java index 6fe1c75c..4c5eb3be 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/vo/TagVO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/TagVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.vo; +package org.dromara.visor.module.infra.entity.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/vo/UserCollectInfoVO.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/UserCollectInfoVO.java similarity index 96% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/vo/UserCollectInfoVO.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/UserCollectInfoVO.java index 95ec1ffa..c46ffed7 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/vo/UserCollectInfoVO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/UserCollectInfoVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.vo; +package org.dromara.visor.module.infra.entity.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/vo/UserLoginVO.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/UserLoginVO.java similarity index 95% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/vo/UserLoginVO.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/UserLoginVO.java index 31f716f6..3bfcaf7c 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/vo/UserLoginVO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/UserLoginVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.vo; +package org.dromara.visor.module.infra.entity.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/vo/UserPermissionVO.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/UserPermissionVO.java similarity index 96% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/vo/UserPermissionVO.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/UserPermissionVO.java index 991db4bf..9d455cb6 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/vo/UserPermissionVO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/UserPermissionVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.vo; +package org.dromara.visor.module.infra.entity.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/vo/UserSessionVO.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/UserSessionVO.java similarity index 96% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/vo/UserSessionVO.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/UserSessionVO.java index fe150996..7c7c7d72 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/vo/UserSessionVO.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/UserSessionVO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.entity.vo; +package org.dromara.visor.module.infra.entity.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/enums/DictValueTypeEnum.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/DictValueTypeEnum.java similarity index 97% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/enums/DictValueTypeEnum.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/DictValueTypeEnum.java index cdc4f97d..5c5f2d6c 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/enums/DictValueTypeEnum.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/DictValueTypeEnum.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.enums; +package org.dromara.visor.module.infra.enums; import java.math.BigDecimal; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/enums/LoginTokenStatusEnum.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/LoginTokenStatusEnum.java similarity index 89% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/enums/LoginTokenStatusEnum.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/LoginTokenStatusEnum.java index 41a4fe16..a1be8c6c 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/enums/LoginTokenStatusEnum.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/LoginTokenStatusEnum.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.enums; +package org.dromara.visor.module.infra.enums; -import com.orion.lang.utils.time.Dates; -import com.orion.visor.framework.common.constant.ErrorCode; -import com.orion.visor.module.infra.entity.dto.LoginTokenDTO; -import com.orion.visor.module.infra.entity.dto.LoginTokenIdentityDTO; +import cn.orionsec.kit.lang.utils.time.Dates; import lombok.AllArgsConstructor; import lombok.Getter; +import org.dromara.visor.framework.common.constant.ErrorCode; +import org.dromara.visor.module.infra.entity.dto.LoginTokenDTO; +import org.dromara.visor.module.infra.entity.dto.LoginTokenIdentityDTO; import java.util.Date; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/enums/MenuStatusEnum.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/MenuStatusEnum.java similarity index 96% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/enums/MenuStatusEnum.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/MenuStatusEnum.java index bc7d64dd..2baa75c8 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/enums/MenuStatusEnum.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/MenuStatusEnum.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.enums; +package org.dromara.visor.module.infra.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/enums/MenuTypeEnum.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/MenuTypeEnum.java similarity index 96% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/enums/MenuTypeEnum.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/MenuTypeEnum.java index 30d2ed0d..94d77950 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/enums/MenuTypeEnum.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/MenuTypeEnum.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.enums; +package org.dromara.visor.module.infra.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/enums/MenuVisibleEnum.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/MenuVisibleEnum.java similarity index 96% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/enums/MenuVisibleEnum.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/MenuVisibleEnum.java index 157a2b31..efdc3fcb 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/enums/MenuVisibleEnum.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/MenuVisibleEnum.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.enums; +package org.dromara.visor.module.infra.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/enums/MessageStatusEnum.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/MessageStatusEnum.java similarity index 95% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/enums/MessageStatusEnum.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/MessageStatusEnum.java index 8cd9ac81..ec2b1349 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/enums/MessageStatusEnum.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/MessageStatusEnum.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.enums; +package org.dromara.visor.module.infra.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/enums/PreferenceTypeEnum.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/PreferenceTypeEnum.java similarity index 77% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/enums/PreferenceTypeEnum.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/PreferenceTypeEnum.java index 00c16a9f..b71fbc23 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/enums/PreferenceTypeEnum.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/PreferenceTypeEnum.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.enums; +package org.dromara.visor.module.infra.enums; -import com.orion.visor.framework.common.handler.data.GenericsDataDefinition; -import com.orion.visor.framework.common.handler.data.model.GenericsDataModel; -import com.orion.visor.framework.common.handler.data.strategy.GenericsDataStrategy; -import com.orion.visor.module.infra.handler.preference.strategy.SystemPreferenceStrategy; -import com.orion.visor.module.infra.handler.preference.strategy.TerminalPreferenceStrategy; import lombok.Getter; +import org.dromara.visor.framework.common.handler.data.GenericsDataDefinition; +import org.dromara.visor.framework.common.handler.data.model.GenericsDataModel; +import org.dromara.visor.framework.common.handler.data.strategy.GenericsDataStrategy; +import org.dromara.visor.module.infra.handler.preference.strategy.SystemPreferenceStrategy; +import org.dromara.visor.module.infra.handler.preference.strategy.TerminalPreferenceStrategy; /** * 偏好类型 diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/enums/RoleStatusEnum.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/RoleStatusEnum.java similarity index 96% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/enums/RoleStatusEnum.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/RoleStatusEnum.java index 6146ff13..b38d03ce 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/enums/RoleStatusEnum.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/RoleStatusEnum.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.enums; +package org.dromara.visor.module.infra.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/enums/SystemSettingTypeEnum.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/SystemSettingTypeEnum.java similarity index 81% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/enums/SystemSettingTypeEnum.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/SystemSettingTypeEnum.java index 27053e7b..9a531936 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/enums/SystemSettingTypeEnum.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/SystemSettingTypeEnum.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.enums; +package org.dromara.visor.module.infra.enums; -import com.orion.visor.framework.common.handler.data.GenericsDataDefinition; -import com.orion.visor.framework.common.handler.data.model.GenericsDataModel; -import com.orion.visor.framework.common.handler.data.strategy.GenericsDataStrategy; -import com.orion.visor.module.infra.handler.setting.strategy.SftpSystemSettingStrategy; import lombok.AllArgsConstructor; import lombok.Getter; +import org.dromara.visor.framework.common.handler.data.GenericsDataDefinition; +import org.dromara.visor.framework.common.handler.data.model.GenericsDataModel; +import org.dromara.visor.framework.common.handler.data.strategy.GenericsDataStrategy; +import org.dromara.visor.module.infra.handler.setting.strategy.SftpSystemSettingStrategy; /** * 系统配置类型枚举 diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/enums/UserStatusEnum.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/UserStatusEnum.java similarity index 93% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/enums/UserStatusEnum.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/UserStatusEnum.java index 0fb486a8..d90ae033 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/enums/UserStatusEnum.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/UserStatusEnum.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.enums; +package org.dromara.visor.module.infra.enums; -import com.orion.visor.framework.common.constant.ErrorCode; import lombok.AllArgsConstructor; import lombok.Getter; +import org.dromara.visor.framework.common.constant.ErrorCode; /** * 用户状态枚举 diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/framework/service/impl/OperatorLogFrameworkServiceImpl.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/framework/service/impl/OperatorLogFrameworkServiceImpl.java similarity index 78% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/framework/service/impl/OperatorLogFrameworkServiceImpl.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/framework/service/impl/OperatorLogFrameworkServiceImpl.java index 81d09dc7..408a66bb 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/framework/service/impl/OperatorLogFrameworkServiceImpl.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/framework/service/impl/OperatorLogFrameworkServiceImpl.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.framework.service.impl; +package org.dromara.visor.module.infra.framework.service.impl; -import com.orion.visor.framework.biz.operator.log.core.model.OperatorLogModel; -import com.orion.visor.framework.biz.operator.log.core.service.OperatorLogFrameworkService; -import com.orion.visor.module.infra.service.OperatorLogService; +import org.dromara.visor.framework.biz.operator.log.core.model.OperatorLogModel; +import org.dromara.visor.framework.biz.operator.log.core.service.OperatorLogFrameworkService; +import org.dromara.visor.module.infra.service.OperatorLogService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/framework/service/impl/SecurityFrameworkServiceImpl.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/framework/service/impl/SecurityFrameworkServiceImpl.java similarity index 82% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/framework/service/impl/SecurityFrameworkServiceImpl.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/framework/service/impl/SecurityFrameworkServiceImpl.java index 090a08d8..de929ca3 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/framework/service/impl/SecurityFrameworkServiceImpl.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/framework/service/impl/SecurityFrameworkServiceImpl.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.framework.service.impl; +package org.dromara.visor.module.infra.framework.service.impl; -import com.orion.visor.framework.common.security.LoginUser; -import com.orion.visor.framework.redis.core.utils.RedisUtils; -import com.orion.visor.framework.security.core.service.SecurityFrameworkService; -import com.orion.visor.module.infra.define.cache.UserCacheKeyDefine; -import com.orion.visor.module.infra.entity.dto.LoginTokenDTO; -import com.orion.visor.module.infra.enums.LoginTokenStatusEnum; -import com.orion.visor.module.infra.enums.UserStatusEnum; -import com.orion.visor.module.infra.service.AuthenticationService; -import com.orion.visor.module.infra.service.UserPermissionService; +import org.dromara.visor.framework.common.security.LoginUser; +import org.dromara.visor.framework.redis.core.utils.RedisUtils; +import org.dromara.visor.framework.security.core.service.SecurityFrameworkService; +import org.dromara.visor.module.infra.define.cache.UserCacheKeyDefine; +import org.dromara.visor.module.infra.entity.dto.LoginTokenDTO; +import org.dromara.visor.module.infra.enums.LoginTokenStatusEnum; +import org.dromara.visor.module.infra.enums.UserStatusEnum; +import org.dromara.visor.module.infra.service.AuthenticationService; +import org.dromara.visor.module.infra.service.UserPermissionService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/preference/model/SystemPreferenceModel.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/preference/model/SystemPreferenceModel.java similarity index 92% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/preference/model/SystemPreferenceModel.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/preference/model/SystemPreferenceModel.java index c1d011fc..72f8e9c6 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/preference/model/SystemPreferenceModel.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/preference/model/SystemPreferenceModel.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.handler.preference.model; +package org.dromara.visor.module.infra.handler.preference.model; -import com.orion.visor.framework.common.handler.data.model.GenericsDataModel; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.dromara.visor.framework.common.handler.data.model.GenericsDataModel; /** * 系统偏好模型 diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/preference/model/TerminalPreferenceModel.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/preference/model/TerminalPreferenceModel.java similarity index 97% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/preference/model/TerminalPreferenceModel.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/preference/model/TerminalPreferenceModel.java index fbc58006..e076f797 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/preference/model/TerminalPreferenceModel.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/preference/model/TerminalPreferenceModel.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.handler.preference.model; +package org.dromara.visor.module.infra.handler.preference.model; +import cn.orionsec.kit.lang.able.IJsonObject; import com.alibaba.fastjson.JSONObject; -import com.orion.lang.able.IJsonObject; -import com.orion.visor.framework.common.handler.data.model.GenericsDataModel; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.dromara.visor.framework.common.handler.data.model.GenericsDataModel; import java.util.List; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/preference/strategy/SystemPreferenceStrategy.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/preference/strategy/SystemPreferenceStrategy.java similarity index 84% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/preference/strategy/SystemPreferenceStrategy.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/preference/strategy/SystemPreferenceStrategy.java index 6ab960e1..8b562117 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/preference/strategy/SystemPreferenceStrategy.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/preference/strategy/SystemPreferenceStrategy.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.handler.preference.strategy; +package org.dromara.visor.module.infra.handler.preference.strategy; -import com.orion.lang.utils.Exceptions; -import com.orion.visor.framework.common.handler.data.strategy.AbstractGenericsDataStrategy; -import com.orion.visor.module.infra.handler.preference.model.SystemPreferenceModel; +import cn.orionsec.kit.lang.utils.Exceptions; +import org.dromara.visor.framework.common.handler.data.strategy.AbstractGenericsDataStrategy; +import org.dromara.visor.module.infra.handler.preference.model.SystemPreferenceModel; import org.springframework.stereotype.Component; /** diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/preference/strategy/TerminalPreferenceStrategy.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/preference/strategy/TerminalPreferenceStrategy.java similarity index 95% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/preference/strategy/TerminalPreferenceStrategy.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/preference/strategy/TerminalPreferenceStrategy.java index 14438d7d..017d0416 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/preference/strategy/TerminalPreferenceStrategy.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/preference/strategy/TerminalPreferenceStrategy.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.handler.preference.strategy; +package org.dromara.visor.module.infra.handler.preference.strategy; +import cn.orionsec.kit.lang.utils.Exceptions; +import cn.orionsec.kit.lang.utils.collect.Lists; +import cn.orionsec.kit.net.host.ssh.TerminalType; import com.alibaba.fastjson.JSONObject; -import com.orion.lang.utils.Exceptions; -import com.orion.lang.utils.collect.Lists; -import com.orion.net.host.ssh.TerminalType; -import com.orion.visor.framework.common.handler.data.strategy.AbstractGenericsDataStrategy; -import com.orion.visor.module.infra.handler.preference.model.TerminalPreferenceModel; +import org.dromara.visor.framework.common.handler.data.strategy.AbstractGenericsDataStrategy; +import org.dromara.visor.module.infra.handler.preference.model.TerminalPreferenceModel; import org.springframework.stereotype.Component; /** diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/setting/model/SftpSystemSettingModel.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/setting/model/SftpSystemSettingModel.java similarity index 88% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/setting/model/SftpSystemSettingModel.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/setting/model/SftpSystemSettingModel.java index dad0c943..a95d942c 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/setting/model/SftpSystemSettingModel.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/setting/model/SftpSystemSettingModel.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.handler.setting.model; +package org.dromara.visor.module.infra.handler.setting.model; -import com.orion.visor.framework.common.handler.data.model.GenericsDataModel; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.dromara.visor.framework.common.handler.data.model.GenericsDataModel; /** * SFTP 系统配置模型 diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/setting/strategy/SftpSystemSettingStrategy.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/setting/strategy/SftpSystemSettingStrategy.java similarity index 81% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/setting/strategy/SftpSystemSettingStrategy.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/setting/strategy/SftpSystemSettingStrategy.java index 1e817114..176cb93a 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/setting/strategy/SftpSystemSettingStrategy.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/setting/strategy/SftpSystemSettingStrategy.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.handler.setting.strategy; +package org.dromara.visor.module.infra.handler.setting.strategy; -import com.orion.lang.utils.Exceptions; -import com.orion.visor.framework.common.handler.data.strategy.AbstractGenericsDataStrategy; -import com.orion.visor.module.infra.handler.setting.model.SftpSystemSettingModel; +import cn.orionsec.kit.lang.utils.Exceptions; +import org.dromara.visor.framework.common.handler.data.strategy.AbstractGenericsDataStrategy; +import org.dromara.visor.module.infra.handler.setting.model.SftpSystemSettingModel; import org.springframework.stereotype.Component; /** diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/upload/FileUploadMessageDispatcher.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/upload/FileUploadMessageDispatcher.java similarity index 82% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/upload/FileUploadMessageDispatcher.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/upload/FileUploadMessageDispatcher.java index d8449cca..8f572870 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/upload/FileUploadMessageDispatcher.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/upload/FileUploadMessageDispatcher.java @@ -13,20 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.handler.upload; +package org.dromara.visor.module.infra.handler.upload; +import cn.orionsec.kit.lang.annotation.Keep; +import cn.orionsec.kit.lang.utils.io.Streams; import com.alibaba.fastjson.JSON; -import com.orion.lang.annotation.Keep; -import com.orion.lang.utils.io.Streams; -import com.orion.visor.framework.common.constant.ExtraFieldConst; -import com.orion.visor.framework.common.file.FileClient; -import com.orion.visor.framework.websocket.core.utils.WebSockets; -import com.orion.visor.module.infra.entity.dto.FileUploadTokenDTO; -import com.orion.visor.module.infra.handler.upload.enums.FileUploadOperatorType; -import com.orion.visor.module.infra.handler.upload.handler.FileUploadHandler; -import com.orion.visor.module.infra.handler.upload.handler.IFileUploadHandler; -import com.orion.visor.module.infra.handler.upload.model.FileUploadRequest; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.common.constant.ExtraFieldConst; +import org.dromara.visor.framework.common.file.FileClient; +import org.dromara.visor.framework.websocket.core.utils.WebSockets; +import org.dromara.visor.module.infra.entity.dto.FileUploadTokenDTO; +import org.dromara.visor.module.infra.handler.upload.enums.FileUploadOperatorType; +import org.dromara.visor.module.infra.handler.upload.handler.FileUploadHandler; +import org.dromara.visor.module.infra.handler.upload.handler.IFileUploadHandler; +import org.dromara.visor.module.infra.handler.upload.model.FileUploadRequest; import org.springframework.stereotype.Component; import org.springframework.web.socket.BinaryMessage; import org.springframework.web.socket.CloseStatus; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/upload/enums/FileUploadOperatorType.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/upload/enums/FileUploadOperatorType.java similarity index 95% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/upload/enums/FileUploadOperatorType.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/upload/enums/FileUploadOperatorType.java index c9759f61..5479bc44 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/upload/enums/FileUploadOperatorType.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/upload/enums/FileUploadOperatorType.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.handler.upload.enums; +package org.dromara.visor.module.infra.handler.upload.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/upload/enums/FileUploadReceiverType.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/upload/enums/FileUploadReceiverType.java similarity index 95% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/upload/enums/FileUploadReceiverType.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/upload/enums/FileUploadReceiverType.java index 4c211fb3..1e4568b9 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/upload/enums/FileUploadReceiverType.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/upload/enums/FileUploadReceiverType.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.handler.upload.enums; +package org.dromara.visor.module.infra.handler.upload.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/upload/handler/FileUploadHandler.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/upload/handler/FileUploadHandler.java similarity index 90% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/upload/handler/FileUploadHandler.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/upload/handler/FileUploadHandler.java index 296bd947..3b8559a9 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/upload/handler/FileUploadHandler.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/upload/handler/FileUploadHandler.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.handler.upload.handler; +package org.dromara.visor.module.infra.handler.upload.handler; +import cn.orionsec.kit.lang.utils.io.Streams; import com.alibaba.fastjson.JSON; -import com.orion.lang.utils.io.Streams; -import com.orion.visor.framework.common.constant.Const; -import com.orion.visor.framework.common.file.FileClient; -import com.orion.visor.framework.websocket.core.utils.WebSockets; -import com.orion.visor.module.infra.handler.upload.enums.FileUploadReceiverType; -import com.orion.visor.module.infra.handler.upload.model.FileUploadResponse; +import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.framework.common.file.FileClient; +import org.dromara.visor.framework.websocket.core.utils.WebSockets; +import org.dromara.visor.module.infra.handler.upload.enums.FileUploadReceiverType; +import org.dromara.visor.module.infra.handler.upload.model.FileUploadResponse; import org.springframework.web.socket.WebSocketSession; import java.io.IOException; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/upload/handler/IFileUploadHandler.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/upload/handler/IFileUploadHandler.java similarity index 91% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/upload/handler/IFileUploadHandler.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/upload/handler/IFileUploadHandler.java index 9e7543ac..dd928ad2 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/upload/handler/IFileUploadHandler.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/upload/handler/IFileUploadHandler.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.handler.upload.handler; +package org.dromara.visor.module.infra.handler.upload.handler; -import com.orion.lang.able.SafeCloseable; +import cn.orionsec.kit.lang.able.SafeCloseable; /** * 文件上传处理器 diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/upload/model/FileUploadRequest.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/upload/model/FileUploadRequest.java similarity index 94% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/upload/model/FileUploadRequest.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/upload/model/FileUploadRequest.java index 051d927e..dd3443dc 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/upload/model/FileUploadRequest.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/upload/model/FileUploadRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.handler.upload.model; +package org.dromara.visor.module.infra.handler.upload.model; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/upload/model/FileUploadResponse.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/upload/model/FileUploadResponse.java similarity index 94% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/upload/model/FileUploadResponse.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/upload/model/FileUploadResponse.java index ab3ede4c..d068288f 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/handler/upload/model/FileUploadResponse.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/upload/model/FileUploadResponse.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.handler.upload.model; +package org.dromara.visor.module.infra.handler.upload.model; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/interceptor/FileUploadInterceptor.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/interceptor/FileUploadInterceptor.java similarity index 88% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/interceptor/FileUploadInterceptor.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/interceptor/FileUploadInterceptor.java index 496679dc..bbf4a4e2 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/interceptor/FileUploadInterceptor.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/interceptor/FileUploadInterceptor.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.interceptor; +package org.dromara.visor.module.infra.interceptor; -import com.orion.lang.utils.Urls; -import com.orion.visor.framework.common.constant.ExtraFieldConst; -import com.orion.visor.module.infra.entity.dto.FileUploadTokenDTO; -import com.orion.visor.module.infra.service.FileUploadService; +import cn.orionsec.kit.lang.utils.Urls; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.common.constant.ExtraFieldConst; +import org.dromara.visor.module.infra.entity.dto.FileUploadTokenDTO; +import org.dromara.visor.module.infra.service.FileUploadService; import org.springframework.http.server.ServerHttpRequest; import org.springframework.http.server.ServerHttpResponse; import org.springframework.stereotype.Component; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/AuthenticationService.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/AuthenticationService.java similarity index 84% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/AuthenticationService.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/AuthenticationService.java index 43de12de..c1a5a7a8 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/AuthenticationService.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/AuthenticationService.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.service; +package org.dromara.visor.module.infra.service; -import com.orion.visor.framework.common.security.LoginUser; -import com.orion.visor.module.infra.entity.domain.SystemUserDO; -import com.orion.visor.module.infra.entity.dto.LoginTokenDTO; -import com.orion.visor.module.infra.entity.request.user.UserLoginRequest; -import com.orion.visor.module.infra.entity.vo.UserLoginVO; +import org.dromara.visor.framework.common.security.LoginUser; +import org.dromara.visor.module.infra.entity.domain.SystemUserDO; +import org.dromara.visor.module.infra.entity.dto.LoginTokenDTO; +import org.dromara.visor.module.infra.entity.request.user.UserLoginRequest; +import org.dromara.visor.module.infra.entity.vo.UserLoginVO; import javax.servlet.http.HttpServletRequest; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/DataExtraService.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/DataExtraService.java similarity index 93% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/DataExtraService.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/DataExtraService.java index dd74501a..32187926 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/DataExtraService.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/DataExtraService.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.service; +package org.dromara.visor.module.infra.service; -import com.orion.visor.module.infra.entity.domain.DataExtraDO; -import com.orion.visor.module.infra.entity.request.data.DataExtraQueryRequest; -import com.orion.visor.module.infra.entity.request.data.DataExtraSetRequest; +import org.dromara.visor.module.infra.entity.domain.DataExtraDO; +import org.dromara.visor.module.infra.entity.request.data.DataExtraQueryRequest; +import org.dromara.visor.module.infra.entity.request.data.DataExtraSetRequest; import java.util.List; import java.util.Map; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/DataGroupRelService.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/DataGroupRelService.java similarity index 94% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/DataGroupRelService.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/DataGroupRelService.java index cae206a9..fe8170e5 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/DataGroupRelService.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/DataGroupRelService.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.service; +package org.dromara.visor.module.infra.service; -import com.orion.visor.module.infra.entity.domain.DataGroupRelDO; -import com.orion.visor.module.infra.entity.dto.DataGroupRelCacheDTO; +import org.dromara.visor.module.infra.entity.domain.DataGroupRelDO; +import org.dromara.visor.module.infra.entity.dto.DataGroupRelCacheDTO; import java.util.List; import java.util.Map; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/DataGroupService.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/DataGroupService.java similarity index 87% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/DataGroupService.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/DataGroupService.java index 1c3437a5..f83822a8 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/DataGroupService.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/DataGroupService.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.service; +package org.dromara.visor.module.infra.service; -import com.orion.visor.module.infra.entity.dto.DataGroupCacheDTO; -import com.orion.visor.module.infra.entity.request.data.DataGroupCreateRequest; -import com.orion.visor.module.infra.entity.request.data.DataGroupMoveRequest; -import com.orion.visor.module.infra.entity.request.data.DataGroupRenameRequest; +import org.dromara.visor.module.infra.entity.dto.DataGroupCacheDTO; +import org.dromara.visor.module.infra.entity.request.data.DataGroupCreateRequest; +import org.dromara.visor.module.infra.entity.request.data.DataGroupMoveRequest; +import org.dromara.visor.module.infra.entity.request.data.DataGroupRenameRequest; import java.util.List; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/DataPermissionService.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/DataPermissionService.java similarity index 95% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/DataPermissionService.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/DataPermissionService.java index e1d36eca..07b5a45e 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/DataPermissionService.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/DataPermissionService.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.service; +package org.dromara.visor.module.infra.service; -import com.orion.visor.module.infra.entity.request.data.DataPermissionUpdateRequest; +import org.dromara.visor.module.infra.entity.request.data.DataPermissionUpdateRequest; import java.util.List; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/DictKeyService.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/DictKeyService.java similarity index 83% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/DictKeyService.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/DictKeyService.java index 9369f152..50ea844e 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/DictKeyService.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/DictKeyService.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.service; +package org.dromara.visor.module.infra.service; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.visor.module.infra.entity.request.dict.DictKeyCreateRequest; -import com.orion.visor.module.infra.entity.request.dict.DictKeyQueryRequest; -import com.orion.visor.module.infra.entity.request.dict.DictKeyUpdateRequest; -import com.orion.visor.module.infra.entity.vo.DictKeyVO; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import org.dromara.visor.module.infra.entity.request.dict.DictKeyCreateRequest; +import org.dromara.visor.module.infra.entity.request.dict.DictKeyQueryRequest; +import org.dromara.visor.module.infra.entity.request.dict.DictKeyUpdateRequest; +import org.dromara.visor.module.infra.entity.vo.DictKeyVO; import java.util.List; import java.util.Map; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/DictValueService.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/DictValueService.java similarity index 85% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/DictValueService.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/DictValueService.java index 72868c5b..f688faf1 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/DictValueService.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/DictValueService.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.service; +package org.dromara.visor.module.infra.service; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; import com.alibaba.fastjson.JSONObject; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.visor.module.infra.entity.request.dict.DictValueCreateRequest; -import com.orion.visor.module.infra.entity.request.dict.DictValueQueryRequest; -import com.orion.visor.module.infra.entity.request.dict.DictValueRollbackRequest; -import com.orion.visor.module.infra.entity.request.dict.DictValueUpdateRequest; -import com.orion.visor.module.infra.entity.vo.DictValueVO; +import org.dromara.visor.module.infra.entity.request.dict.DictValueCreateRequest; +import org.dromara.visor.module.infra.entity.request.dict.DictValueQueryRequest; +import org.dromara.visor.module.infra.entity.request.dict.DictValueRollbackRequest; +import org.dromara.visor.module.infra.entity.request.dict.DictValueUpdateRequest; +import org.dromara.visor.module.infra.entity.vo.DictValueVO; import java.util.List; import java.util.Map; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/FavoriteService.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/FavoriteService.java similarity index 86% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/FavoriteService.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/FavoriteService.java index 4f2b33ae..cfd40a23 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/FavoriteService.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/FavoriteService.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.service; +package org.dromara.visor.module.infra.service; -import com.orion.visor.module.infra.entity.request.favorite.FavoriteOperatorRequest; -import com.orion.visor.module.infra.entity.request.favorite.FavoriteQueryRequest; -import com.orion.visor.module.infra.entity.vo.FavoriteVO; +import org.dromara.visor.module.infra.entity.request.favorite.FavoriteOperatorRequest; +import org.dromara.visor.module.infra.entity.request.favorite.FavoriteQueryRequest; +import org.dromara.visor.module.infra.entity.vo.FavoriteVO; import java.util.List; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/FileUploadService.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/FileUploadService.java similarity index 90% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/FileUploadService.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/FileUploadService.java index 26af2ff5..20e1d916 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/FileUploadService.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/FileUploadService.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.service; +package org.dromara.visor.module.infra.service; -import com.orion.visor.module.infra.entity.dto.FileUploadTokenDTO; +import org.dromara.visor.module.infra.entity.dto.FileUploadTokenDTO; /** * 文件上传服务 diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/HistoryValueService.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/HistoryValueService.java similarity index 82% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/HistoryValueService.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/HistoryValueService.java index a10f7894..90317b38 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/HistoryValueService.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/HistoryValueService.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.service; +package org.dromara.visor.module.infra.service; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.visor.module.infra.entity.domain.HistoryValueDO; -import com.orion.visor.module.infra.entity.request.history.HistoryValueCreateRequest; -import com.orion.visor.module.infra.entity.request.history.HistoryValueQueryRequest; -import com.orion.visor.module.infra.entity.vo.HistoryValueVO; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import org.dromara.visor.module.infra.entity.domain.HistoryValueDO; +import org.dromara.visor.module.infra.entity.request.history.HistoryValueCreateRequest; +import org.dromara.visor.module.infra.entity.request.history.HistoryValueQueryRequest; +import org.dromara.visor.module.infra.entity.vo.HistoryValueVO; import java.util.List; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/MineService.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/MineService.java similarity index 73% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/MineService.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/MineService.java index b4b4c864..ab9ad197 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/MineService.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/MineService.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.service; +package org.dromara.visor.module.infra.service; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.visor.module.infra.entity.request.operator.OperatorLogQueryRequest; -import com.orion.visor.module.infra.entity.request.user.SystemUserUpdateRequest; -import com.orion.visor.module.infra.entity.request.user.UserSessionOfflineRequest; -import com.orion.visor.module.infra.entity.request.user.UserUpdatePasswordRequest; -import com.orion.visor.module.infra.entity.vo.LoginHistoryVO; -import com.orion.visor.module.infra.entity.vo.OperatorLogVO; -import com.orion.visor.module.infra.entity.vo.SystemUserVO; -import com.orion.visor.module.infra.entity.vo.UserSessionVO; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import org.dromara.visor.module.infra.entity.request.operator.OperatorLogQueryRequest; +import org.dromara.visor.module.infra.entity.request.user.SystemUserUpdateRequest; +import org.dromara.visor.module.infra.entity.request.user.UserSessionOfflineRequest; +import org.dromara.visor.module.infra.entity.request.user.UserUpdatePasswordRequest; +import org.dromara.visor.module.infra.entity.vo.LoginHistoryVO; +import org.dromara.visor.module.infra.entity.vo.OperatorLogVO; +import org.dromara.visor.module.infra.entity.vo.SystemUserVO; +import org.dromara.visor.module.infra.entity.vo.UserSessionVO; import java.util.List; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/OperatorLogService.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/OperatorLogService.java similarity index 79% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/OperatorLogService.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/OperatorLogService.java index 2ea64dcb..20e3c753 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/OperatorLogService.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/OperatorLogService.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.service; +package org.dromara.visor.module.infra.service; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.visor.framework.biz.operator.log.core.model.OperatorLogModel; -import com.orion.visor.module.infra.entity.domain.OperatorLogDO; -import com.orion.visor.module.infra.entity.request.operator.OperatorLogClearRequest; -import com.orion.visor.module.infra.entity.request.operator.OperatorLogQueryRequest; -import com.orion.visor.module.infra.entity.vo.LoginHistoryVO; -import com.orion.visor.module.infra.entity.vo.OperatorLogVO; +import org.dromara.visor.framework.biz.operator.log.core.model.OperatorLogModel; +import org.dromara.visor.module.infra.entity.domain.OperatorLogDO; +import org.dromara.visor.module.infra.entity.request.operator.OperatorLogClearRequest; +import org.dromara.visor.module.infra.entity.request.operator.OperatorLogQueryRequest; +import org.dromara.visor.module.infra.entity.vo.LoginHistoryVO; +import org.dromara.visor.module.infra.entity.vo.OperatorLogVO; import java.util.List; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/PermissionService.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/PermissionService.java similarity index 97% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/PermissionService.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/PermissionService.java index 3f566fc2..a8b21a0f 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/PermissionService.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/PermissionService.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.service; +package org.dromara.visor.module.infra.service; import java.util.List; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/PreferenceService.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/PreferenceService.java similarity index 87% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/PreferenceService.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/PreferenceService.java index 48ca16aa..ad13ecbd 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/PreferenceService.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/PreferenceService.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.service; +package org.dromara.visor.module.infra.service; -import com.orion.visor.module.infra.entity.request.preference.PreferenceUpdatePartialRequest; -import com.orion.visor.module.infra.entity.request.preference.PreferenceUpdateRequest; -import com.orion.visor.module.infra.enums.PreferenceTypeEnum; +import org.dromara.visor.module.infra.entity.request.preference.PreferenceUpdatePartialRequest; +import org.dromara.visor.module.infra.entity.request.preference.PreferenceUpdateRequest; +import org.dromara.visor.module.infra.enums.PreferenceTypeEnum; import java.util.List; import java.util.Map; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/SystemMenuService.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/SystemMenuService.java similarity index 81% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/SystemMenuService.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/SystemMenuService.java index f0750e91..463b0dfb 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/SystemMenuService.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/SystemMenuService.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.service; +package org.dromara.visor.module.infra.service; -import com.orion.visor.module.infra.entity.request.menu.SystemMenuCreateRequest; -import com.orion.visor.module.infra.entity.request.menu.SystemMenuQueryRequest; -import com.orion.visor.module.infra.entity.request.menu.SystemMenuUpdateRequest; -import com.orion.visor.module.infra.entity.request.menu.SystemMenuUpdateStatusRequest; -import com.orion.visor.module.infra.entity.vo.SystemMenuVO; +import org.dromara.visor.module.infra.entity.request.menu.SystemMenuCreateRequest; +import org.dromara.visor.module.infra.entity.request.menu.SystemMenuQueryRequest; +import org.dromara.visor.module.infra.entity.request.menu.SystemMenuUpdateRequest; +import org.dromara.visor.module.infra.entity.request.menu.SystemMenuUpdateStatusRequest; +import org.dromara.visor.module.infra.entity.vo.SystemMenuVO; import java.util.List; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/SystemMessageService.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/SystemMessageService.java similarity index 87% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/SystemMessageService.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/SystemMessageService.java index d27f9a68..012e4071 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/SystemMessageService.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/SystemMessageService.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.service; +package org.dromara.visor.module.infra.service; -import com.orion.visor.module.infra.entity.request.message.SystemMessageCreateRequest; -import com.orion.visor.module.infra.entity.request.message.SystemMessageQueryRequest; -import com.orion.visor.module.infra.entity.vo.SystemMessageVO; +import org.dromara.visor.module.infra.entity.request.message.SystemMessageCreateRequest; +import org.dromara.visor.module.infra.entity.request.message.SystemMessageQueryRequest; +import org.dromara.visor.module.infra.entity.vo.SystemMessageVO; import java.util.List; import java.util.Map; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/SystemRoleMenuService.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/SystemRoleMenuService.java similarity index 89% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/SystemRoleMenuService.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/SystemRoleMenuService.java index 2250b1b4..01f9644b 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/SystemRoleMenuService.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/SystemRoleMenuService.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.service; +package org.dromara.visor.module.infra.service; -import com.orion.visor.module.infra.entity.request.menu.SystemRoleGrantMenuRequest; +import org.dromara.visor.module.infra.entity.request.menu.SystemRoleGrantMenuRequest; import java.util.List; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/SystemRoleService.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/SystemRoleService.java similarity index 79% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/SystemRoleService.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/SystemRoleService.java index d93e4327..f4c08ba5 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/SystemRoleService.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/SystemRoleService.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.service; +package org.dromara.visor.module.infra.service; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.visor.module.infra.entity.request.role.SystemRoleCreateRequest; -import com.orion.visor.module.infra.entity.request.role.SystemRoleQueryRequest; -import com.orion.visor.module.infra.entity.request.role.SystemRoleStatusRequest; -import com.orion.visor.module.infra.entity.request.role.SystemRoleUpdateRequest; -import com.orion.visor.module.infra.entity.vo.SystemRoleVO; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import org.dromara.visor.module.infra.entity.request.role.SystemRoleCreateRequest; +import org.dromara.visor.module.infra.entity.request.role.SystemRoleQueryRequest; +import org.dromara.visor.module.infra.entity.request.role.SystemRoleStatusRequest; +import org.dromara.visor.module.infra.entity.request.role.SystemRoleUpdateRequest; +import org.dromara.visor.module.infra.entity.vo.SystemRoleVO; import java.util.List; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/SystemSettingService.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/SystemSettingService.java similarity index 83% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/SystemSettingService.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/SystemSettingService.java index 219b50f9..b61d01f6 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/SystemSettingService.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/SystemSettingService.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.service; +package org.dromara.visor.module.infra.service; -import com.orion.visor.module.infra.entity.request.system.SystemSettingUpdatePartialRequest; -import com.orion.visor.module.infra.entity.request.system.SystemSettingUpdateRequest; -import com.orion.visor.module.infra.entity.vo.AppInfoVO; +import org.dromara.visor.module.infra.entity.request.system.SystemSettingUpdatePartialRequest; +import org.dromara.visor.module.infra.entity.request.system.SystemSettingUpdateRequest; +import org.dromara.visor.module.infra.entity.vo.AppInfoVO; import java.util.Map; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/SystemUserManagementService.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/SystemUserManagementService.java similarity index 85% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/SystemUserManagementService.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/SystemUserManagementService.java index c7c77281..4ceb1a68 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/SystemUserManagementService.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/SystemUserManagementService.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.service; +package org.dromara.visor.module.infra.service; -import com.orion.visor.module.infra.entity.request.user.UserSessionOfflineRequest; -import com.orion.visor.module.infra.entity.vo.UserSessionVO; +import org.dromara.visor.module.infra.entity.request.user.UserSessionOfflineRequest; +import org.dromara.visor.module.infra.entity.vo.UserSessionVO; import java.util.List; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/SystemUserRoleService.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/SystemUserRoleService.java similarity index 92% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/SystemUserRoleService.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/SystemUserRoleService.java index bdc3cd6f..45c5ae9b 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/SystemUserRoleService.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/SystemUserRoleService.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.service; +package org.dromara.visor.module.infra.service; -import com.orion.visor.module.infra.entity.request.user.SystemUserUpdateRoleRequest; +import org.dromara.visor.module.infra.entity.request.user.SystemUserUpdateRoleRequest; import java.util.List; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/SystemUserService.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/SystemUserService.java similarity index 90% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/SystemUserService.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/SystemUserService.java index bc5d61b7..e755b7d1 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/SystemUserService.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/SystemUserService.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.service; +package org.dromara.visor.module.infra.service; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.visor.module.infra.entity.domain.SystemUserDO; -import com.orion.visor.module.infra.entity.request.user.*; -import com.orion.visor.module.infra.entity.vo.SystemUserVO; +import org.dromara.visor.module.infra.entity.domain.SystemUserDO; +import org.dromara.visor.module.infra.entity.request.user.*; +import org.dromara.visor.module.infra.entity.vo.SystemUserVO; import java.util.List; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/TagRelService.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/TagRelService.java similarity index 95% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/TagRelService.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/TagRelService.java index 84fba3a7..537416c9 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/TagRelService.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/TagRelService.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.service; +package org.dromara.visor.module.infra.service; -import com.orion.visor.module.infra.entity.dto.TagCacheDTO; +import org.dromara.visor.module.infra.entity.dto.TagCacheDTO; import java.util.List; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/TagService.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/TagService.java similarity index 89% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/TagService.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/TagService.java index 5c265a44..1bb435bc 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/TagService.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/TagService.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.service; +package org.dromara.visor.module.infra.service; -import com.orion.visor.module.infra.entity.request.tag.TagCreateRequest; -import com.orion.visor.module.infra.entity.vo.TagVO; +import org.dromara.visor.module.infra.entity.request.tag.TagCreateRequest; +import org.dromara.visor.module.infra.entity.vo.TagVO; import java.util.List; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/TipsService.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/TipsService.java similarity index 95% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/TipsService.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/TipsService.java index 2693fbe1..cbe4b35b 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/TipsService.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/TipsService.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.service; +package org.dromara.visor.module.infra.service; import java.util.List; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/UserPermissionService.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/UserPermissionService.java similarity index 88% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/UserPermissionService.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/UserPermissionService.java index e26f918e..50e28a7f 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/UserPermissionService.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/UserPermissionService.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.service; +package org.dromara.visor.module.infra.service; -import com.orion.visor.module.infra.entity.domain.SystemRoleDO; -import com.orion.visor.module.infra.entity.dto.SystemMenuCacheDTO; -import com.orion.visor.module.infra.entity.vo.SystemMenuVO; -import com.orion.visor.module.infra.entity.vo.UserPermissionVO; +import org.dromara.visor.module.infra.entity.domain.SystemRoleDO; +import org.dromara.visor.module.infra.entity.dto.SystemMenuCacheDTO; +import org.dromara.visor.module.infra.entity.vo.SystemMenuVO; +import org.dromara.visor.module.infra.entity.vo.UserPermissionVO; import java.util.List; import java.util.Map; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/AuthenticationServiceImpl.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/AuthenticationServiceImpl.java similarity index 86% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/AuthenticationServiceImpl.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/AuthenticationServiceImpl.java index 08a06036..4e250625 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/AuthenticationServiceImpl.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/AuthenticationServiceImpl.java @@ -13,46 +13,46 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.service.impl; +package org.dromara.visor.module.infra.service.impl; +import cn.orionsec.kit.lang.annotation.Keep; +import cn.orionsec.kit.lang.define.wrapper.Pair; +import cn.orionsec.kit.lang.utils.Exceptions; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.collect.Lists; +import cn.orionsec.kit.lang.utils.crypto.Signatures; +import cn.orionsec.kit.lang.utils.time.Dates; +import cn.orionsec.kit.web.servlet.web.Servlets; import com.alibaba.fastjson.JSON; -import com.orion.lang.annotation.Keep; -import com.orion.lang.define.wrapper.Pair; -import com.orion.lang.utils.Exceptions; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.collect.Lists; -import com.orion.lang.utils.crypto.Signatures; -import com.orion.lang.utils.time.Dates; -import com.orion.visor.framework.biz.operator.log.core.utils.OperatorLogs; -import com.orion.visor.framework.common.constant.Const; -import com.orion.visor.framework.common.constant.ErrorMessage; -import com.orion.visor.framework.common.constant.ExtraFieldConst; -import com.orion.visor.framework.common.security.LoginUser; -import com.orion.visor.framework.common.security.UserRole; -import com.orion.visor.framework.common.utils.CryptoUtils; -import com.orion.visor.framework.common.utils.IpUtils; -import com.orion.visor.framework.common.utils.Valid; -import com.orion.visor.framework.redis.core.utils.RedisStrings; -import com.orion.visor.framework.redis.core.utils.RedisUtils; -import com.orion.visor.framework.security.core.utils.SecurityUtils; -import com.orion.visor.module.infra.api.SystemMessageApi; -import com.orion.visor.module.infra.convert.SystemUserConvert; -import com.orion.visor.module.infra.dao.SystemUserDAO; -import com.orion.visor.module.infra.dao.SystemUserRoleDAO; -import com.orion.visor.module.infra.define.cache.UserCacheKeyDefine; -import com.orion.visor.module.infra.define.config.AppAuthenticationConfig; -import com.orion.visor.module.infra.define.message.SystemUserMessageDefine; -import com.orion.visor.module.infra.entity.domain.SystemUserDO; -import com.orion.visor.module.infra.entity.dto.LoginTokenDTO; -import com.orion.visor.module.infra.entity.dto.LoginTokenIdentityDTO; -import com.orion.visor.module.infra.entity.dto.message.SystemMessageDTO; -import com.orion.visor.module.infra.entity.request.user.UserLoginRequest; -import com.orion.visor.module.infra.entity.vo.UserLoginVO; -import com.orion.visor.module.infra.enums.LoginTokenStatusEnum; -import com.orion.visor.module.infra.enums.UserStatusEnum; -import com.orion.visor.module.infra.service.AuthenticationService; -import com.orion.visor.module.infra.service.UserPermissionService; -import com.orion.web.servlet.web.Servlets; +import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; +import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.framework.common.constant.ErrorMessage; +import org.dromara.visor.framework.common.constant.ExtraFieldConst; +import org.dromara.visor.framework.common.security.LoginUser; +import org.dromara.visor.framework.common.security.UserRole; +import org.dromara.visor.framework.common.utils.CryptoUtils; +import org.dromara.visor.framework.common.utils.IpUtils; +import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.framework.redis.core.utils.RedisStrings; +import org.dromara.visor.framework.redis.core.utils.RedisUtils; +import org.dromara.visor.framework.security.core.utils.SecurityUtils; +import org.dromara.visor.module.infra.api.SystemMessageApi; +import org.dromara.visor.module.infra.convert.SystemUserConvert; +import org.dromara.visor.module.infra.dao.SystemUserDAO; +import org.dromara.visor.module.infra.dao.SystemUserRoleDAO; +import org.dromara.visor.module.infra.define.cache.UserCacheKeyDefine; +import org.dromara.visor.module.infra.define.config.AppAuthenticationConfig; +import org.dromara.visor.module.infra.define.message.SystemUserMessageDefine; +import org.dromara.visor.module.infra.entity.domain.SystemUserDO; +import org.dromara.visor.module.infra.entity.dto.LoginTokenDTO; +import org.dromara.visor.module.infra.entity.dto.LoginTokenIdentityDTO; +import org.dromara.visor.module.infra.entity.dto.message.SystemMessageDTO; +import org.dromara.visor.module.infra.entity.request.user.UserLoginRequest; +import org.dromara.visor.module.infra.entity.vo.UserLoginVO; +import org.dromara.visor.module.infra.enums.LoginTokenStatusEnum; +import org.dromara.visor.module.infra.enums.UserStatusEnum; +import org.dromara.visor.module.infra.service.AuthenticationService; +import org.dromara.visor.module.infra.service.UserPermissionService; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/DataExtraServiceImpl.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataExtraServiceImpl.java similarity index 91% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/DataExtraServiceImpl.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataExtraServiceImpl.java index d54aef10..fa98df89 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/DataExtraServiceImpl.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataExtraServiceImpl.java @@ -13,23 +13,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.service.impl; +package org.dromara.visor.module.infra.service.impl; +import cn.orionsec.kit.lang.function.Functions; +import cn.orionsec.kit.lang.utils.collect.Lists; +import cn.orionsec.kit.lang.utils.collect.Maps; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.lang.function.Functions; -import com.orion.lang.utils.collect.Lists; -import com.orion.lang.utils.collect.Maps; -import com.orion.visor.framework.common.constant.Const; -import com.orion.visor.framework.mybatis.core.query.ThenLambdaWrapper; -import com.orion.visor.framework.redis.core.utils.RedisMaps; -import com.orion.visor.framework.redis.core.utils.barrier.CacheBarriers; -import com.orion.visor.module.infra.dao.DataExtraDAO; -import com.orion.visor.module.infra.define.cache.DataExtraCacheKeyDefine; -import com.orion.visor.module.infra.entity.domain.DataExtraDO; -import com.orion.visor.module.infra.entity.request.data.DataExtraQueryRequest; -import com.orion.visor.module.infra.entity.request.data.DataExtraSetRequest; -import com.orion.visor.module.infra.service.DataExtraService; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.framework.mybatis.core.query.ThenLambdaWrapper; +import org.dromara.visor.framework.redis.core.utils.RedisMaps; +import org.dromara.visor.framework.redis.core.utils.barrier.CacheBarriers; +import org.dromara.visor.module.infra.dao.DataExtraDAO; +import org.dromara.visor.module.infra.define.cache.DataExtraCacheKeyDefine; +import org.dromara.visor.module.infra.entity.domain.DataExtraDO; +import org.dromara.visor.module.infra.entity.request.data.DataExtraQueryRequest; +import org.dromara.visor.module.infra.entity.request.data.DataExtraSetRequest; +import org.dromara.visor.module.infra.service.DataExtraService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/DataGroupRelServiceImpl.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataGroupRelServiceImpl.java similarity index 89% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/DataGroupRelServiceImpl.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataGroupRelServiceImpl.java index b57a405c..0582a1ea 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/DataGroupRelServiceImpl.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataGroupRelServiceImpl.java @@ -13,28 +13,28 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.service.impl; +package org.dromara.visor.module.infra.service.impl; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.collect.Lists; -import com.orion.lang.utils.collect.Maps; -import com.orion.spring.SpringHolder; -import com.orion.visor.framework.biz.operator.log.core.utils.OperatorLogs; -import com.orion.visor.framework.common.constant.ErrorMessage; -import com.orion.visor.framework.common.utils.Valid; -import com.orion.visor.framework.redis.core.utils.RedisLists; -import com.orion.visor.framework.redis.core.utils.RedisStrings; -import com.orion.visor.framework.redis.core.utils.RedisUtils; -import com.orion.visor.framework.redis.core.utils.barrier.CacheBarriers; -import com.orion.visor.module.infra.convert.DataGroupRelConvert; -import com.orion.visor.module.infra.dao.DataGroupDAO; -import com.orion.visor.module.infra.dao.DataGroupRelDAO; -import com.orion.visor.module.infra.define.cache.DataGroupCacheKeyDefine; -import com.orion.visor.module.infra.entity.domain.DataGroupDO; -import com.orion.visor.module.infra.entity.domain.DataGroupRelDO; -import com.orion.visor.module.infra.entity.dto.DataGroupRelCacheDTO; -import com.orion.visor.module.infra.service.DataGroupRelService; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.collect.Lists; +import cn.orionsec.kit.lang.utils.collect.Maps; +import cn.orionsec.kit.spring.SpringHolder; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; +import org.dromara.visor.framework.common.constant.ErrorMessage; +import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.framework.redis.core.utils.RedisLists; +import org.dromara.visor.framework.redis.core.utils.RedisStrings; +import org.dromara.visor.framework.redis.core.utils.RedisUtils; +import org.dromara.visor.framework.redis.core.utils.barrier.CacheBarriers; +import org.dromara.visor.module.infra.convert.DataGroupRelConvert; +import org.dromara.visor.module.infra.dao.DataGroupDAO; +import org.dromara.visor.module.infra.dao.DataGroupRelDAO; +import org.dromara.visor.module.infra.define.cache.DataGroupCacheKeyDefine; +import org.dromara.visor.module.infra.entity.domain.DataGroupDO; +import org.dromara.visor.module.infra.entity.domain.DataGroupRelDO; +import org.dromara.visor.module.infra.entity.dto.DataGroupRelCacheDTO; +import org.dromara.visor.module.infra.service.DataGroupRelService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/DataGroupServiceImpl.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataGroupServiceImpl.java similarity index 89% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/DataGroupServiceImpl.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataGroupServiceImpl.java index fe8333d3..a9d1ec2f 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/DataGroupServiceImpl.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataGroupServiceImpl.java @@ -13,32 +13,32 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.service.impl; +package org.dromara.visor.module.infra.service.impl; +import cn.orionsec.kit.lang.utils.collect.Lists; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.lang.utils.collect.Lists; -import com.orion.visor.framework.biz.operator.log.core.utils.OperatorLogs; -import com.orion.visor.framework.common.constant.Const; -import com.orion.visor.framework.common.constant.ErrorMessage; -import com.orion.visor.framework.common.enums.MovePosition; -import com.orion.visor.framework.common.utils.TreeUtils; -import com.orion.visor.framework.common.utils.Valid; -import com.orion.visor.framework.redis.core.utils.RedisStrings; -import com.orion.visor.framework.redis.core.utils.barrier.CacheBarriers; -import com.orion.visor.module.infra.convert.DataGroupConvert; -import com.orion.visor.module.infra.dao.DataGroupDAO; -import com.orion.visor.module.infra.dao.DataGroupRelDAO; -import com.orion.visor.module.infra.define.cache.DataGroupCacheKeyDefine; -import com.orion.visor.module.infra.entity.domain.DataGroupDO; -import com.orion.visor.module.infra.entity.domain.DataGroupRelDO; -import com.orion.visor.module.infra.entity.dto.DataGroupCacheDTO; -import com.orion.visor.module.infra.entity.request.data.DataGroupCreateRequest; -import com.orion.visor.module.infra.entity.request.data.DataGroupMoveRequest; -import com.orion.visor.module.infra.entity.request.data.DataGroupRenameRequest; -import com.orion.visor.module.infra.service.DataGroupRelService; -import com.orion.visor.module.infra.service.DataGroupService; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; +import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.framework.common.constant.ErrorMessage; +import org.dromara.visor.framework.common.enums.MovePosition; +import org.dromara.visor.framework.common.utils.TreeUtils; +import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.framework.redis.core.utils.RedisStrings; +import org.dromara.visor.framework.redis.core.utils.barrier.CacheBarriers; +import org.dromara.visor.module.infra.convert.DataGroupConvert; +import org.dromara.visor.module.infra.dao.DataGroupDAO; +import org.dromara.visor.module.infra.dao.DataGroupRelDAO; +import org.dromara.visor.module.infra.define.cache.DataGroupCacheKeyDefine; +import org.dromara.visor.module.infra.entity.domain.DataGroupDO; +import org.dromara.visor.module.infra.entity.domain.DataGroupRelDO; +import org.dromara.visor.module.infra.entity.dto.DataGroupCacheDTO; +import org.dromara.visor.module.infra.entity.request.data.DataGroupCreateRequest; +import org.dromara.visor.module.infra.entity.request.data.DataGroupMoveRequest; +import org.dromara.visor.module.infra.entity.request.data.DataGroupRenameRequest; +import org.dromara.visor.module.infra.service.DataGroupRelService; +import org.dromara.visor.module.infra.service.DataGroupService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/DataPermissionServiceImpl.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataPermissionServiceImpl.java similarity index 92% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/DataPermissionServiceImpl.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataPermissionServiceImpl.java index 1f543158..914dc487 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/DataPermissionServiceImpl.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataPermissionServiceImpl.java @@ -13,23 +13,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.service.impl; +package org.dromara.visor.module.infra.service.impl; +import cn.orionsec.kit.lang.utils.collect.Lists; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.lang.utils.collect.Lists; -import com.orion.visor.framework.common.utils.Valid; -import com.orion.visor.framework.mybatis.core.query.Conditions; -import com.orion.visor.framework.redis.core.utils.RedisLists; -import com.orion.visor.framework.redis.core.utils.RedisUtils; -import com.orion.visor.framework.redis.core.utils.barrier.CacheBarriers; -import com.orion.visor.module.infra.dao.DataPermissionDAO; -import com.orion.visor.module.infra.dao.SystemUserRoleDAO; -import com.orion.visor.module.infra.define.cache.DataPermissionCacheKeyDefine; -import com.orion.visor.module.infra.entity.domain.DataPermissionDO; -import com.orion.visor.module.infra.entity.request.data.DataPermissionUpdateRequest; -import com.orion.visor.module.infra.enums.DataPermissionTypeEnum; -import com.orion.visor.module.infra.service.DataPermissionService; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.framework.mybatis.core.query.Conditions; +import org.dromara.visor.framework.redis.core.utils.RedisLists; +import org.dromara.visor.framework.redis.core.utils.RedisUtils; +import org.dromara.visor.framework.redis.core.utils.barrier.CacheBarriers; +import org.dromara.visor.module.infra.dao.DataPermissionDAO; +import org.dromara.visor.module.infra.dao.SystemUserRoleDAO; +import org.dromara.visor.module.infra.define.cache.DataPermissionCacheKeyDefine; +import org.dromara.visor.module.infra.entity.domain.DataPermissionDO; +import org.dromara.visor.module.infra.entity.request.data.DataPermissionUpdateRequest; +import org.dromara.visor.module.infra.enums.DataPermissionTypeEnum; +import org.dromara.visor.module.infra.service.DataPermissionService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/DictKeyServiceImpl.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DictKeyServiceImpl.java similarity index 84% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/DictKeyServiceImpl.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DictKeyServiceImpl.java index 2a9e1566..16d16b29 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/DictKeyServiceImpl.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DictKeyServiceImpl.java @@ -13,38 +13,38 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.service.impl; +package org.dromara.visor.module.infra.service.impl; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import cn.orionsec.kit.lang.utils.Objects1; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.collect.Lists; +import cn.orionsec.kit.lang.utils.collect.Maps; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; 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.collect.Maps; -import com.orion.visor.framework.biz.operator.log.core.utils.OperatorLogs; -import com.orion.visor.framework.common.constant.Const; -import com.orion.visor.framework.common.constant.ErrorMessage; -import com.orion.visor.framework.common.utils.Valid; -import com.orion.visor.framework.redis.core.utils.RedisMaps; -import com.orion.visor.framework.redis.core.utils.RedisStrings; -import com.orion.visor.framework.redis.core.utils.RedisUtils; -import com.orion.visor.framework.redis.core.utils.barrier.CacheBarriers; -import com.orion.visor.module.infra.convert.DictKeyConvert; -import com.orion.visor.module.infra.dao.DictKeyDAO; -import com.orion.visor.module.infra.define.cache.DictCacheKeyDefine; -import com.orion.visor.module.infra.entity.domain.DictKeyDO; -import com.orion.visor.module.infra.entity.dto.DictKeyCacheDTO; -import com.orion.visor.module.infra.entity.dto.DictKeyExtraSchemaDTO; -import com.orion.visor.module.infra.entity.request.dict.DictKeyCreateRequest; -import com.orion.visor.module.infra.entity.request.dict.DictKeyQueryRequest; -import com.orion.visor.module.infra.entity.request.dict.DictKeyUpdateRequest; -import com.orion.visor.module.infra.entity.vo.DictKeyVO; -import com.orion.visor.module.infra.enums.DictValueTypeEnum; -import com.orion.visor.module.infra.service.DictKeyService; -import com.orion.visor.module.infra.service.DictValueService; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; +import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.framework.common.constant.ErrorMessage; +import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.framework.redis.core.utils.RedisMaps; +import org.dromara.visor.framework.redis.core.utils.RedisStrings; +import org.dromara.visor.framework.redis.core.utils.RedisUtils; +import org.dromara.visor.framework.redis.core.utils.barrier.CacheBarriers; +import org.dromara.visor.module.infra.convert.DictKeyConvert; +import org.dromara.visor.module.infra.dao.DictKeyDAO; +import org.dromara.visor.module.infra.define.cache.DictCacheKeyDefine; +import org.dromara.visor.module.infra.entity.domain.DictKeyDO; +import org.dromara.visor.module.infra.entity.dto.DictKeyCacheDTO; +import org.dromara.visor.module.infra.entity.dto.DictKeyExtraSchemaDTO; +import org.dromara.visor.module.infra.entity.request.dict.DictKeyCreateRequest; +import org.dromara.visor.module.infra.entity.request.dict.DictKeyQueryRequest; +import org.dromara.visor.module.infra.entity.request.dict.DictKeyUpdateRequest; +import org.dromara.visor.module.infra.entity.vo.DictKeyVO; +import org.dromara.visor.module.infra.enums.DictValueTypeEnum; +import org.dromara.visor.module.infra.service.DictKeyService; +import org.dromara.visor.module.infra.service.DictValueService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/DictValueServiceImpl.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DictValueServiceImpl.java similarity index 89% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/DictValueServiceImpl.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DictValueServiceImpl.java index cbbe1831..7c94ec58 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/DictValueServiceImpl.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DictValueServiceImpl.java @@ -13,40 +13,40 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.service.impl; +package org.dromara.visor.module.infra.service.impl; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.collect.Lists; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; 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.visor.framework.biz.operator.log.core.utils.OperatorLogs; -import com.orion.visor.framework.common.constant.Const; -import com.orion.visor.framework.common.constant.ErrorMessage; -import com.orion.visor.framework.common.constant.FieldConst; -import com.orion.visor.framework.common.utils.Valid; -import com.orion.visor.framework.mybatis.core.query.Conditions; -import com.orion.visor.framework.redis.core.utils.RedisStrings; -import com.orion.visor.module.infra.convert.DictValueConvert; -import com.orion.visor.module.infra.dao.DictKeyDAO; -import com.orion.visor.module.infra.dao.DictValueDAO; -import com.orion.visor.module.infra.define.cache.DictCacheKeyDefine; -import com.orion.visor.module.infra.entity.domain.DictKeyDO; -import com.orion.visor.module.infra.entity.domain.DictValueDO; -import com.orion.visor.module.infra.entity.domain.HistoryValueDO; -import com.orion.visor.module.infra.entity.request.dict.DictValueCreateRequest; -import com.orion.visor.module.infra.entity.request.dict.DictValueQueryRequest; -import com.orion.visor.module.infra.entity.request.dict.DictValueRollbackRequest; -import com.orion.visor.module.infra.entity.request.dict.DictValueUpdateRequest; -import com.orion.visor.module.infra.entity.request.history.HistoryValueCreateRequest; -import com.orion.visor.module.infra.entity.vo.DictValueVO; -import com.orion.visor.module.infra.enums.DictValueTypeEnum; -import com.orion.visor.module.infra.enums.HistoryValueTypeEnum; -import com.orion.visor.module.infra.service.DictKeyService; -import com.orion.visor.module.infra.service.DictValueService; -import com.orion.visor.module.infra.service.HistoryValueService; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; +import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.framework.common.constant.ErrorMessage; +import org.dromara.visor.framework.common.constant.FieldConst; +import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.framework.mybatis.core.query.Conditions; +import org.dromara.visor.framework.redis.core.utils.RedisStrings; +import org.dromara.visor.module.infra.convert.DictValueConvert; +import org.dromara.visor.module.infra.dao.DictKeyDAO; +import org.dromara.visor.module.infra.dao.DictValueDAO; +import org.dromara.visor.module.infra.define.cache.DictCacheKeyDefine; +import org.dromara.visor.module.infra.entity.domain.DictKeyDO; +import org.dromara.visor.module.infra.entity.domain.DictValueDO; +import org.dromara.visor.module.infra.entity.domain.HistoryValueDO; +import org.dromara.visor.module.infra.entity.request.dict.DictValueCreateRequest; +import org.dromara.visor.module.infra.entity.request.dict.DictValueQueryRequest; +import org.dromara.visor.module.infra.entity.request.dict.DictValueRollbackRequest; +import org.dromara.visor.module.infra.entity.request.dict.DictValueUpdateRequest; +import org.dromara.visor.module.infra.entity.request.history.HistoryValueCreateRequest; +import org.dromara.visor.module.infra.entity.vo.DictValueVO; +import org.dromara.visor.module.infra.enums.DictValueTypeEnum; +import org.dromara.visor.module.infra.enums.HistoryValueTypeEnum; +import org.dromara.visor.module.infra.service.DictKeyService; +import org.dromara.visor.module.infra.service.DictValueService; +import org.dromara.visor.module.infra.service.HistoryValueService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/FavoriteServiceImpl.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/FavoriteServiceImpl.java similarity index 83% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/FavoriteServiceImpl.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/FavoriteServiceImpl.java index 354d1b21..0ea37499 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/FavoriteServiceImpl.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/FavoriteServiceImpl.java @@ -13,25 +13,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.service.impl; +package org.dromara.visor.module.infra.service.impl; +import cn.orionsec.kit.lang.annotation.Keep; +import cn.orionsec.kit.lang.utils.collect.Lists; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.lang.annotation.Keep; -import com.orion.lang.utils.collect.Lists; -import com.orion.visor.framework.common.utils.Valid; -import com.orion.visor.framework.redis.core.utils.RedisLists; -import com.orion.visor.framework.redis.core.utils.barrier.CacheBarriers; -import com.orion.visor.framework.security.core.utils.SecurityUtils; -import com.orion.visor.module.infra.convert.FavoriteConvert; -import com.orion.visor.module.infra.dao.FavoriteDAO; -import com.orion.visor.module.infra.define.cache.FavoriteCacheKeyDefine; -import com.orion.visor.module.infra.entity.domain.FavoriteDO; -import com.orion.visor.module.infra.entity.request.favorite.FavoriteOperatorRequest; -import com.orion.visor.module.infra.entity.request.favorite.FavoriteQueryRequest; -import com.orion.visor.module.infra.entity.vo.FavoriteVO; -import com.orion.visor.module.infra.enums.FavoriteTypeEnum; -import com.orion.visor.module.infra.service.FavoriteService; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.framework.redis.core.utils.RedisLists; +import org.dromara.visor.framework.redis.core.utils.barrier.CacheBarriers; +import org.dromara.visor.framework.security.core.utils.SecurityUtils; +import org.dromara.visor.module.infra.convert.FavoriteConvert; +import org.dromara.visor.module.infra.dao.FavoriteDAO; +import org.dromara.visor.module.infra.define.cache.FavoriteCacheKeyDefine; +import org.dromara.visor.module.infra.entity.domain.FavoriteDO; +import org.dromara.visor.module.infra.entity.request.favorite.FavoriteOperatorRequest; +import org.dromara.visor.module.infra.entity.request.favorite.FavoriteQueryRequest; +import org.dromara.visor.module.infra.entity.vo.FavoriteVO; +import org.dromara.visor.module.infra.enums.FavoriteTypeEnum; +import org.dromara.visor.module.infra.service.FavoriteService; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/FileUploadServiceImpl.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/FileUploadServiceImpl.java similarity index 83% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/FileUploadServiceImpl.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/FileUploadServiceImpl.java index eb87c774..9fdee98f 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/FileUploadServiceImpl.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/FileUploadServiceImpl.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.service.impl; +package org.dromara.visor.module.infra.service.impl; -import com.orion.lang.id.UUIds; -import com.orion.visor.framework.redis.core.utils.RedisStrings; -import com.orion.visor.module.infra.define.cache.FileUploadCacheKeyDefine; -import com.orion.visor.module.infra.entity.dto.FileUploadTokenDTO; -import com.orion.visor.module.infra.service.FileUploadService; +import cn.orionsec.kit.lang.id.UUIds; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.redis.core.utils.RedisStrings; +import org.dromara.visor.module.infra.define.cache.FileUploadCacheKeyDefine; +import org.dromara.visor.module.infra.entity.dto.FileUploadTokenDTO; +import org.dromara.visor.module.infra.service.FileUploadService; import org.springframework.stereotype.Service; /** diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/HistoryValueServiceImpl.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/HistoryValueServiceImpl.java similarity index 85% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/HistoryValueServiceImpl.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/HistoryValueServiceImpl.java index 76f9c89f..23ae9477 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/HistoryValueServiceImpl.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/HistoryValueServiceImpl.java @@ -13,20 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.service.impl; +package org.dromara.visor.module.infra.service.impl; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import cn.orionsec.kit.lang.utils.Strings; 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.visor.module.infra.convert.HistoryValueConvert; -import com.orion.visor.module.infra.dao.HistoryValueDAO; -import com.orion.visor.module.infra.entity.domain.HistoryValueDO; -import com.orion.visor.module.infra.entity.request.history.HistoryValueCreateRequest; -import com.orion.visor.module.infra.entity.request.history.HistoryValueQueryRequest; -import com.orion.visor.module.infra.entity.vo.HistoryValueVO; -import com.orion.visor.module.infra.service.HistoryValueService; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.module.infra.convert.HistoryValueConvert; +import org.dromara.visor.module.infra.dao.HistoryValueDAO; +import org.dromara.visor.module.infra.entity.domain.HistoryValueDO; +import org.dromara.visor.module.infra.entity.request.history.HistoryValueCreateRequest; +import org.dromara.visor.module.infra.entity.request.history.HistoryValueQueryRequest; +import org.dromara.visor.module.infra.entity.vo.HistoryValueVO; +import org.dromara.visor.module.infra.service.HistoryValueService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/MineServiceImpl.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/MineServiceImpl.java similarity index 69% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/MineServiceImpl.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/MineServiceImpl.java index 2d1a91a7..6913694f 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/MineServiceImpl.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/MineServiceImpl.java @@ -13,29 +13,29 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.service.impl; +package org.dromara.visor.module.infra.service.impl; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.lang.utils.crypto.Signatures; -import com.orion.visor.framework.common.constant.ErrorMessage; -import com.orion.visor.framework.common.utils.Valid; -import com.orion.visor.framework.security.core.utils.SecurityUtils; -import com.orion.visor.module.infra.dao.SystemUserDAO; -import com.orion.visor.module.infra.entity.domain.SystemUserDO; -import com.orion.visor.module.infra.entity.request.operator.OperatorLogQueryRequest; -import com.orion.visor.module.infra.entity.request.user.SystemUserUpdateRequest; -import com.orion.visor.module.infra.entity.request.user.UserResetPasswordRequest; -import com.orion.visor.module.infra.entity.request.user.UserSessionOfflineRequest; -import com.orion.visor.module.infra.entity.request.user.UserUpdatePasswordRequest; -import com.orion.visor.module.infra.entity.vo.LoginHistoryVO; -import com.orion.visor.module.infra.entity.vo.OperatorLogVO; -import com.orion.visor.module.infra.entity.vo.SystemUserVO; -import com.orion.visor.module.infra.entity.vo.UserSessionVO; -import com.orion.visor.module.infra.service.MineService; -import com.orion.visor.module.infra.service.OperatorLogService; -import com.orion.visor.module.infra.service.SystemUserManagementService; -import com.orion.visor.module.infra.service.SystemUserService; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import cn.orionsec.kit.lang.utils.crypto.Signatures; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.common.constant.ErrorMessage; +import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.framework.security.core.utils.SecurityUtils; +import org.dromara.visor.module.infra.dao.SystemUserDAO; +import org.dromara.visor.module.infra.entity.domain.SystemUserDO; +import org.dromara.visor.module.infra.entity.request.operator.OperatorLogQueryRequest; +import org.dromara.visor.module.infra.entity.request.user.SystemUserUpdateRequest; +import org.dromara.visor.module.infra.entity.request.user.UserResetPasswordRequest; +import org.dromara.visor.module.infra.entity.request.user.UserSessionOfflineRequest; +import org.dromara.visor.module.infra.entity.request.user.UserUpdatePasswordRequest; +import org.dromara.visor.module.infra.entity.vo.LoginHistoryVO; +import org.dromara.visor.module.infra.entity.vo.OperatorLogVO; +import org.dromara.visor.module.infra.entity.vo.SystemUserVO; +import org.dromara.visor.module.infra.entity.vo.UserSessionVO; +import org.dromara.visor.module.infra.service.MineService; +import org.dromara.visor.module.infra.service.OperatorLogService; +import org.dromara.visor.module.infra.service.SystemUserManagementService; +import org.dromara.visor.module.infra.service.SystemUserService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/OperatorLogServiceImpl.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/OperatorLogServiceImpl.java similarity index 80% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/OperatorLogServiceImpl.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/OperatorLogServiceImpl.java index 49eafd5e..6c071b77 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/OperatorLogServiceImpl.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/OperatorLogServiceImpl.java @@ -13,27 +13,27 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.service.impl; +package org.dromara.visor.module.infra.service.impl; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import cn.orionsec.kit.lang.utils.Arrays1; +import cn.orionsec.kit.lang.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.Arrays1; -import com.orion.lang.utils.Valid; -import com.orion.visor.framework.biz.operator.log.core.model.OperatorLogModel; -import com.orion.visor.framework.biz.operator.log.core.utils.OperatorLogs; -import com.orion.visor.framework.common.constant.ErrorMessage; -import com.orion.visor.framework.common.utils.SqlUtils; -import com.orion.visor.module.infra.convert.OperatorLogConvert; -import com.orion.visor.module.infra.dao.OperatorLogDAO; -import com.orion.visor.module.infra.define.operator.AuthenticationOperatorType; -import com.orion.visor.module.infra.entity.domain.OperatorLogDO; -import com.orion.visor.module.infra.entity.request.operator.OperatorLogClearRequest; -import com.orion.visor.module.infra.entity.request.operator.OperatorLogQueryRequest; -import com.orion.visor.module.infra.entity.vo.LoginHistoryVO; -import com.orion.visor.module.infra.entity.vo.OperatorLogVO; -import com.orion.visor.module.infra.service.OperatorLogService; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.biz.operator.log.core.model.OperatorLogModel; +import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; +import org.dromara.visor.framework.common.constant.ErrorMessage; +import org.dromara.visor.framework.common.utils.SqlUtils; +import org.dromara.visor.module.infra.convert.OperatorLogConvert; +import org.dromara.visor.module.infra.dao.OperatorLogDAO; +import org.dromara.visor.module.infra.define.operator.AuthenticationOperatorType; +import org.dromara.visor.module.infra.entity.domain.OperatorLogDO; +import org.dromara.visor.module.infra.entity.request.operator.OperatorLogClearRequest; +import org.dromara.visor.module.infra.entity.request.operator.OperatorLogQueryRequest; +import org.dromara.visor.module.infra.entity.vo.LoginHistoryVO; +import org.dromara.visor.module.infra.entity.vo.OperatorLogVO; +import org.dromara.visor.module.infra.service.OperatorLogService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/PermissionServiceImpl.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/PermissionServiceImpl.java similarity index 85% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/PermissionServiceImpl.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/PermissionServiceImpl.java index bbf6bb88..eaec68fe 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/PermissionServiceImpl.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/PermissionServiceImpl.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.service.impl; +package org.dromara.visor.module.infra.service.impl; -import com.orion.lang.utils.collect.Lists; -import com.orion.visor.module.infra.dao.SystemRoleDAO; -import com.orion.visor.module.infra.define.RoleDefine; -import com.orion.visor.module.infra.entity.domain.SystemRoleDO; -import com.orion.visor.module.infra.enums.RoleStatusEnum; -import com.orion.visor.module.infra.service.PermissionService; +import cn.orionsec.kit.lang.utils.collect.Lists; +import org.dromara.visor.module.infra.dao.SystemRoleDAO; +import org.dromara.visor.module.infra.define.RoleDefine; +import org.dromara.visor.module.infra.entity.domain.SystemRoleDO; +import org.dromara.visor.module.infra.enums.RoleStatusEnum; +import org.dromara.visor.module.infra.service.PermissionService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/PreferenceServiceImpl.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/PreferenceServiceImpl.java similarity index 91% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/PreferenceServiceImpl.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/PreferenceServiceImpl.java index 5a2745ed..9ae10983 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/PreferenceServiceImpl.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/PreferenceServiceImpl.java @@ -13,24 +13,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.service.impl; +package org.dromara.visor.module.infra.service.impl; +import cn.orionsec.kit.lang.function.Functions; +import cn.orionsec.kit.lang.utils.Refs; +import cn.orionsec.kit.lang.utils.collect.Lists; +import cn.orionsec.kit.lang.utils.collect.Maps; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.lang.function.Functions; -import com.orion.lang.utils.Refs; -import com.orion.lang.utils.collect.Lists; -import com.orion.lang.utils.collect.Maps; -import com.orion.visor.framework.common.utils.Valid; -import com.orion.visor.framework.redis.core.utils.RedisMaps; -import com.orion.visor.framework.security.core.utils.SecurityUtils; -import com.orion.visor.module.infra.dao.PreferenceDAO; -import com.orion.visor.module.infra.define.cache.PreferenceCacheKeyDefine; -import com.orion.visor.module.infra.entity.domain.PreferenceDO; -import com.orion.visor.module.infra.entity.request.preference.PreferenceUpdatePartialRequest; -import com.orion.visor.module.infra.entity.request.preference.PreferenceUpdateRequest; -import com.orion.visor.module.infra.enums.PreferenceTypeEnum; -import com.orion.visor.module.infra.service.PreferenceService; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.framework.redis.core.utils.RedisMaps; +import org.dromara.visor.framework.security.core.utils.SecurityUtils; +import org.dromara.visor.module.infra.dao.PreferenceDAO; +import org.dromara.visor.module.infra.define.cache.PreferenceCacheKeyDefine; +import org.dromara.visor.module.infra.entity.domain.PreferenceDO; +import org.dromara.visor.module.infra.entity.request.preference.PreferenceUpdatePartialRequest; +import org.dromara.visor.module.infra.entity.request.preference.PreferenceUpdateRequest; +import org.dromara.visor.module.infra.enums.PreferenceTypeEnum; +import org.dromara.visor.module.infra.service.PreferenceService; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/SystemMenuServiceImpl.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemMenuServiceImpl.java similarity index 89% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/SystemMenuServiceImpl.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemMenuServiceImpl.java index f5654143..2eed41f6 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/SystemMenuServiceImpl.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemMenuServiceImpl.java @@ -13,32 +13,32 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.service.impl; +package org.dromara.visor.module.infra.service.impl; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.collect.Lists; import com.alibaba.fastjson.JSON; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.collect.Lists; -import com.orion.visor.framework.biz.operator.log.core.utils.OperatorLogs; -import com.orion.visor.framework.common.constant.Const; -import com.orion.visor.framework.common.constant.ErrorMessage; -import com.orion.visor.framework.common.utils.Valid; -import com.orion.visor.framework.mybatis.core.query.Conditions; -import com.orion.visor.module.infra.convert.SystemMenuConvert; -import com.orion.visor.module.infra.dao.SystemMenuDAO; -import com.orion.visor.module.infra.dao.SystemRoleMenuDAO; -import com.orion.visor.module.infra.entity.domain.SystemMenuDO; -import com.orion.visor.module.infra.entity.dto.SystemMenuCacheDTO; -import com.orion.visor.module.infra.entity.request.menu.SystemMenuCreateRequest; -import com.orion.visor.module.infra.entity.request.menu.SystemMenuQueryRequest; -import com.orion.visor.module.infra.entity.request.menu.SystemMenuUpdateRequest; -import com.orion.visor.module.infra.entity.request.menu.SystemMenuUpdateStatusRequest; -import com.orion.visor.module.infra.entity.vo.SystemMenuVO; -import com.orion.visor.module.infra.enums.MenuStatusEnum; -import com.orion.visor.module.infra.enums.MenuTypeEnum; -import com.orion.visor.module.infra.enums.MenuVisibleEnum; -import com.orion.visor.module.infra.service.SystemMenuService; -import com.orion.visor.module.infra.service.UserPermissionService; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; +import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.framework.common.constant.ErrorMessage; +import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.framework.mybatis.core.query.Conditions; +import org.dromara.visor.module.infra.convert.SystemMenuConvert; +import org.dromara.visor.module.infra.dao.SystemMenuDAO; +import org.dromara.visor.module.infra.dao.SystemRoleMenuDAO; +import org.dromara.visor.module.infra.entity.domain.SystemMenuDO; +import org.dromara.visor.module.infra.entity.dto.SystemMenuCacheDTO; +import org.dromara.visor.module.infra.entity.request.menu.SystemMenuCreateRequest; +import org.dromara.visor.module.infra.entity.request.menu.SystemMenuQueryRequest; +import org.dromara.visor.module.infra.entity.request.menu.SystemMenuUpdateRequest; +import org.dromara.visor.module.infra.entity.request.menu.SystemMenuUpdateStatusRequest; +import org.dromara.visor.module.infra.entity.vo.SystemMenuVO; +import org.dromara.visor.module.infra.enums.MenuStatusEnum; +import org.dromara.visor.module.infra.enums.MenuTypeEnum; +import org.dromara.visor.module.infra.enums.MenuVisibleEnum; +import org.dromara.visor.module.infra.service.SystemMenuService; +import org.dromara.visor.module.infra.service.UserPermissionService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/SystemMessageServiceImpl.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemMessageServiceImpl.java similarity index 87% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/SystemMessageServiceImpl.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemMessageServiceImpl.java index 02c88f69..295dde7a 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/SystemMessageServiceImpl.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemMessageServiceImpl.java @@ -13,25 +13,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.service.impl; +package org.dromara.visor.module.infra.service.impl; +import cn.orionsec.kit.lang.function.Functions; +import cn.orionsec.kit.lang.utils.Booleans; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.lang.function.Functions; -import com.orion.lang.utils.Booleans; -import com.orion.visor.framework.security.core.utils.SecurityUtils; -import com.orion.visor.module.infra.convert.SystemMessageConvert; -import com.orion.visor.module.infra.dao.SystemMessageDAO; -import com.orion.visor.module.infra.dao.SystemUserDAO; -import com.orion.visor.module.infra.entity.domain.SystemMessageDO; -import com.orion.visor.module.infra.entity.domain.SystemUserDO; -import com.orion.visor.module.infra.entity.po.SystemMessageCountPO; -import com.orion.visor.module.infra.entity.request.message.SystemMessageCreateRequest; -import com.orion.visor.module.infra.entity.request.message.SystemMessageQueryRequest; -import com.orion.visor.module.infra.entity.vo.SystemMessageVO; -import com.orion.visor.module.infra.enums.MessageStatusEnum; -import com.orion.visor.module.infra.service.SystemMessageService; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.security.core.utils.SecurityUtils; +import org.dromara.visor.module.infra.convert.SystemMessageConvert; +import org.dromara.visor.module.infra.dao.SystemMessageDAO; +import org.dromara.visor.module.infra.dao.SystemUserDAO; +import org.dromara.visor.module.infra.entity.domain.SystemMessageDO; +import org.dromara.visor.module.infra.entity.domain.SystemUserDO; +import org.dromara.visor.module.infra.entity.po.SystemMessageCountPO; +import org.dromara.visor.module.infra.entity.request.message.SystemMessageCreateRequest; +import org.dromara.visor.module.infra.entity.request.message.SystemMessageQueryRequest; +import org.dromara.visor.module.infra.entity.vo.SystemMessageVO; +import org.dromara.visor.module.infra.enums.MessageStatusEnum; +import org.dromara.visor.module.infra.service.SystemMessageService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/SystemRoleMenuServiceImpl.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemRoleMenuServiceImpl.java similarity index 79% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/SystemRoleMenuServiceImpl.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemRoleMenuServiceImpl.java index 97c41178..260583f4 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/SystemRoleMenuServiceImpl.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemRoleMenuServiceImpl.java @@ -13,27 +13,27 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.service.impl; +package org.dromara.visor.module.infra.service.impl; +import cn.orionsec.kit.lang.utils.collect.Lists; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.lang.utils.collect.Lists; -import com.orion.visor.framework.biz.operator.log.core.utils.OperatorLogs; -import com.orion.visor.framework.common.constant.ErrorCode; -import com.orion.visor.framework.common.constant.ErrorMessage; -import com.orion.visor.framework.common.utils.Valid; -import com.orion.visor.framework.mybatis.core.query.Conditions; -import com.orion.visor.module.infra.convert.SystemMenuConvert; -import com.orion.visor.module.infra.dao.SystemMenuDAO; -import com.orion.visor.module.infra.dao.SystemRoleDAO; -import com.orion.visor.module.infra.dao.SystemRoleMenuDAO; -import com.orion.visor.module.infra.entity.domain.SystemMenuDO; -import com.orion.visor.module.infra.entity.domain.SystemRoleDO; -import com.orion.visor.module.infra.entity.domain.SystemRoleMenuDO; -import com.orion.visor.module.infra.entity.dto.SystemMenuCacheDTO; -import com.orion.visor.module.infra.entity.request.menu.SystemRoleGrantMenuRequest; -import com.orion.visor.module.infra.service.SystemRoleMenuService; -import com.orion.visor.module.infra.service.UserPermissionService; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; +import org.dromara.visor.framework.common.constant.ErrorCode; +import org.dromara.visor.framework.common.constant.ErrorMessage; +import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.framework.mybatis.core.query.Conditions; +import org.dromara.visor.module.infra.convert.SystemMenuConvert; +import org.dromara.visor.module.infra.dao.SystemMenuDAO; +import org.dromara.visor.module.infra.dao.SystemRoleDAO; +import org.dromara.visor.module.infra.dao.SystemRoleMenuDAO; +import org.dromara.visor.module.infra.entity.domain.SystemMenuDO; +import org.dromara.visor.module.infra.entity.domain.SystemRoleDO; +import org.dromara.visor.module.infra.entity.domain.SystemRoleMenuDO; +import org.dromara.visor.module.infra.entity.dto.SystemMenuCacheDTO; +import org.dromara.visor.module.infra.entity.request.menu.SystemRoleGrantMenuRequest; +import org.dromara.visor.module.infra.service.SystemRoleMenuService; +import org.dromara.visor.module.infra.service.UserPermissionService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/SystemRoleServiceImpl.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemRoleServiceImpl.java similarity index 85% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/SystemRoleServiceImpl.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemRoleServiceImpl.java index 6298677d..8b542975 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/SystemRoleServiceImpl.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemRoleServiceImpl.java @@ -13,32 +13,32 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.service.impl; +package org.dromara.visor.module.infra.service.impl; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import cn.orionsec.kit.lang.utils.collect.Lists; 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.collect.Lists; -import com.orion.visor.framework.biz.operator.log.core.utils.OperatorLogs; -import com.orion.visor.framework.common.constant.ErrorMessage; -import com.orion.visor.framework.common.utils.Valid; -import com.orion.visor.module.infra.convert.SystemRoleConvert; -import com.orion.visor.module.infra.dao.SystemRoleDAO; -import com.orion.visor.module.infra.dao.SystemRoleMenuDAO; -import com.orion.visor.module.infra.dao.SystemUserRoleDAO; -import com.orion.visor.module.infra.define.RoleDefine; -import com.orion.visor.module.infra.entity.domain.SystemRoleDO; -import com.orion.visor.module.infra.entity.request.role.SystemRoleCreateRequest; -import com.orion.visor.module.infra.entity.request.role.SystemRoleQueryRequest; -import com.orion.visor.module.infra.entity.request.role.SystemRoleStatusRequest; -import com.orion.visor.module.infra.entity.request.role.SystemRoleUpdateRequest; -import com.orion.visor.module.infra.entity.vo.SystemRoleVO; -import com.orion.visor.module.infra.enums.RoleStatusEnum; -import com.orion.visor.module.infra.service.DataPermissionService; -import com.orion.visor.module.infra.service.SystemRoleService; -import com.orion.visor.module.infra.service.SystemUserRoleService; -import com.orion.visor.module.infra.service.UserPermissionService; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; +import org.dromara.visor.framework.common.constant.ErrorMessage; +import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.module.infra.convert.SystemRoleConvert; +import org.dromara.visor.module.infra.dao.SystemRoleDAO; +import org.dromara.visor.module.infra.dao.SystemRoleMenuDAO; +import org.dromara.visor.module.infra.dao.SystemUserRoleDAO; +import org.dromara.visor.module.infra.define.RoleDefine; +import org.dromara.visor.module.infra.entity.domain.SystemRoleDO; +import org.dromara.visor.module.infra.entity.request.role.SystemRoleCreateRequest; +import org.dromara.visor.module.infra.entity.request.role.SystemRoleQueryRequest; +import org.dromara.visor.module.infra.entity.request.role.SystemRoleStatusRequest; +import org.dromara.visor.module.infra.entity.request.role.SystemRoleUpdateRequest; +import org.dromara.visor.module.infra.entity.vo.SystemRoleVO; +import org.dromara.visor.module.infra.enums.RoleStatusEnum; +import org.dromara.visor.module.infra.service.DataPermissionService; +import org.dromara.visor.module.infra.service.SystemRoleService; +import org.dromara.visor.module.infra.service.SystemUserRoleService; +import org.dromara.visor.module.infra.service.UserPermissionService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/SystemSettingServiceImpl.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemSettingServiceImpl.java similarity index 83% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/SystemSettingServiceImpl.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemSettingServiceImpl.java index 1b21167d..11cf9c14 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/SystemSettingServiceImpl.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemSettingServiceImpl.java @@ -13,34 +13,34 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.service.impl; +package org.dromara.visor.module.infra.service.impl; +import cn.orionsec.kit.ext.process.ProcessAwaitExecutor; +import cn.orionsec.kit.lang.function.Functions; +import cn.orionsec.kit.lang.support.Attempt; +import cn.orionsec.kit.lang.utils.Arrays1; +import cn.orionsec.kit.lang.utils.Refs; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.collect.Maps; +import cn.orionsec.kit.lang.utils.crypto.Signatures; +import cn.orionsec.kit.lang.utils.io.Streams; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.ext.process.ProcessAwaitExecutor; -import com.orion.lang.function.Functions; -import com.orion.lang.support.Attempt; -import com.orion.lang.utils.Arrays1; -import com.orion.lang.utils.Refs; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.collect.Maps; -import com.orion.lang.utils.crypto.Signatures; -import com.orion.lang.utils.io.Streams; -import com.orion.visor.framework.biz.operator.log.core.utils.OperatorLogs; -import com.orion.visor.framework.common.constant.AppConst; -import com.orion.visor.framework.common.constant.Const; -import com.orion.visor.framework.common.constant.ErrorMessage; -import com.orion.visor.framework.common.utils.Valid; -import com.orion.visor.framework.redis.core.utils.RedisMaps; -import com.orion.visor.framework.redis.core.utils.RedisUtils; -import com.orion.visor.module.infra.dao.SystemSettingDAO; -import com.orion.visor.module.infra.define.cache.SystemSettingKeyDefine; -import com.orion.visor.module.infra.define.operator.SystemSettingOperatorType; -import com.orion.visor.module.infra.entity.domain.SystemSettingDO; -import com.orion.visor.module.infra.entity.request.system.SystemSettingUpdatePartialRequest; -import com.orion.visor.module.infra.entity.request.system.SystemSettingUpdateRequest; -import com.orion.visor.module.infra.entity.vo.AppInfoVO; -import com.orion.visor.module.infra.enums.SystemSettingTypeEnum; -import com.orion.visor.module.infra.service.SystemSettingService; +import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; +import org.dromara.visor.framework.common.constant.AppConst; +import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.framework.common.constant.ErrorMessage; +import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.framework.redis.core.utils.RedisMaps; +import org.dromara.visor.framework.redis.core.utils.RedisUtils; +import org.dromara.visor.module.infra.dao.SystemSettingDAO; +import org.dromara.visor.module.infra.define.cache.SystemSettingKeyDefine; +import org.dromara.visor.module.infra.define.operator.SystemSettingOperatorType; +import org.dromara.visor.module.infra.entity.domain.SystemSettingDO; +import org.dromara.visor.module.infra.entity.request.system.SystemSettingUpdatePartialRequest; +import org.dromara.visor.module.infra.entity.request.system.SystemSettingUpdateRequest; +import org.dromara.visor.module.infra.entity.vo.AppInfoVO; +import org.dromara.visor.module.infra.enums.SystemSettingTypeEnum; +import org.dromara.visor.module.infra.service.SystemSettingService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/SystemUserManagementServiceImpl.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemUserManagementServiceImpl.java similarity index 78% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/SystemUserManagementServiceImpl.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemUserManagementServiceImpl.java index b77ab9ed..452d07ce 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/SystemUserManagementServiceImpl.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemUserManagementServiceImpl.java @@ -13,25 +13,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.service.impl; +package org.dromara.visor.module.infra.service.impl; -import com.orion.lang.utils.collect.Lists; -import com.orion.visor.framework.biz.operator.log.core.utils.OperatorLogs; -import com.orion.visor.framework.common.constant.ErrorMessage; -import com.orion.visor.framework.common.utils.Requests; -import com.orion.visor.framework.common.utils.Valid; -import com.orion.visor.framework.redis.core.utils.RedisStrings; -import com.orion.visor.framework.security.core.utils.SecurityUtils; -import com.orion.visor.module.infra.dao.SystemUserDAO; -import com.orion.visor.module.infra.define.cache.UserCacheKeyDefine; -import com.orion.visor.module.infra.entity.domain.SystemUserDO; -import com.orion.visor.module.infra.entity.dto.LoginTokenDTO; -import com.orion.visor.module.infra.entity.dto.LoginTokenIdentityDTO; -import com.orion.visor.module.infra.entity.request.user.UserSessionOfflineRequest; -import com.orion.visor.module.infra.entity.vo.UserSessionVO; -import com.orion.visor.module.infra.enums.LoginTokenStatusEnum; -import com.orion.visor.module.infra.service.SystemUserManagementService; +import cn.orionsec.kit.lang.utils.collect.Lists; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; +import org.dromara.visor.framework.common.constant.ErrorMessage; +import org.dromara.visor.framework.common.utils.Requests; +import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.framework.redis.core.utils.RedisStrings; +import org.dromara.visor.framework.security.core.utils.SecurityUtils; +import org.dromara.visor.module.infra.dao.SystemUserDAO; +import org.dromara.visor.module.infra.define.cache.UserCacheKeyDefine; +import org.dromara.visor.module.infra.entity.domain.SystemUserDO; +import org.dromara.visor.module.infra.entity.dto.LoginTokenDTO; +import org.dromara.visor.module.infra.entity.dto.LoginTokenIdentityDTO; +import org.dromara.visor.module.infra.entity.request.user.UserSessionOfflineRequest; +import org.dromara.visor.module.infra.entity.vo.UserSessionVO; +import org.dromara.visor.module.infra.enums.LoginTokenStatusEnum; +import org.dromara.visor.module.infra.service.SystemUserManagementService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/SystemUserRoleServiceImpl.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemUserRoleServiceImpl.java similarity index 82% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/SystemUserRoleServiceImpl.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemUserRoleServiceImpl.java index 7d21f278..0c10ab24 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/SystemUserRoleServiceImpl.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemUserRoleServiceImpl.java @@ -13,26 +13,26 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.service.impl; +package org.dromara.visor.module.infra.service.impl; -import com.orion.lang.utils.collect.Lists; -import com.orion.visor.framework.biz.operator.log.core.utils.OperatorLogs; -import com.orion.visor.framework.common.constant.ErrorMessage; -import com.orion.visor.framework.common.security.LoginUser; -import com.orion.visor.framework.common.security.UserRole; -import com.orion.visor.framework.common.utils.Valid; -import com.orion.visor.framework.redis.core.utils.RedisStrings; -import com.orion.visor.module.infra.dao.SystemRoleDAO; -import com.orion.visor.module.infra.dao.SystemUserDAO; -import com.orion.visor.module.infra.dao.SystemUserRoleDAO; -import com.orion.visor.module.infra.define.cache.UserCacheKeyDefine; -import com.orion.visor.module.infra.entity.domain.SystemRoleDO; -import com.orion.visor.module.infra.entity.domain.SystemUserDO; -import com.orion.visor.module.infra.entity.domain.SystemUserRoleDO; -import com.orion.visor.module.infra.entity.request.user.SystemUserUpdateRoleRequest; -import com.orion.visor.module.infra.service.DataPermissionService; -import com.orion.visor.module.infra.service.SystemUserRoleService; +import cn.orionsec.kit.lang.utils.collect.Lists; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; +import org.dromara.visor.framework.common.constant.ErrorMessage; +import org.dromara.visor.framework.common.security.LoginUser; +import org.dromara.visor.framework.common.security.UserRole; +import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.framework.redis.core.utils.RedisStrings; +import org.dromara.visor.module.infra.dao.SystemRoleDAO; +import org.dromara.visor.module.infra.dao.SystemUserDAO; +import org.dromara.visor.module.infra.dao.SystemUserRoleDAO; +import org.dromara.visor.module.infra.define.cache.UserCacheKeyDefine; +import org.dromara.visor.module.infra.entity.domain.SystemRoleDO; +import org.dromara.visor.module.infra.entity.domain.SystemUserDO; +import org.dromara.visor.module.infra.entity.domain.SystemUserRoleDO; +import org.dromara.visor.module.infra.entity.request.user.SystemUserUpdateRoleRequest; +import org.dromara.visor.module.infra.service.DataPermissionService; +import org.dromara.visor.module.infra.service.SystemUserRoleService; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/SystemUserServiceImpl.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemUserServiceImpl.java similarity index 86% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/SystemUserServiceImpl.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemUserServiceImpl.java index 5fc06e35..b5f5ce84 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/SystemUserServiceImpl.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemUserServiceImpl.java @@ -13,44 +13,44 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.service.impl; +package org.dromara.visor.module.infra.service.impl; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import cn.orionsec.kit.lang.utils.collect.Lists; +import cn.orionsec.kit.lang.utils.crypto.Signatures; +import cn.orionsec.kit.spring.SpringHolder; 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.collect.Lists; -import com.orion.lang.utils.crypto.Signatures; -import com.orion.spring.SpringHolder; -import com.orion.visor.framework.biz.operator.log.core.utils.OperatorLogs; -import com.orion.visor.framework.common.constant.Const; -import com.orion.visor.framework.common.constant.ErrorCode; -import com.orion.visor.framework.common.constant.ErrorMessage; -import com.orion.visor.framework.common.security.LoginUser; -import com.orion.visor.framework.common.utils.Valid; -import com.orion.visor.framework.redis.core.utils.RedisMaps; -import com.orion.visor.framework.redis.core.utils.RedisStrings; -import com.orion.visor.framework.redis.core.utils.RedisUtils; -import com.orion.visor.framework.redis.core.utils.barrier.CacheBarriers; -import com.orion.visor.framework.security.core.utils.SecurityUtils; -import com.orion.visor.module.asset.api.CommandSnippetApi; -import com.orion.visor.module.asset.api.PathBookmarkApi; -import com.orion.visor.module.infra.convert.SystemRoleConvert; -import com.orion.visor.module.infra.convert.SystemUserConvert; -import com.orion.visor.module.infra.dao.OperatorLogDAO; -import com.orion.visor.module.infra.dao.SystemRoleDAO; -import com.orion.visor.module.infra.dao.SystemUserDAO; -import com.orion.visor.module.infra.dao.SystemUserRoleDAO; -import com.orion.visor.module.infra.define.cache.TipsCacheKeyDefine; -import com.orion.visor.module.infra.define.cache.UserCacheKeyDefine; -import com.orion.visor.module.infra.define.config.AppAuthenticationConfig; -import com.orion.visor.module.infra.entity.domain.SystemRoleDO; -import com.orion.visor.module.infra.entity.domain.SystemUserDO; -import com.orion.visor.module.infra.entity.dto.UserInfoDTO; -import com.orion.visor.module.infra.entity.request.user.*; -import com.orion.visor.module.infra.entity.vo.SystemUserVO; -import com.orion.visor.module.infra.enums.UserStatusEnum; -import com.orion.visor.module.infra.service.*; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; +import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.framework.common.constant.ErrorCode; +import org.dromara.visor.framework.common.constant.ErrorMessage; +import org.dromara.visor.framework.common.security.LoginUser; +import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.framework.redis.core.utils.RedisMaps; +import org.dromara.visor.framework.redis.core.utils.RedisStrings; +import org.dromara.visor.framework.redis.core.utils.RedisUtils; +import org.dromara.visor.framework.redis.core.utils.barrier.CacheBarriers; +import org.dromara.visor.framework.security.core.utils.SecurityUtils; +import org.dromara.visor.module.asset.api.CommandSnippetApi; +import org.dromara.visor.module.asset.api.PathBookmarkApi; +import org.dromara.visor.module.infra.convert.SystemRoleConvert; +import org.dromara.visor.module.infra.convert.SystemUserConvert; +import org.dromara.visor.module.infra.dao.OperatorLogDAO; +import org.dromara.visor.module.infra.dao.SystemRoleDAO; +import org.dromara.visor.module.infra.dao.SystemUserDAO; +import org.dromara.visor.module.infra.dao.SystemUserRoleDAO; +import org.dromara.visor.module.infra.define.cache.TipsCacheKeyDefine; +import org.dromara.visor.module.infra.define.cache.UserCacheKeyDefine; +import org.dromara.visor.module.infra.define.config.AppAuthenticationConfig; +import org.dromara.visor.module.infra.entity.domain.SystemRoleDO; +import org.dromara.visor.module.infra.entity.domain.SystemUserDO; +import org.dromara.visor.module.infra.entity.dto.UserInfoDTO; +import org.dromara.visor.module.infra.entity.request.user.*; +import org.dromara.visor.module.infra.entity.vo.SystemUserVO; +import org.dromara.visor.module.infra.enums.UserStatusEnum; +import org.dromara.visor.module.infra.service.*; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/TagRelServiceImpl.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/TagRelServiceImpl.java similarity index 90% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/TagRelServiceImpl.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/TagRelServiceImpl.java index 148fd692..80953e30 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/TagRelServiceImpl.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/TagRelServiceImpl.java @@ -13,23 +13,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.service.impl; +package org.dromara.visor.module.infra.service.impl; +import cn.orionsec.kit.lang.annotation.Keep; +import cn.orionsec.kit.lang.utils.collect.Lists; +import cn.orionsec.kit.lang.utils.collect.Maps; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.lang.annotation.Keep; -import com.orion.lang.utils.collect.Lists; -import com.orion.lang.utils.collect.Maps; -import com.orion.visor.framework.redis.core.utils.RedisStrings; -import com.orion.visor.module.infra.convert.TagRelConvert; -import com.orion.visor.module.infra.dao.TagDAO; -import com.orion.visor.module.infra.dao.TagRelDAO; -import com.orion.visor.module.infra.define.cache.TagCacheKeyDefine; -import com.orion.visor.module.infra.entity.domain.TagDO; -import com.orion.visor.module.infra.entity.domain.TagRelDO; -import com.orion.visor.module.infra.entity.dto.TagCacheDTO; -import com.orion.visor.module.infra.entity.request.tag.TagRelQueryRequest; -import com.orion.visor.module.infra.service.TagRelService; +import org.dromara.visor.framework.redis.core.utils.RedisStrings; +import org.dromara.visor.module.infra.convert.TagRelConvert; +import org.dromara.visor.module.infra.dao.TagDAO; +import org.dromara.visor.module.infra.dao.TagRelDAO; +import org.dromara.visor.module.infra.define.cache.TagCacheKeyDefine; +import org.dromara.visor.module.infra.entity.domain.TagDO; +import org.dromara.visor.module.infra.entity.domain.TagRelDO; +import org.dromara.visor.module.infra.entity.dto.TagCacheDTO; +import org.dromara.visor.module.infra.entity.request.tag.TagRelQueryRequest; +import org.dromara.visor.module.infra.service.TagRelService; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/TagServiceImpl.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/TagServiceImpl.java similarity index 86% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/TagServiceImpl.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/TagServiceImpl.java index 6afb806c..ab810b7a 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/TagServiceImpl.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/TagServiceImpl.java @@ -13,23 +13,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.service.impl; +package org.dromara.visor.module.infra.service.impl; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.visor.framework.common.constant.Const; -import com.orion.visor.framework.mybatis.core.query.Conditions; -import com.orion.visor.framework.redis.core.utils.RedisLists; -import com.orion.visor.framework.redis.core.utils.barrier.CacheBarriers; -import com.orion.visor.module.infra.convert.TagConvert; -import com.orion.visor.module.infra.dao.TagDAO; -import com.orion.visor.module.infra.define.cache.TagCacheKeyDefine; -import com.orion.visor.module.infra.entity.domain.TagDO; -import com.orion.visor.module.infra.entity.dto.TagCacheDTO; -import com.orion.visor.module.infra.entity.request.tag.TagCreateRequest; -import com.orion.visor.module.infra.entity.vo.TagVO; -import com.orion.visor.module.infra.service.TagService; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.framework.mybatis.core.query.Conditions; +import org.dromara.visor.framework.redis.core.utils.RedisLists; +import org.dromara.visor.framework.redis.core.utils.barrier.CacheBarriers; +import org.dromara.visor.module.infra.convert.TagConvert; +import org.dromara.visor.module.infra.dao.TagDAO; +import org.dromara.visor.module.infra.define.cache.TagCacheKeyDefine; +import org.dromara.visor.module.infra.entity.domain.TagDO; +import org.dromara.visor.module.infra.entity.dto.TagCacheDTO; +import org.dromara.visor.module.infra.entity.request.tag.TagCreateRequest; +import org.dromara.visor.module.infra.entity.vo.TagVO; +import org.dromara.visor.module.infra.service.TagService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/TipsServiceImpl.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/TipsServiceImpl.java similarity index 78% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/TipsServiceImpl.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/TipsServiceImpl.java index 96156004..8f602a59 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/TipsServiceImpl.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/TipsServiceImpl.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.service.impl; +package org.dromara.visor.module.infra.service.impl; -import com.orion.lang.utils.collect.Lists; -import com.orion.visor.framework.redis.core.utils.RedisLists; -import com.orion.visor.framework.security.core.utils.SecurityUtils; -import com.orion.visor.module.infra.define.cache.TipsCacheKeyDefine; -import com.orion.visor.module.infra.service.TipsService; +import cn.orionsec.kit.lang.utils.collect.Lists; +import org.dromara.visor.framework.redis.core.utils.RedisLists; +import org.dromara.visor.framework.security.core.utils.SecurityUtils; +import org.dromara.visor.module.infra.define.cache.TipsCacheKeyDefine; +import org.dromara.visor.module.infra.service.TipsService; import org.springframework.stereotype.Service; import java.util.List; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/UserPermissionServiceImpl.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/UserPermissionServiceImpl.java similarity index 85% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/UserPermissionServiceImpl.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/UserPermissionServiceImpl.java index cbd60cf5..8dd61e84 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/UserPermissionServiceImpl.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/UserPermissionServiceImpl.java @@ -13,39 +13,39 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.service.impl; +package org.dromara.visor.module.infra.service.impl; -import com.orion.lang.utils.Arrays1; -import com.orion.lang.utils.collect.Lists; -import com.orion.lang.utils.collect.Maps; -import com.orion.visor.framework.common.constant.Const; -import com.orion.visor.framework.common.security.LoginUser; -import com.orion.visor.framework.common.security.UserRole; -import com.orion.visor.framework.security.core.utils.SecurityUtils; -import com.orion.visor.module.infra.convert.SystemMenuConvert; -import com.orion.visor.module.infra.convert.SystemUserConvert; -import com.orion.visor.module.infra.dao.SystemMenuDAO; -import com.orion.visor.module.infra.dao.SystemRoleDAO; -import com.orion.visor.module.infra.dao.SystemRoleMenuDAO; -import com.orion.visor.module.infra.define.RoleDefine; -import com.orion.visor.module.infra.entity.domain.SystemMenuDO; -import com.orion.visor.module.infra.entity.domain.SystemRoleDO; -import com.orion.visor.module.infra.entity.domain.SystemRoleMenuDO; -import com.orion.visor.module.infra.entity.dto.SystemMenuCacheDTO; -import com.orion.visor.module.infra.entity.vo.SystemMenuVO; -import com.orion.visor.module.infra.entity.vo.UserCollectInfoVO; -import com.orion.visor.module.infra.entity.vo.UserPermissionVO; -import com.orion.visor.module.infra.enums.MenuStatusEnum; -import com.orion.visor.module.infra.enums.MenuTypeEnum; -import com.orion.visor.module.infra.enums.PreferenceTypeEnum; -import com.orion.visor.module.infra.enums.RoleStatusEnum; -import com.orion.visor.module.infra.service.PreferenceService; -import com.orion.visor.module.infra.service.SystemMenuService; -import com.orion.visor.module.infra.service.TipsService; -import com.orion.visor.module.infra.service.UserPermissionService; +import cn.orionsec.kit.lang.utils.Arrays1; +import cn.orionsec.kit.lang.utils.collect.Lists; +import cn.orionsec.kit.lang.utils.collect.Maps; import lombok.Getter; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.framework.common.security.LoginUser; +import org.dromara.visor.framework.common.security.UserRole; +import org.dromara.visor.framework.security.core.utils.SecurityUtils; +import org.dromara.visor.module.infra.convert.SystemMenuConvert; +import org.dromara.visor.module.infra.convert.SystemUserConvert; +import org.dromara.visor.module.infra.dao.SystemMenuDAO; +import org.dromara.visor.module.infra.dao.SystemRoleDAO; +import org.dromara.visor.module.infra.dao.SystemRoleMenuDAO; +import org.dromara.visor.module.infra.define.RoleDefine; +import org.dromara.visor.module.infra.entity.domain.SystemMenuDO; +import org.dromara.visor.module.infra.entity.domain.SystemRoleDO; +import org.dromara.visor.module.infra.entity.domain.SystemRoleMenuDO; +import org.dromara.visor.module.infra.entity.dto.SystemMenuCacheDTO; +import org.dromara.visor.module.infra.entity.vo.SystemMenuVO; +import org.dromara.visor.module.infra.entity.vo.UserCollectInfoVO; +import org.dromara.visor.module.infra.entity.vo.UserPermissionVO; +import org.dromara.visor.module.infra.enums.MenuStatusEnum; +import org.dromara.visor.module.infra.enums.MenuTypeEnum; +import org.dromara.visor.module.infra.enums.PreferenceTypeEnum; +import org.dromara.visor.module.infra.enums.RoleStatusEnum; +import org.dromara.visor.module.infra.service.PreferenceService; +import org.dromara.visor.module.infra.service.SystemMenuService; +import org.dromara.visor.module.infra.service.TipsService; +import org.dromara.visor.module.infra.service.UserPermissionService; import org.springframework.stereotype.Service; import javax.annotation.PostConstruct; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/task/TagAutoClearTask.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/task/TagAutoClearTask.java similarity index 89% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/task/TagAutoClearTask.java rename to orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/task/TagAutoClearTask.java index d01adb90..668935bc 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/task/TagAutoClearTask.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/task/TagAutoClearTask.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.orion.visor.module.infra.task; +package org.dromara.visor.module.infra.task; -import com.orion.visor.framework.common.utils.LockerUtils; -import com.orion.visor.module.infra.service.TagService; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.common.utils.LockerUtils; +import org.dromara.visor.module.infra.service.TagService; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/META-INF/additional-spring-configuration-metadata.json index 619bde55..4b489df4 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -2,8 +2,8 @@ "groups": [ { "name": "app.authentication", - "type": "com.orion.visor.module.infra.define.config.AppAuthenticationConfig", - "sourceType": "com.orion.visor.module.infra.define.config.AppAuthenticationConfig" + "type": "org.dromara.visor.module.infra.define.config.AppAuthenticationConfig", + "sourceType": "org.dromara.visor.module.infra.define.config.AppAuthenticationConfig" } ], "properties": [ diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/DataExtraMapper.xml b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/DataExtraMapper.xml index e8e04b6d..fd0e55b5 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/DataExtraMapper.xml +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/DataExtraMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/DataGroupMapper.xml b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/DataGroupMapper.xml index fce691c5..f7ea8216 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/DataGroupMapper.xml +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/DataGroupMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/DataGroupRelMapper.xml b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/DataGroupRelMapper.xml index ed7399b3..3e6a1b43 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/DataGroupRelMapper.xml +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/DataGroupRelMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/DataPermissionMapper.xml b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/DataPermissionMapper.xml index a2f46269..a587c60a 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/DataPermissionMapper.xml +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/DataPermissionMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/DictKeyMapper.xml b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/DictKeyMapper.xml index 5fa5ac6a..4743b7cc 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/DictKeyMapper.xml +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/DictKeyMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/DictValueMapper.xml b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/DictValueMapper.xml index 32d035d2..5aab800f 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/DictValueMapper.xml +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/DictValueMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/FavoriteMapper.xml b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/FavoriteMapper.xml index 4c4dd2a7..dee4e5e5 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/FavoriteMapper.xml +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/FavoriteMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/HistoryValueMapper.xml b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/HistoryValueMapper.xml index 07e6f397..64f6e971 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/HistoryValueMapper.xml +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/HistoryValueMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/OperatorLogMapper.xml b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/OperatorLogMapper.xml index 24f24f00..b62f145c 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/OperatorLogMapper.xml +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/OperatorLogMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/PreferenceMapper.xml b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/PreferenceMapper.xml index 08b2f90a..cc87ac12 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/PreferenceMapper.xml +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/PreferenceMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/SystemMenuMapper.xml b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/SystemMenuMapper.xml index 4d80235a..3fe1a09a 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/SystemMenuMapper.xml +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/SystemMenuMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/SystemMessageMapper.xml b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/SystemMessageMapper.xml index feb15e45..4b84d94a 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/SystemMessageMapper.xml +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/SystemMessageMapper.xml @@ -1,9 +1,9 @@ - + - + @@ -18,7 +18,7 @@ - + diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/SystemRoleMapper.xml b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/SystemRoleMapper.xml index d00aaea7..50ca80cf 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/SystemRoleMapper.xml +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/SystemRoleMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/SystemRoleMenuMapper.xml b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/SystemRoleMenuMapper.xml index c441a7ed..3d7ff042 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/SystemRoleMenuMapper.xml +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/SystemRoleMenuMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/SystemSettingMapper.xml b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/SystemSettingMapper.xml index ae70409f..7e990e2a 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/SystemSettingMapper.xml +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/SystemSettingMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/SystemUserMapper.xml b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/SystemUserMapper.xml index 5288191d..3d3ff1c9 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/SystemUserMapper.xml +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/SystemUserMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/SystemUserRoleMapper.xml b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/SystemUserRoleMapper.xml index fa9ea734..885b811b 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/SystemUserRoleMapper.xml +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/SystemUserRoleMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/TagMapper.xml b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/TagMapper.xml index d3c990d1..0aebd35f 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/TagMapper.xml +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/TagMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/TagRelMapper.xml b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/TagRelMapper.xml index 630fccbe..5ec6db9f 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/TagRelMapper.xml +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/TagRelMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/test/java/com/orion/visor/module/infra/api/impl/.gitkeep b/orion-visor-module-infra/orion-visor-module-infra-service/src/test/java/org/dromara/visor/module/infra/api/impl/.gitkeep similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/test/java/com/orion/visor/module/infra/api/impl/.gitkeep rename to orion-visor-module-infra/orion-visor-module-infra-service/src/test/java/org/dromara/visor/module/infra/api/impl/.gitkeep diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/test/java/com/orion/visor/module/infra/service/impl/.gitkeep b/orion-visor-module-infra/orion-visor-module-infra-service/src/test/java/org/dromara/visor/module/infra/service/impl/.gitkeep similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/test/java/com/orion/visor/module/infra/service/impl/.gitkeep rename to orion-visor-module-infra/orion-visor-module-infra-service/src/test/java/org/dromara/visor/module/infra/service/impl/.gitkeep diff --git a/orion-visor-module-infra/pom.xml b/orion-visor-module-infra/pom.xml index 01b683f7..b6a89a9c 100644 --- a/orion-visor-module-infra/pom.xml +++ b/orion-visor-module-infra/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - com.orion.visor + org.dromara.visor orion-visor ${revision} diff --git a/orion-visor-ui/.env.development b/orion-visor-ui/.env.development index 4e4f3c67..ff0eee49 100644 --- a/orion-visor-ui/.env.development +++ b/orion-visor-ui/.env.development @@ -1,5 +1,5 @@ VITE_API_BASE_URL= 'http://127.0.0.1:9200/orion-visor/api' VITE_WS_BASE_URL= 'ws://127.0.0.1:9200/orion-visor/keep-alive' -VITE_APP_VERSION= '2.1.7' +VITE_APP_VERSION= '2.2.0' VITE_APP_RELEASE= 'community' VITE_DEMO_MODE= false diff --git a/orion-visor-ui/.env.production b/orion-visor-ui/.env.production index 97bc362f..b39670ab 100644 --- a/orion-visor-ui/.env.production +++ b/orion-visor-ui/.env.production @@ -1,5 +1,5 @@ VITE_API_BASE_URL= '/orion-visor/api' VITE_WS_BASE_URL= '/orion-visor/keep-alive' -VITE_APP_VERSION= '2.1.7' +VITE_APP_VERSION= '2.2.0' VITE_APP_RELEASE= 'community' VITE_DEMO_MODE= false diff --git a/orion-visor-ui/package.json b/orion-visor-ui/package.json index 7975bd11..af1d6470 100644 --- a/orion-visor-ui/package.json +++ b/orion-visor-ui/package.json @@ -1,7 +1,7 @@ { "name": "orion-visor-ui", "description": "Orion Visor UI", - "version": "2.1.8", + "version": "2.2.0", "private": true, "author": "Jiahang Li", "license": "Apache 2.0", diff --git a/pom.xml b/pom.xml index 98ff45d4..e3a40b77 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.orion.visor + org.dromara.visor orion-visor ${revision} pom @@ -22,7 +22,7 @@ - 2.1.8 + 2.2.0 8 8 3.0.0-M5 @@ -37,7 +37,7 @@ - com.orion.visor + org.dromara.visor orion-visor-dependencies ${revision} pom