diff --git a/docker/adminer/build.sh b/docker/adminer/build.sh index 7a17a419..6e10de18 100644 --- a/docker/adminer/build.sh +++ b/docker/adminer/build.sh @@ -1,5 +1,5 @@ #/bin/bash -version=2.2.3 +version=2.3.0 docker build -t orion-visor-adminer:${version} . docker tag orion-visor-adminer:${version} registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-adminer:${version} docker tag orion-visor-adminer:${version} registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-adminer:latest diff --git a/docker/mysql/build.sh b/docker/mysql/build.sh index 77fee879..0c7db7da 100644 --- a/docker/mysql/build.sh +++ b/docker/mysql/build.sh @@ -1,5 +1,5 @@ #/bin/bash -version=2.2.3 +version=2.3.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 51dbd22f..bb296787 100644 --- a/docker/push.sh +++ b/docker/push.sh @@ -1,5 +1,5 @@ #/bin/bash -version=2.2.3 +version=2.3.0 docker push registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-adminer:${version} docker push registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-mysql:${version} docker push registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-redis:${version} diff --git a/docker/redis/build.sh b/docker/redis/build.sh index 61a290d2..a58ef254 100644 --- a/docker/redis/build.sh +++ b/docker/redis/build.sh @@ -1,5 +1,5 @@ #/bin/bash -version=2.2.3 +version=2.3.0 docker build -t orion-visor-redis:${version} . docker tag orion-visor-redis:${version} registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-redis:${version} docker tag orion-visor-redis:${version} registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-redis:latest diff --git a/docker/service/build.sh b/docker/service/build.sh index 1b381b3c..6312f193 100644 --- a/docker/service/build.sh +++ b/docker/service/build.sh @@ -1,5 +1,5 @@ #/bin/bash -version=2.2.3 +version=2.3.0 mv ../../orion-visor-launch/target/orion-visor-launch.jar ./orion-visor-launch.jar mv ../../orion-visor-ui/dist ./dist docker build --no-cache -t orion-visor-service:${version} . diff --git a/orion-visor-framework/orion-visor-framework-common/pom.xml b/orion-visor-common/pom.xml similarity index 96% rename from orion-visor-framework/orion-visor-framework-common/pom.xml rename to orion-visor-common/pom.xml index c377e6fb..0a5bea45 100644 --- a/orion-visor-framework/orion-visor-framework-common/pom.xml +++ b/orion-visor-common/pom.xml @@ -4,12 +4,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara.visor - orion-visor-framework + orion-visor ${revision} 4.0.0 - orion-visor-framework-common + orion-visor-common ${project.artifactId} jar diff --git a/orion-visor-common/src/main/java/org/dromara/visor/common/config/ConfigRef.java b/orion-visor-common/src/main/java/org/dromara/visor/common/config/ConfigRef.java new file mode 100644 index 00000000..7f009f59 --- /dev/null +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/config/ConfigRef.java @@ -0,0 +1,80 @@ +/* + * Copyright (c) 2023 - present Dromara, All rights reserved. + * + * https://visor.dromara.org + * https://visor.dromara.org.cn + * https://visor.orionsec.cn + * + * Members: + * Jiahang Li - ljh1553488six@139.com - author + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.dromara.visor.common.config; + +import lombok.extern.slf4j.Slf4j; + +import java.util.function.BiConsumer; +import java.util.function.Function; + +/** + * 配置引用 + * + * @author Jiahang Li + * @version 1.0.0 + * @since 2025/1/6 18:01 + */ +@Slf4j +public abstract class ConfigRef { + + public final String key; + + public T value; + + protected final Function convert; + + public ConfigRef(String key, Function convert) { + this.key = key; + this.convert = convert; + } + + /** + * 覆盖配置 + * + * @param value value + */ + public abstract void override(String value); + + /** + * 修改配置 + * + * @param value value + */ + public abstract void set(T value); + + /** + * 获取配置 + * + * @return value + */ + public abstract T get(); + + /** + * 修改回调 + * + * @param changeEvent changeEvent + * @return this + */ + public abstract ConfigRef onChange(BiConsumer changeEvent); + +} diff --git a/orion-visor-common/src/main/java/org/dromara/visor/common/config/ConfigStore.java b/orion-visor-common/src/main/java/org/dromara/visor/common/config/ConfigStore.java new file mode 100644 index 00000000..d320a4e6 --- /dev/null +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/config/ConfigStore.java @@ -0,0 +1,265 @@ +/* + * Copyright (c) 2023 - present Dromara, All rights reserved. + * + * https://visor.dromara.org + * https://visor.dromara.org.cn + * https://visor.orionsec.cn + * + * Members: + * Jiahang Li - ljh1553488six@139.com - author + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.dromara.visor.common.config; + +import java.util.function.Function; + +/** + * 配置中心 + * + * @author Jiahang Li + * @version 1.0.0 + * @since 2025/1/5 21:30 + */ +public interface ConfigStore { + + /** + * 获取 string 配置 + * + * @param key key + * @return config + */ + String getString(String key); + + /** + * 获取 string 配置 + * + * @param key key + * @param defaultValue defaultValue + * @return config + */ + String getString(String key, String defaultValue); + + /** + * 获取 int 配置 + * + * @param key key + * @return config + */ + Integer getInteger(String key); + + /** + * 获取 int 配置 + * + * @param key key + * @param defaultValue defaultValue + * @return config + */ + Integer getInteger(String key, Integer defaultValue); + + /** + * 获取 long 配置 + * + * @param key key + * @return config + */ + Long getLong(String key); + + /** + * 获取 long 配置 + * + * @param key key + * @param defaultValue defaultValue + * @return config + */ + Long getLong(String key, Long defaultValue); + + /** + * 获取 double 配置 + * + * @param key key + * @return config + */ + Double getDouble(String key); + + /** + * 获取 double 配置 + * + * @param key key + * @param defaultValue defaultValue + * @return config + */ + Double getDouble(String key, Double defaultValue); + + /** + * 获取 boolean 配置 + * + * @param key key + * @return config + */ + Boolean getBoolean(String key); + + /** + * 获取 boolean 配置 + * + * @param key key + * @param defaultValue defaultValue + * @return config + */ + Boolean getBoolean(String key, Boolean defaultValue); + + /** + * 获取配置 + * + * @param key key + * @return conf + */ + String getConfig(String key); + + /** + * 获取配置 + * + * @param key key + * @param defaultValue defaultValue + * @return conf + */ + String getConfig(String key, String defaultValue); + + /** + * 获取配置 + * + * @param key key + * @param convert convert + * @param T + * @return conf + */ + T getConfig(String key, Function convert); + + /** + * 获取配置 + * + * @param key key + * @param convert convert + * @param defaultValue defaultValue + * @param T + * @return conf + */ + T getConfig(String key, Function convert, T defaultValue); + + /** + * 获取 string 配置 + * + * @param key key + * @return ref + */ + ConfigRef string(String key); + + /** + * 获取 string 配置 + * + * @param key key + * @param defaultValue defaultValue + * @return ref + */ + ConfigRef string(String key, String defaultValue); + + /** + * 获取 int 配置 + * + * @param key key + * @return ref + */ + ConfigRef int32(String key); + + /** + * 获取 int 配置 + * + * @param key key + * @param defaultValue defaultValue + * @return ref + */ + ConfigRef int32(String key, Integer defaultValue); + + /** + * 获取 long 配置 + * + * @param key key + * @return ref + */ + ConfigRef int64(String key); + + /** + * 获取 long 配置 + * + * @param key key + * @param defaultValue defaultValue + * @return ref + */ + ConfigRef int64(String key, Long defaultValue); + + /** + * 获取 double 配置 + * + * @param key key + * @return ref + */ + ConfigRef float64(String key); + + /** + * 获取 double 配置 + * + * @param key key + * @param defaultValue defaultValue + * @return ref + */ + ConfigRef float64(String key, Double defaultValue); + + /** + * 获取 boolean 配置 + * + * @param key key + * @return ref + */ + ConfigRef bool(String key); + + /** + * 获取 boolean 配置 + * + * @param key key + * @param defaultValue defaultValue + * @return ref + */ + ConfigRef bool(String key, Boolean defaultValue); + + /** + * 获取配置 + * + * @param key key + * @param convert convert + * @param T + * @return ref + */ + ConfigRef ref(String key, Function convert); + + /** + * 获取配置 + * + * @param key key + * @param convert convert + * @param defaultValue defaultValue + * @param T + * @return ref + */ + ConfigRef ref(String key, Function convert, T defaultValue); + +} diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/AppConst.java b/orion-visor-common/src/main/java/org/dromara/visor/common/constant/AppConst.java similarity index 94% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/AppConst.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/constant/AppConst.java index b2feccfa..444bd022 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/AppConst.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/constant/AppConst.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.constant; +package org.dromara.visor.common.constant; import cn.orionsec.kit.lang.constant.OrionConst; @@ -36,7 +36,7 @@ public interface AppConst extends OrionConst { /** * 同 ${orion.version} 迭代时候需要手动更改 */ - String VERSION = "2.2.3"; + String VERSION = "2.3.0"; /** * 同 ${spring.application.name} diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/AutoConfigureOrderConst.java b/orion-visor-common/src/main/java/org/dromara/visor/common/constant/AutoConfigureOrderConst.java similarity index 73% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/AutoConfigureOrderConst.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/constant/AutoConfigureOrderConst.java index 0b046f66..e652083a 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/AutoConfigureOrderConst.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/constant/AutoConfigureOrderConst.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.constant; +package org.dromara.visor.common.constant; /** * 自动装配排序常量 @@ -33,14 +33,10 @@ package org.dromara.visor.framework.common.constant; */ public interface AutoConfigureOrderConst { - int FRAMEWORK_COMMON = Integer.MIN_VALUE + 1000; - int FRAMEWORK_WEB = Integer.MIN_VALUE + 1100; int FRAMEWORK_SECURITY = Integer.MIN_VALUE + 1200; - int FRAMEWORK_SECURITY_CRYPTO = Integer.MIN_VALUE + 1250; - int FRAMEWORK_WEBSOCKET = Integer.MIN_VALUE + 1300; int FRAMEWORK_DESENSITIZE = Integer.MIN_VALUE + 1400; @@ -55,17 +51,23 @@ public interface AutoConfigureOrderConst { int FRAMEWORK_REDIS = Integer.MIN_VALUE + 1900; - int FRAMEWORK_REDIS_CACHE = Integer.MIN_VALUE + 1950; + int FRAMEWORK_REDIS_CACHE = Integer.MIN_VALUE + 2000; - int FRAMEWORK_STORAGE = Integer.MIN_VALUE + 2000; + int FRAMEWORK_CONFIG = Integer.MIN_VALUE + 2100; - int FRAMEWORK_JOB = Integer.MIN_VALUE + 2100; + int FRAMEWORK_ENCRYPT = Integer.MIN_VALUE + 2200; - int FRAMEWORK_JOB_QUARTZ = Integer.MIN_VALUE + 2150; + int FRAMEWORK_STORAGE = Integer.MIN_VALUE + 2300; - int FRAMEWORK_MONITOR = Integer.MIN_VALUE + 2200; + int FRAMEWORK_JOB = Integer.MIN_VALUE + 2400; - int FRAMEWORK_BIZ_OPERATOR_LOG = Integer.MIN_VALUE + 3000; + int FRAMEWORK_JOB_QUARTZ = Integer.MIN_VALUE + 2500; + + int FRAMEWORK_JOB_ASYNC = Integer.MIN_VALUE + 2600; + + int FRAMEWORK_MONITOR = Integer.MIN_VALUE + 2700; + + int FRAMEWORK_BIZ_OPERATOR_LOG = Integer.MIN_VALUE + 2800; int FRAMEWORK_BANNER = Integer.MIN_VALUE + 10000; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/BeanOrderConst.java b/orion-visor-common/src/main/java/org/dromara/visor/common/constant/BeanOrderConst.java similarity index 96% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/BeanOrderConst.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/constant/BeanOrderConst.java index eab285f8..a84c8b3b 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/BeanOrderConst.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/constant/BeanOrderConst.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.constant; +package org.dromara.visor.common.constant; /** * bean 排序常量 diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/CnConst.java b/orion-visor-common/src/main/java/org/dromara/visor/common/constant/CnConst.java similarity index 95% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/CnConst.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/constant/CnConst.java index d794a91f..2d88c772 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/CnConst.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/constant/CnConst.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.constant; +package org.dromara.visor.common.constant; /** * 常量 - 中文 diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/crypto/CryptoConfig.java b/orion-visor-common/src/main/java/org/dromara/visor/common/constant/ConfigKeys.java similarity index 76% rename from orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/crypto/CryptoConfig.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/constant/ConfigKeys.java index 4c2bcf8c..3ef9c0ad 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/crypto/CryptoConfig.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/constant/ConfigKeys.java @@ -20,28 +20,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.security.core.crypto; - -import lombok.Data; +package org.dromara.visor.common.constant; /** - * 加密配置 + * 配置项常量 * * @author Jiahang Li * @version 1.0.0 - * @since 2023/7/8 0:14 + * @since 2025/1/14 16:15 */ -@Data -public class CryptoConfig { +public interface ConfigKeys { /** - * 是否为默认加密器 + * 加密公钥 */ - protected boolean primary; + String ENCRYPT_PUBLIC_KEY = "encrypt.publicKey"; /** - * 是否启用 + * 加密私钥 */ - protected boolean enabled; + String ENCRYPT_PRIVATE_KEY = "encrypt.privateKey"; } diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/Const.java b/orion-visor-common/src/main/java/org/dromara/visor/common/constant/Const.java similarity index 96% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/Const.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/constant/Const.java index 87219af0..74b25a24 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/Const.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/constant/Const.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.constant; +package org.dromara.visor.common.constant; /** * 常量 diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/ErrorCode.java b/orion-visor-common/src/main/java/org/dromara/visor/common/constant/ErrorCode.java similarity index 98% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/ErrorCode.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/constant/ErrorCode.java index 32701d56..7af51c47 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/ErrorCode.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/constant/ErrorCode.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.constant; +package org.dromara.visor.common.constant; import cn.orionsec.kit.lang.define.wrapper.CodeInfo; import cn.orionsec.kit.lang.define.wrapper.HttpWrapper; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/ErrorMessage.java b/orion-visor-common/src/main/java/org/dromara/visor/common/constant/ErrorMessage.java similarity index 98% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/ErrorMessage.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/constant/ErrorMessage.java index 2e5735c5..7657bb0d 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/ErrorMessage.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/constant/ErrorMessage.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.constant; +package org.dromara.visor.common.constant; import cn.orionsec.kit.lang.exception.ApplicationException; import cn.orionsec.kit.lang.exception.argument.InvalidArgumentException; @@ -94,6 +94,8 @@ public interface ErrorMessage { String UNSUPPORTED_CHARSET = "不支持的编码 [{}]"; + String DECRYPT_ERROR = "数据解密失败"; + String PASSWORD_MISSING = "请输入密码"; String BEFORE_PASSWORD_ERROR = "原密码错误"; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/ExtraFieldConst.java b/orion-visor-common/src/main/java/org/dromara/visor/common/constant/ExtraFieldConst.java similarity index 96% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/ExtraFieldConst.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/constant/ExtraFieldConst.java index 8a1580a8..fcbf2ce6 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/ExtraFieldConst.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/constant/ExtraFieldConst.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.constant; +package org.dromara.visor.common.constant; /** * 额外字段常量 diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/FieldConst.java b/orion-visor-common/src/main/java/org/dromara/visor/common/constant/FieldConst.java similarity index 96% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/FieldConst.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/constant/FieldConst.java index 9785cdf3..7931edaf 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/FieldConst.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/constant/FieldConst.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.constant; +package org.dromara.visor.common.constant; /** * 字段常量 @@ -105,4 +105,6 @@ public interface FieldConst { String ALL = "all"; + String CONFIG = "config"; + } diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/FileConst.java b/orion-visor-common/src/main/java/org/dromara/visor/common/constant/FileConst.java similarity index 95% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/FileConst.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/constant/FileConst.java index 5c5bc155..df4b1d5f 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/FileConst.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/constant/FileConst.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.constant; +package org.dromara.visor.common.constant; /** * 文件常量 diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/FilterOrderConst.java b/orion-visor-common/src/main/java/org/dromara/visor/common/constant/FilterOrderConst.java similarity index 95% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/FilterOrderConst.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/constant/FilterOrderConst.java index d81107c3..73c1f3b7 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/FilterOrderConst.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/constant/FilterOrderConst.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.constant; +package org.dromara.visor.common.constant; /** * 过滤器排序常量 diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/ValidConst.java b/orion-visor-common/src/main/java/org/dromara/visor/common/constant/ValidConst.java similarity index 95% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/ValidConst.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/constant/ValidConst.java index 7c7e48ac..5d46a402 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/ValidConst.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/constant/ValidConst.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.constant; +package org.dromara.visor.common.constant; /** * 验证常量 diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/AutoClearConfig.java b/orion-visor-common/src/main/java/org/dromara/visor/common/entity/AutoClearConfig.java similarity index 95% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/AutoClearConfig.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/entity/AutoClearConfig.java index bcce76dc..79075e12 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/AutoClearConfig.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/entity/AutoClearConfig.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.entity; +package org.dromara.visor.common.entity; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/DataClearRequest.java b/orion-visor-common/src/main/java/org/dromara/visor/common/entity/DataClearRequest.java similarity index 95% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/DataClearRequest.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/entity/DataClearRequest.java index 47031a8e..00e7089c 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/DataClearRequest.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/entity/DataClearRequest.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.entity; +package org.dromara.visor.common.entity; /** * 数据清理请求 定义 diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/PageRequest.java b/orion-visor-common/src/main/java/org/dromara/visor/common/entity/PageRequest.java similarity index 93% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/PageRequest.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/entity/PageRequest.java index 77793001..409cb4dc 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/PageRequest.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/entity/PageRequest.java @@ -20,11 +20,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.entity; +package org.dromara.visor.common.entity; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import org.dromara.visor.framework.common.validator.group.Page; +import org.dromara.visor.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/org/dromara/visor/framework/common/entity/RequestIdentity.java b/orion-visor-common/src/main/java/org/dromara/visor/common/entity/RequestIdentity.java similarity index 96% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/RequestIdentity.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/entity/RequestIdentity.java index eced4b20..7f314d8d 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/RequestIdentity.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/entity/RequestIdentity.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.entity; +package org.dromara.visor.common.entity; import java.io.Serializable; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/RequestIdentityModel.java b/orion-visor-common/src/main/java/org/dromara/visor/common/entity/RequestIdentityModel.java similarity index 96% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/RequestIdentityModel.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/entity/RequestIdentityModel.java index b5a8e7ea..f2989619 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/RequestIdentityModel.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/entity/RequestIdentityModel.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.entity; +package org.dromara.visor.common.entity; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/StatisticsRange.java b/orion-visor-common/src/main/java/org/dromara/visor/common/entity/StatisticsRange.java similarity index 98% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/StatisticsRange.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/entity/StatisticsRange.java index ae60b873..a3f3af72 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/StatisticsRange.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/entity/StatisticsRange.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.entity; +package org.dromara.visor.common.entity; import cn.orionsec.kit.lang.utils.collect.Lists; import cn.orionsec.kit.lang.utils.time.DateStream; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/TreeNode.java b/orion-visor-common/src/main/java/org/dromara/visor/common/entity/TreeNode.java similarity index 96% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/TreeNode.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/entity/TreeNode.java index a1342c8d..1643bc29 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/TreeNode.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/entity/TreeNode.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.entity; +package org.dromara.visor.common.entity; import java.util.List; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/chart/BarSingleChartData.java b/orion-visor-common/src/main/java/org/dromara/visor/common/entity/chart/BarSingleChartData.java similarity index 95% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/chart/BarSingleChartData.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/entity/chart/BarSingleChartData.java index 3a2fc865..c06de2a2 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/chart/BarSingleChartData.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/entity/chart/BarSingleChartData.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.entity.chart; +package org.dromara.visor.common.entity.chart; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/chart/LineChartData.java b/orion-visor-common/src/main/java/org/dromara/visor/common/entity/chart/LineChartData.java similarity index 96% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/chart/LineChartData.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/entity/chart/LineChartData.java index ededf971..3af23887 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/chart/LineChartData.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/entity/chart/LineChartData.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.entity.chart; +package org.dromara.visor.common.entity.chart; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/chart/LineSingleChartData.java b/orion-visor-common/src/main/java/org/dromara/visor/common/entity/chart/LineSingleChartData.java similarity index 96% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/chart/LineSingleChartData.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/entity/chart/LineSingleChartData.java index 47a00d47..f44fe5ff 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/chart/LineSingleChartData.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/entity/chart/LineSingleChartData.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.entity.chart; +package org.dromara.visor.common.entity.chart; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/chart/PieChartData.java b/orion-visor-common/src/main/java/org/dromara/visor/common/entity/chart/PieChartData.java similarity index 95% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/chart/PieChartData.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/entity/chart/PieChartData.java index 615cfea6..b95500b9 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/entity/chart/PieChartData.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/entity/chart/PieChartData.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.entity.chart; +package org.dromara.visor.common.entity.chart; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/enums/BooleanBit.java b/orion-visor-common/src/main/java/org/dromara/visor/common/enums/BooleanBit.java similarity index 97% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/enums/BooleanBit.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/enums/BooleanBit.java index b9a07ec2..3d841622 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/enums/BooleanBit.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/enums/BooleanBit.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.enums; +package org.dromara.visor.common.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/enums/EnableStatus.java b/orion-visor-common/src/main/java/org/dromara/visor/common/enums/EnableStatus.java similarity index 96% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/enums/EnableStatus.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/enums/EnableStatus.java index 77c8a1bb..2db0e372 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/enums/EnableStatus.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/enums/EnableStatus.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.enums; +package org.dromara.visor.common.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/enums/EndpointDefine.java b/orion-visor-common/src/main/java/org/dromara/visor/common/enums/EndpointDefine.java similarity index 96% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/enums/EndpointDefine.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/enums/EndpointDefine.java index 02528c28..6fbd42f7 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/enums/EndpointDefine.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/enums/EndpointDefine.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.enums; +package org.dromara.visor.common.enums; import cn.orionsec.kit.lang.utils.Strings; import lombok.AllArgsConstructor; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/enums/MovePosition.java b/orion-visor-common/src/main/java/org/dromara/visor/common/enums/MovePosition.java similarity index 96% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/enums/MovePosition.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/enums/MovePosition.java index 74303484..dbace534 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/enums/MovePosition.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/enums/MovePosition.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.enums; +package org.dromara.visor.common.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/handler/data/GenericsStrategyDefinition.java b/orion-visor-common/src/main/java/org/dromara/visor/common/handler/data/GenericsStrategyDefinition.java similarity index 91% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/handler/data/GenericsStrategyDefinition.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/handler/data/GenericsStrategyDefinition.java index 0a628c9d..16eb0cee 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/handler/data/GenericsStrategyDefinition.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/handler/data/GenericsStrategyDefinition.java @@ -20,11 +20,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.handler.data; +package org.dromara.visor.common.handler.data; 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; +import org.dromara.visor.common.handler.data.model.GenericsDataModel; +import org.dromara.visor.common.handler.data.strategy.GenericsDataStrategy; /** * 标准数据定义 diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/handler/data/model/GenericsDataModel.java b/orion-visor-common/src/main/java/org/dromara/visor/common/handler/data/model/GenericsDataModel.java similarity index 95% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/handler/data/model/GenericsDataModel.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/handler/data/model/GenericsDataModel.java index a46c561b..29facd9d 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/handler/data/model/GenericsDataModel.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/handler/data/model/GenericsDataModel.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.handler.data.model; +package org.dromara.visor.common.handler.data.model; import com.alibaba.fastjson.JSON; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/handler/data/strategy/AbstractGenericsDataStrategy.java b/orion-visor-common/src/main/java/org/dromara/visor/common/handler/data/strategy/AbstractGenericsDataStrategy.java similarity index 93% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/handler/data/strategy/AbstractGenericsDataStrategy.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/handler/data/strategy/AbstractGenericsDataStrategy.java index 25d32968..29a46fc5 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/handler/data/strategy/AbstractGenericsDataStrategy.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/handler/data/strategy/AbstractGenericsDataStrategy.java @@ -20,10 +20,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.handler.data.strategy; +package org.dromara.visor.common.handler.data.strategy; import com.alibaba.fastjson.JSON; -import org.dromara.visor.framework.common.handler.data.model.GenericsDataModel; +import org.dromara.visor.common.handler.data.model.GenericsDataModel; /** * 标准数据处理策略 基类 diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/handler/data/strategy/GenericsDataStrategy.java b/orion-visor-common/src/main/java/org/dromara/visor/common/handler/data/strategy/GenericsDataStrategy.java similarity index 91% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/handler/data/strategy/GenericsDataStrategy.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/handler/data/strategy/GenericsDataStrategy.java index 74043f37..c0cd853a 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/handler/data/strategy/GenericsDataStrategy.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/handler/data/strategy/GenericsDataStrategy.java @@ -20,9 +20,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.handler.data.strategy; +package org.dromara.visor.common.handler.data.strategy; -import org.dromara.visor.framework.common.handler.data.model.GenericsDataModel; +import org.dromara.visor.common.handler.data.model.GenericsDataModel; /** * 标准数据处理策略 diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/crypto/ValueCrypto.java b/orion-visor-common/src/main/java/org/dromara/visor/common/interfaces/AesEncryptor.java similarity index 89% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/crypto/ValueCrypto.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/interfaces/AesEncryptor.java index b56e20fa..bf3f1360 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/crypto/ValueCrypto.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/interfaces/AesEncryptor.java @@ -20,24 +20,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.crypto; +package org.dromara.visor.common.interfaces; import cn.orionsec.kit.lang.utils.codec.Base62s; import cn.orionsec.kit.lang.utils.crypto.symmetric.SymmetricCrypto; /** - * 数据加密器 + * aes 加密器 * * @author Jiahang Li * @version 1.0.0 * @since 2023/7/8 0:20 */ -public interface ValueCrypto extends SymmetricCrypto { - - /** - * 初始化 - */ - void init(); +public interface AesEncryptor extends SymmetricCrypto { /** * 加密后 base62 编码 diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/file/FileClient.java b/orion-visor-common/src/main/java/org/dromara/visor/common/interfaces/FileClient.java similarity index 89% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/file/FileClient.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/interfaces/FileClient.java index dd2d0350..d6f62d4a 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/file/FileClient.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/interfaces/FileClient.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.file; +package org.dromara.visor.common.interfaces; import java.io.InputStream; import java.io.OutputStream; @@ -114,6 +114,25 @@ public interface FileClient { */ byte[] getContent(String path) throws Exception; + /** + * 获取文件内容 + * + * @param path path + * @return content + * @throws Exception Exception + */ + String getContentAsString(String path) throws Exception; + + /** + * 获取文件内容 + * + * @param path path + * @param charset charset + * @return content + * @throws Exception Exception + */ + String getContentAsString(String path, String charset) throws Exception; + /** * 获取文件输入流 * diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/lock/Locker.java b/orion-visor-common/src/main/java/org/dromara/visor/common/interfaces/Locker.java similarity index 96% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/lock/Locker.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/interfaces/Locker.java index 4f561970..d08705ea 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/lock/Locker.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/interfaces/Locker.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.lock; +package org.dromara.visor.common.interfaces; import java.util.function.Supplier; diff --git a/orion-visor-common/src/main/java/org/dromara/visor/common/interfaces/RsaEncryptor.java b/orion-visor-common/src/main/java/org/dromara/visor/common/interfaces/RsaEncryptor.java new file mode 100644 index 00000000..a0edc757 --- /dev/null +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/interfaces/RsaEncryptor.java @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2023 - present Dromara, All rights reserved. + * + * https://visor.dromara.org + * https://visor.dromara.org.cn + * https://visor.orionsec.cn + * + * Members: + * Jiahang Li - ljh1553488six@139.com - author + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.dromara.visor.common.interfaces; + +/** + * rsa 加密器 + * + * @author Jiahang Li + * @version 1.0.0 + * @since 2025/1/5 20:58 + */ +public interface RsaEncryptor { + + /** + * 加密 + * + * @param value value + * @return value + */ + String encrypt(String value); + + /** + * 解密 + * + * @param value value + * @return value + */ + String decrypt(String value); + +} diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/json/filter/FieldDesensitizeFilter.java b/orion-visor-common/src/main/java/org/dromara/visor/common/json/FieldDesensitizeFilter.java similarity index 97% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/json/filter/FieldDesensitizeFilter.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/json/FieldDesensitizeFilter.java index 42557916..fac1a124 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/json/filter/FieldDesensitizeFilter.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/json/FieldDesensitizeFilter.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.json.filter; +package org.dromara.visor.common.json; import cn.orionsec.kit.lang.utils.Desensitizes; import cn.orionsec.kit.lang.utils.Objects1; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/json/filter/FieldIgnoreFilter.java b/orion-visor-common/src/main/java/org/dromara/visor/common/json/FieldIgnoreFilter.java similarity index 96% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/json/filter/FieldIgnoreFilter.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/json/FieldIgnoreFilter.java index 6ec0af7d..5f382942 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/json/filter/FieldIgnoreFilter.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/json/FieldIgnoreFilter.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.json.filter; +package org.dromara.visor.common.json; import cn.orionsec.kit.lang.utils.collect.Lists; import com.alibaba.fastjson.serializer.PropertyFilter; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/security/LoginUser.java b/orion-visor-common/src/main/java/org/dromara/visor/common/security/LoginUser.java similarity index 96% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/security/LoginUser.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/security/LoginUser.java index 4ee621d7..4818f7fa 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/security/LoginUser.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/security/LoginUser.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.security; +package org.dromara.visor.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/org/dromara/visor/framework/common/security/PasswordModifier.java b/orion-visor-common/src/main/java/org/dromara/visor/common/security/PasswordModifier.java similarity index 86% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/security/PasswordModifier.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/security/PasswordModifier.java index 7d0e7281..79aac8a7 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/security/PasswordModifier.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/security/PasswordModifier.java @@ -20,12 +20,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.security; +package org.dromara.visor.common.security; 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; +import org.dromara.visor.common.constant.Const; +import org.dromara.visor.common.utils.AesEncryptUtils; /** * 密码修改器 @@ -52,7 +52,7 @@ public class PasswordModifier { if (Strings.isBlank(password)) { return Const.EMPTY; } else { - return CryptoUtils.encryptAsString(password); + return AesEncryptUtils.encryptAsString(password); } } else { return null; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/security/SecurityHolder.java b/orion-visor-common/src/main/java/org/dromara/visor/common/security/SecurityHolder.java similarity index 95% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/security/SecurityHolder.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/security/SecurityHolder.java index 7157266f..d23c27d1 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/security/SecurityHolder.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/security/SecurityHolder.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.security; +package org.dromara.visor.common.security; /** * SecurityUtils 的 bean 对象 diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/security/UpdatePasswordAction.java b/orion-visor-common/src/main/java/org/dromara/visor/common/security/UpdatePasswordAction.java similarity index 95% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/security/UpdatePasswordAction.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/security/UpdatePasswordAction.java index 06eebb16..5f1d3cfc 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/security/UpdatePasswordAction.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/security/UpdatePasswordAction.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.security; +package org.dromara.visor.common.security; import java.io.Serializable; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/security/UserRole.java b/orion-visor-common/src/main/java/org/dromara/visor/common/security/UserRole.java similarity index 96% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/security/UserRole.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/security/UserRole.java index 304662f4..5de1c380 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/security/UserRole.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/security/UserRole.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.security; +package org.dromara.visor.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/org/dromara/visor/framework/common/thread/ThreadPoolMdcTaskExecutor.java b/orion-visor-common/src/main/java/org/dromara/visor/common/thread/ThreadPoolMdcTaskExecutor.java similarity index 92% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/thread/ThreadPoolMdcTaskExecutor.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/thread/ThreadPoolMdcTaskExecutor.java index cb85fa53..9a393b94 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/thread/ThreadPoolMdcTaskExecutor.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/thread/ThreadPoolMdcTaskExecutor.java @@ -20,9 +20,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.thread; +package org.dromara.visor.common.thread; -import org.dromara.visor.framework.common.utils.ThreadMdcUtils; +import org.dromara.visor.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/org/dromara/visor/framework/common/meta/TraceIdHolder.java b/orion-visor-common/src/main/java/org/dromara/visor/common/trace/TraceIdHolder.java similarity index 98% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/meta/TraceIdHolder.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/trace/TraceIdHolder.java index d36f4633..53a22bff 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/meta/TraceIdHolder.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/trace/TraceIdHolder.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.meta; +package org.dromara.visor.common.trace; import cn.orionsec.kit.lang.id.UUIds; import com.alibaba.ttl.TransmittableThreadLocal; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/CryptoUtils.java b/orion-visor-common/src/main/java/org/dromara/visor/common/utils/AesEncryptUtils.java similarity index 89% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/CryptoUtils.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/utils/AesEncryptUtils.java index c7744208..cf8cfaf1 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/CryptoUtils.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/utils/AesEncryptUtils.java @@ -20,25 +20,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.utils; +package org.dromara.visor.common.utils; import cn.orionsec.kit.lang.utils.Exceptions; -import org.dromara.visor.framework.common.crypto.ValueCrypto; +import org.dromara.visor.common.interfaces.AesEncryptor; /** - * 加密工具类 - *

- * PrimaryValueCrypto 代理类工具 + * aes 数据加密工具类 * * @author Jiahang Li * @version 1.0.0 * @since 2023/7/8 0:05 */ -public class CryptoUtils { +public class AesEncryptUtils { - private static ValueCrypto delegate; + private static AesEncryptor delegate; - private CryptoUtils() { + private AesEncryptUtils() { } /** @@ -163,12 +161,12 @@ public class CryptoUtils { return delegate.decryptBase62(text); } - public static void setDelegate(ValueCrypto delegate) { - if (CryptoUtils.delegate != null) { + public static void setDelegate(AesEncryptor delegate) { + if (AesEncryptUtils.delegate != null) { // unmodified throw Exceptions.state(); } - CryptoUtils.delegate = delegate; + AesEncryptUtils.delegate = delegate; } } diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/ConfigUtils.java b/orion-visor-common/src/main/java/org/dromara/visor/common/utils/ConfigUtils.java similarity index 97% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/ConfigUtils.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/utils/ConfigUtils.java index a6c15d98..42d4931e 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/ConfigUtils.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/utils/ConfigUtils.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.utils; +package org.dromara.visor.common.utils; import cn.orionsec.kit.lang.constant.Const; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/FileNames.java b/orion-visor-common/src/main/java/org/dromara/visor/common/utils/FileNames.java similarity index 91% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/FileNames.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/utils/FileNames.java index eb4ace1f..0241420f 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/FileNames.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/utils/FileNames.java @@ -20,10 +20,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.utils; +package org.dromara.visor.common.utils; import cn.orionsec.kit.lang.utils.time.Dates; -import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.common.constant.Const; /** * 文件名称 diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/IpUtils.java b/orion-visor-common/src/main/java/org/dromara/visor/common/utils/IpUtils.java similarity index 96% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/IpUtils.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/utils/IpUtils.java index c532a5a6..7781ae42 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/IpUtils.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/utils/IpUtils.java @@ -20,12 +20,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.utils; +package org.dromara.visor.common.utils; 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 org.dromara.visor.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/org/dromara/visor/framework/common/utils/LockerUtils.java b/orion-visor-common/src/main/java/org/dromara/visor/common/utils/LockerUtils.java similarity index 94% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/LockerUtils.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/utils/LockerUtils.java index 73e3d985..01ce1219 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/LockerUtils.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/utils/LockerUtils.java @@ -20,11 +20,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.utils; +package org.dromara.visor.common.utils; import cn.orionsec.kit.lang.utils.Exceptions; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.lock.Locker; +import org.dromara.visor.common.interfaces.Locker; import java.util.function.Supplier; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/PathUtils.java b/orion-visor-common/src/main/java/org/dromara/visor/common/utils/PathUtils.java similarity index 95% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/PathUtils.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/utils/PathUtils.java index 0b69296d..3befea39 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/PathUtils.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/utils/PathUtils.java @@ -20,13 +20,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.utils; +package org.dromara.visor.common.utils; 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; +import org.dromara.visor.common.constant.AppConst; +import org.dromara.visor.common.constant.Const; /** * 路径工具类 diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/Requests.java b/orion-visor-common/src/main/java/org/dromara/visor/common/utils/Requests.java similarity index 91% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/Requests.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/utils/Requests.java index 99b3643a..a41f7f36 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/Requests.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/utils/Requests.java @@ -20,11 +20,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.utils; +package org.dromara.visor.common.utils; 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.dromara.visor.common.entity.RequestIdentity; +import org.dromara.visor.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-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/crypto/PrimaryValueCrypto.java b/orion-visor-common/src/main/java/org/dromara/visor/common/utils/RsaEncryptUtils.java similarity index 57% rename from orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/crypto/PrimaryValueCrypto.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/utils/RsaEncryptUtils.java index b86ef211..b048b6b2 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/crypto/PrimaryValueCrypto.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/utils/RsaEncryptUtils.java @@ -20,42 +20,51 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.security.core.crypto; +package org.dromara.visor.common.utils; import cn.orionsec.kit.lang.utils.Exceptions; -import org.dromara.visor.framework.common.crypto.ValueCrypto; +import org.dromara.visor.common.interfaces.RsaEncryptor; /** - * 默认加密器 + * rsa 加密工具类 * * @author Jiahang Li * @version 1.0.0 - * @since 2023/7/21 12:11 + * @since 2025/1/5 21:13 */ -public class PrimaryValueCrypto implements ValueCrypto { +public class RsaEncryptUtils { - private static ValueCrypto delegate; + private static RsaEncryptor delegate; - @Override - public void init() { + private RsaEncryptUtils() { } - @Override - public byte[] encrypt(byte[] plain) { - return delegate.encrypt(plain); + /** + * 加密 + * + * @param value value + * @return value + */ + public static String encrypt(String value) { + return delegate.encrypt(value); } - @Override - public byte[] decrypt(byte[] text) { - return delegate.decrypt(text); + /** + * 解密 + * + * @param value value + * @return value + */ + public static String decrypt(String value) { + return delegate.decrypt(value); } - protected static void setDelegate(ValueCrypto delegate) { - if (PrimaryValueCrypto.delegate != null) { + public static void setDelegate(RsaEncryptor delegate) { + if (RsaEncryptUtils.delegate != null) { // unmodified throw Exceptions.state(); } - PrimaryValueCrypto.delegate = delegate; + RsaEncryptUtils.delegate = delegate; } } diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/SqlUtils.java b/orion-visor-common/src/main/java/org/dromara/visor/common/utils/SqlUtils.java similarity index 92% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/SqlUtils.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/utils/SqlUtils.java index 0aa29296..0af399c1 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/SqlUtils.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/utils/SqlUtils.java @@ -20,9 +20,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.utils; +package org.dromara.visor.common.utils; -import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.common.constant.Const; /** * sql 工具类 diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/SwaggerUtils.java b/orion-visor-common/src/main/java/org/dromara/visor/common/utils/SwaggerUtils.java similarity index 94% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/SwaggerUtils.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/utils/SwaggerUtils.java index aa589a07..d33e4428 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/SwaggerUtils.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/utils/SwaggerUtils.java @@ -20,12 +20,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.utils; +package org.dromara.visor.common.utils; 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 org.dromara.visor.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/org/dromara/visor/framework/common/utils/ThreadMdcUtils.java b/orion-visor-common/src/main/java/org/dromara/visor/common/utils/ThreadMdcUtils.java similarity index 96% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/ThreadMdcUtils.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/utils/ThreadMdcUtils.java index c77540db..5fe93837 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/ThreadMdcUtils.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/utils/ThreadMdcUtils.java @@ -20,9 +20,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.utils; +package org.dromara.visor.common.utils; -import org.dromara.visor.framework.common.meta.TraceIdHolder; +import org.dromara.visor.common.trace.TraceIdHolder; import org.slf4j.MDC; import java.util.Map; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/TreeUtils.java b/orion-visor-common/src/main/java/org/dromara/visor/common/utils/TreeUtils.java similarity index 94% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/TreeUtils.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/utils/TreeUtils.java index 967b1d08..a274d72b 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/TreeUtils.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/utils/TreeUtils.java @@ -20,11 +20,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.utils; +package org.dromara.visor.common.utils; 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 org.dromara.visor.common.constant.Const; +import org.dromara.visor.common.entity.TreeNode; import java.util.Comparator; import java.util.List; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/Valid.java b/orion-visor-common/src/main/java/org/dromara/visor/common/utils/Valid.java similarity index 97% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/Valid.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/utils/Valid.java index feaa085e..35fecb7a 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/Valid.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/utils/Valid.java @@ -20,12 +20,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.utils; +package org.dromara.visor.common.utils; 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 org.dromara.visor.common.constant.ErrorMessage; import javax.validation.ConstraintViolation; import javax.validation.ConstraintViolationException; diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/validator/group/Batch.java b/orion-visor-common/src/main/java/org/dromara/visor/common/validator/group/Batch.java similarity index 93% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/validator/group/Batch.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/validator/group/Batch.java index f2b7c64f..af869ac7 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/validator/group/Batch.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/validator/group/Batch.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.validator.group; +package org.dromara.visor.common.validator.group; /** * 批量验证分组 diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/validator/group/Clear.java b/orion-visor-common/src/main/java/org/dromara/visor/common/validator/group/Clear.java similarity index 93% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/validator/group/Clear.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/validator/group/Clear.java index e7470732..f6266077 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/validator/group/Clear.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/validator/group/Clear.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.validator.group; +package org.dromara.visor.common.validator.group; /** * 清理验证分组 diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/validator/group/Export.java b/orion-visor-common/src/main/java/org/dromara/visor/common/validator/group/Export.java similarity index 93% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/validator/group/Export.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/validator/group/Export.java index 38ba7cf8..7ca74a1d 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/validator/group/Export.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/validator/group/Export.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.validator.group; +package org.dromara.visor.common.validator.group; /** * 导出验证分组 diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/validator/group/Id.java b/orion-visor-common/src/main/java/org/dromara/visor/common/validator/group/Id.java similarity index 93% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/validator/group/Id.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/validator/group/Id.java index 0eb04f50..5fccd109 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/validator/group/Id.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/validator/group/Id.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.validator.group; +package org.dromara.visor.common.validator.group; /** * 分页验证分组 diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/validator/group/Import.java b/orion-visor-common/src/main/java/org/dromara/visor/common/validator/group/Import.java similarity index 93% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/validator/group/Import.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/validator/group/Import.java index 25b42e36..307f0a5e 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/validator/group/Import.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/validator/group/Import.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.validator.group; +package org.dromara.visor.common.validator.group; /** * 导出验证分组 diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/validator/group/Page.java b/orion-visor-common/src/main/java/org/dromara/visor/common/validator/group/Page.java similarity index 93% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/validator/group/Page.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/validator/group/Page.java index 83a7b142..ac01fd6d 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/validator/group/Page.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/validator/group/Page.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.validator.group; +package org.dromara.visor.common.validator.group; /** * 分页验证分组 diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/web/filter/FilterCreator.java b/orion-visor-common/src/main/java/org/dromara/visor/common/web/WebFilterCreator.java similarity index 92% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/web/filter/FilterCreator.java rename to orion-visor-common/src/main/java/org/dromara/visor/common/web/WebFilterCreator.java index b331885d..8c0f197e 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/web/filter/FilterCreator.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/web/WebFilterCreator.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.web.filter; +package org.dromara.visor.common.web; import org.springframework.boot.web.servlet.FilterRegistrationBean; @@ -33,9 +33,9 @@ import javax.servlet.Filter; * @version 1.0.0 * @since 2023/6/25 15:05 */ -public class FilterCreator { +public class WebFilterCreator { - private FilterCreator() { + private WebFilterCreator() { } /** diff --git a/orion-visor-dependencies/pom.xml b/orion-visor-dependencies/pom.xml index 2ac6deef..92f73f8d 100644 --- a/orion-visor-dependencies/pom.xml +++ b/orion-visor-dependencies/pom.xml @@ -14,7 +14,7 @@ https://github.com/dromara/orion-visor - 2.2.3 + 2.3.0 2.7.17 2.7.15 1.5.0 @@ -62,7 +62,7 @@ org.dromara.visor - orion-visor-framework-common + orion-visor-common ${revision} @@ -75,6 +75,11 @@ orion-visor-spring-boot-starter-web ${revision} + + org.dromara.visor + orion-visor-spring-boot-starter-config + ${revision} + org.dromara.visor orion-visor-spring-boot-starter-swagger @@ -110,6 +115,11 @@ orion-visor-spring-boot-starter-desensitize ${revision} + + org.dromara.visor + orion-visor-spring-boot-starter-encrypt + ${revision} + org.dromara.visor orion-visor-spring-boot-starter-log diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/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 deleted file mode 100644 index e4fa0932..00000000 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/utils/FileClientUtils.java +++ /dev/null @@ -1,205 +0,0 @@ -/* - * Copyright (c) 2023 - present Dromara, All rights reserved. - * - * https://visor.dromara.org - * https://visor.dromara.org.cn - * https://visor.orionsec.cn - * - * Members: - * Jiahang Li - ljh1553488six@139.com - author - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.dromara.visor.framework.common.utils; - -import cn.orionsec.kit.lang.utils.Exceptions; -import org.dromara.visor.framework.common.file.FileClient; - -import java.io.InputStream; -import java.io.OutputStream; - -/** - * 文件客户端工具 - *

- * PrimaryFileClient 代理类工具 - * - * @author Jiahang Li - * @version 1.0.0 - * @since 2023/7/21 12:05 - */ -public class FileClientUtils { - - private static FileClient delegate; - - private FileClientUtils() { - } - - /** - * 上传文件 - * - * @param path 文件路径 - * @param content 文件内容 - * @return 路径 - * @throws Exception Exception - */ - public static String upload(String path, byte[] content) throws Exception { - return delegate.upload(path, content); - } - - /** - * 上传文件 - * - * @param path 文件路径 - * @param content 文件内容 - * @param overrideIfExist 文件存在是否覆盖 - * @return 路径 - * @throws Exception Exception - */ - public static String upload(String path, byte[] content, boolean overrideIfExist) throws Exception { - return delegate.upload(path, content, overrideIfExist); - } - - /** - * 上传文件 - * - * @param path 文件路径 - * @param in in - * @return 路径 - * @throws Exception Exception - */ - public static String upload(String path, InputStream in) throws Exception { - return delegate.upload(path, in); - } - - /** - * 上传文件 - * - * @param path 文件路径 - * @param in in - * @param autoClose autoClose - * @return 路径 - * @throws Exception Exception - */ - public static String upload(String path, InputStream in, boolean autoClose) throws Exception { - return delegate.upload(path, in, autoClose); - } - - /** - * 上传文件 - * - * @param path 文件路径 - * @param in in - * @param autoClose autoClose - * @param overrideIfExist 文件存在是否覆盖 - * @return 路径 - * @throws Exception Exception - */ - public static String upload(String path, InputStream in, boolean autoClose, boolean overrideIfExist) throws Exception { - return delegate.upload(path, in, autoClose, overrideIfExist); - } - - /** - * 检查文件是否存在 - * - * @param path path - * @return 是否存在 - */ - public static boolean isExists(String path) { - return delegate.isExists(path); - } - - /** - * 删除文件 - * - * @param path 路径 - * @return 是否删除 - * @throws Exception Exception - */ - public static boolean delete(String path) throws Exception { - return delegate.delete(path); - } - - /** - * 获取文件内容 - * - * @param path path - * @return bytes - * @throws Exception Exception - */ - public static byte[] getContent(String path) throws Exception { - return delegate.getContent(path); - } - - /** - * 获取文件输入流 - * - * @param path path - * @return stream - * @throws Exception Exception - */ - public static InputStream getContentInputStream(String path) throws Exception { - return delegate.getContentInputStream(path); - } - - /** - * 获取文件输出流 - * - * @param path path - * @return stream - * @throws Exception Exception - */ - public static OutputStream getContentOutputStream(String path) throws Exception { - return delegate.getContentOutputStream(path); - } - - /** - * 获取文件输出流 - * - * @param path path - * @param append append - * @return stream - * @throws Exception Exception - */ - public static OutputStream getContentOutputStream(String path, boolean append) throws Exception { - return delegate.getContentOutputStream(path, append); - } - - /** - * 获取返回路径 用于客户端返回 - * - * @param path path - * @return returnPath - */ - public static String getReturnPath(String path) { - return delegate.getReturnPath(path); - } - - /** - * 获取实际存储路径 用于服务端的存储 - * - * @param returnPath returnPath - * @return absolutePath - */ - public static String getAbsolutePath(String returnPath) { - return delegate.getAbsolutePath(returnPath); - } - - public static void setDelegate(FileClient delegate) { - if (FileClientUtils.delegate != null) { - // unmodified - throw Exceptions.state(); - } - FileClientUtils.delegate = delegate; - } - -} 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 deleted file mode 100644 index 455845f5..00000000 --- a/orion-visor-framework/orion-visor-framework-common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -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 9fc7bce2..bca53d1f 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 @@ -19,7 +19,7 @@ org.dromara.visor - orion-visor-framework-common + orion-visor-common diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-banner/src/main/java/org/dromara/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 index fef1099e..4c831056 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-banner/src/main/java/org/dromara/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 @@ -22,8 +22,8 @@ */ package org.dromara.visor.framework.banner.configuration; +import org.dromara.visor.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-biz-operator-log/pom.xml b/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/pom.xml index e738642b..174f571b 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 @@ -19,7 +19,7 @@ org.dromara.visor - orion-visor-framework-common + orion-visor-common diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/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 index 8964b735..dc87d734 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/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 @@ -24,15 +24,15 @@ package org.dromara.visor.framework.biz.operator.log.configuration; import com.alibaba.fastjson.serializer.SerializeFilter; import com.alibaba.fastjson.serializer.ValueFilter; +import org.dromara.visor.common.constant.AutoConfigureOrderConst; +import org.dromara.visor.common.json.FieldDesensitizeFilter; +import org.dromara.visor.common.json.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/org/dromara/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 index a69f6bba..75a9542e 100644 --- a/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 +++ 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 @@ -23,7 +23,7 @@ package org.dromara.visor.framework.biz.operator.log.configuration.config; import lombok.Data; -import org.dromara.visor.framework.common.utils.ConfigUtils; +import org.dromara.visor.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/org/dromara/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 index 9039d48f..283e55dd 100644 --- a/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 +++ 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 @@ -30,6 +30,9 @@ 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.common.constant.BeanOrderConst; +import org.dromara.visor.common.security.LoginUser; +import org.dromara.visor.common.security.SecurityHolder; 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; @@ -38,9 +41,6 @@ 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/org/dromara/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 index e2b067cd..a55430c5 100644 --- a/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 +++ 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 @@ -23,7 +23,7 @@ package org.dromara.visor.framework.biz.operator.log.core.model; import lombok.Data; -import org.dromara.visor.framework.common.entity.RequestIdentity; +import org.dromara.visor.common.entity.RequestIdentity; import java.util.Date; diff --git a/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 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 index 5dc0d345..11c8063e 100644 --- a/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 +++ 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 @@ -29,16 +29,16 @@ 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 org.dromara.visor.common.entity.RequestIdentity; +import org.dromara.visor.common.enums.BooleanBit; +import org.dromara.visor.common.trace.TraceIdHolder; +import org.dromara.visor.common.security.LoginUser; +import org.dromara.visor.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/org/dromara/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 index 3d2298a2..d8ea3486 100644 --- a/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 +++ 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 @@ -23,11 +23,13 @@ package org.dromara.visor.framework.biz.operator.log.core.utils; import cn.orionsec.kit.lang.utils.Exceptions; +import cn.orionsec.kit.lang.utils.Strings; import cn.orionsec.kit.lang.utils.collect.Maps; import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.serializer.SerializeFilter; -import org.dromara.visor.framework.common.constant.ExtraFieldConst; -import org.dromara.visor.framework.common.security.LoginUser; +import org.dromara.visor.common.constant.ExtraFieldConst; +import org.dromara.visor.common.security.LoginUser; import java.util.Map; @@ -74,7 +76,7 @@ public class OperatorLogs implements ExtraFieldConst { * @param value value */ public static void addJson(String key, Object value) { - EXTRA_HOLDER.get().put(key, JSON.parseObject(JSON.toJSONString(value, serializeFilters))); + EXTRA_HOLDER.get().put(key, JSON.parseObject(toJsonString(value))); } /** @@ -96,13 +98,25 @@ public class OperatorLogs implements ExtraFieldConst { if (obj == null) { return; } - if (obj instanceof Map) { + if (obj instanceof JSONObject || obj instanceof com.alibaba.fastjson2.JSONObject) { + EXTRA_HOLDER.get().putAll(JSON.parseObject(toJsonString(obj))); + } else if (obj instanceof Map) { EXTRA_HOLDER.get().putAll((Map) obj); } else { - EXTRA_HOLDER.get().putAll(JSON.parseObject(JSON.toJSONString(obj, serializeFilters))); + EXTRA_HOLDER.get().putAll(JSON.parseObject(toJsonString(obj))); } } + /** + * 获取 json + * + * @param value value + * @return json + */ + public static String toJsonString(Object value) { + return JSON.toJSONString(value, serializeFilters); + } + /** * 设置不保存 */ @@ -167,6 +181,29 @@ public class OperatorLogs implements ExtraFieldConst { USER_HOLDER.remove(); } + /** + * 清空 html tag + * + * @param log log + * @return cleared + */ + public static String clearHtmlTag(String log) { + if (Strings.isBlank(log)) { + return log; + } + return log.replaceAll("", "") + .replaceAll("", "") + .replaceAll("", "") + .replaceAll("", "") + .replaceAll("", "") + .replaceAll("", "") + .replaceAll("", "") + .replaceAll("", "") + .replaceAll("", "") + .replaceAll("", "") + .replaceAll("
", "\n"); + } + public static void setSerializeFilters(SerializeFilter[] serializeFilters) { if (OperatorLogs.serializeFilters != null) { // unmodified diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-config/pom.xml b/orion-visor-framework/orion-visor-spring-boot-starter-config/pom.xml new file mode 100644 index 00000000..727c4a95 --- /dev/null +++ b/orion-visor-framework/orion-visor-spring-boot-starter-config/pom.xml @@ -0,0 +1,33 @@ + + + + org.dromara.visor + orion-visor-framework + ${revision} + + + 4.0.0 + orion-visor-spring-boot-starter-config + ${project.artifactId} + jar + + 项目配置中心 + https://github.com/dromara/orion-visor + + + + + org.dromara.visor + orion-visor-common + + + + + org.springframework.boot + spring-boot-starter + + + + \ No newline at end of file diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-config/src/main/java/org/dromara/visor/framework/config/configuration/OrionConfigAutoConfiguration.java b/orion-visor-framework/orion-visor-spring-boot-starter-config/src/main/java/org/dromara/visor/framework/config/configuration/OrionConfigAutoConfiguration.java new file mode 100644 index 00000000..f1b6bbbe --- /dev/null +++ b/orion-visor-framework/orion-visor-spring-boot-starter-config/src/main/java/org/dromara/visor/framework/config/configuration/OrionConfigAutoConfiguration.java @@ -0,0 +1,82 @@ +/* + * Copyright (c) 2023 - present Dromara, All rights reserved. + * + * https://visor.dromara.org + * https://visor.dromara.org.cn + * https://visor.orionsec.cn + * + * Members: + * Jiahang Li - ljh1553488six@139.com - author + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.dromara.visor.framework.config.configuration; + +import org.dromara.visor.common.constant.AutoConfigureOrderConst; +import org.dromara.visor.framework.config.core.listener.ConfigUpdateListener; +import org.dromara.visor.framework.config.core.service.ConfigFrameworkService; +import org.dromara.visor.framework.config.core.service.ConfigFrameworkServiceDelegate; +import org.dromara.visor.framework.config.core.store.ManagementConfigStore; +import org.dromara.visor.framework.config.core.store.ManagementConfigStoreImpl; +import org.dromara.visor.framework.config.core.utils.ConfigStores; +import org.springframework.boot.autoconfigure.AutoConfiguration; +import org.springframework.boot.autoconfigure.AutoConfigureOrder; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Primary; + +/** + * 配置中心 自动配置类 + * + * @author Jiahang Li + * @version 1.0.0 + * @since 2025/1/6 15:44 + */ +@AutoConfiguration +@AutoConfigureOrder(AutoConfigureOrderConst.FRAMEWORK_CONFIG) +public class OrionConfigAutoConfiguration { + + /** + * @param impl impl + * @return 配置框架服务 + */ + @Bean + @Primary + public ConfigFrameworkServiceDelegate configFrameworkService(ConfigFrameworkService impl) { + return new ConfigFrameworkServiceDelegate(impl); + } + + /** + * @param delegate delegate + * @return 配置修改监听器 + */ + @Bean + public ManagementConfigStore configStore(ConfigFrameworkServiceDelegate delegate) { + // 初始化 + ManagementConfigStoreImpl configStore = new ManagementConfigStoreImpl(delegate); + // 加载全部配置 + configStore.loadAllConfig(); + // 设置 ConfigStores + ConfigStores.setDelegate(configStore); + return configStore; + } + + /** + * @param configStore configStore + * @return 配置更新监听器 + */ + @Bean + public ConfigUpdateListener configUpdateListener(ManagementConfigStore configStore) { + return new ConfigUpdateListener(configStore); + } + +} diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-config/src/main/java/org/dromara/visor/framework/config/core/event/ConfigUpdateEvent.java b/orion-visor-framework/orion-visor-spring-boot-starter-config/src/main/java/org/dromara/visor/framework/config/core/event/ConfigUpdateEvent.java new file mode 100644 index 00000000..6f8a2689 --- /dev/null +++ b/orion-visor-framework/orion-visor-spring-boot-starter-config/src/main/java/org/dromara/visor/framework/config/core/event/ConfigUpdateEvent.java @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2023 - present Dromara, All rights reserved. + * + * https://visor.dromara.org + * https://visor.dromara.org.cn + * https://visor.orionsec.cn + * + * Members: + * Jiahang Li - ljh1553488six@139.com - author + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.dromara.visor.framework.config.core.event; + +import cn.orionsec.kit.lang.utils.collect.Maps; +import org.springframework.context.ApplicationEvent; + +import java.util.Map; + +/** + * 配置更新事件 + * + * @author Jiahang Li + * @version 1.0.0 + * @since 2025/1/6 17:24 + */ +public class ConfigUpdateEvent extends ApplicationEvent { + + private ConfigUpdateEvent(Map configs) { + super(configs); + } + + public static ConfigUpdateEvent of(Map configs) { + return new ConfigUpdateEvent(configs); + } + + public static ConfigUpdateEvent of(String key, String value) { + return new ConfigUpdateEvent(Maps.of(key, value)); + } + +} diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-config/src/main/java/org/dromara/visor/framework/config/core/listener/ConfigUpdateListener.java b/orion-visor-framework/orion-visor-spring-boot-starter-config/src/main/java/org/dromara/visor/framework/config/core/listener/ConfigUpdateListener.java new file mode 100644 index 00000000..784ab64b --- /dev/null +++ b/orion-visor-framework/orion-visor-spring-boot-starter-config/src/main/java/org/dromara/visor/framework/config/core/listener/ConfigUpdateListener.java @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2023 - present Dromara, All rights reserved. + * + * https://visor.dromara.org + * https://visor.dromara.org.cn + * https://visor.orionsec.cn + * + * Members: + * Jiahang Li - ljh1553488six@139.com - author + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.dromara.visor.framework.config.core.listener; + +import org.dromara.visor.framework.config.core.event.ConfigUpdateEvent; +import org.dromara.visor.framework.config.core.store.ManagementConfigStore; +import org.springframework.context.ApplicationListener; + +import java.util.Map; + +/** + * 配置修改监听器 + * + * @author Jiahang Li + * @version 1.0.0 + * @since 2025/1/6 16:01 + */ +public class ConfigUpdateListener implements ApplicationListener { + + private final ManagementConfigStore configStore; + + public ConfigUpdateListener(ManagementConfigStore configStore) { + this.configStore = configStore; + } + + @SuppressWarnings("unchecked") + @Override + public void onApplicationEvent(ConfigUpdateEvent event) { + // 获取修改的配置并且覆盖 + Map configs = (Map) event.getSource(); + configs.forEach(configStore::override); + } + +} diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-config/src/main/java/org/dromara/visor/framework/config/core/ref/ConfigRefImpl.java b/orion-visor-framework/orion-visor-spring-boot-starter-config/src/main/java/org/dromara/visor/framework/config/core/ref/ConfigRefImpl.java new file mode 100644 index 00000000..d82841bf --- /dev/null +++ b/orion-visor-framework/orion-visor-spring-boot-starter-config/src/main/java/org/dromara/visor/framework/config/core/ref/ConfigRefImpl.java @@ -0,0 +1,82 @@ +/* + * Copyright (c) 2023 - present Dromara, All rights reserved. + * + * https://visor.dromara.org + * https://visor.dromara.org.cn + * https://visor.orionsec.cn + * + * Members: + * Jiahang Li - ljh1553488six@139.com - author + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.dromara.visor.framework.config.core.ref; + +import cn.orionsec.kit.lang.utils.Objects1; +import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.common.config.ConfigRef; + +import java.util.function.BiConsumer; +import java.util.function.Function; + +/** + * 配置引用实现类 + * + * @author Jiahang Li + * @version 1.0.0 + * @since 2025/1/14 16:10 + */ +@Slf4j +public class ConfigRefImpl extends ConfigRef { + + protected BiConsumer changeEvent; + + public ConfigRefImpl(String key, Function convert) { + super(key, convert); + } + + @Override + public void override(String value) { + try { + this.set(convert.apply(value)); + } catch (Exception e) { + log.error("ConfigRef trigger override error key: {}, value: {}", key, value, e); + } + } + + @Override + public void set(T value) { + T before = this.value; + this.value = value; + // 被修改 + if (!Objects1.eq(before, value)) { + log.info("ConfigRef changed key: {}, value: {}", key, value); + // 触发事件 + if (changeEvent != null) { + changeEvent.accept(value, before); + } + } + } + + @Override + public T get() { + return value; + } + + @Override + public ConfigRef onChange(BiConsumer changeEvent) { + this.changeEvent = changeEvent; + return this; + } + +} diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-config/src/main/java/org/dromara/visor/framework/config/core/service/ConfigFrameworkService.java b/orion-visor-framework/orion-visor-spring-boot-starter-config/src/main/java/org/dromara/visor/framework/config/core/service/ConfigFrameworkService.java new file mode 100644 index 00000000..3362d857 --- /dev/null +++ b/orion-visor-framework/orion-visor-spring-boot-starter-config/src/main/java/org/dromara/visor/framework/config/core/service/ConfigFrameworkService.java @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2023 - present Dromara, All rights reserved. + * + * https://visor.dromara.org + * https://visor.dromara.org.cn + * https://visor.orionsec.cn + * + * Members: + * Jiahang Li - ljh1553488six@139.com - author + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.dromara.visor.framework.config.core.service; + +import java.util.Map; + +/** + * 配置框架服务 + *

+ * 在业务层定义 bean + * + * @author Jiahang Li + * @version 1.0.0 + * @since 2025/1/6 17:08 + */ +public interface ConfigFrameworkService { + + /** + * 获取全部配置 + * + * @return config + */ + Map getAllConfig(); + +} diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-config/src/main/java/org/dromara/visor/framework/config/core/service/ConfigFrameworkServiceDelegate.java b/orion-visor-framework/orion-visor-spring-boot-starter-config/src/main/java/org/dromara/visor/framework/config/core/service/ConfigFrameworkServiceDelegate.java new file mode 100644 index 00000000..9de5e34c --- /dev/null +++ b/orion-visor-framework/orion-visor-spring-boot-starter-config/src/main/java/org/dromara/visor/framework/config/core/service/ConfigFrameworkServiceDelegate.java @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2023 - present Dromara, All rights reserved. + * + * https://visor.dromara.org + * https://visor.dromara.org.cn + * https://visor.orionsec.cn + * + * Members: + * Jiahang Li - ljh1553488six@139.com - author + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.dromara.visor.framework.config.core.service; + +import java.util.Map; + +/** + * 配置框架服务代理 + * + * @author Jiahang Li + * @version 1.0.0 + * @since 2025/1/6 17:08 + */ +public class ConfigFrameworkServiceDelegate implements ConfigFrameworkService { + + private final ConfigFrameworkService configFrameworkService; + + public ConfigFrameworkServiceDelegate(ConfigFrameworkService configFrameworkService) { + this.configFrameworkService = configFrameworkService; + } + + @Override + public Map getAllConfig() { + return configFrameworkService.getAllConfig(); + } + +} diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-config/src/main/java/org/dromara/visor/framework/config/core/store/ManagementConfigStore.java b/orion-visor-framework/orion-visor-spring-boot-starter-config/src/main/java/org/dromara/visor/framework/config/core/store/ManagementConfigStore.java new file mode 100644 index 00000000..e85a1ac7 --- /dev/null +++ b/orion-visor-framework/orion-visor-spring-boot-starter-config/src/main/java/org/dromara/visor/framework/config/core/store/ManagementConfigStore.java @@ -0,0 +1,57 @@ +/* + * Copyright (c) 2023 - present Dromara, All rights reserved. + * + * https://visor.dromara.org + * https://visor.dromara.org.cn + * https://visor.orionsec.cn + * + * Members: + * Jiahang Li - ljh1553488six@139.com - author + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.dromara.visor.framework.config.core.store; + +import org.dromara.visor.common.config.ConfigRef; +import org.dromara.visor.common.config.ConfigStore; + +/** + * 可控配置中心 + * + * @author Jiahang Li + * @version 1.0.0 + * @since 2025/1/6 23:00 + */ +public interface ManagementConfigStore extends ConfigStore { + + /** + * 加载全部配置 + */ + void loadAllConfig(); + + /** + * 覆盖配置 + * + * @param key key + * @param value value + */ + void override(String key, String value); + + /** + * 注册 ref + * + * @param ref ref + */ + void register(ConfigRef ref); + +} diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-config/src/main/java/org/dromara/visor/framework/config/core/store/ManagementConfigStoreImpl.java b/orion-visor-framework/orion-visor-spring-boot-starter-config/src/main/java/org/dromara/visor/framework/config/core/store/ManagementConfigStoreImpl.java new file mode 100644 index 00000000..7d4a84a0 --- /dev/null +++ b/orion-visor-framework/orion-visor-spring-boot-starter-config/src/main/java/org/dromara/visor/framework/config/core/store/ManagementConfigStoreImpl.java @@ -0,0 +1,229 @@ +/* + * Copyright (c) 2023 - present Dromara, All rights reserved. + * + * https://visor.dromara.org + * https://visor.dromara.org.cn + * https://visor.orionsec.cn + * + * Members: + * Jiahang Li - ljh1553488six@139.com - author + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.dromara.visor.framework.config.core.store; + +import cn.orionsec.kit.lang.utils.collect.Lists; +import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.common.config.ConfigRef; +import org.dromara.visor.framework.config.core.ref.ConfigRefImpl; +import org.dromara.visor.framework.config.core.service.ConfigFrameworkService; + +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.ConcurrentHashMap; +import java.util.function.Function; + +/** + * 配置中心实现 + * + * @author Jiahang Li + * @version 1.0.0 + * @since 2025/1/6 17:20 + */ +@Slf4j +public class ManagementConfigStoreImpl implements ManagementConfigStore { + + private final ConcurrentHashMap configMap = new ConcurrentHashMap<>(); + + private final ConcurrentHashMap>> configRefs = new ConcurrentHashMap<>(); + + private final ConfigFrameworkService service; + + public ManagementConfigStoreImpl(ConfigFrameworkService service) { + this.service = service; + } + + @Override + public void loadAllConfig() { + configMap.putAll(service.getAllConfig()); + } + + @Override + public void override(String key, String value) { + log.info("ConfigStore.override key: {}, value: {}", key, value); + // 修改配置 + configMap.put(key, value); + // 修改引用 + List> refs = configRefs.get(key); + if (!Lists.isEmpty(refs)) { + refs.forEach(s -> s.override(value)); + } + } + + @Override + public void register(ConfigRef ref) { + String key = ref.key; + log.info("ConfigStore.register ref key: {}", key); + // 注册引用 + configRefs.computeIfAbsent(key, k -> new ArrayList<>()).add(ref); + } + + @Override + public String getString(String key) { + return this.getConfig(key); + } + + @Override + public String getString(String key, String defaultValue) { + return this.getConfig(key, defaultValue); + } + + @Override + public Integer getInteger(String key) { + return this.getConfig(key, Integer::valueOf, null); + } + + @Override + public Integer getInteger(String key, Integer defaultValue) { + return this.getConfig(key, Integer::valueOf, defaultValue); + } + + @Override + public Long getLong(String key) { + return this.getConfig(key, Long::valueOf, null); + } + + @Override + public Long getLong(String key, Long defaultValue) { + return this.getConfig(key, Long::valueOf, defaultValue); + } + + @Override + public Double getDouble(String key) { + return this.getConfig(key, Double::valueOf, null); + } + + @Override + public Double getDouble(String key, Double defaultValue) { + return this.getConfig(key, Double::valueOf, defaultValue); + } + + @Override + public Boolean getBoolean(String key) { + return this.getConfig(key, Boolean::valueOf, null); + } + + @Override + public Boolean getBoolean(String key, Boolean defaultValue) { + return this.getConfig(key, Boolean::valueOf, defaultValue); + } + + @Override + public String getConfig(String key) { + return this.getConfig(key, Function.identity(), null); + } + + @Override + public String getConfig(String key, String defaultValue) { + return this.getConfig(key, Function.identity(), defaultValue); + } + + @Override + public T getConfig(String key, Function convert) { + return this.getConfig(key, convert, null); + } + + @Override + public T getConfig(String key, Function convert, T defaultValue) { + // 获取配置 + String conf = configMap.get(key); + // 默认值 + if (conf == null) { + return defaultValue; + } + // 转换 + return convert.apply(conf); + } + + @Override + public ConfigRef string(String key) { + return this.ref(key, Function.identity(), null); + } + + @Override + public ConfigRef string(String key, String defaultValue) { + return this.ref(key, Function.identity(), defaultValue); + } + + @Override + public ConfigRef int32(String key) { + return this.ref(key, Integer::valueOf, null); + } + + @Override + public ConfigRef int32(String key, Integer defaultValue) { + return this.ref(key, Integer::valueOf, defaultValue); + } + + @Override + public ConfigRef int64(String key) { + return this.ref(key, Long::valueOf, null); + } + + @Override + public ConfigRef int64(String key, Long defaultValue) { + return this.ref(key, Long::valueOf, defaultValue); + } + + @Override + public ConfigRef float64(String key) { + return this.ref(key, Double::valueOf, null); + } + + @Override + public ConfigRef float64(String key, Double defaultValue) { + return this.ref(key, Double::valueOf, defaultValue); + } + + @Override + public ConfigRef bool(String key) { + return this.ref(key, Boolean::valueOf, null); + } + + @Override + public ConfigRef bool(String key, Boolean defaultValue) { + return this.ref(key, Boolean::valueOf, defaultValue); + } + + @Override + public ConfigRef ref(String key, Function convert) { + return this.ref(key, convert, null); + } + + @Override + public ConfigRef ref(String key, Function convert, T defaultValue) { + // 创建引用 + ConfigRef ref = new ConfigRefImpl<>(key, convert); + // 设置值 + String value = configMap.get(key); + if (value != null) { + ref.override(value); + } else { + ref.set(defaultValue); + } + // 注册引用 + this.register(ref); + return ref; + } + +} diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-config/src/main/java/org/dromara/visor/framework/config/core/utils/ConfigStores.java b/orion-visor-framework/orion-visor-spring-boot-starter-config/src/main/java/org/dromara/visor/framework/config/core/utils/ConfigStores.java new file mode 100644 index 00000000..c3145518 --- /dev/null +++ b/orion-visor-framework/orion-visor-spring-boot-starter-config/src/main/java/org/dromara/visor/framework/config/core/utils/ConfigStores.java @@ -0,0 +1,333 @@ +/* + * Copyright (c) 2023 - present Dromara, All rights reserved. + * + * https://visor.dromara.org + * https://visor.dromara.org.cn + * https://visor.orionsec.cn + * + * Members: + * Jiahang Li - ljh1553488six@139.com - author + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.dromara.visor.framework.config.core.utils; + +import cn.orionsec.kit.lang.utils.Exceptions; +import org.dromara.visor.common.config.ConfigRef; +import org.dromara.visor.common.config.ConfigStore; + +import java.util.function.Function; + +/** + * 配置中心 + * + * @author Jiahang Li + * @version 1.0.0 + * @since 2025/1/6 17:20 + */ +public class ConfigStores { + + private static ConfigStore delegate; + + private ConfigStores() { + } + + /** + * 获取 string 配置 + * + * @param key key + * @return config + */ + public String getString(String key) { + return delegate.getString(key); + } + + /** + * 获取 string 配置 + * + * @param key key + * @param defaultValue defaultValue + * @return config + */ + public String getString(String key, String defaultValue) { + return delegate.getString(key, defaultValue); + } + + /** + * 获取 int 配置 + * + * @param key key + * @return config + */ + public Integer getInteger(String key) { + return delegate.getInteger(key); + } + + /** + * 获取 int 配置 + * + * @param key key + * @param defaultValue defaultValue + * @return config + */ + public Integer getInteger(String key, Integer defaultValue) { + return delegate.getInteger(key, defaultValue); + } + + /** + * 获取 long 配置 + * + * @param key key + * @return config + */ + public Long getLong(String key) { + return delegate.getLong(key); + } + + /** + * 获取 long 配置 + * + * @param key key + * @param defaultValue defaultValue + * @return config + */ + public Long getLong(String key, Long defaultValue) { + return delegate.getLong(key, defaultValue); + } + + /** + * 获取 double 配置 + * + * @param key key + * @return config + */ + public Double getDouble(String key) { + return delegate.getDouble(key); + } + + /** + * 获取 double 配置 + * + * @param key key + * @param defaultValue defaultValue + * @return config + */ + public Double getDouble(String key, Double defaultValue) { + return delegate.getDouble(key, defaultValue); + } + + /** + * 获取 boolean 配置 + * + * @param key key + * @return config + */ + public Boolean getBoolean(String key) { + return delegate.getBoolean(key); + } + + /** + * 获取 boolean 配置 + * + * @param key key + * @param defaultValue defaultValue + * @return config + */ + public Boolean getBoolean(String key, Boolean defaultValue) { + return delegate.getBoolean(key, defaultValue); + } + + /** + * 获取配置 + * + * @param key key + * @return conf + */ + public static String getConfig(String key) { + return delegate.getConfig(key); + } + + /** + * 获取配置 + * + * @param key key + * @param defaultValue defaultValue + * @return conf + */ + public static String getConfig(String key, String defaultValue) { + return delegate.getConfig(key, defaultValue); + } + + /** + * 获取配置 + * + * @param key key + * @param convert convert + * @param T + * @return conf + */ + public static T getConfig(String key, Function convert) { + return delegate.getConfig(key, convert); + } + + /** + * 获取配置 + * + * @param key key + * @param defaultValue defaultValue + * @param T + * @return conf + */ + public static T getConfig(String key, Function convert, T defaultValue) { + return delegate.getConfig(key, convert, defaultValue); + } + + /** + * 获取 string 配置 + * + * @param key key + * @return ref + */ + public static ConfigRef string(String key) { + return delegate.string(key); + } + + /** + * 获取 string 配置 + * + * @param key key + * @param defaultValue defaultValue + * @return ref + */ + public static ConfigRef string(String key, String defaultValue) { + return delegate.string(key, defaultValue); + } + + /** + * 获取 int 配置 + * + * @param key key + * @return ref + */ + public static ConfigRef int32(String key) { + return delegate.int32(key); + } + + /** + * 获取 int 配置 + * + * @param key key + * @param defaultValue defaultValue + * @return ref + */ + public static ConfigRef int32(String key, Integer defaultValue) { + return delegate.int32(key, defaultValue); + } + + /** + * 获取 long 配置 + * + * @param key key + * @return ref + */ + public static ConfigRef int64(String key) { + return delegate.int64(key); + } + + /** + * 获取 long 配置 + * + * @param key key + * @param defaultValue defaultValue + * @return ref + */ + public static ConfigRef int64(String key, Long defaultValue) { + return delegate.int64(key, defaultValue); + } + + /** + * 获取 double 配置 + * + * @param key key + * @return ref + */ + public static ConfigRef float64(String key) { + return delegate.float64(key); + } + + /** + * 获取 double 配置 + * + * @param key key + * @param defaultValue defaultValue + * @return ref + */ + public static ConfigRef float64(String key, Double defaultValue) { + return delegate.float64(key, defaultValue); + } + + /** + * 获取 boolean 配置 + * + * @param key key + * @return ref + */ + public static ConfigRef bool(String key) { + return delegate.bool(key); + } + + /** + * 获取 boolean 配置 + * + * @param key key + * @param defaultValue defaultValue + * @return ref + */ + public static ConfigRef bool(String key, Boolean defaultValue) { + return delegate.bool(key, defaultValue); + } + + /** + * 获取配置 + * + * @param key key + * @param convert convert + * @param T + * @return ref + */ + public static ConfigRef ref(String key, Function convert) { + return delegate.ref(key, convert); + } + + /** + * 获取配置 + * + * @param key key + * @param convert convert + * @param defaultValue defaultValue + * @param T + * @return ref + */ + public static ConfigRef ref(String key, Function convert, T defaultValue) { + return delegate.ref(key, convert, defaultValue); + } + + public static void setDelegate(ConfigStore configStore) { + if (ConfigStores.delegate != null) { + // unmodified + throw Exceptions.state(); + } + ConfigStores.delegate = configStore; + } + +} diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-config/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/orion-visor-framework/orion-visor-spring-boot-starter-config/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 00000000..4a58ff77 --- /dev/null +++ b/orion-visor-framework/orion-visor-spring-boot-starter-config/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +org.dromara.visor.framework.config.configuration.OrionConfigAutoConfiguration \ 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 3571a237..1f872166 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 @@ -19,7 +19,7 @@ org.dromara.visor - orion-visor-framework-common + orion-visor-common diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-datasource/src/main/java/org/dromara/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 index 5d21efdb..96d656a7 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-datasource/src/main/java/org/dromara/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 @@ -23,7 +23,7 @@ package org.dromara.visor.framework.datasource.configuration; import com.alibaba.druid.spring.boot.autoconfigure.properties.DruidStatProperties; -import org.dromara.visor.framework.common.constant.AutoConfigureOrderConst; +import org.dromara.visor.common.constant.AutoConfigureOrderConst; import org.dromara.visor.framework.datasource.core.filter.DruidAdRemoveFilter; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigureOrder; 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 d3e280ae..856aff7b 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 @@ -19,7 +19,7 @@ org.dromara.visor - orion-visor-framework-common + orion-visor-common diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-desensitize/src/main/java/org/dromara/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 index 7d81e35f..7090a2ca 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-desensitize/src/main/java/org/dromara/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 @@ -22,7 +22,7 @@ */ package org.dromara.visor.framework.desensitize.configuration; -import org.dromara.visor.framework.common.constant.AutoConfigureOrderConst; +import org.dromara.visor.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; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-desensitize/src/main/java/org/dromara/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 index 68ca496e..de32c264 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-desensitize/src/main/java/org/dromara/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 @@ -30,7 +30,7 @@ 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 org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.common.constant.Const; import org.dromara.visor.framework.desensitize.core.annotation.Desensitize; import org.dromara.visor.framework.desensitize.core.annotation.DesensitizeObject; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-encrypt/pom.xml b/orion-visor-framework/orion-visor-spring-boot-starter-encrypt/pom.xml new file mode 100644 index 00000000..b1364d07 --- /dev/null +++ b/orion-visor-framework/orion-visor-spring-boot-starter-encrypt/pom.xml @@ -0,0 +1,33 @@ + + + + org.dromara.visor + orion-visor-framework + ${revision} + + + 4.0.0 + orion-visor-spring-boot-starter-encrypt + ${project.artifactId} + jar + + 项目加密包 + https://github.com/dromara/orion-visor + + + + + org.dromara.visor + orion-visor-common + + + + + org.springframework.boot + spring-boot-starter + + + + \ No newline at end of file diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-encrypt/src/main/java/org/dromara/visor/framework/encrypt/configuration/OrionEncryptAutoConfiguration.java b/orion-visor-framework/orion-visor-spring-boot-starter-encrypt/src/main/java/org/dromara/visor/framework/encrypt/configuration/OrionEncryptAutoConfiguration.java new file mode 100644 index 00000000..2157a14b --- /dev/null +++ b/orion-visor-framework/orion-visor-spring-boot-starter-encrypt/src/main/java/org/dromara/visor/framework/encrypt/configuration/OrionEncryptAutoConfiguration.java @@ -0,0 +1,77 @@ +/* + * Copyright (c) 2023 - present Dromara, All rights reserved. + * + * https://visor.dromara.org + * https://visor.dromara.org.cn + * https://visor.orionsec.cn + * + * Members: + * Jiahang Li - ljh1553488six@139.com - author + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.dromara.visor.framework.encrypt.configuration; + +import org.dromara.visor.common.config.ConfigStore; +import org.dromara.visor.common.constant.AutoConfigureOrderConst; +import org.dromara.visor.common.interfaces.AesEncryptor; +import org.dromara.visor.common.interfaces.RsaEncryptor; +import org.dromara.visor.common.utils.AesEncryptUtils; +import org.dromara.visor.common.utils.RsaEncryptUtils; +import org.dromara.visor.framework.encrypt.configuration.config.AesEncryptConfig; +import org.dromara.visor.framework.encrypt.core.impl.AesEncryptorImpl; +import org.dromara.visor.framework.encrypt.core.impl.RsaEncryptorImpl; +import org.springframework.boot.autoconfigure.AutoConfiguration; +import org.springframework.boot.autoconfigure.AutoConfigureOrder; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.context.annotation.Bean; + +/** + * 项目加密解密配置 + * + * @author Jiahang Li + * @version 1.0.0 + * @since 2025/1/7 22:32 + */ +@AutoConfiguration +@EnableConfigurationProperties({AesEncryptConfig.class}) +@AutoConfigureOrder(AutoConfigureOrderConst.FRAMEWORK_ENCRYPT) +public class OrionEncryptAutoConfiguration { + + /** + * @param config config + * @return aes 加密器 + */ + @Bean + public AesEncryptor aesEncryptor(AesEncryptConfig config) { + // 加密器 + AesEncryptorImpl encryptor = new AesEncryptorImpl(config); + // 设置工具类 + AesEncryptUtils.setDelegate(encryptor); + return encryptor; + } + + /** + * @param configStore configStore + * @return rsa 加密器 + */ + @Bean + public RsaEncryptor rsaEncryptor(ConfigStore configStore) { + // 加密器 + RsaEncryptor encryptor = new RsaEncryptorImpl(configStore); + // 设置工具类 + RsaEncryptUtils.setDelegate(encryptor); + return encryptor; + } + +} diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/configuration/config/AesCryptoConfig.java b/orion-visor-framework/orion-visor-spring-boot-starter-encrypt/src/main/java/org/dromara/visor/framework/encrypt/configuration/config/AesEncryptConfig.java similarity index 76% rename from orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/configuration/config/AesCryptoConfig.java rename to orion-visor-framework/orion-visor-spring-boot-starter-encrypt/src/main/java/org/dromara/visor/framework/encrypt/configuration/config/AesEncryptConfig.java index ef557780..c681c8bd 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/configuration/config/AesCryptoConfig.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-encrypt/src/main/java/org/dromara/visor/framework/encrypt/configuration/config/AesEncryptConfig.java @@ -20,14 +20,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.security.configuration.config; +package org.dromara.visor.framework.encrypt.configuration.config; 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; /** @@ -38,19 +36,18 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * @since 2023/7/7 22:22 */ @Data -@EqualsAndHashCode(callSuper = true) -@ConfigurationProperties("orion.crypto.aes") -public class AesCryptoConfig extends CryptoConfig { +@ConfigurationProperties("orion.encrypt.aes") +public class AesEncryptConfig { /** * 加密模式 */ - private WorkingMode workingMode = WorkingMode.ECB; + private WorkingMode workingMode; /** * 填充模式 */ - private PaddingMode paddingMode = PaddingMode.PKCS5_PADDING; + private PaddingMode paddingMode; /** * 加密密钥 @@ -60,12 +57,12 @@ public class AesCryptoConfig extends CryptoConfig { /** * 是否生成密钥 */ - private boolean useGeneratorKey = true; + private boolean useGeneratorKey; /** * 生成的密钥长度 128 192 256bytes */ - private int generatorKeyLength = CryptoConst.AES_KEY_LENGTH; + private int generatorKeyLength; /** * 向量 长度为 16bytes @@ -83,4 +80,11 @@ public class AesCryptoConfig extends CryptoConfig { */ private String aad; + public AesEncryptConfig() { + this.workingMode = WorkingMode.ECB; + this.paddingMode = PaddingMode.PKCS5_PADDING; + this.useGeneratorKey = true; + this.generatorKeyLength = CryptoConst.AES_KEY_LENGTH; + } + } diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/crypto/CryptoProcessor.java b/orion-visor-framework/orion-visor-spring-boot-starter-encrypt/src/main/java/org/dromara/visor/framework/encrypt/core/BaseAesEncryptor.java similarity index 71% rename from orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/crypto/CryptoProcessor.java rename to orion-visor-framework/orion-visor-spring-boot-starter-encrypt/src/main/java/org/dromara/visor/framework/encrypt/core/BaseAesEncryptor.java index c0010c58..27e0a390 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/crypto/CryptoProcessor.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-encrypt/src/main/java/org/dromara/visor/framework/encrypt/core/BaseAesEncryptor.java @@ -20,10 +20,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.security.core.crypto; +package org.dromara.visor.framework.encrypt.core; -import org.dromara.visor.framework.common.crypto.ValueCrypto; -import org.dromara.visor.framework.common.utils.CryptoUtils; +import org.dromara.visor.common.interfaces.AesEncryptor; /** * 数据加密器 @@ -32,19 +31,19 @@ import org.dromara.visor.framework.common.utils.CryptoUtils; * @version 1.0.0 * @since 2023/7/7 22:48 */ -public abstract class CryptoProcessor implements ValueCrypto { +public abstract class BaseAesEncryptor implements AesEncryptor { protected final Config config; - protected CryptoProcessor(Config config) { + protected BaseAesEncryptor(Config config) { this.config = config; - // 设置为默认加密器 - if (config.isPrimary()) { - PrimaryValueCrypto.setDelegate(this); - CryptoUtils.setDelegate(this); - } } + /** + * 初始化 + */ + protected abstract void init(); + /** * 初始化密钥 */ diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/crypto/processor/AesCryptoProcessor.java b/orion-visor-framework/orion-visor-spring-boot-starter-encrypt/src/main/java/org/dromara/visor/framework/encrypt/core/impl/AesEncryptorImpl.java similarity index 89% rename from orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/crypto/processor/AesCryptoProcessor.java rename to orion-visor-framework/orion-visor-spring-boot-starter-encrypt/src/main/java/org/dromara/visor/framework/encrypt/core/impl/AesEncryptorImpl.java index d05c1ef0..e4bdb0ea 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/crypto/processor/AesCryptoProcessor.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-encrypt/src/main/java/org/dromara/visor/framework/encrypt/core/impl/AesEncryptorImpl.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.security.core.crypto.processor; +package org.dromara.visor.framework.encrypt.core.impl; import cn.orionsec.kit.lang.utils.Strings; import cn.orionsec.kit.lang.utils.crypto.Keys; @@ -28,8 +28,8 @@ 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 org.dromara.visor.framework.encrypt.configuration.config.AesEncryptConfig; +import org.dromara.visor.framework.encrypt.core.BaseAesEncryptor; import javax.crypto.SecretKey; import java.security.spec.AlgorithmParameterSpec; @@ -41,7 +41,7 @@ import java.security.spec.AlgorithmParameterSpec; * @version 1.0.0 * @since 2023/7/8 0:05 */ -public class AesCryptoProcessor extends CryptoProcessor { +public class AesEncryptorImpl extends BaseAesEncryptor { /** * 加密器 @@ -53,12 +53,14 @@ public class AesCryptoProcessor extends CryptoProcessor { */ private SymmetricBuilder builder; - public AesCryptoProcessor(AesCryptoConfig config) { + public AesEncryptorImpl(AesEncryptConfig config) { super(config); + // 初始化 + this.init(); } @Override - public void init() { + protected void init() { // 创建构建器 this.builder = SymmetricBuilder.aes() .workingMode(config.getWorkingMode()) diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-encrypt/src/main/java/org/dromara/visor/framework/encrypt/core/impl/RsaEncryptorImpl.java b/orion-visor-framework/orion-visor-spring-boot-starter-encrypt/src/main/java/org/dromara/visor/framework/encrypt/core/impl/RsaEncryptorImpl.java new file mode 100644 index 00000000..be53e73a --- /dev/null +++ b/orion-visor-framework/orion-visor-spring-boot-starter-encrypt/src/main/java/org/dromara/visor/framework/encrypt/core/impl/RsaEncryptorImpl.java @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2023 - present Dromara, All rights reserved. + * + * https://visor.dromara.org + * https://visor.dromara.org.cn + * https://visor.orionsec.cn + * + * Members: + * Jiahang Li - ljh1553488six@139.com - author + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.dromara.visor.framework.encrypt.core.impl; + +import cn.orionsec.kit.lang.utils.crypto.RSA; +import org.dromara.visor.common.config.ConfigRef; +import org.dromara.visor.common.config.ConfigStore; +import org.dromara.visor.common.constant.ConfigKeys; +import org.dromara.visor.common.interfaces.RsaEncryptor; + +import java.security.interfaces.RSAPrivateKey; +import java.security.interfaces.RSAPublicKey; + +/** + * rsa 加密器 + * + * @author Jiahang Li + * @version 1.0.0 + * @since 2025/1/7 11:32 + */ +public class RsaEncryptorImpl implements RsaEncryptor { + + private final ConfigRef publicKey; + + private final ConfigRef privateKey; + + public RsaEncryptorImpl(ConfigStore configStore) { + this.publicKey = configStore.ref(ConfigKeys.ENCRYPT_PUBLIC_KEY, RSA::getPublicKey); + this.privateKey = configStore.ref(ConfigKeys.ENCRYPT_PRIVATE_KEY, RSA::getPrivateKey); + } + + @Override + public String encrypt(String value) { + return RSA.encrypt(value, publicKey.value); + } + + @Override + public String decrypt(String value) { + return RSA.decrypt(value, privateKey.value); + } + +} diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-encrypt/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/orion-visor-framework/orion-visor-spring-boot-starter-encrypt/src/main/resources/META-INF/additional-spring-configuration-metadata.json new file mode 100644 index 00000000..8dd616b9 --- /dev/null +++ b/orion-visor-framework/orion-visor-spring-boot-starter-encrypt/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -0,0 +1,55 @@ +{ + "groups": [ + { + "name": "orion.encrypt.aes", + "type": "org.dromara.visor.framework.encrypt.configuration.config.AesEncryptConfig", + "sourceType": "org.dromara.visor.framework.encrypt.configuration.config.AesEncryptConfig" + } + ], + "properties": [ + { + "name": "orion.encrypt.aes.working-mode", + "type": "cn.orionsec.kit.lang.utils.crypto.enums.WorkingMode", + "description": "加密模式.", + "defaultValue": "ECB" + }, + { + "name": "orion.encrypt.aes.padding-mode", + "type": "cn.orionsec.kit.lang.utils.crypto.enums.PaddingMode", + "description": "填充模式.", + "defaultValue": "PKCS5_PADDING" + }, + { + "name": "orion.encrypt.aes.secret-key", + "type": "java.lang.String", + "description": "加密密钥." + }, + { + "name": "orion.encrypt.aes.use-generator-key", + "type": "java.lang.Boolean", + "description": "是否生成密钥.", + "defaultValue": "true" + }, + { + "name": "orion.encrypt.aes.generator-key-length", + "type": "java.lang.Integer", + "description": "生成的密钥长度 128 192 256bytes.", + "defaultValue": "128" + }, + { + "name": "orion.encrypt.aes.iv", + "type": "java.lang.String", + "description": "向量 长度为 16bytes." + }, + { + "name": "orion.encrypt.aes.gcm", + "type": "java.lang.String", + "description": "GCM 模式参数 长度为 96 104 112 120 128bytes." + }, + { + "name": "orion.encrypt.aes.aad", + "type": "java.lang.String", + "description": "GCM 模式 aad." + } + ] +} \ No newline at end of file diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-encrypt/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/orion-visor-framework/orion-visor-spring-boot-starter-encrypt/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 00000000..ed914b6c --- /dev/null +++ b/orion-visor-framework/orion-visor-spring-boot-starter-encrypt/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +org.dromara.visor.framework.encrypt.configuration.OrionEncryptAutoConfiguration \ 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 789edbd9..2bd119dd 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 @@ -19,7 +19,7 @@ org.dromara.visor - orion-visor-framework-common + orion-visor-common diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/configuration/OrionCommonAutoConfiguration.java b/orion-visor-framework/orion-visor-spring-boot-starter-job/src/main/java/org/dromara/visor/framework/job/configuration/OrionAsyncAutoConfiguration.java similarity index 79% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/configuration/OrionCommonAutoConfiguration.java rename to orion-visor-framework/orion-visor-spring-boot-starter-job/src/main/java/org/dromara/visor/framework/job/configuration/OrionAsyncAutoConfiguration.java index c117d1ae..30427ded 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/configuration/OrionCommonAutoConfiguration.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-job/src/main/java/org/dromara/visor/framework/job/configuration/OrionAsyncAutoConfiguration.java @@ -20,12 +20,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.configuration; +package org.dromara.visor.framework.job.configuration; -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.dromara.visor.common.constant.AutoConfigureOrderConst; +import org.dromara.visor.common.thread.ThreadPoolMdcTaskExecutor; +import org.dromara.visor.framework.job.configuration.config.AsyncExecutorConfig; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigureOrder; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -37,7 +36,7 @@ import org.springframework.scheduling.annotation.EnableAsync; import java.util.concurrent.ThreadPoolExecutor; /** - * 应用配置类 + * async 异步任务 * * @author Jiahang Li * @version 1.0.0 @@ -45,17 +44,9 @@ import java.util.concurrent.ThreadPoolExecutor; */ @EnableAsync @AutoConfiguration -@AutoConfigureOrder(AutoConfigureOrderConst.FRAMEWORK_COMMON) +@AutoConfigureOrder(AutoConfigureOrderConst.FRAMEWORK_JOB_ASYNC) @EnableConfigurationProperties(AsyncExecutorConfig.class) -public class OrionCommonAutoConfiguration { - - /** - * @return spring 容器工具类 - */ - @Bean - public SpringHolder.ApplicationContextAwareStore springHolderAware() { - return new SpringHolder.ApplicationContextAwareStore(); - } +public class OrionAsyncAutoConfiguration { /** * 支持 MDC 的异步线程池 diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-job/src/main/java/org/dromara/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 index 07224b25..19a67faa 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-job/src/main/java/org/dromara/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 @@ -22,7 +22,7 @@ */ package org.dromara.visor.framework.job.configuration; -import org.dromara.visor.framework.common.constant.AutoConfigureOrderConst; +import org.dromara.visor.common.constant.AutoConfigureOrderConst; import org.dromara.visor.framework.job.core.utils.QuartzUtils; import org.quartz.Scheduler; import org.springframework.boot.autoconfigure.AutoConfiguration; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-job/src/main/java/org/dromara/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 index e59b7d8a..c6c78804 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-job/src/main/java/org/dromara/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 @@ -22,7 +22,7 @@ */ package org.dromara.visor.framework.job.configuration; -import org.dromara.visor.framework.common.constant.AutoConfigureOrderConst; +import org.dromara.visor.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-framework-common/src/main/java/org/dromara/visor/framework/common/configuration/config/AsyncExecutorConfig.java b/orion-visor-framework/orion-visor-spring-boot-starter-job/src/main/java/org/dromara/visor/framework/job/configuration/config/AsyncExecutorConfig.java similarity index 95% rename from orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/configuration/config/AsyncExecutorConfig.java rename to orion-visor-framework/orion-visor-spring-boot-starter-job/src/main/java/org/dromara/visor/framework/job/configuration/config/AsyncExecutorConfig.java index ee73df34..4ea9f91c 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/configuration/config/AsyncExecutorConfig.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-job/src/main/java/org/dromara/visor/framework/job/configuration/config/AsyncExecutorConfig.java @@ -20,7 +20,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.framework.common.configuration.config; +package org.dromara.visor.framework.job.configuration.config; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-job/src/main/java/org/dromara/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 index c6a34df1..3da04c6e 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-job/src/main/java/org/dromara/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 @@ -25,7 +25,7 @@ package org.dromara.visor.framework.job.core.utils; 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.dromara.visor.common.constant.FieldConst; import org.quartz.*; import java.util.Map; 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-spring-boot-starter-job/src/main/resources/META-INF/additional-spring-configuration-metadata.json similarity index 80% rename from orion-visor-framework/orion-visor-framework-common/src/main/resources/META-INF/additional-spring-configuration-metadata.json rename to orion-visor-framework/orion-visor-spring-boot-starter-job/src/main/resources/META-INF/additional-spring-configuration-metadata.json index 5381052c..80da6cb2 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-spring-boot-starter-job/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -2,8 +2,8 @@ "groups": [ { "name": "orion.async.executor", - "type": "org.dromara.visor.framework.common.configuration.config.AsyncExecutorConfig", - "sourceType": "org.dromara.visor.framework.common.configuration.config.AsyncExecutorConfig" + "type": "org.dromara.visor.framework.job.configuration.config.AsyncExecutorConfig", + "sourceType": "org.dromara.visor.framework.job.configuration.config.AsyncExecutorConfig" } ], "properties": [ 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 2552da5d..73005eb9 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,3 @@ org.dromara.visor.framework.job.configuration.OrionSchedulerAutoConfiguration -org.dromara.visor.framework.job.configuration.OrionQuartzAutoConfiguration \ No newline at end of file +org.dromara.visor.framework.job.configuration.OrionQuartzAutoConfiguration +org.dromara.visor.framework.job.configuration.OrionAsyncAutoConfiguration \ 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 95c39220..6a80ad83 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 @@ -19,7 +19,7 @@ org.dromara.visor - orion-visor-framework-common + orion-visor-common diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/org/dromara/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 index 868f4d43..9b2d8c16 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/org/dromara/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 @@ -22,8 +22,8 @@ */ package org.dromara.visor.framework.log.configuration; -import org.dromara.visor.framework.common.constant.AutoConfigureOrderConst; -import org.dromara.visor.framework.common.constant.BeanOrderConst; +import org.dromara.visor.common.constant.AutoConfigureOrderConst; +import org.dromara.visor.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; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/org/dromara/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 index a67aba95..c5e05aa5 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/org/dromara/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 @@ -23,7 +23,7 @@ package org.dromara.visor.framework.log.configuration.config; import lombok.Data; -import org.dromara.visor.framework.common.utils.ConfigUtils; +import org.dromara.visor.common.utils.ConfigUtils; import org.dromara.visor.framework.log.core.enums.LogPrinterMode; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/org/dromara/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 index 8ce29aa8..2b219c1a 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/org/dromara/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 @@ -29,10 +29,10 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.serializer.SerializeFilter; import com.alibaba.fastjson.serializer.ValueFilter; 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.common.json.FieldDesensitizeFilter; +import org.dromara.visor.common.json.FieldIgnoreFilter; +import org.dromara.visor.common.trace.TraceIdHolder; +import org.dromara.visor.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; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/org/dromara/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 index 5663582f..1031ad25 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/org/dromara/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 @@ -28,8 +28,8 @@ 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.common.utils.IpUtils; +import org.dromara.visor.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/org/dromara/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 index 612e40af..6e7696a0 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/org/dromara/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 @@ -29,8 +29,8 @@ import cn.orionsec.kit.web.servlet.web.Servlets; import com.alibaba.fastjson.JSON; 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.common.utils.IpUtils; +import org.dromara.visor.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; 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 eb036f5f..0b102228 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 @@ -19,7 +19,7 @@ org.dromara.visor - orion-visor-framework-common + orion-visor-common diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-monitor/src/main/java/org/dromara/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 index afadb3af..023a28e3 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-monitor/src/main/java/org/dromara/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 @@ -26,7 +26,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.module.SimpleModule; 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.dromara.visor.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-mybatis/pom.xml b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/pom.xml index 85cb2fcd..673f5d2d 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 @@ -19,7 +19,7 @@ org.dromara.visor - orion-visor-framework-common + orion-visor-common diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/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 index 30a4fa20..75b47958 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/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 @@ -26,8 +26,8 @@ import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor; 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.common.constant.AutoConfigureOrderConst; +import org.dromara.visor.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; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/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 index b4aa6b18..f34eb502 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/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 @@ -28,7 +28,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 org.dromara.visor.common.constant.Const; import java.io.Serializable; import java.util.Date; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/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 index d6b2b787..d2d0ec94 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/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 @@ -36,7 +36,7 @@ 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.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; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/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 index 425d5547..7fa0a07a 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/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 @@ -31,8 +31,8 @@ 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 org.dromara.visor.framework.common.constant.AppConst; -import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.common.constant.AppConst; +import org.dromara.visor.common.constant.Const; import org.dromara.visor.framework.mybatis.core.generator.template.Table; import org.jetbrains.annotations.NotNull; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/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 index 77c2e227..e66a8487 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/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 @@ -27,8 +27,8 @@ 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 org.dromara.visor.framework.common.constant.Const; -import org.dromara.visor.framework.common.constant.FieldConst; +import org.dromara.visor.common.constant.Const; +import org.dromara.visor.common.constant.FieldConst; import org.dromara.visor.framework.mybatis.core.generator.template.DictMeta; import org.dromara.visor.framework.mybatis.core.generator.template.Table; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/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 index 0dcabd1b..376ca74b 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/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 @@ -23,7 +23,7 @@ package org.dromara.visor.framework.mybatis.core.generator.template; import cn.orionsec.kit.lang.utils.collect.Lists; -import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.common.constant.Const; import java.util.LinkedHashMap; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/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 index 7ba8e2a9..33f33b62 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/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 @@ -25,7 +25,7 @@ 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 org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.common.constant.Const; import org.dromara.visor.framework.mybatis.core.query.Conditions; import org.dromara.visor.framework.mybatis.core.query.DataQuery; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/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 index 261068c8..2024c27f 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/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 @@ -24,8 +24,8 @@ 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 org.dromara.visor.framework.common.constant.ErrorMessage; -import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.common.constant.ErrorMessage; +import org.dromara.visor.common.utils.Valid; import java.util.Collection; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/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 index ccdd9295..aa52f133 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/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 @@ -37,8 +37,8 @@ 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 org.dromara.visor.framework.common.constant.Const; -import org.dromara.visor.framework.common.utils.SqlUtils; +import org.dromara.visor.common.constant.Const; +import org.dromara.visor.common.utils.SqlUtils; import org.dromara.visor.framework.mybatis.core.domain.BaseDO; import java.io.Serializable; @@ -96,8 +96,8 @@ public class DataQuery { return new DataQuery<>(dao, wrapper); } - 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"); + public DataQuery page(org.dromara.visor.common.entity.PageRequest page) { + org.dromara.visor.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/org/dromara/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 index f16f25c1..14182c84 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/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 @@ -27,7 +27,7 @@ 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 org.dromara.visor.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/org/dromara/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 index 340c7bac..bcc4c02a 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/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 @@ -27,7 +27,7 @@ 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 org.dromara.visor.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/org/dromara/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 index 61644c14..cda7a58f 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/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 @@ -26,7 +26,7 @@ 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 org.dromara.visor.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/org/dromara/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 index b81d4372..73182c78 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/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 @@ -23,7 +23,7 @@ package org.dromara.visor.framework.mybatis.core.utils; import cn.orionsec.kit.lang.utils.Exceptions; -import org.dromara.visor.framework.common.security.SecurityHolder; +import org.dromara.visor.common.security.SecurityHolder; import org.dromara.visor.framework.mybatis.core.domain.BaseDO; import java.util.Date; 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 adb0063d..2c95ae5b 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 @@ -27,10 +27,10 @@ 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.common.validator.group.Page; #if($meta.enableOperatorLog) import org.dromara.visor.framework.biz.operator.log.core.annotation.OperatorLog; #end -import org.dromara.visor.framework.common.validator.group.Page; import org.dromara.visor.framework.log.core.annotation.IgnoreLog; #if($meta.enableDemoApi) import org.dromara.visor.framework.web.core.annotation.DemoDisableApi; 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 1dba8eb3..ddb8269f 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 @@ -25,7 +25,7 @@ package ${currentPackage}; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import org.dromara.visor.framework.common.entity.PageRequest; +import org.dromara.visor.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-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 91c5191b..839fd3e2 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 @@ -28,8 +28,8 @@ import cn.orionsec.kit.lang.utils.collect.Lists; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 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.common.constant.ErrorMessage; +import org.dromara.visor.common.utils.Valid; #if($meta.enableCache) import org.dromara.visor.framework.redis.core.utils.RedisMaps; import org.dromara.visor.framework.redis.core.utils.barrier.CacheBarriers; 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 bef47300..350941ae 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 @@ -26,8 +26,8 @@ import cn.orionsec.kit.lang.utils.collect.Lists; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 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.common.constant.ErrorMessage; +import org.dromara.visor.common.utils.Valid; #foreach($pkg in ${customModuleFilePackages}) import ${pkg}.*; #end 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 8b4ddb23..a33a408a 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 @@ -19,7 +19,7 @@ org.dromara.visor - orion-visor-framework-common + orion-visor-common @@ -36,6 +36,12 @@ io.netty netty-all + + + + com.github.fppt + jedis-mock + \ No newline at end of file diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/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 index bc1fa57e..37b9bde4 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/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 @@ -22,7 +22,7 @@ */ package org.dromara.visor.framework.redis.configuration; -import org.dromara.visor.framework.common.constant.AutoConfigureOrderConst; +import org.dromara.visor.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/org/dromara/visor/framework/redis/configuration/OrionNoRedisAutoConfiguration.java b/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/configuration/OrionNoRedisAutoConfiguration.java new file mode 100644 index 00000000..6ef6a1f0 --- /dev/null +++ b/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/configuration/OrionNoRedisAutoConfiguration.java @@ -0,0 +1,100 @@ +/* + * Copyright (c) 2023 - present Dromara, All rights reserved. + * + * https://visor.dromara.org + * https://visor.dromara.org.cn + * https://visor.orionsec.cn + * + * Members: + * Jiahang Li - ljh1553488six@139.com - author + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.dromara.visor.framework.redis.configuration; + +import com.github.fppt.jedismock.RedisServer; +import org.dromara.visor.common.constant.AutoConfigureOrderConst; +import org.dromara.visor.common.interfaces.Locker; +import org.dromara.visor.common.utils.LockerUtils; +import org.springframework.boot.autoconfigure.AutoConfiguration; +import org.springframework.boot.autoconfigure.AutoConfigureOrder; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.boot.autoconfigure.data.redis.RedisProperties; +import org.springframework.context.annotation.Bean; +import org.springframework.data.redis.connection.jedis.JedisConnectionFactory; +import redis.clients.jedis.JedisPoolConfig; + +import java.net.InetAddress; +import java.util.function.Supplier; + +/** + * noRedis 配置 + * 仅用于本地调试无 redis 的情况 + * + * @author Jiahang Li + * @version 1.0.0 + * @since 2024/12/26 10:02 + */ +@ConditionalOnProperty(value = "no.redis", havingValue = "true") +@AutoConfiguration +@AutoConfigureOrder(AutoConfigureOrderConst.FRAMEWORK_REDIS - 10) +public class OrionNoRedisAutoConfiguration { + + /** + * @return mocked redis server + */ + @Bean + public RedisServer redisServer(RedisProperties properties) { + RedisServer server = new RedisServer(properties.getPort(), InetAddress.getLoopbackAddress()); + try { + server.start(); + } catch (Exception ignore) { + } + return server; + } + + /** + * @return mocked jedis factory + */ + @Bean + public JedisConnectionFactory jedisConnectionFactory(RedisServer redisServer) { + JedisConnectionFactory factory = new JedisConnectionFactory(); + factory.setHostName(redisServer.getHost()); + factory.setPort(redisServer.getBindPort()); + factory.setUsePool(true); + factory.setPoolConfig(new JedisPoolConfig()); + return factory; + } + + /** + * @return mocked redis locker + */ + @Bean + public Locker redisLocker() { + Locker locker = new Locker() { + @Override + public boolean tryLock(String key, Runnable run) { + run.run(); + return true; + } + + @Override + public T tryLock(String key, Supplier call) { + return call.get(); + } + }; + LockerUtils.setDelegate(locker); + return locker; + } + +} diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/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 index 857a3df3..96652341 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/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 @@ -22,9 +22,9 @@ */ package org.dromara.visor.framework.redis.configuration; -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.common.constant.AutoConfigureOrderConst; +import org.dromara.visor.common.interfaces.Locker; +import org.dromara.visor.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; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/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 index ca2c95dd..03d83c75 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/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 @@ -24,7 +24,7 @@ package org.dromara.visor.framework.redis.core.lock; import cn.orionsec.kit.lang.utils.Exceptions; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.lock.Locker; +import org.dromara.visor.common.interfaces.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/org/dromara/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 index 8928ce3d..7ec5ab11 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/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 @@ -25,7 +25,7 @@ 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 org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.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/org/dromara/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 index 4919d998..cda0e5d7 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/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 @@ -27,7 +27,7 @@ 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 org.dromara.visor.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 742bca9f..51558866 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 @@ -24,6 +24,12 @@ "type": "java.lang.Integer", "description": "最小空闲连接数.", "defaultValue": "16" + }, + { + "name": "no.redis", + "type": "java.lang.Boolean", + "description": "是否无 redis.", + "defaultValue": false } ] } \ No newline at end of file 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 87d2d384..cccc4c8f 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,3 @@ +org.dromara.visor.framework.redis.configuration.OrionNoRedisAutoConfiguration 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 7ebd4451..3ed32b2c 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 @@ -19,7 +19,7 @@ org.dromara.visor - orion-visor-framework-common + orion-visor-common diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/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 deleted file mode 100644 index 73df8560..00000000 --- a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/configuration/OrionCryptoAutoConfiguration.java +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Copyright (c) 2023 - present Dromara, All rights reserved. - * - * https://visor.dromara.org - * https://visor.dromara.org.cn - * https://visor.orionsec.cn - * - * Members: - * Jiahang Li - ljh1553488six@139.com - author - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.dromara.visor.framework.security.configuration; - -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; -import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Primary; - -/** - * 项目加密解密配置 - * - * @author Jiahang Li - * @version 1.0.0 - * @since 2023/7/7 23:59 - */ -@AutoConfiguration -@EnableConfigurationProperties({AesCryptoConfig.class}) -@AutoConfigureOrder(AutoConfigureOrderConst.FRAMEWORK_SECURITY_CRYPTO) -public class OrionCryptoAutoConfiguration { - - /** - * @return 默认加密器 - */ - @Bean(name = "valueCrypto") - @Primary - public ValueCrypto primaryValueCrypto() { - return new PrimaryValueCrypto(); - } - - /** - * @return aes 加密器 - */ - @Bean(initMethod = "init") - @ConditionalOnProperty(value = "orion.crypto.aes.enabled", havingValue = "true") - public ValueCrypto aesValueCrypto(AesCryptoConfig config) { - return new AesCryptoProcessor(config); - } - -} diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/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 index 4da10c72..0e18775c 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/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 @@ -22,7 +22,7 @@ */ package org.dromara.visor.framework.security.configuration; -import org.dromara.visor.framework.common.constant.AutoConfigureOrderConst; +import org.dromara.visor.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; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/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 index cd1c99d2..ee3d4057 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/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 @@ -23,7 +23,7 @@ package org.dromara.visor.framework.security.configuration.config; import lombok.Data; -import org.dromara.visor.framework.common.utils.ConfigUtils; +import org.dromara.visor.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/org/dromara/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 index ea0d200b..c0acf8e8 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/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 @@ -26,8 +26,8 @@ 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.common.constant.ErrorCode; +import org.dromara.visor.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; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/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 index b278b1b6..6e96dbf6 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/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 @@ -24,7 +24,7 @@ package org.dromara.visor.framework.security.core.handler; 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.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/org/dromara/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 index e67e04c4..ba5e62b3 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/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 @@ -24,7 +24,7 @@ package org.dromara.visor.framework.security.core.handler; 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.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/org/dromara/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 index 91c24a03..7f2679d2 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/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 @@ -22,7 +22,7 @@ */ package org.dromara.visor.framework.security.core.service; -import org.dromara.visor.framework.common.security.LoginUser; +import org.dromara.visor.common.security.LoginUser; /** * 权限校验服务 diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/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 index 86c80428..53ddaea4 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/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 @@ -22,7 +22,7 @@ */ package org.dromara.visor.framework.security.core.service; -import org.dromara.visor.framework.common.security.LoginUser; +import org.dromara.visor.common.security.LoginUser; /** * 权限校验服务委托类 diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/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 index 536faf60..000cfaa7 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/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 @@ -22,8 +22,8 @@ */ package org.dromara.visor.framework.security.core.service; -import org.dromara.visor.framework.common.security.LoginUser; -import org.dromara.visor.framework.common.security.SecurityHolder; +import org.dromara.visor.common.security.LoginUser; +import org.dromara.visor.common.security.SecurityHolder; import org.dromara.visor.framework.security.core.utils.SecurityUtils; /** diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/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 index 3321426b..08cc7b4c 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/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 @@ -24,8 +24,8 @@ package org.dromara.visor.framework.security.core.utils; 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.dromara.visor.common.constant.Const; +import org.dromara.visor.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 9c0b0f26..ce0153cf 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 @@ -4,11 +4,6 @@ "name": "orion.security", "type": "org.dromara.visor.framework.security.configuration.config.SecurityConfig", "sourceType": "org.dromara.visor.framework.security.configuration.config.SecurityConfig" - }, - { - "name": "orion.crypto.aes", - "type": "org.dromara.visor.framework.security.configuration.config.AesCryptoConfig", - "sourceType": "org.dromara.visor.framework.security.configuration.config.AesCryptoConfig" } ], "properties": [ @@ -22,62 +17,6 @@ "name": "orion.security.permit-url", "type": "java.util.List", "description": "匿名接口." - }, - { - "name": "orion.crypto.aes.primary", - "type": "java.lang.Boolean", - "description": "是否为默认加密器.", - "defaultValue": "false" - }, - { - "name": "orion.crypto.aes.enabled", - "type": "java.lang.Boolean", - "description": "是否启用.", - "defaultValue": "false" - }, - { - "name": "orion.crypto.aes.working-mode", - "type": "cn.orionsec.kit.lang.utils.crypto.enums.WorkingMode", - "description": "加密模式.", - "defaultValue": "ECB" - }, - { - "name": "orion.crypto.aes.padding-mode", - "type": "cn.orionsec.kit.lang.utils.crypto.enums.PaddingMode", - "description": "填充模式.", - "defaultValue": "PKCS5_PADDING" - }, - { - "name": "orion.crypto.aes.secret-key", - "type": "java.lang.String", - "description": "加密密钥." - }, - { - "name": "orion.crypto.aes.use-generator-key", - "type": "java.lang.Boolean", - "description": "是否生成密钥.", - "defaultValue": "true" - }, - { - "name": "orion.crypto.aes.generator-key-length", - "type": "java.lang.Integer", - "description": "生成的密钥长度 128 192 256bytes.", - "defaultValue": "128" - }, - { - "name": "orion.crypto.aes.iv", - "type": "java.lang.String", - "description": "向量 长度为 16bytes." - }, - { - "name": "orion.crypto.aes.gcm", - "type": "java.lang.String", - "description": "GCM 模式参数 长度为 96 104 112 120 128bytes." - }, - { - "name": "orion.crypto.aes.aad", - "type": "java.lang.String", - "description": "GCM 模式 aad." } ] } \ No newline at end of file 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 0de7d6c5..a63cfef4 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 @@ -org.dromara.visor.framework.security.configuration.OrionSecurityAutoConfiguration -org.dromara.visor.framework.security.configuration.OrionCryptoAutoConfiguration \ No newline at end of file +org.dromara.visor.framework.security.configuration.OrionSecurityAutoConfiguration \ 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 698525c6..e0bb5cc4 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 @@ -19,7 +19,7 @@ org.dromara.visor - orion-visor-framework-common + orion-visor-common diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/org/dromara/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 index 7ee1617b..195ab9fb 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/org/dromara/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 @@ -22,18 +22,16 @@ */ package org.dromara.visor.framework.storage.configuration; -import org.dromara.visor.framework.common.constant.AutoConfigureOrderConst; -import org.dromara.visor.framework.common.file.FileClient; +import org.dromara.visor.common.constant.AutoConfigureOrderConst; +import org.dromara.visor.common.interfaces.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; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Primary; /** * 存储配置类 @@ -49,15 +47,6 @@ import org.springframework.context.annotation.Primary; @EnableConfigurationProperties({LocalStorageConfig.class, LogsStorageConfig.class}) public class OrionStorageAutoConfiguration { - /** - * @return 默认文件客户端 - */ - @Bean(name = "primaryFileClient") - @Primary - public FileClient primaryFileClient() { - return new PrimaryFileClient(); - } - /** * @return 本地文件客户端 */ diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/org/dromara/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 index 47d5ba61..05f7a896 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/org/dromara/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 @@ -25,9 +25,8 @@ package org.dromara.visor.framework.storage.core.client; 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 org.dromara.visor.common.constant.Const; +import org.dromara.visor.common.interfaces.FileClient; import java.io.InputStream; import java.io.OutputStream; @@ -46,11 +45,6 @@ public abstract class AbstractFileClient implem public AbstractFileClient(Config config) { this.config = config; - // 设置默认文件客户端 - if (config.isPrimary()) { - PrimaryFileClient.setDelegate(this); - FileClientUtils.setDelegate(this); - } } @Override @@ -85,6 +79,16 @@ public abstract class AbstractFileClient implem } } + @Override + public String getContentAsString(String path) throws Exception { + return this.getContentAsString(path, Const.UTF_8); + } + + @Override + public String getContentAsString(String path, String charset) throws Exception { + return new String(this.getContent(path), charset); + } + @Override public OutputStream getContentOutputStream(String path) throws Exception { return this.getContentOutputStream(path, false); diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/org/dromara/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 index 8e744bd2..3ee25533 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/org/dromara/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 @@ -35,11 +35,6 @@ import lombok.Data; @Data public class FileClientConfig { - /** - * 是否为默认客户端 - */ - protected boolean primary; - /** * 是否启用 */ diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/org/dromara/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 deleted file mode 100644 index 2c63ad19..00000000 --- a/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/org/dromara/visor/framework/storage/core/client/PrimaryFileClient.java +++ /dev/null @@ -1,115 +0,0 @@ -/* - * Copyright (c) 2023 - present Dromara, All rights reserved. - * - * https://visor.dromara.org - * https://visor.dromara.org.cn - * https://visor.orionsec.cn - * - * Members: - * Jiahang Li - ljh1553488six@139.com - author - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.dromara.visor.framework.storage.core.client; - -import cn.orionsec.kit.lang.utils.Exceptions; -import org.dromara.visor.framework.common.file.FileClient; - -import java.io.InputStream; -import java.io.OutputStream; - -/** - * 默认文件客户端 - * - * @author Jiahang Li - * @version 1.0.0 - * @since 2023/7/14 11:01 - */ -public class PrimaryFileClient implements FileClient { - - private static FileClient delegate; - - @Override - public String upload(String path, byte[] content) throws Exception { - return delegate.upload(path, content); - } - - @Override - public String upload(String path, byte[] content, boolean overrideIfExist) throws Exception { - return delegate.upload(path, content, overrideIfExist); - } - - @Override - public String upload(String path, InputStream in) throws Exception { - return delegate.upload(path, in); - } - - @Override - public String upload(String path, InputStream in, boolean autoClose) throws Exception { - return delegate.upload(path, in, autoClose); - } - - @Override - public String upload(String path, InputStream in, boolean autoClose, boolean overrideIfExist) throws Exception { - return delegate.upload(path, in, autoClose, overrideIfExist); - } - - @Override - public boolean isExists(String path) { - return delegate.isExists(path); - } - - @Override - public boolean delete(String path) throws Exception { - return delegate.delete(path); - } - - @Override - public byte[] getContent(String path) throws Exception { - return delegate.getContent(path); - } - - @Override - public InputStream getContentInputStream(String path) throws Exception { - return delegate.getContentInputStream(path); - } - - @Override - public OutputStream getContentOutputStream(String path) throws Exception { - return delegate.getContentOutputStream(path); - } - - @Override - public OutputStream getContentOutputStream(String path, boolean append) throws Exception { - return delegate.getContentOutputStream(path, append); - } - - @Override - public String getReturnPath(String path) { - return delegate.getReturnPath(path); - } - - @Override - public String getAbsolutePath(String returnPath) { - return delegate.getAbsolutePath(returnPath); - } - - public static void setDelegate(FileClient delegate) { - if (PrimaryFileClient.delegate != null) { - // unmodified - throw Exceptions.state(); - } - PrimaryFileClient.delegate = delegate; - } - -} diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/org/dromara/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 index a94a2fe5..3904b068 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/org/dromara/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 @@ -24,7 +24,7 @@ package org.dromara.visor.framework.storage.core.client.local; 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.common.constant.Const; import org.dromara.visor.framework.storage.core.client.AbstractFileClient; import java.io.InputStream; 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 965b6c8a..8a688732 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 @@ -12,12 +12,6 @@ } ], "properties": [ - { - "name": "orion.storage.local.primary", - "type": "java.lang.Boolean", - "description": "是否为默认客户端.", - "defaultValue": false - }, { "name": "orion.storage.local.enabled", "type": "java.lang.Boolean", 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 6e923407..fb8c56e2 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 @@ -19,7 +19,7 @@ org.dromara.visor - orion-visor-framework-common + orion-visor-common diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-swagger/src/main/java/org/dromara/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 index e991d915..9b54f15b 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-swagger/src/main/java/org/dromara/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 @@ -31,7 +31,7 @@ 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.common.constant.AutoConfigureOrderConst; import org.dromara.visor.framework.swagger.configuration.config.SwaggerConfig; import org.springdoc.core.*; import org.springdoc.core.customizers.OpenApiBuilderCustomizer; 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 62514a9a..4f286b4a 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 @@ -19,7 +19,7 @@ org.dromara.visor - orion-visor-framework-common + orion-visor-common org.dromara.visor diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-test/src/main/java/org/dromara/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 index 436c0a99..b3949ad8 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-test/src/main/java/org/dromara/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 @@ -23,8 +23,8 @@ package org.dromara.visor.framework.test.configuration; 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.common.security.LoginUser; +import org.dromara.visor.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; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-test/src/main/java/org/dromara/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 index 47bb23a9..7ffe8d85 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-test/src/main/java/org/dromara/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 @@ -23,8 +23,8 @@ package org.dromara.visor.framework.test.configuration; import com.github.fppt.jedismock.RedisServer; -import org.dromara.visor.framework.common.lock.Locker; -import org.dromara.visor.framework.common.utils.LockerUtils; +import org.dromara.visor.common.interfaces.Locker; +import org.dromara.visor.common.utils.LockerUtils; import org.springframework.boot.autoconfigure.data.redis.RedisProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; @@ -32,6 +32,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Lazy; import org.springframework.context.annotation.Profile; +import java.net.InetAddress; import java.util.function.Supplier; /** @@ -52,7 +53,7 @@ public class OrionMockRedisTestConfiguration { */ @Bean public RedisServer redisMockServer(RedisProperties properties) { - RedisServer server = new RedisServer(properties.getPort()); + RedisServer server = new RedisServer(properties.getPort(), InetAddress.getLoopbackAddress()); try { server.start(); } catch (Exception ignore) { diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-test/src/main/java/org/dromara/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 index 0472170b..1f07ce5a 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-test/src/main/java/org/dromara/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 @@ -24,7 +24,6 @@ package org.dromara.visor.framework.test.core.base; import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure; import com.baomidou.mybatisplus.autoconfigure.MybatisPlusAutoConfiguration; -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; @@ -58,8 +57,6 @@ import org.springframework.transaction.annotation.Transactional; public class BaseUnitTest { @Import({ - // holder - OrionCommonAutoConfiguration.class, // mock OrionMockBeanTestConfiguration.class, OrionMockRedisTestConfiguration.class, @@ -77,6 +74,7 @@ public class BaseUnitTest { RedisAutoConfiguration.class, RedissonAutoConfiguration.class, }) + // TODO public static class Application { } 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 0c1251e7..c4587e31 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 @@ -19,7 +19,7 @@ org.dromara.visor - orion-visor-framework-common + orion-visor-common diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/org/dromara/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 index 3159bf72..46b53817 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/org/dromara/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 @@ -25,9 +25,9 @@ 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 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.common.constant.AutoConfigureOrderConst; +import org.dromara.visor.common.constant.FilterOrderConst; +import org.dromara.visor.common.web.WebFilterCreator; 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; @@ -151,7 +151,7 @@ public class OrionWebAutoConfiguration implements WebMvcConfigurer { // 创建 UrlBasedCorsConfigurationSource 对象 UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); source.registerCorsConfiguration("/**", config); - return FilterCreator.create(new CorsFilter(source), FilterOrderConst.CORS_FILTER); + return WebFilterCreator.create(new CorsFilter(source), FilterOrderConst.CORS_FILTER); } /** @@ -159,7 +159,7 @@ public class OrionWebAutoConfiguration implements WebMvcConfigurer { */ @Bean public FilterRegistrationBean traceIdFilterBean() { - return FilterCreator.create(new TraceIdFilter(), FilterOrderConst.TRICE_ID_FILTER); + return WebFilterCreator.create(new TraceIdFilter(), FilterOrderConst.TRICE_ID_FILTER); } /** diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/org/dromara/visor/framework/web/core/annotation/ParamDecrypt.java b/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/org/dromara/visor/framework/web/core/annotation/ParamDecrypt.java new file mode 100644 index 00000000..76d9e3c7 --- /dev/null +++ b/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/org/dromara/visor/framework/web/core/annotation/ParamDecrypt.java @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2023 - present Dromara, All rights reserved. + * + * https://visor.dromara.org + * https://visor.dromara.org.cn + * https://visor.orionsec.cn + * + * Members: + * Jiahang Li - ljh1553488six@139.com - author + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.dromara.visor.framework.web.core.annotation; + +import com.fasterxml.jackson.annotation.JacksonAnnotationsInside; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import org.dromara.visor.framework.web.core.deserializer.ParamDecryptDeserializer; + +import java.lang.annotation.*; + +/** + * Jackson 参数解密元注解 + *

+ * Jackson 标注在字段上则标记该字段执行 http 反列化 (解析 request)时解密的字段 (http-message-converts 用的是 jackson) + * + * @author Jiahang Li + * @version 1.0.0 + * @since 2025/1/5 15:33 + */ +@Target({ElementType.FIELD}) +@Retention(RetentionPolicy.RUNTIME) +@Documented +@JacksonAnnotationsInside +@JsonDeserialize(using = ParamDecryptDeserializer.class) +public @interface ParamDecrypt { +} diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/org/dromara/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 index 9ebb2f4b..2dc45e96 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/org/dromara/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 @@ -26,8 +26,8 @@ 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.common.constant.BeanOrderConst; +import org.dromara.visor.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/org/dromara/visor/framework/web/core/deserializer/ParamDecryptDeserializer.java b/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/org/dromara/visor/framework/web/core/deserializer/ParamDecryptDeserializer.java new file mode 100644 index 00000000..608367a2 --- /dev/null +++ b/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/org/dromara/visor/framework/web/core/deserializer/ParamDecryptDeserializer.java @@ -0,0 +1,58 @@ +/* + * Copyright (c) 2023 - present Dromara, All rights reserved. + * + * https://visor.dromara.org + * https://visor.dromara.org.cn + * https://visor.orionsec.cn + * + * Members: + * Jiahang Li - ljh1553488six@139.com - author + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.dromara.visor.framework.web.core.deserializer; + +import cn.orionsec.kit.lang.utils.Strings; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.databind.DeserializationContext; +import com.fasterxml.jackson.databind.JsonDeserializer; +import com.fasterxml.jackson.databind.JsonNode; +import org.dromara.visor.common.constant.ErrorMessage; +import org.dromara.visor.common.utils.RsaEncryptUtils; +import org.dromara.visor.common.utils.Valid; + +import java.io.IOException; + +/** + * 参数解密反序列化器 + * + * @author Jiahang Li + * @version 1.0.0 + * @since 2025/1/5 15:32 + */ +public class ParamDecryptDeserializer extends JsonDeserializer { + + @Override + public String deserialize(JsonParser p, DeserializationContext ctx) throws IOException { + JsonNode node = p.getCodec().readTree(p); + String value = node.asText(); + // 为空直接返回 + if (Strings.isBlank(value)) { + return value; + } + // 解密参数 + String decrypt = RsaEncryptUtils.decrypt(value); + return Valid.notNull(decrypt, ErrorMessage.DECRYPT_ERROR); + } + +} \ No newline at end of file diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/org/dromara/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 index 5e6294e6..29e4a588 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/org/dromara/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 @@ -22,7 +22,7 @@ */ package org.dromara.visor.framework.web.core.filter; -import org.dromara.visor.framework.common.meta.TraceIdHolder; +import org.dromara.visor.common.trace.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/org/dromara/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 index e4a5c9fc..0a47cd58 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/org/dromara/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 @@ -32,9 +32,9 @@ 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.dromara.visor.common.constant.Const; +import org.dromara.visor.common.constant.ErrorCode; +import org.dromara.visor.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/org/dromara/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 index 1e231b9c..ad55d484 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/org/dromara/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 @@ -25,7 +25,7 @@ package org.dromara.visor.framework.web.core.handler; 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.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; 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 ce8e971f..00b72ded 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 @@ -19,7 +19,7 @@ org.dromara.visor - orion-visor-framework-common + orion-visor-common diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-websocket/src/main/java/org/dromara/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 index c7f60b74..885e4e95 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-websocket/src/main/java/org/dromara/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 @@ -22,7 +22,7 @@ */ package org.dromara.visor.framework.websocket.configuration; -import org.dromara.visor.framework.common.constant.AutoConfigureOrderConst; +import org.dromara.visor.common.constant.AutoConfigureOrderConst; import org.dromara.visor.framework.websocket.configuration.config.WebSocketConfig; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigureOrder; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-websocket/src/main/java/org/dromara/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 index 23540159..cba8eb6c 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-websocket/src/main/java/org/dromara/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 @@ -26,7 +26,7 @@ import cn.orionsec.kit.lang.utils.Exceptions; import cn.orionsec.kit.lang.utils.Threads; import com.alibaba.fastjson.JSON; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.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; diff --git a/orion-visor-framework/pom.xml b/orion-visor-framework/pom.xml index 5f73606d..209522eb 100644 --- a/orion-visor-framework/pom.xml +++ b/orion-visor-framework/pom.xml @@ -16,16 +16,17 @@ https://github.com/dromara/orion-visor - orion-visor-framework-common orion-visor-spring-boot-starter-web orion-visor-spring-boot-starter-banner orion-visor-spring-boot-starter-swagger orion-visor-spring-boot-starter-datasource orion-visor-spring-boot-starter-mybatis + orion-visor-spring-boot-starter-config orion-visor-spring-boot-starter-job orion-visor-spring-boot-starter-websocket orion-visor-spring-boot-starter-redis orion-visor-spring-boot-starter-desensitize + orion-visor-spring-boot-starter-encrypt orion-visor-spring-boot-starter-log orion-visor-spring-boot-starter-storage orion-visor-spring-boot-starter-security diff --git a/orion-visor-launch/pom.xml b/orion-visor-launch/pom.xml index 56f1725b..22fd2893 100644 --- a/orion-visor-launch/pom.xml +++ b/orion-visor-launch/pom.xml @@ -22,13 +22,26 @@ spring-boot-configuration-processor true + org.springframework.boot spring-boot-starter - + + + org.dromara.visor + orion-visor-module-infra-service + ${revision} + + + org.dromara.visor + orion-visor-module-asset-service + ${revision} + + + org.dromara.visor orion-visor-spring-boot-starter-banner @@ -49,6 +62,14 @@ org.dromara.visor orion-visor-spring-boot-starter-mybatis + + org.dromara.visor + orion-visor-spring-boot-starter-config + + + org.dromara.visor + orion-visor-spring-boot-starter-encrypt + org.dromara.visor orion-visor-spring-boot-starter-job @@ -85,19 +106,6 @@ org.dromara.visor orion-visor-spring-boot-starter-biz-operator-log - - - - org.dromara.visor - orion-visor-module-infra-service - ${revision} - - - org.dromara.visor - orion-visor-module-asset-service - ${revision} - - diff --git a/orion-visor-launch/src/main/java/org/dromara/visor/launch/LaunchApplication.java b/orion-visor-launch/src/main/java/org/dromara/visor/launch/LaunchApplication.java index f060fe7f..5d893310 100644 --- a/orion-visor-launch/src/main/java/org/dromara/visor/launch/LaunchApplication.java +++ b/orion-visor-launch/src/main/java/org/dromara/visor/launch/LaunchApplication.java @@ -23,7 +23,7 @@ package org.dromara.visor.launch; import cn.orionsec.kit.lang.utils.Strings; -import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.common.constant.Const; import org.springframework.beans.factory.annotation.AnnotatedBeanDefinition; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionReaderUtils; diff --git a/orion-visor-launch/src/main/java/org/dromara/visor/launch/configuration/LaunchApplicationConfiguration.java b/orion-visor-launch/src/main/java/org/dromara/visor/launch/configuration/LaunchApplicationConfiguration.java new file mode 100644 index 00000000..31148f0f --- /dev/null +++ b/orion-visor-launch/src/main/java/org/dromara/visor/launch/configuration/LaunchApplicationConfiguration.java @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2023 - present Dromara, All rights reserved. + * + * https://visor.dromara.org + * https://visor.dromara.org.cn + * https://visor.orionsec.cn + * + * Members: + * Jiahang Li - ljh1553488six@139.com - author + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.dromara.visor.launch.configuration; + +import cn.orionsec.kit.spring.SpringHolder; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +/** + * 应用配置类 + * + * @author Jiahang Li + * @version 1.0.0 + * @since 2023/6/20 10:34 + */ +@Configuration +public class LaunchApplicationConfiguration { + + /** + * @return spring 容器工具类 + */ + @Bean + public SpringHolder.ApplicationContextAwareStore springHolderAware() { + return new SpringHolder.ApplicationContextAwareStore(); + } + +} diff --git a/orion-visor-launch/src/main/resources/application-dev.yaml b/orion-visor-launch/src/main/resources/application-dev.yaml index d5a313c7..b8e04dc2 100644 --- a/orion-visor-launch/src/main/resources/application-dev.yaml +++ b/orion-visor-launch/src/main/resources/application-dev.yaml @@ -35,3 +35,6 @@ mybatis-plus: configuration: # sql 日志打印 log-impl: org.apache.ibatis.logging.stdout.StdOutImpl + +no: + redis: false diff --git a/orion-visor-launch/src/main/resources/application-prod.yaml b/orion-visor-launch/src/main/resources/application-prod.yaml index 284b6f82..6ea73dd7 100644 --- a/orion-visor-launch/src/main/resources/application-prod.yaml +++ b/orion-visor-launch/src/main/resources/application-prod.yaml @@ -61,7 +61,7 @@ orion: logging: printer: mode: ROW - crypto: + encrypt: aes: # 加密密钥 secret-key: ${SECRET_KEY:uQeacXV8b3isvKLK} diff --git a/orion-visor-launch/src/main/resources/application.yaml b/orion-visor-launch/src/main/resources/application.yaml index 7e8bf4a5..2fe71f43 100644 --- a/orion-visor-launch/src/main/resources/application.yaml +++ b/orion-visor-launch/src/main/resources/application.yaml @@ -256,7 +256,6 @@ orion: storage: # 本地文件存储 local: - primary: true enabled: true timestamp-prefix: false date-directory: false @@ -274,11 +273,9 @@ orion: # 匿名接口 permit-url: - ${orion.api.prefix}/server/bootstrap/health - crypto: + encrypt: # aes加密器 aes: - primary: true - enabled: true working-mode: ECB padding-mode: PKCS5_PADDING # 加密密钥 diff --git a/orion-visor-launch/src/test/java/org/dromara/visor/launch/ReplaceVersion.java b/orion-visor-launch/src/test/java/org/dromara/visor/launch/ReplaceVersion.java index 9aeb3407..86558434 100644 --- a/orion-visor-launch/src/test/java/org/dromara/visor/launch/ReplaceVersion.java +++ b/orion-visor-launch/src/test/java/org/dromara/visor/launch/ReplaceVersion.java @@ -39,9 +39,9 @@ import java.util.function.Function; */ public class ReplaceVersion { - private static final String TARGET_VERSION = "2.2.2"; + private static final String TARGET_VERSION = "2.2.3"; - private static final String REPLACE_VERSION = "2.2.3"; + private static final String REPLACE_VERSION = "2.3.0"; private static final String PATH = new File("").getAbsolutePath(); @@ -61,7 +61,7 @@ public class ReplaceVersion { "orion-visor-dependencies/pom.xml" }; - private static final String APP_CONST_FILE = "orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/AppConst.java"; + private static final String APP_CONST_FILE = "orion-visor-common/src/main/java/org/dromara/visor/common/constant/AppConst.java"; private static final String PACKAGE_JSON_FILE = "orion-visor-ui/package.json"; @@ -115,7 +115,7 @@ public class ReplaceVersion { */ private static void replaceViteEnvFiles() { for (String file : VITE_ENV_FILES) { - readAndWrite(file, s -> s.replaceAll("VITE_APP_VERSION= '" + TARGET_VERSION + "'", "VITE_APP_VERSION= '" + REPLACE_VERSION + "'")); + readAndWrite(file, s -> s.replaceAll("VITE_APP_VERSION=" + TARGET_VERSION, "VITE_APP_VERSION=" + REPLACE_VERSION)); } } diff --git a/orion-visor-module-asset/orion-visor-module-asset-provider/pom.xml b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-provider/pom.xml similarity index 92% rename from orion-visor-module-asset/orion-visor-module-asset-provider/pom.xml rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-provider/pom.xml index f43901e8..b9ddc97a 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-provider/pom.xml +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-provider/pom.xml @@ -18,7 +18,7 @@ org.dromara.visor - orion-visor-framework-common + orion-visor-common diff --git a/orion-visor-module-asset/orion-visor-module-asset-provider/src/main/java/org/dromara/visor/module/asset/api/CommandSnippetApi.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-provider/src/main/java/org/dromara/visor/module/asset/api/CommandSnippetApi.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-provider/src/main/java/org/dromara/visor/module/asset/api/CommandSnippetApi.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-provider/src/main/java/org/dromara/visor/module/asset/api/CommandSnippetApi.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-provider/src/main/java/org/dromara/visor/module/asset/api/PathBookmarkApi.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-provider/src/main/java/org/dromara/visor/module/asset/api/PathBookmarkApi.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-provider/src/main/java/org/dromara/visor/module/asset/api/PathBookmarkApi.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-provider/src/main/java/org/dromara/visor/module/asset/api/PathBookmarkApi.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/pom.xml b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/pom.xml similarity index 86% rename from orion-visor-module-asset/orion-visor-module-asset-service/pom.xml rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/pom.xml index e6693a93..d3c6ff2d 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/pom.xml +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/pom.xml @@ -18,78 +18,66 @@ org.dromara.visor - orion-visor-framework-common + orion-visor-common - + org.dromara.visor orion-visor-module-infra-provider ${revision} - - org.dromara.visor orion-visor-module-asset-provider ${revision} - + org.dromara.visor orion-visor-spring-boot-starter-web - - org.dromara.visor orion-visor-spring-boot-starter-websocket - - org.dromara.visor orion-visor-spring-boot-starter-log - - org.dromara.visor orion-visor-spring-boot-starter-biz-operator-log - - org.dromara.visor orion-visor-spring-boot-starter-desensitize - - + + org.dromara.visor + orion-visor-spring-boot-starter-encrypt + + + org.dromara.visor + orion-visor-spring-boot-starter-config + org.dromara.visor orion-visor-spring-boot-starter-security - - org.dromara.visor orion-visor-spring-boot-starter-redis - - org.dromara.visor orion-visor-spring-boot-starter-mybatis - - org.dromara.visor orion-visor-spring-boot-starter-storage - - org.dromara.visor orion-visor-spring-boot-starter-job diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/api/impl/CommandSnippetApiImpl.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/api/impl/CommandSnippetApiImpl.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/api/impl/CommandSnippetApiImpl.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/api/impl/CommandSnippetApiImpl.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/api/impl/PathBookmarkApiImpl.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/api/impl/PathBookmarkApiImpl.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/api/impl/PathBookmarkApiImpl.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/api/impl/PathBookmarkApiImpl.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/configuration/AssetWebSocketConfiguration.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/configuration/AssetWebSocketConfiguration.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/configuration/AssetWebSocketConfiguration.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/configuration/AssetWebSocketConfiguration.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/AssetAuthorizedDataServiceController.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/AssetAuthorizedDataServiceController.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/AssetAuthorizedDataServiceController.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/AssetAuthorizedDataServiceController.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/AssetDataGrantServiceController.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/AssetDataGrantServiceController.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/AssetDataGrantServiceController.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/AssetDataGrantServiceController.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/AssetStatisticsController.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/AssetStatisticsController.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/AssetStatisticsController.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/AssetStatisticsController.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/CommandSnippetController.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/CommandSnippetController.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/CommandSnippetController.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/CommandSnippetController.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/CommandSnippetGroupController.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/CommandSnippetGroupController.java similarity index 98% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/CommandSnippetGroupController.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/CommandSnippetGroupController.java index a10228c3..439071b8 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/CommandSnippetGroupController.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/CommandSnippetGroupController.java @@ -25,7 +25,7 @@ package org.dromara.visor.module.asset.controller; 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.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; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/ExecCommandController.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/ExecCommandController.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/ExecCommandController.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/ExecCommandController.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/ExecCommandLogController.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/ExecCommandLogController.java similarity index 98% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/ExecCommandLogController.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/ExecCommandLogController.java index f85ffc2b..f6290190 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/ExecCommandLogController.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/ExecCommandLogController.java @@ -27,9 +27,9 @@ 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.common.utils.Valid; +import org.dromara.visor.common.validator.group.Page; 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; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/ExecJobController.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/ExecJobController.java similarity index 98% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/ExecJobController.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/ExecJobController.java index f94eb64c..265b170e 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/ExecJobController.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/ExecJobController.java @@ -27,8 +27,8 @@ 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.common.validator.group.Page; 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; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/ExecJobLogController.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/ExecJobLogController.java similarity index 98% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/ExecJobLogController.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/ExecJobLogController.java index 5a424a59..38368988 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/ExecJobLogController.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/ExecJobLogController.java @@ -27,9 +27,9 @@ 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.common.utils.Valid; +import org.dromara.visor.common.validator.group.Page; 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; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/ExecTemplateController.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/ExecTemplateController.java similarity index 98% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/ExecTemplateController.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/ExecTemplateController.java index 32808d61..6ee91f55 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/ExecTemplateController.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/ExecTemplateController.java @@ -27,8 +27,8 @@ 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.common.validator.group.Page; 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; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/HostController.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/HostController.java similarity index 98% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/HostController.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/HostController.java index cdf1723a..de72a08c 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/HostController.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/HostController.java @@ -27,8 +27,8 @@ 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.common.validator.group.Page; 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; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/HostExtraController.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/HostExtraController.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/HostExtraController.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/HostExtraController.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/HostGroupController.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/HostGroupController.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/HostGroupController.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/HostGroupController.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/HostIdentityController.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/HostIdentityController.java similarity index 98% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/HostIdentityController.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/HostIdentityController.java index aa3bc979..3cdc3e31 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/HostIdentityController.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/HostIdentityController.java @@ -27,8 +27,8 @@ 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.common.validator.group.Page; 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; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/HostKeyController.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/HostKeyController.java similarity index 98% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/HostKeyController.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/HostKeyController.java index 45ca24ed..33b002dd 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/HostKeyController.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/HostKeyController.java @@ -27,8 +27,8 @@ 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.common.validator.group.Page; 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; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/PathBookmarkController.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/PathBookmarkController.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/PathBookmarkController.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/PathBookmarkController.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/PathBookmarkGroupController.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/PathBookmarkGroupController.java similarity index 98% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/PathBookmarkGroupController.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/PathBookmarkGroupController.java index 4e88daaa..59f0b2e0 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/PathBookmarkGroupController.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/PathBookmarkGroupController.java @@ -25,7 +25,7 @@ package org.dromara.visor.module.asset.controller; 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.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; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/TerminalConnectLogController.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/TerminalConnectLogController.java similarity index 97% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/TerminalConnectLogController.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/TerminalConnectLogController.java index d6476bfa..dd1d9d79 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/TerminalConnectLogController.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/TerminalConnectLogController.java @@ -27,9 +27,9 @@ 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.common.validator.group.Id; +import org.dromara.visor.common.validator.group.Page; 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; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/TerminalController.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/TerminalController.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/TerminalController.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/TerminalController.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/TerminalSftpController.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/TerminalSftpController.java similarity index 98% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/TerminalSftpController.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/TerminalSftpController.java index 9b084f17..b0abfa07 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/TerminalSftpController.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/TerminalSftpController.java @@ -27,8 +27,8 @@ 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.common.validator.group.Page; 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; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/UploadTaskController.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/UploadTaskController.java similarity index 98% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/UploadTaskController.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/UploadTaskController.java index 531b9b1b..f1fb7069 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/UploadTaskController.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/UploadTaskController.java @@ -27,8 +27,8 @@ 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.common.validator.group.Page; 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; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/CommandSnippetConvert.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/CommandSnippetConvert.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/CommandSnippetConvert.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/CommandSnippetConvert.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/CommandSnippetGroupConvert.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/CommandSnippetGroupConvert.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/CommandSnippetGroupConvert.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/CommandSnippetGroupConvert.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/ExecConvert.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/ExecConvert.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/ExecConvert.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/ExecConvert.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/ExecHostLogConvert.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/ExecHostLogConvert.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/ExecHostLogConvert.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/ExecHostLogConvert.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/ExecJobConvert.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/ExecJobConvert.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/ExecJobConvert.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/ExecJobConvert.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/ExecLogConvert.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/ExecLogConvert.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/ExecLogConvert.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/ExecLogConvert.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/ExecTemplateConvert.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/ExecTemplateConvert.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/ExecTemplateConvert.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/ExecTemplateConvert.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/HostConvert.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/HostConvert.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/HostConvert.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/HostConvert.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/HostGroupConvert.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/HostGroupConvert.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/HostGroupConvert.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/HostGroupConvert.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/HostIdentityConvert.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/HostIdentityConvert.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/HostIdentityConvert.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/HostIdentityConvert.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/HostKeyConvert.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/HostKeyConvert.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/HostKeyConvert.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/HostKeyConvert.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/PathBookmarkConvert.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/PathBookmarkConvert.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/PathBookmarkConvert.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/PathBookmarkConvert.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/PathBookmarkGroupConvert.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/PathBookmarkGroupConvert.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/PathBookmarkGroupConvert.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/PathBookmarkGroupConvert.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/TerminalConnectLogConvert.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/TerminalConnectLogConvert.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/TerminalConnectLogConvert.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/TerminalConnectLogConvert.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/TerminalSftpLogConvert.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/TerminalSftpLogConvert.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/TerminalSftpLogConvert.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/TerminalSftpLogConvert.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/UploadTaskConvert.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/UploadTaskConvert.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/UploadTaskConvert.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/UploadTaskConvert.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/UploadTaskFileConvert.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/UploadTaskFileConvert.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/UploadTaskFileConvert.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/convert/UploadTaskFileConvert.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/CommandSnippetDAO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/CommandSnippetDAO.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/CommandSnippetDAO.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/CommandSnippetDAO.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/ExecHostLogDAO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/ExecHostLogDAO.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/ExecHostLogDAO.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/ExecHostLogDAO.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/ExecJobDAO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/ExecJobDAO.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/ExecJobDAO.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/ExecJobDAO.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/ExecJobHostDAO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/ExecJobHostDAO.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/ExecJobHostDAO.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/ExecJobHostDAO.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/ExecLogDAO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/ExecLogDAO.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/ExecLogDAO.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/ExecLogDAO.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/ExecTemplateDAO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/ExecTemplateDAO.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/ExecTemplateDAO.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/ExecTemplateDAO.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/ExecTemplateHostDAO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/ExecTemplateHostDAO.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/ExecTemplateHostDAO.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/ExecTemplateHostDAO.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/HostDAO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/HostDAO.java similarity index 98% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/HostDAO.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/HostDAO.java index 1d51933b..bb40536c 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/HostDAO.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/HostDAO.java @@ -50,6 +50,7 @@ public interface HostDAO extends IMapper { HostDO::getAddress, HostDO::getPort, HostDO::getStatus, + HostDO::getDescription, HostDO::getCreateTime, HostDO::getUpdateTime, HostDO::getCreator, diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/HostIdentityDAO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/HostIdentityDAO.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/HostIdentityDAO.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/HostIdentityDAO.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/HostKeyDAO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/HostKeyDAO.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/HostKeyDAO.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/HostKeyDAO.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/PathBookmarkDAO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/PathBookmarkDAO.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/PathBookmarkDAO.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/PathBookmarkDAO.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/TerminalConnectLogDAO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/TerminalConnectLogDAO.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/TerminalConnectLogDAO.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/TerminalConnectLogDAO.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/UploadTaskDAO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/UploadTaskDAO.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/UploadTaskDAO.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/UploadTaskDAO.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/UploadTaskFileDAO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/UploadTaskFileDAO.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/UploadTaskFileDAO.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/UploadTaskFileDAO.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/AssetThreadPools.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/AssetThreadPools.java similarity index 98% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/AssetThreadPools.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/AssetThreadPools.java index db79ff4c..ef8eedc6 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/AssetThreadPools.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/AssetThreadPools.java @@ -23,7 +23,7 @@ package org.dromara.visor.module.asset.define; import cn.orionsec.kit.lang.define.thread.ExecutorBuilder; -import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.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/org/dromara/visor/module/asset/define/cache/AssetStatisticsCacheKeyDefine.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/cache/AssetStatisticsCacheKeyDefine.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/cache/AssetStatisticsCacheKeyDefine.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/cache/AssetStatisticsCacheKeyDefine.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/cache/CommandSnippetCacheKeyDefine.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/cache/CommandSnippetCacheKeyDefine.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/cache/CommandSnippetCacheKeyDefine.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/cache/CommandSnippetCacheKeyDefine.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/cache/ExecCacheKeyDefine.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/cache/ExecCacheKeyDefine.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/cache/ExecCacheKeyDefine.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/cache/ExecCacheKeyDefine.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/cache/HostCacheKeyDefine.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/cache/HostCacheKeyDefine.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/cache/HostCacheKeyDefine.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/cache/HostCacheKeyDefine.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/cache/PathBookmarkCacheKeyDefine.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/cache/PathBookmarkCacheKeyDefine.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/cache/PathBookmarkCacheKeyDefine.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/cache/PathBookmarkCacheKeyDefine.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/cache/TerminalCacheKeyDefine.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/cache/TerminalCacheKeyDefine.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/cache/TerminalCacheKeyDefine.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/cache/TerminalCacheKeyDefine.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/config/AppExecLogAutoClearConfig.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/config/AppExecLogAutoClearConfig.java similarity index 95% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/config/AppExecLogAutoClearConfig.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/config/AppExecLogAutoClearConfig.java index 9973c373..ad5be0d3 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/config/AppExecLogAutoClearConfig.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/config/AppExecLogAutoClearConfig.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.asset.define.config; import lombok.Data; import lombok.EqualsAndHashCode; -import org.dromara.visor.framework.common.entity.AutoClearConfig; +import org.dromara.visor.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/org/dromara/visor/module/asset/define/config/AppExecLogConfig.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/config/AppExecLogConfig.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/config/AppExecLogConfig.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/config/AppExecLogConfig.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/config/AppSftpConfig.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/config/AppSftpConfig.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/config/AppSftpConfig.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/config/AppSftpConfig.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/config/AppTerminalConnectLogAutoClearConfig.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/config/AppTerminalConnectLogAutoClearConfig.java similarity index 95% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/config/AppTerminalConnectLogAutoClearConfig.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/config/AppTerminalConnectLogAutoClearConfig.java index 8b5901a6..7c9930e7 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/config/AppTerminalConnectLogAutoClearConfig.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/config/AppTerminalConnectLogAutoClearConfig.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.asset.define.config; import lombok.Data; import lombok.EqualsAndHashCode; -import org.dromara.visor.framework.common.entity.AutoClearConfig; +import org.dromara.visor.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/org/dromara/visor/module/asset/define/config/AppTrackerConfig.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/config/AppTrackerConfig.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/config/AppTrackerConfig.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/config/AppTrackerConfig.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/message/ExecMessageDefine.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/message/ExecMessageDefine.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/message/ExecMessageDefine.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/message/ExecMessageDefine.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/message/UploadMessageDefine.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/message/UploadMessageDefine.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/message/UploadMessageDefine.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/message/UploadMessageDefine.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/ExecCommandLogOperatorType.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/ExecCommandLogOperatorType.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/ExecCommandLogOperatorType.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/ExecCommandLogOperatorType.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/ExecCommandOperatorType.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/ExecCommandOperatorType.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/ExecCommandOperatorType.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/ExecCommandOperatorType.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/ExecJobLogOperatorType.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/ExecJobLogOperatorType.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/ExecJobLogOperatorType.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/ExecJobLogOperatorType.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/ExecJobOperatorType.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/ExecJobOperatorType.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/ExecJobOperatorType.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/ExecJobOperatorType.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/ExecTemplateOperatorType.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/ExecTemplateOperatorType.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/ExecTemplateOperatorType.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/ExecTemplateOperatorType.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/HostGroupOperatorType.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/HostGroupOperatorType.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/HostGroupOperatorType.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/HostGroupOperatorType.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/HostIdentityOperatorType.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/HostIdentityOperatorType.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/HostIdentityOperatorType.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/HostIdentityOperatorType.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/HostKeyOperatorType.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/HostKeyOperatorType.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/HostKeyOperatorType.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/HostKeyOperatorType.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/HostOperatorType.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/HostOperatorType.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/HostOperatorType.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/HostOperatorType.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/TerminalConnectLogOperatorType.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/TerminalConnectLogOperatorType.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/TerminalConnectLogOperatorType.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/TerminalConnectLogOperatorType.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/TerminalOperatorType.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/TerminalOperatorType.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/TerminalOperatorType.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/TerminalOperatorType.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/UploadTaskOperatorType.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/UploadTaskOperatorType.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/UploadTaskOperatorType.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/define/operator/UploadTaskOperatorType.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/CommandSnippetDO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/CommandSnippetDO.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/CommandSnippetDO.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/CommandSnippetDO.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/ExecHostLogDO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/ExecHostLogDO.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/ExecHostLogDO.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/ExecHostLogDO.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/ExecJobDO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/ExecJobDO.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/ExecJobDO.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/ExecJobDO.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/ExecJobHostDO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/ExecJobHostDO.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/ExecJobHostDO.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/ExecJobHostDO.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/ExecLogDO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/ExecLogDO.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/ExecLogDO.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/ExecLogDO.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/ExecTemplateDO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/ExecTemplateDO.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/ExecTemplateDO.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/ExecTemplateDO.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/ExecTemplateHostDO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/ExecTemplateHostDO.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/ExecTemplateHostDO.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/ExecTemplateHostDO.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/HostDO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/HostDO.java similarity index 96% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/HostDO.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/HostDO.java index 6ea8dcbe..f40b9a96 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/HostDO.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/HostDO.java @@ -84,4 +84,8 @@ public class HostDO extends BaseDO { @TableField("config") private String config; + @Schema(description = "描述") + @TableField("description") + private String description; + } diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/HostIdentityDO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/HostIdentityDO.java similarity index 95% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/HostIdentityDO.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/HostIdentityDO.java index 837f993f..0a17e431 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/HostIdentityDO.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/HostIdentityDO.java @@ -72,4 +72,8 @@ public class HostIdentityDO extends BaseDO { @TableField("key_id") private Long keyId; + @Schema(description = "描述") + @TableField("description") + private String description; + } diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/HostKeyDO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/HostKeyDO.java similarity index 95% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/HostKeyDO.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/HostKeyDO.java index e83cdba3..ede5fbe5 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/HostKeyDO.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/HostKeyDO.java @@ -68,4 +68,8 @@ public class HostKeyDO extends BaseDO { @TableField("password") private String password; + @Schema(description = "描述") + @TableField("description") + private String description; + } diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/PathBookmarkDO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/PathBookmarkDO.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/PathBookmarkDO.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/PathBookmarkDO.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/TerminalConnectLogDO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/TerminalConnectLogDO.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/TerminalConnectLogDO.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/TerminalConnectLogDO.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/UploadTaskDO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/UploadTaskDO.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/UploadTaskDO.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/UploadTaskDO.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/UploadTaskFileDO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/UploadTaskFileDO.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/UploadTaskFileDO.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/UploadTaskFileDO.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/CommandSnippetCacheDTO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/CommandSnippetCacheDTO.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/CommandSnippetCacheDTO.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/CommandSnippetCacheDTO.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/ExecCommandExecDTO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/ExecCommandExecDTO.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/ExecCommandExecDTO.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/ExecCommandExecDTO.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/ExecHostLogTailDTO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/ExecHostLogTailDTO.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/ExecHostLogTailDTO.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/ExecHostLogTailDTO.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/ExecLogTailDTO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/ExecLogTailDTO.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/ExecLogTailDTO.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/ExecLogTailDTO.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/ExecParameterSchemaDTO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/ExecParameterSchemaDTO.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/ExecParameterSchemaDTO.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/ExecParameterSchemaDTO.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/HostCacheDTO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/HostCacheDTO.java similarity index 96% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/HostCacheDTO.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/HostCacheDTO.java index 5590adf1..a49ddd0c 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/HostCacheDTO.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/HostCacheDTO.java @@ -69,4 +69,7 @@ public class HostCacheDTO implements LongCacheIdModel, Serializable { @Schema(description = "主机状态") private String status; + @Schema(description = "描述") + private String description; + } diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/HostIdentityCacheDTO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/HostIdentityCacheDTO.java similarity index 90% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/HostIdentityCacheDTO.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/HostIdentityCacheDTO.java index ea5b801e..4cf4f769 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/HostIdentityCacheDTO.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/HostIdentityCacheDTO.java @@ -61,16 +61,10 @@ public class HostIdentityCacheDTO implements LongCacheIdModel, Serializable { @Schema(description = "密钥id") private Long keyId; - /** - * 资产页面展示 - */ - @Schema(description = "创建时间") + @Schema(description = "描述") + private String description; + + @Schema(description = "创建时间 资产页面展示") private Date createTime; - /** - * 资产页面展示 - */ - @Schema(description = "修改时间") - private Date updateTime; - } diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/HostKeyCacheDTO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/HostKeyCacheDTO.java similarity index 88% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/HostKeyCacheDTO.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/HostKeyCacheDTO.java index a9923eb1..049037ca 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/HostKeyCacheDTO.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/HostKeyCacheDTO.java @@ -52,16 +52,10 @@ public class HostKeyCacheDTO implements LongCacheIdModel, Serializable { @Schema(description = "名称") private String name; - /** - * 资产页面展示 - */ - @Schema(description = "创建时间") + @Schema(description = "描述") + private String description; + + @Schema(description = "创建时间 资产页面展示") private Date createTime; - /** - * 资产页面展示 - */ - @Schema(description = "修改时间") - private Date updateTime; - } diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/PathBookmarkCacheDTO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/PathBookmarkCacheDTO.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/PathBookmarkCacheDTO.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/PathBookmarkCacheDTO.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/SftpGetContentCacheDTO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/SftpGetContentCacheDTO.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/SftpGetContentCacheDTO.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/SftpGetContentCacheDTO.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/SftpSetContentCacheDTO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/SftpSetContentCacheDTO.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/SftpSetContentCacheDTO.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/SftpSetContentCacheDTO.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/TerminalAccessDTO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/TerminalAccessDTO.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/TerminalAccessDTO.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/TerminalAccessDTO.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/TerminalConnectDTO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/TerminalConnectDTO.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/TerminalConnectDTO.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/TerminalConnectDTO.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/TerminalConnectLogExtraDTO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/TerminalConnectLogExtraDTO.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/TerminalConnectLogExtraDTO.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/TerminalConnectLogExtraDTO.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/TerminalTransferDTO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/TerminalTransferDTO.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/TerminalTransferDTO.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/TerminalTransferDTO.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/UploadTaskExtraDTO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/UploadTaskExtraDTO.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/UploadTaskExtraDTO.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/dto/UploadTaskExtraDTO.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/po/ExecLogCountPO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/po/ExecLogCountPO.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/po/ExecLogCountPO.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/po/ExecLogCountPO.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/po/TerminalConnectLogCountPO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/po/TerminalConnectLogCountPO.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/po/TerminalConnectLogCountPO.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/po/TerminalConnectLogCountPO.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/asset/AssetAuthorizedDataQueryRequest.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/asset/AssetAuthorizedDataQueryRequest.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/asset/AssetAuthorizedDataQueryRequest.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/asset/AssetAuthorizedDataQueryRequest.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/asset/AssetDataGrantRequest.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/asset/AssetDataGrantRequest.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/asset/AssetDataGrantRequest.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/asset/AssetDataGrantRequest.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/command/CommandSnippetCreateRequest.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/command/CommandSnippetCreateRequest.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/command/CommandSnippetCreateRequest.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/command/CommandSnippetCreateRequest.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/command/CommandSnippetGroupCreateRequest.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/command/CommandSnippetGroupCreateRequest.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/command/CommandSnippetGroupCreateRequest.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/command/CommandSnippetGroupCreateRequest.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/command/CommandSnippetGroupDeleteRequest.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/command/CommandSnippetGroupDeleteRequest.java similarity index 96% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/command/CommandSnippetGroupDeleteRequest.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/command/CommandSnippetGroupDeleteRequest.java index 4ae65956..9cd07111 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/command/CommandSnippetGroupDeleteRequest.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/command/CommandSnippetGroupDeleteRequest.java @@ -27,7 +27,7 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import org.dromara.visor.framework.common.validator.group.Id; +import org.dromara.visor.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/org/dromara/visor/module/asset/entity/request/command/CommandSnippetGroupUpdateRequest.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/command/CommandSnippetGroupUpdateRequest.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/command/CommandSnippetGroupUpdateRequest.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/command/CommandSnippetGroupUpdateRequest.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/command/CommandSnippetUpdateRequest.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/command/CommandSnippetUpdateRequest.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/command/CommandSnippetUpdateRequest.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/command/CommandSnippetUpdateRequest.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecCommandRequest.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecCommandRequest.java similarity index 99% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecCommandRequest.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecCommandRequest.java index 66f1dfe8..660568a5 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecCommandRequest.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecCommandRequest.java @@ -47,7 +47,7 @@ import java.util.List; @Schema(name = "ExecCommandRequest", description = "批量执行命令 请求对象") public class ExecCommandRequest { - @Size(max = 128) + @Size(max = 255) @Schema(description = "执行描述") private String description; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecInterruptRequest.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecInterruptRequest.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecInterruptRequest.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecInterruptRequest.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecJobCreateRequest.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecJobCreateRequest.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecJobCreateRequest.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecJobCreateRequest.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecJobQueryRequest.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecJobQueryRequest.java similarity index 96% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecJobQueryRequest.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecJobQueryRequest.java index 3bc690f7..93c6efcf 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecJobQueryRequest.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecJobQueryRequest.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.asset.entity.request.exec; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import org.dromara.visor.framework.common.entity.PageRequest; +import org.dromara.visor.common.entity.PageRequest; import javax.validation.constraints.Size; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecJobTriggerRequest.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecJobTriggerRequest.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecJobTriggerRequest.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecJobTriggerRequest.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecJobUpdateExecUserRequest.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecJobUpdateExecUserRequest.java similarity index 96% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecJobUpdateExecUserRequest.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecJobUpdateExecUserRequest.java index e767041c..fdc4d096 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecJobUpdateExecUserRequest.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecJobUpdateExecUserRequest.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.asset.entity.request.exec; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import org.dromara.visor.framework.common.entity.PageRequest; +import org.dromara.visor.common.entity.PageRequest; import javax.validation.constraints.NotNull; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecJobUpdateRequest.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecJobUpdateRequest.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecJobUpdateRequest.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecJobUpdateRequest.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecJobUpdateStatusRequest.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecJobUpdateStatusRequest.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecJobUpdateStatusRequest.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecJobUpdateStatusRequest.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecLogClearRequest.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecLogClearRequest.java similarity index 95% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecLogClearRequest.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecLogClearRequest.java index a894cc55..c77f6932 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecLogClearRequest.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecLogClearRequest.java @@ -25,7 +25,7 @@ package org.dromara.visor.module.asset.entity.request.exec; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; -import org.dromara.visor.framework.common.entity.DataClearRequest; +import org.dromara.visor.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/org/dromara/visor/module/asset/entity/request/exec/ExecLogQueryRequest.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecLogQueryRequest.java similarity index 96% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecLogQueryRequest.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecLogQueryRequest.java index e102df79..56374fea 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecLogQueryRequest.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecLogQueryRequest.java @@ -25,7 +25,7 @@ package org.dromara.visor.module.asset.entity.request.exec; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import org.dromara.visor.framework.common.entity.PageRequest; +import org.dromara.visor.common.entity.PageRequest; import javax.validation.constraints.Size; import java.util.Date; @@ -66,7 +66,7 @@ public class ExecLogQueryRequest extends PageRequest { @Schema(description = "执行方式") private String execMode; - @Size(max = 128) + @Size(max = 255) @Schema(description = "执行描述") private String description; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecLogTailRequest.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecLogTailRequest.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecLogTailRequest.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecLogTailRequest.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecTemplateCreateRequest.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecTemplateCreateRequest.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecTemplateCreateRequest.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecTemplateCreateRequest.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecTemplateQueryRequest.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecTemplateQueryRequest.java similarity index 96% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecTemplateQueryRequest.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecTemplateQueryRequest.java index d3a84fb9..6ea0d6cf 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecTemplateQueryRequest.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecTemplateQueryRequest.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.asset.entity.request.exec; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import org.dromara.visor.framework.common.entity.PageRequest; +import org.dromara.visor.common.entity.PageRequest; import javax.validation.constraints.Size; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecTemplateUpdateRequest.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecTemplateUpdateRequest.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecTemplateUpdateRequest.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecTemplateUpdateRequest.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ReExecCommandRequest.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ReExecCommandRequest.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ReExecCommandRequest.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ReExecCommandRequest.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostCreateRequest.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostCreateRequest.java similarity index 96% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostCreateRequest.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostCreateRequest.java index 42a21b80..23bf9166 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostCreateRequest.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostCreateRequest.java @@ -85,4 +85,8 @@ public class HostCreateRequest implements Serializable { @Schema(description = "tags") private List tags; + @Size(max = 255) + @Schema(description = "描述") + private String description; + } diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostExtraQueryRequest.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostExtraQueryRequest.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostExtraQueryRequest.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostExtraQueryRequest.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostExtraUpdateRequest.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostExtraUpdateRequest.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostExtraUpdateRequest.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostExtraUpdateRequest.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostGroupRelUpdateRequest.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostGroupRelUpdateRequest.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostGroupRelUpdateRequest.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostGroupRelUpdateRequest.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostIdentityCreateRequest.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostIdentityCreateRequest.java similarity index 91% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostIdentityCreateRequest.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostIdentityCreateRequest.java index e5f2e415..9404b4ca 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostIdentityCreateRequest.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostIdentityCreateRequest.java @@ -27,6 +27,7 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.dromara.visor.framework.web.core.annotation.ParamDecrypt; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; @@ -61,11 +62,15 @@ public class HostIdentityCreateRequest implements Serializable { @Schema(description = "用户名") private String username; - @Size(max = 512) + @ParamDecrypt @Schema(description = "用户密码") private String password; @Schema(description = "密钥id") private Long keyId; + @Size(max = 255) + @Schema(description = "描述") + private String description; + } diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostIdentityQueryRequest.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostIdentityQueryRequest.java similarity index 91% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostIdentityQueryRequest.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostIdentityQueryRequest.java index bb42e2e8..eb6b33eb 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostIdentityQueryRequest.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostIdentityQueryRequest.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.asset.entity.request.host; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import org.dromara.visor.framework.common.entity.PageRequest; +import org.dromara.visor.common.entity.PageRequest; import javax.validation.constraints.Size; @@ -61,11 +61,11 @@ public class HostIdentityQueryRequest extends PageRequest { @Schema(description = "用户名") private String username; - @Size(max = 512) - @Schema(description = "用户密码") - private String password; - @Schema(description = "密钥id") private Long keyId; + @Size(max = 255) + @Schema(description = "描述") + private String description; + } diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostIdentityUpdateRequest.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostIdentityUpdateRequest.java similarity index 89% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostIdentityUpdateRequest.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostIdentityUpdateRequest.java index 4b425f28..ad83db8a 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostIdentityUpdateRequest.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostIdentityUpdateRequest.java @@ -27,7 +27,8 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import org.dromara.visor.framework.common.security.UpdatePasswordAction; +import org.dromara.visor.common.security.UpdatePasswordAction; +import org.dromara.visor.framework.web.core.annotation.ParamDecrypt; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; @@ -66,7 +67,7 @@ public class HostIdentityUpdateRequest implements UpdatePasswordAction { @Schema(description = "用户名") private String username; - @Size(max = 512) + @ParamDecrypt @Schema(description = "用户密码") private String password; @@ -76,4 +77,8 @@ public class HostIdentityUpdateRequest implements UpdatePasswordAction { @Schema(description = "是否使用新密码") private Boolean useNewPassword; + @Size(max = 255) + @Schema(description = "描述") + private String description; + } diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostKeyCreateRequest.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostKeyCreateRequest.java similarity index 89% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostKeyCreateRequest.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostKeyCreateRequest.java index 340f8e6c..35e3edd2 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostKeyCreateRequest.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostKeyCreateRequest.java @@ -27,6 +27,7 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.dromara.visor.framework.web.core.annotation.ParamDecrypt; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; @@ -51,15 +52,21 @@ public class HostKeyCreateRequest implements Serializable { @Schema(description = "名称") private String name; + @ParamDecrypt @Schema(description = "公钥文本") private String publicKey; @NotBlank + @ParamDecrypt @Schema(description = "私钥文本") private String privateKey; - @Size(max = 512) + @ParamDecrypt @Schema(description = "密码") private String password; + @Size(max = 255) + @Schema(description = "描述") + private String description; + } diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostKeyQueryRequest.java b/orion-visor-modules/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/org/dromara/visor/module/asset/entity/request/host/HostKeyQueryRequest.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostKeyQueryRequest.java index f7254e3f..8443a2d0 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostKeyQueryRequest.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostKeyQueryRequest.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.asset.entity.request.host; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import org.dromara.visor.framework.common.entity.PageRequest; +import org.dromara.visor.common.entity.PageRequest; import javax.validation.constraints.Size; @@ -53,4 +53,8 @@ public class HostKeyQueryRequest extends PageRequest { @Schema(description = "名称") private String name; + @Size(max = 255) + @Schema(description = "描述") + private String description; + } diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostKeyUpdateRequest.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostKeyUpdateRequest.java similarity index 87% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostKeyUpdateRequest.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostKeyUpdateRequest.java index f5602a1f..4721b941 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostKeyUpdateRequest.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostKeyUpdateRequest.java @@ -27,7 +27,8 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import org.dromara.visor.framework.common.security.UpdatePasswordAction; +import org.dromara.visor.common.security.UpdatePasswordAction; +import org.dromara.visor.framework.web.core.annotation.ParamDecrypt; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; @@ -56,18 +57,24 @@ public class HostKeyUpdateRequest implements UpdatePasswordAction { @Schema(description = "名称") private String name; + @ParamDecrypt @Schema(description = "公钥文本") private String publicKey; @NotBlank + @ParamDecrypt @Schema(description = "私钥文本") private String privateKey; - @Size(max = 512) + @ParamDecrypt @Schema(description = "密码") private String password; @Schema(description = "是否使用新密码") private Boolean useNewPassword; + @Size(max = 255) + @Schema(description = "描述") + private String description; + } diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostQueryRequest.java b/orion-visor-modules/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/org/dromara/visor/module/asset/entity/request/host/HostQueryRequest.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostQueryRequest.java index 524e3831..57ebf050 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostQueryRequest.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostQueryRequest.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.asset.entity.request.host; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import org.dromara.visor.framework.common.entity.PageRequest; +import org.dromara.visor.common.entity.PageRequest; import javax.validation.constraints.Size; import java.util.List; @@ -77,6 +77,10 @@ public class HostQueryRequest extends PageRequest { @Schema(description = "tag") private List tags; + @Size(max = 255) + @Schema(description = "描述") + private String description; + @Schema(description = "是否查询 tag 信息") private Boolean queryTag; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostUpdateConfigRequest.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostUpdateConfigRequest.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostUpdateConfigRequest.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostUpdateConfigRequest.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostUpdateRequest.java b/orion-visor-modules/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/org/dromara/visor/module/asset/entity/request/host/HostUpdateRequest.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostUpdateRequest.java index 23ae2c20..0414b028 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostUpdateRequest.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostUpdateRequest.java @@ -83,4 +83,8 @@ public class HostUpdateRequest implements Serializable { @Schema(description = "tags") private List tags; + @Size(max = 255) + @Schema(description = "描述") + private String description; + } diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostUpdateStatusRequest.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostUpdateStatusRequest.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostUpdateStatusRequest.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/HostUpdateStatusRequest.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/TerminalConnectLogClearRequest.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/TerminalConnectLogClearRequest.java similarity index 95% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/TerminalConnectLogClearRequest.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/TerminalConnectLogClearRequest.java index 7d01520f..4247744c 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/TerminalConnectLogClearRequest.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/TerminalConnectLogClearRequest.java @@ -25,7 +25,7 @@ package org.dromara.visor.module.asset.entity.request.host; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; -import org.dromara.visor.framework.common.entity.DataClearRequest; +import org.dromara.visor.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/org/dromara/visor/module/asset/entity/request/host/TerminalConnectLogCreateRequest.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/TerminalConnectLogCreateRequest.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/TerminalConnectLogCreateRequest.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/TerminalConnectLogCreateRequest.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/TerminalConnectLogQueryRequest.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/TerminalConnectLogQueryRequest.java similarity index 95% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/TerminalConnectLogQueryRequest.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/TerminalConnectLogQueryRequest.java index 339534ab..f0505da6 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/TerminalConnectLogQueryRequest.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/TerminalConnectLogQueryRequest.java @@ -25,8 +25,8 @@ package org.dromara.visor.module.asset.entity.request.host; import com.fasterxml.jackson.annotation.JsonFormat; 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 org.dromara.visor.common.entity.PageRequest; +import org.dromara.visor.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/org/dromara/visor/module/asset/entity/request/host/TerminalSftpLogQueryRequest.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/TerminalSftpLogQueryRequest.java similarity index 96% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/TerminalSftpLogQueryRequest.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/TerminalSftpLogQueryRequest.java index ccc5a1aa..b66aa514 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/TerminalSftpLogQueryRequest.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/TerminalSftpLogQueryRequest.java @@ -25,7 +25,7 @@ package org.dromara.visor.module.asset.entity.request.host; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import org.dromara.visor.framework.common.entity.PageRequest; +import org.dromara.visor.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/org/dromara/visor/module/asset/entity/request/path/PathBookmarkCreateRequest.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/path/PathBookmarkCreateRequest.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/path/PathBookmarkCreateRequest.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/path/PathBookmarkCreateRequest.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/path/PathBookmarkGroupCreateRequest.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/path/PathBookmarkGroupCreateRequest.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/path/PathBookmarkGroupCreateRequest.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/path/PathBookmarkGroupCreateRequest.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/path/PathBookmarkGroupDeleteRequest.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/path/PathBookmarkGroupDeleteRequest.java similarity index 96% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/path/PathBookmarkGroupDeleteRequest.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/path/PathBookmarkGroupDeleteRequest.java index 0281acda..b7ada2b7 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/path/PathBookmarkGroupDeleteRequest.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/path/PathBookmarkGroupDeleteRequest.java @@ -27,7 +27,7 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import org.dromara.visor.framework.common.validator.group.Id; +import org.dromara.visor.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/org/dromara/visor/module/asset/entity/request/path/PathBookmarkGroupUpdateRequest.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/path/PathBookmarkGroupUpdateRequest.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/path/PathBookmarkGroupUpdateRequest.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/path/PathBookmarkGroupUpdateRequest.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/path/PathBookmarkUpdateRequest.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/path/PathBookmarkUpdateRequest.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/path/PathBookmarkUpdateRequest.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/path/PathBookmarkUpdateRequest.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/upload/UploadTaskClearRequest.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/upload/UploadTaskClearRequest.java similarity index 95% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/upload/UploadTaskClearRequest.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/upload/UploadTaskClearRequest.java index 8d04c786..87d28dff 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/upload/UploadTaskClearRequest.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/upload/UploadTaskClearRequest.java @@ -25,7 +25,7 @@ package org.dromara.visor.module.asset.entity.request.upload; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; -import org.dromara.visor.framework.common.entity.DataClearRequest; +import org.dromara.visor.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/org/dromara/visor/module/asset/entity/request/upload/UploadTaskCreateRequest.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/upload/UploadTaskCreateRequest.java similarity index 98% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/upload/UploadTaskCreateRequest.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/upload/UploadTaskCreateRequest.java index 67a791c5..ca6111fa 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/upload/UploadTaskCreateRequest.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/upload/UploadTaskCreateRequest.java @@ -56,7 +56,7 @@ public class UploadTaskCreateRequest implements Serializable { @Schema(description = "远程路径") private String remotePath; - @Size(max = 128) + @Size(max = 255) @Schema(description = "描述") private String description; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/upload/UploadTaskFileRequest.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/upload/UploadTaskFileRequest.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/upload/UploadTaskFileRequest.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/upload/UploadTaskFileRequest.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/upload/UploadTaskQueryRequest.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/upload/UploadTaskQueryRequest.java similarity index 95% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/upload/UploadTaskQueryRequest.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/upload/UploadTaskQueryRequest.java index c772f7d4..80006255 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/upload/UploadTaskQueryRequest.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/upload/UploadTaskQueryRequest.java @@ -25,7 +25,7 @@ package org.dromara.visor.module.asset.entity.request.upload; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import org.dromara.visor.framework.common.entity.PageRequest; +import org.dromara.visor.common.entity.PageRequest; import javax.validation.constraints.Size; import java.util.Date; @@ -51,7 +51,7 @@ public class UploadTaskQueryRequest extends PageRequest { @Schema(description = "用户id") private Long userId; - @Size(max = 128) + @Size(max = 255) @Schema(description = "描述") private String description; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/upload/UploadTaskRequest.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/upload/UploadTaskRequest.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/upload/UploadTaskRequest.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/upload/UploadTaskRequest.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/AssetWorkplaceStatisticsVO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/AssetWorkplaceStatisticsVO.java similarity index 96% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/AssetWorkplaceStatisticsVO.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/AssetWorkplaceStatisticsVO.java index eb77614c..5b2c5d7d 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/AssetWorkplaceStatisticsVO.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/AssetWorkplaceStatisticsVO.java @@ -27,7 +27,7 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import org.dromara.visor.framework.common.entity.chart.LineSingleChartData; +import org.dromara.visor.common.entity.chart.LineSingleChartData; import java.util.List; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/AuthorizedHostWrapperVO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/AuthorizedHostWrapperVO.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/AuthorizedHostWrapperVO.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/AuthorizedHostWrapperVO.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/CommandSnippetGroupVO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/CommandSnippetGroupVO.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/CommandSnippetGroupVO.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/CommandSnippetGroupVO.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/CommandSnippetVO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/CommandSnippetVO.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/CommandSnippetVO.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/CommandSnippetVO.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/CommandSnippetWrapperVO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/CommandSnippetWrapperVO.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/CommandSnippetWrapperVO.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/CommandSnippetWrapperVO.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/ExecHostLogVO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/ExecHostLogVO.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/ExecHostLogVO.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/ExecHostLogVO.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/ExecJobHostVO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/ExecJobHostVO.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/ExecJobHostVO.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/ExecJobHostVO.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/ExecJobVO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/ExecJobVO.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/ExecJobVO.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/ExecJobVO.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/ExecLogStatusVO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/ExecLogStatusVO.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/ExecLogStatusVO.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/ExecLogStatusVO.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/ExecLogVO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/ExecLogVO.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/ExecLogVO.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/ExecLogVO.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/ExecTemplateVO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/ExecTemplateVO.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/ExecTemplateVO.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/ExecTemplateVO.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/HostBaseVO.java b/orion-visor-modules/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/org/dromara/visor/module/asset/entity/vo/HostBaseVO.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/HostBaseVO.java index d6c0de63..ab59528c 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/HostBaseVO.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/HostBaseVO.java @@ -64,4 +64,7 @@ public class HostBaseVO implements Serializable { @Schema(description = "主机端口") private Integer port; + @Schema(description = "描述") + private String description; + } diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/HostConfigVO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/HostConfigVO.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/HostConfigVO.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/HostConfigVO.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/HostGroupTreeVO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/HostGroupTreeVO.java similarity index 96% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/HostGroupTreeVO.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/HostGroupTreeVO.java index 4b015089..2ab416f2 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/HostGroupTreeVO.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/HostGroupTreeVO.java @@ -28,7 +28,7 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import org.dromara.visor.framework.common.entity.TreeNode; +import org.dromara.visor.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/org/dromara/visor/module/asset/entity/vo/HostIdentityVO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/HostIdentityVO.java similarity index 90% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/HostIdentityVO.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/HostIdentityVO.java index 63e49335..384154d6 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/HostIdentityVO.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/HostIdentityVO.java @@ -65,10 +65,19 @@ public class HostIdentityVO implements Serializable { @Schema(description = "密钥名称") private String keyName; + @Schema(description = "描述") + private String description; + @Schema(description = "创建时间") private Date createTime; @Schema(description = "修改时间") private Date updateTime; + @Schema(description = "创建人") + private String creator; + + @Schema(description = "修改人") + private String updater; + } diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/HostKeyVO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/HostKeyVO.java similarity index 89% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/HostKeyVO.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/HostKeyVO.java index f2152faa..baeaea41 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/HostKeyVO.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/HostKeyVO.java @@ -59,10 +59,19 @@ public class HostKeyVO implements Serializable { @Schema(description = "私钥文本") private String privateKey; + @Schema(description = "描述") + private String description; + @Schema(description = "创建时间") private Date createTime; @Schema(description = "修改时间") private Date updateTime; + @Schema(description = "创建人") + private String creator; + + @Schema(description = "修改人") + private String updater; + } diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/HostVO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/HostVO.java similarity index 97% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/HostVO.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/HostVO.java index fc6df963..560b9abe 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/HostVO.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/HostVO.java @@ -74,6 +74,9 @@ public class HostVO implements Serializable { @Schema(description = "主机状态") private String status; + @Schema(description = "描述") + private String description; + @Schema(description = "创建时间") private Date createTime; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/PathBookmarkGroupVO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/PathBookmarkGroupVO.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/PathBookmarkGroupVO.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/PathBookmarkGroupVO.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/PathBookmarkVO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/PathBookmarkVO.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/PathBookmarkVO.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/PathBookmarkVO.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/PathBookmarkWrapperVO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/PathBookmarkWrapperVO.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/PathBookmarkWrapperVO.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/PathBookmarkWrapperVO.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/TerminalConnectLogVO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/TerminalConnectLogVO.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/TerminalConnectLogVO.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/TerminalConnectLogVO.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/TerminalSftpLogVO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/TerminalSftpLogVO.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/TerminalSftpLogVO.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/TerminalSftpLogVO.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/TerminalThemeVO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/TerminalThemeVO.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/TerminalThemeVO.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/TerminalThemeVO.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/UploadTaskCreateVO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/UploadTaskCreateVO.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/UploadTaskCreateVO.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/UploadTaskCreateVO.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/UploadTaskFileVO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/UploadTaskFileVO.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/UploadTaskFileVO.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/UploadTaskFileVO.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/UploadTaskHostVO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/UploadTaskHostVO.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/UploadTaskHostVO.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/UploadTaskHostVO.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/UploadTaskStatusVO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/UploadTaskStatusVO.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/UploadTaskStatusVO.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/UploadTaskStatusVO.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/UploadTaskVO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/UploadTaskVO.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/UploadTaskVO.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/vo/UploadTaskVO.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/ExecHostStatusEnum.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/ExecHostStatusEnum.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/ExecHostStatusEnum.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/ExecHostStatusEnum.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/ExecJobStatusEnum.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/ExecJobStatusEnum.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/ExecJobStatusEnum.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/ExecJobStatusEnum.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/ExecModeEnum.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/ExecModeEnum.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/ExecModeEnum.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/ExecModeEnum.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/ExecSourceEnum.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/ExecSourceEnum.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/ExecSourceEnum.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/ExecSourceEnum.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/ExecStatusEnum.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/ExecStatusEnum.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/ExecStatusEnum.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/ExecStatusEnum.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/HostExtraItemEnum.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/HostExtraItemEnum.java similarity index 88% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/HostExtraItemEnum.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/HostExtraItemEnum.java index a3fd5fb5..92e45cef 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/HostExtraItemEnum.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/HostExtraItemEnum.java @@ -24,9 +24,9 @@ package org.dromara.visor.module.asset.enums; import lombok.AllArgsConstructor; import lombok.Getter; -import org.dromara.visor.framework.common.handler.data.GenericsStrategyDefinition; -import org.dromara.visor.framework.common.handler.data.model.GenericsDataModel; -import org.dromara.visor.framework.common.handler.data.strategy.GenericsDataStrategy; +import org.dromara.visor.common.handler.data.GenericsStrategyDefinition; +import org.dromara.visor.common.handler.data.model.GenericsDataModel; +import org.dromara.visor.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/org/dromara/visor/module/asset/enums/HostExtraSshAuthTypeEnum.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/HostExtraSshAuthTypeEnum.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/HostExtraSshAuthTypeEnum.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/HostExtraSshAuthTypeEnum.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/HostIdentityTypeEnum.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/HostIdentityTypeEnum.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/HostIdentityTypeEnum.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/HostIdentityTypeEnum.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/HostOsTypeEnum.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/HostOsTypeEnum.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/HostOsTypeEnum.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/HostOsTypeEnum.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/HostSshAuthTypeEnum.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/HostSshAuthTypeEnum.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/HostSshAuthTypeEnum.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/HostSshAuthTypeEnum.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/HostStatusEnum.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/HostStatusEnum.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/HostStatusEnum.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/HostStatusEnum.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/HostTypeEnum.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/HostTypeEnum.java similarity index 86% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/HostTypeEnum.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/HostTypeEnum.java index 157b79c5..3d1d0bf6 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/HostTypeEnum.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/HostTypeEnum.java @@ -24,9 +24,9 @@ package org.dromara.visor.module.asset.enums; import lombok.AllArgsConstructor; import lombok.Getter; -import org.dromara.visor.framework.common.handler.data.GenericsStrategyDefinition; -import org.dromara.visor.framework.common.handler.data.model.GenericsDataModel; -import org.dromara.visor.framework.common.handler.data.strategy.GenericsDataStrategy; +import org.dromara.visor.common.handler.data.GenericsStrategyDefinition; +import org.dromara.visor.common.handler.data.model.GenericsDataModel; +import org.dromara.visor.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/org/dromara/visor/module/asset/enums/ScriptExecEnum.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/ScriptExecEnum.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/ScriptExecEnum.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/ScriptExecEnum.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/TerminalConnectStatusEnum.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/TerminalConnectStatusEnum.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/TerminalConnectStatusEnum.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/TerminalConnectStatusEnum.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/TerminalConnectTypeEnum.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/TerminalConnectTypeEnum.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/TerminalConnectTypeEnum.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/TerminalConnectTypeEnum.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/UploadTaskFileStatusEnum.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/UploadTaskFileStatusEnum.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/UploadTaskFileStatusEnum.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/UploadTaskFileStatusEnum.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/UploadTaskStatusEnum.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/UploadTaskStatusEnum.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/UploadTaskStatusEnum.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/enums/UploadTaskStatusEnum.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/config/model/HostSshConfigModel.java b/orion-visor-modules/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 93% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/config/model/HostSshConfigModel.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/config/model/HostSshConfigModel.java index ddb8e2e0..8382d5ed 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/config/model/HostSshConfigModel.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/config/model/HostSshConfigModel.java @@ -26,8 +26,8 @@ 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 org.dromara.visor.common.handler.data.model.GenericsDataModel; +import org.dromara.visor.common.security.UpdatePasswordAction; import javax.validation.constraints.*; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/config/strategy/HostSshConfigStrategy.java b/orion-visor-modules/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 83% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/config/strategy/HostSshConfigStrategy.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/config/strategy/HostSshConfigStrategy.java index f839236b..0fd5da54 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/config/strategy/HostSshConfigStrategy.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/config/strategy/HostSshConfigStrategy.java @@ -24,13 +24,13 @@ package org.dromara.visor.module.asset.handler.host.config.strategy; 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.common.constant.Const; +import org.dromara.visor.common.constant.ErrorMessage; +import org.dromara.visor.common.handler.data.strategy.AbstractGenericsDataStrategy; +import org.dromara.visor.common.utils.AesEncryptUtils; +import org.dromara.visor.common.utils.RsaEncryptUtils; +import org.dromara.visor.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; @@ -126,16 +126,18 @@ public class HostSshConfigStrategy extends AbstractGenericsDataStrategy c .eq(HostIdentityDO::getId, searchValue).or() .like(HostIdentityDO::getName, searchValue).or() diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostKeyServiceImpl.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostKeyServiceImpl.java similarity index 92% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostKeyServiceImpl.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostKeyServiceImpl.java index f285a060..f09ad180 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostKeyServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostKeyServiceImpl.java @@ -28,12 +28,12 @@ import cn.orionsec.kit.lang.utils.collect.Lists; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.common.constant.Const; +import org.dromara.visor.common.constant.ErrorMessage; +import org.dromara.visor.common.security.PasswordModifier; +import org.dromara.visor.common.utils.AesEncryptUtils; +import org.dromara.visor.common.utils.Valid; 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; @@ -97,7 +97,7 @@ public class HostKeyServiceImpl implements HostKeyService { this.encryptKey(record); String password = record.getPassword(); if (!Strings.isBlank(password)) { - record.setPassword(CryptoUtils.encryptAsString(password)); + record.setPassword(AesEncryptUtils.encryptAsString(password)); } // 插入 int effect = hostKeyDAO.insert(record); @@ -154,7 +154,7 @@ public class HostKeyServiceImpl implements HostKeyService { // 解密密码 String password = record.getPassword(); if (!Strings.isBlank(password)) { - record.setPassword(CryptoUtils.decryptAsString(password)); + record.setPassword(AesEncryptUtils.decryptAsString(password)); } return record; } @@ -254,6 +254,7 @@ public class HostKeyServiceImpl implements HostKeyService { return hostKeyDAO.wrapper() .eq(HostKeyDO::getId, request.getId()) .like(HostKeyDO::getName, request.getName()) + .like(HostKeyDO::getDescription, request.getDescription()) .and(Strings.isNotEmpty(searchValue), c -> c .eq(HostKeyDO::getId, searchValue).or() .like(HostKeyDO::getName, searchValue) @@ -278,11 +279,11 @@ public class HostKeyServiceImpl implements HostKeyService { private void encryptKey(HostKeyDO record) { String publicKey = record.getPublicKey(); if (!Strings.isBlank(publicKey)) { - record.setPublicKey(CryptoUtils.encryptAsString(publicKey)); + record.setPublicKey(AesEncryptUtils.encryptAsString(publicKey)); } String privateKey = record.getPrivateKey(); if (!Strings.isBlank(privateKey)) { - record.setPrivateKey(CryptoUtils.encryptAsString(privateKey)); + record.setPrivateKey(AesEncryptUtils.encryptAsString(privateKey)); } } @@ -294,11 +295,11 @@ public class HostKeyServiceImpl implements HostKeyService { private void decryptKey(HostKeyDO record) { String publicKey = record.getPublicKey(); if (!Strings.isBlank(publicKey)) { - record.setPublicKey(CryptoUtils.decryptAsString(publicKey)); + record.setPublicKey(AesEncryptUtils.decryptAsString(publicKey)); } String privateKey = record.getPrivateKey(); if (!Strings.isBlank(privateKey)) { - record.setPrivateKey(CryptoUtils.decryptAsString(privateKey)); + record.setPrivateKey(AesEncryptUtils.decryptAsString(privateKey)); } } diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostServiceImpl.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostServiceImpl.java similarity index 96% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostServiceImpl.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostServiceImpl.java index f4270189..d21992db 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostServiceImpl.java @@ -31,11 +31,12 @@ import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.common.constant.Const; +import org.dromara.visor.common.constant.ErrorMessage; +import org.dromara.visor.common.constant.ExtraFieldConst; +import org.dromara.visor.common.handler.data.model.GenericsDataModel; +import org.dromara.visor.common.utils.Valid; 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; @@ -179,7 +180,10 @@ public class HostServiceImpl implements HostService { @Override public Integer updateHostConfig(HostUpdateConfigRequest request) { - log.info("HostService-updateHostConfig request: {}", JSON.toJSONString(request)); + // 设置日志参数 + String param = OperatorLogs.toJsonString(JSON.parseObject(request.getConfig())); + OperatorLogs.add(ExtraFieldConst.CONFIG, param); + log.info("HostService-updateHostConfig request: {}", param); Long id = request.getId(); try { CURRENT_UPDATE_CONFIG_ID.set(id); @@ -400,12 +404,13 @@ public class HostServiceImpl implements HostService { } // 基础条件 wrapper.eq(HostDO::getId, request.getId()) - .like(HostDO::getName, request.getName()) - .like(HostDO::getCode, request.getCode()) - .like(HostDO::getAddress, request.getAddress()) .eq(HostDO::getStatus, request.getStatus()) .eq(HostDO::getType, request.getType()) .eq(HostDO::getOsType, request.getOsType()) + .like(HostDO::getName, request.getName()) + .like(HostDO::getCode, request.getCode()) + .like(HostDO::getAddress, request.getAddress()) + .like(HostDO::getDescription, request.getDescription()) .and(Strings.isNotEmpty(searchValue), c -> c .eq(HostDO::getId, searchValue).or() .like(HostDO::getName, searchValue).or() diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/PathBookmarkGroupServiceImpl.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/PathBookmarkGroupServiceImpl.java similarity index 97% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/PathBookmarkGroupServiceImpl.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/PathBookmarkGroupServiceImpl.java index c89719a8..b4af1389 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/PathBookmarkGroupServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/PathBookmarkGroupServiceImpl.java @@ -25,9 +25,9 @@ package org.dromara.visor.module.asset.service.impl; import cn.orionsec.kit.lang.utils.Booleans; import com.alibaba.fastjson.JSON; 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.common.constant.Const; +import org.dromara.visor.common.constant.ErrorMessage; +import org.dromara.visor.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; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/PathBookmarkServiceImpl.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/PathBookmarkServiceImpl.java similarity index 98% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/PathBookmarkServiceImpl.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/PathBookmarkServiceImpl.java index a5072eb3..d6756de4 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/PathBookmarkServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/PathBookmarkServiceImpl.java @@ -27,8 +27,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; 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.common.constant.ErrorMessage; +import org.dromara.visor.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; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/TerminalConnectLogServiceImpl.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/TerminalConnectLogServiceImpl.java similarity index 98% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/TerminalConnectLogServiceImpl.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/TerminalConnectLogServiceImpl.java index 640baf09..fc503747 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/TerminalConnectLogServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/TerminalConnectLogServiceImpl.java @@ -28,11 +28,11 @@ import cn.orionsec.kit.lang.utils.collect.Lists; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.common.constant.Const; +import org.dromara.visor.common.constant.ErrorMessage; +import org.dromara.visor.common.utils.SqlUtils; +import org.dromara.visor.common.utils.Valid; 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; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/TerminalServiceImpl.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/TerminalServiceImpl.java similarity index 98% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/TerminalServiceImpl.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/TerminalServiceImpl.java index bd2aeb0f..3bd170d0 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/TerminalServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/TerminalServiceImpl.java @@ -25,10 +25,10 @@ package org.dromara.visor.module.asset.service.impl; import cn.orionsec.kit.lang.id.UUIds; import com.alibaba.fastjson.JSONObject; 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.common.constant.ErrorMessage; +import org.dromara.visor.common.constant.ExtraFieldConst; +import org.dromara.visor.common.security.LoginUser; +import org.dromara.visor.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; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/TerminalSftpServiceImpl.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/TerminalSftpServiceImpl.java similarity index 98% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/TerminalSftpServiceImpl.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/TerminalSftpServiceImpl.java index 422fc57a..096d134a 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/TerminalSftpServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/TerminalSftpServiceImpl.java @@ -37,10 +37,10 @@ import cn.orionsec.kit.web.servlet.web.Servlets; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.common.constant.Const; +import org.dromara.visor.common.constant.ErrorMessage; +import org.dromara.visor.common.constant.ExtraFieldConst; 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; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/UploadTaskFileServiceImpl.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/UploadTaskFileServiceImpl.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/UploadTaskFileServiceImpl.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/UploadTaskFileServiceImpl.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/UploadTaskServiceImpl.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/UploadTaskServiceImpl.java similarity index 98% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/UploadTaskServiceImpl.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/UploadTaskServiceImpl.java index 4f58e777..dfe33b87 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/UploadTaskServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/UploadTaskServiceImpl.java @@ -35,14 +35,14 @@ import cn.orionsec.kit.lang.utils.time.Dates; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.common.constant.Const; +import org.dromara.visor.common.constant.ErrorMessage; +import org.dromara.visor.common.enums.EndpointDefine; +import org.dromara.visor.common.interfaces.FileClient; +import org.dromara.visor.common.security.LoginUser; +import org.dromara.visor.common.utils.SqlUtils; +import org.dromara.visor.common.utils.Valid; 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.EndpointDefine; -import org.dromara.visor.framework.common.file.FileClient; -import org.dromara.visor.framework.common.security.LoginUser; -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; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/task/CommandSnippetGroupAutoClearTask.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/task/CommandSnippetGroupAutoClearTask.java similarity index 96% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/task/CommandSnippetGroupAutoClearTask.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/task/CommandSnippetGroupAutoClearTask.java index 4ecf8deb..7d9c12cd 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/task/CommandSnippetGroupAutoClearTask.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/task/CommandSnippetGroupAutoClearTask.java @@ -23,7 +23,7 @@ package org.dromara.visor.module.asset.task; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.utils.LockerUtils; +import org.dromara.visor.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/org/dromara/visor/module/asset/task/ExecLogFileAutoClearTask.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/task/ExecLogFileAutoClearTask.java similarity index 97% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/task/ExecLogFileAutoClearTask.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/task/ExecLogFileAutoClearTask.java index e79a16b9..d128c819 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/task/ExecLogFileAutoClearTask.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/task/ExecLogFileAutoClearTask.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.asset.task; 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.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; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/task/PathBookmarkGroupAutoClearTask.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/task/PathBookmarkGroupAutoClearTask.java similarity index 96% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/task/PathBookmarkGroupAutoClearTask.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/task/PathBookmarkGroupAutoClearTask.java index e1f8b784..2d8bd666 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/task/PathBookmarkGroupAutoClearTask.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/task/PathBookmarkGroupAutoClearTask.java @@ -23,7 +23,7 @@ package org.dromara.visor.module.asset.task; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.utils.LockerUtils; +import org.dromara.visor.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/org/dromara/visor/module/asset/task/TerminalConnectLogAutoClearTask.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/task/TerminalConnectLogAutoClearTask.java similarity index 97% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/task/TerminalConnectLogAutoClearTask.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/task/TerminalConnectLogAutoClearTask.java index 37fe51ac..10ee6bbc 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/task/TerminalConnectLogAutoClearTask.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/task/TerminalConnectLogAutoClearTask.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.asset.task; 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.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; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/utils/SftpUtils.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/utils/SftpUtils.java similarity index 97% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/utils/SftpUtils.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/utils/SftpUtils.java index d83e65f7..ce1ea510 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/utils/SftpUtils.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/utils/SftpUtils.java @@ -58,7 +58,7 @@ public class SftpUtils { SftpFile file = executor.getFile(path); if (file != null) { // 文件存在则备份 - SftpFileBackupParams backupParams = new SftpFileBackupParams(file.getName(), System.currentTimeMillis()); + SftpFileBackupParams backupParams = new SftpFileBackupParams(file.getName()); String target = Strings.format(config.getBackupFileName(), JSON.parseObject(JSON.toJSONString(backupParams))); // 移动 executor.move(path, target); 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-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/META-INF/additional-spring-configuration-metadata.json similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/META-INF/additional-spring-configuration-metadata.json rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/META-INF/additional-spring-configuration-metadata.json diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/CommandSnippetMapper.xml b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/CommandSnippetMapper.xml similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/CommandSnippetMapper.xml rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/CommandSnippetMapper.xml diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/ExecHostLogMapper.xml b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/ExecHostLogMapper.xml similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/ExecHostLogMapper.xml rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/ExecHostLogMapper.xml diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/ExecJobHostMapper.xml b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/ExecJobHostMapper.xml similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/ExecJobHostMapper.xml rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/ExecJobHostMapper.xml diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/ExecJobMapper.xml b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/ExecJobMapper.xml similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/ExecJobMapper.xml rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/ExecJobMapper.xml diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/ExecLogMapper.xml b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/ExecLogMapper.xml similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/ExecLogMapper.xml rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/ExecLogMapper.xml diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/ExecTemplateHostMapper.xml b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/ExecTemplateHostMapper.xml similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/ExecTemplateHostMapper.xml rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/ExecTemplateHostMapper.xml diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/ExecTemplateMapper.xml b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/ExecTemplateMapper.xml similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/ExecTemplateMapper.xml rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/ExecTemplateMapper.xml diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/HostIdentityMapper.xml b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/HostIdentityMapper.xml similarity index 85% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/HostIdentityMapper.xml rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/HostIdentityMapper.xml index a69ca9f9..69393b15 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/HostIdentityMapper.xml +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/HostIdentityMapper.xml @@ -5,20 +5,21 @@ + + + + + - - - - - id, name, username, password, key_id, create_time, update_time, creator, updater, deleted + id, name, username, password, key_id, description, create_time, update_time, creator, updater, deleted diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/HostKeyMapper.xml b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/HostKeyMapper.xml similarity index 84% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/HostKeyMapper.xml rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/HostKeyMapper.xml index 8bf10dd6..539a22e2 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/HostKeyMapper.xml +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/HostKeyMapper.xml @@ -5,20 +5,21 @@ + + + + + - - - - - id, name, public_key, private_key, password, create_time, update_time, creator, updater, deleted + id, name, public_key, private_key, password, description, create_time, update_time, creator, updater, deleted diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/HostMapper.xml b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/HostMapper.xml similarity index 93% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/HostMapper.xml rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/HostMapper.xml index a1f75c3f..f909461b 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/HostMapper.xml +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/HostMapper.xml @@ -13,6 +13,7 @@ + @@ -22,7 +23,7 @@ - id, type, os_type, name, code, address, port, status, config, create_time, update_time, creator, updater, deleted + id, type, os_type, name, code, address, port, status, config, description, create_time, update_time, creator, updater, deleted diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/PathBookmarkMapper.xml b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/PathBookmarkMapper.xml similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/PathBookmarkMapper.xml rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/PathBookmarkMapper.xml diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/TerminalConnectLogMapper.xml b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/TerminalConnectLogMapper.xml similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/TerminalConnectLogMapper.xml rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/TerminalConnectLogMapper.xml diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/UploadTaskFileMapper.xml b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/UploadTaskFileMapper.xml similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/UploadTaskFileMapper.xml rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/UploadTaskFileMapper.xml diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/UploadTaskMapper.xml b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/UploadTaskMapper.xml similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/UploadTaskMapper.xml rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/UploadTaskMapper.xml diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/test/java/org/dromara/visor/module/asset/api/impl/.gitkeep b/orion-visor-modules/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/org/dromara/visor/module/asset/api/impl/.gitkeep rename to orion-visor-modules/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/org/dromara/visor/module/asset/meta/TerminalThemeGenerator.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/test/java/org/dromara/visor/module/asset/meta/TerminalThemeGenerator.java similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/test/java/org/dromara/visor/module/asset/meta/TerminalThemeGenerator.java rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/test/java/org/dromara/visor/module/asset/meta/TerminalThemeGenerator.java diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/test/java/org/dromara/visor/module/asset/service/impl/.gitkeep b/orion-visor-modules/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/org/dromara/visor/module/asset/service/impl/.gitkeep rename to orion-visor-modules/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/orion-visor-module-asset-service/src/test/resources/application-unit-test.yaml b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/test/resources/application-unit-test.yaml similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/test/resources/application-unit-test.yaml rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/test/resources/application-unit-test.yaml diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/test/resources/sql/.gitkeep b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/test/resources/sql/.gitkeep similarity index 100% rename from orion-visor-module-asset/orion-visor-module-asset-service/src/test/resources/sql/.gitkeep rename to orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/test/resources/sql/.gitkeep diff --git a/orion-visor-module-asset/pom.xml b/orion-visor-modules/orion-visor-module-asset/pom.xml similarity index 93% rename from orion-visor-module-asset/pom.xml rename to orion-visor-modules/orion-visor-module-asset/pom.xml index 60587567..e6d659e4 100644 --- a/orion-visor-module-asset/pom.xml +++ b/orion-visor-modules/orion-visor-module-asset/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"> org.dromara.visor - orion-visor + orion-visor-modules ${revision} diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/pom.xml b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/pom.xml similarity index 92% rename from orion-visor-module-infra/orion-visor-module-infra-provider/pom.xml rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/pom.xml index a86edb47..0fea0799 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-provider/pom.xml +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/pom.xml @@ -18,7 +18,7 @@ org.dromara.visor - orion-visor-framework-common + orion-visor-common diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/AuthenticationApi.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/AuthenticationApi.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/AuthenticationApi.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/AuthenticationApi.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/DataExtraApi.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/DataExtraApi.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/DataExtraApi.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/DataExtraApi.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/DataGroupApi.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/DataGroupApi.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/DataGroupApi.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/DataGroupApi.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/DataGroupRelApi.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/DataGroupRelApi.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/DataGroupRelApi.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/DataGroupRelApi.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/DataGroupUserApi.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/DataGroupUserApi.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/DataGroupUserApi.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/DataGroupUserApi.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/DataGroupUserRelApi.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/DataGroupUserRelApi.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/DataGroupUserRelApi.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/DataGroupUserRelApi.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/DataPermissionApi.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/DataPermissionApi.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/DataPermissionApi.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/DataPermissionApi.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/DictValueApi.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/DictValueApi.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/DictValueApi.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/DictValueApi.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/FavoriteApi.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/FavoriteApi.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/FavoriteApi.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/FavoriteApi.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/FileUploadApi.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/FileUploadApi.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/FileUploadApi.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/FileUploadApi.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/HistoryValueApi.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/HistoryValueApi.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/HistoryValueApi.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/HistoryValueApi.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/OperatorLogApi.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/OperatorLogApi.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/OperatorLogApi.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/OperatorLogApi.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/PermissionApi.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/PermissionApi.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/PermissionApi.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/PermissionApi.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/SystemMessageApi.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/SystemMessageApi.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/SystemMessageApi.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/SystemMessageApi.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/SystemRoleApi.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/SystemRoleApi.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/SystemRoleApi.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/SystemRoleApi.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/SystemUserApi.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/SystemUserApi.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/SystemUserApi.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/SystemUserApi.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/TagRelApi.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/TagRelApi.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/TagRelApi.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/TagRelApi.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/constant/DataExtraItems.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/constant/DataExtraItems.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/constant/DataExtraItems.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/constant/DataExtraItems.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/define/RoleDefine.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/define/RoleDefine.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/define/RoleDefine.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/define/RoleDefine.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/define/SystemMessageDefine.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/define/SystemMessageDefine.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/define/SystemMessageDefine.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/define/SystemMessageDefine.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/data/DataExtraDTO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/data/DataExtraDTO.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/data/DataExtraDTO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/data/DataExtraDTO.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/data/DataExtraQueryDTO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/data/DataExtraQueryDTO.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/data/DataExtraQueryDTO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/data/DataExtraQueryDTO.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/data/DataExtraSetDTO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/data/DataExtraSetDTO.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/data/DataExtraSetDTO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/data/DataExtraSetDTO.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/data/DataGroupCreateDTO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/data/DataGroupCreateDTO.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/data/DataGroupCreateDTO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/data/DataGroupCreateDTO.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/data/DataGroupDTO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/data/DataGroupDTO.java similarity index 96% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/data/DataGroupDTO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/data/DataGroupDTO.java index 3ac259e3..903cbb76 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/data/DataGroupDTO.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/data/DataGroupDTO.java @@ -27,7 +27,7 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import org.dromara.visor.framework.common.entity.TreeNode; +import org.dromara.visor.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/org/dromara/visor/module/infra/entity/dto/data/DataGroupMoveDTO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/data/DataGroupMoveDTO.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/data/DataGroupMoveDTO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/data/DataGroupMoveDTO.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/data/DataGroupRenameDTO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/data/DataGroupRenameDTO.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/data/DataGroupRenameDTO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/data/DataGroupRenameDTO.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/data/DataPermissionUpdateDTO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/data/DataPermissionUpdateDTO.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/data/DataPermissionUpdateDTO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/data/DataPermissionUpdateDTO.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/history/HistoryValueCreateDTO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/history/HistoryValueCreateDTO.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/history/HistoryValueCreateDTO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/history/HistoryValueCreateDTO.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/history/HistoryValueDTO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/history/HistoryValueDTO.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/history/HistoryValueDTO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/history/HistoryValueDTO.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/message/SystemMessageCreateDTO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/message/SystemMessageCreateDTO.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/message/SystemMessageCreateDTO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/message/SystemMessageCreateDTO.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/message/SystemMessageDTO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/message/SystemMessageDTO.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/message/SystemMessageDTO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/message/SystemMessageDTO.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/operator/OperatorLogDTO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/operator/OperatorLogDTO.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/operator/OperatorLogDTO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/operator/OperatorLogDTO.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/operator/OperatorLogQueryDTO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/operator/OperatorLogQueryDTO.java similarity index 97% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/operator/OperatorLogQueryDTO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/operator/OperatorLogQueryDTO.java index 932f4422..e134b8d6 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/operator/OperatorLogQueryDTO.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/operator/OperatorLogQueryDTO.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.infra.entity.dto.operator; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import org.dromara.visor.framework.common.entity.PageRequest; +import org.dromara.visor.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/org/dromara/visor/module/infra/entity/dto/role/SystemRoleDTO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/role/SystemRoleDTO.java similarity index 95% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/role/SystemRoleDTO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/role/SystemRoleDTO.java index b5b37774..c96732c7 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/role/SystemRoleDTO.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/role/SystemRoleDTO.java @@ -58,4 +58,7 @@ public class SystemRoleDTO implements Serializable { @Schema(description = "状态 0停用 1启用") private Integer status; + @Schema(description = "描述") + private String description; + } diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/tag/TagDTO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/tag/TagDTO.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/tag/TagDTO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/tag/TagDTO.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/user/SystemUserAuthDTO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/user/SystemUserAuthDTO.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/user/SystemUserAuthDTO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/user/SystemUserAuthDTO.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/user/SystemUserDTO.java b/orion-visor-modules/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/org/dromara/visor/module/infra/entity/dto/user/SystemUserDTO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/user/SystemUserDTO.java index 0f6967af..1d2b1170 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/user/SystemUserDTO.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/entity/dto/user/SystemUserDTO.java @@ -71,4 +71,7 @@ public class SystemUserDTO implements Serializable { @Schema(description = "最后登录时间") private Date lastLoginTime; + @Schema(description = "描述") + private String description; + } diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/enums/DataExtraTypeEnum.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/enums/DataExtraTypeEnum.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/enums/DataExtraTypeEnum.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/enums/DataExtraTypeEnum.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/enums/DataGroupTypeEnum.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/enums/DataGroupTypeEnum.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/enums/DataGroupTypeEnum.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/enums/DataGroupTypeEnum.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/enums/DataPermissionTypeEnum.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/enums/DataPermissionTypeEnum.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/enums/DataPermissionTypeEnum.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/enums/DataPermissionTypeEnum.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/enums/FavoriteTypeEnum.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/enums/FavoriteTypeEnum.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/enums/FavoriteTypeEnum.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/enums/FavoriteTypeEnum.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/enums/HistoryValueTypeEnum.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/enums/HistoryValueTypeEnum.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/enums/HistoryValueTypeEnum.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/enums/HistoryValueTypeEnum.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/enums/MessageClassifyEnum.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/enums/MessageClassifyEnum.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/enums/MessageClassifyEnum.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/enums/MessageClassifyEnum.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/enums/TagTypeEnum.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/enums/TagTypeEnum.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/enums/TagTypeEnum.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/enums/TagTypeEnum.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/pom.xml b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/pom.xml similarity index 88% rename from orion-visor-module-infra/orion-visor-module-infra-service/pom.xml rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/pom.xml index 5af269eb..8bc529da 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/pom.xml +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/pom.xml @@ -16,80 +16,65 @@ https://github.com/dromara/orion-visor + org.dromara.visor - orion-visor-framework-common + orion-visor-common - + org.dromara.visor orion-visor-module-infra-provider ${revision} - - org.dromara.visor orion-visor-module-asset-provider ${revision} - + org.dromara.visor orion-visor-spring-boot-starter-web - - org.dromara.visor orion-visor-spring-boot-starter-websocket - - org.dromara.visor orion-visor-spring-boot-starter-log - - org.dromara.visor orion-visor-spring-boot-starter-biz-operator-log - - org.dromara.visor orion-visor-spring-boot-starter-desensitize - - + + org.dromara.visor + orion-visor-spring-boot-starter-config + org.dromara.visor orion-visor-spring-boot-starter-security - - org.dromara.visor orion-visor-spring-boot-starter-redis - - org.dromara.visor orion-visor-spring-boot-starter-mybatis - - org.dromara.visor orion-visor-spring-boot-starter-storage - - org.dromara.visor orion-visor-spring-boot-starter-test diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/AuthenticationApiImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/AuthenticationApiImpl.java similarity index 95% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/AuthenticationApiImpl.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/AuthenticationApiImpl.java index 5a9996f3..0be17cee 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/AuthenticationApiImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/AuthenticationApiImpl.java @@ -23,8 +23,8 @@ package org.dromara.visor.module.infra.api.impl; 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.common.constant.ErrorMessage; +import org.dromara.visor.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; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataExtraApiImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataExtraApiImpl.java similarity index 99% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataExtraApiImpl.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataExtraApiImpl.java index 281304b1..146f0586 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataExtraApiImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataExtraApiImpl.java @@ -23,7 +23,7 @@ package org.dromara.visor.module.infra.api.impl; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.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; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataGroupApiImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataGroupApiImpl.java similarity index 97% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataGroupApiImpl.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataGroupApiImpl.java index 84eb860e..862c2983 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataGroupApiImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataGroupApiImpl.java @@ -23,8 +23,8 @@ package org.dromara.visor.module.infra.api.impl; 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.common.constant.Const; +import org.dromara.visor.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; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataGroupRelApiImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataGroupRelApiImpl.java similarity index 97% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataGroupRelApiImpl.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataGroupRelApiImpl.java index 7be1b9bf..c6f02a08 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataGroupRelApiImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataGroupRelApiImpl.java @@ -23,8 +23,8 @@ package org.dromara.visor.module.infra.api.impl; 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.common.constant.Const; +import org.dromara.visor.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; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataGroupUserApiImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataGroupUserApiImpl.java similarity index 98% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataGroupUserApiImpl.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataGroupUserApiImpl.java index 1fa730d5..33891592 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataGroupUserApiImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataGroupUserApiImpl.java @@ -23,7 +23,7 @@ package org.dromara.visor.module.infra.api.impl; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.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; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataGroupUserRelApiImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataGroupUserRelApiImpl.java similarity index 98% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataGroupUserRelApiImpl.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataGroupUserRelApiImpl.java index baad9a61..51d65057 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataGroupUserRelApiImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataGroupUserRelApiImpl.java @@ -23,7 +23,7 @@ package org.dromara.visor.module.infra.api.impl; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.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; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataPermissionApiImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataPermissionApiImpl.java similarity index 98% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataPermissionApiImpl.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataPermissionApiImpl.java index 4c70c0a7..6a8278b6 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataPermissionApiImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DataPermissionApiImpl.java @@ -23,7 +23,7 @@ package org.dromara.visor.module.infra.api.impl; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.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; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DictValueApiImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DictValueApiImpl.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DictValueApiImpl.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DictValueApiImpl.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/FavoriteApiImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/FavoriteApiImpl.java similarity index 98% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/FavoriteApiImpl.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/FavoriteApiImpl.java index 7b9984a5..a5a2e4b4 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/FavoriteApiImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/FavoriteApiImpl.java @@ -22,7 +22,7 @@ */ package org.dromara.visor.module.infra.api.impl; -import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.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; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/FileUploadApiImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/FileUploadApiImpl.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/FileUploadApiImpl.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/FileUploadApiImpl.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/HistoryValueApiImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/HistoryValueApiImpl.java similarity index 96% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/HistoryValueApiImpl.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/HistoryValueApiImpl.java index 8a91f8dc..4fa2edd4 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/HistoryValueApiImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/HistoryValueApiImpl.java @@ -24,8 +24,8 @@ package org.dromara.visor.module.infra.api.impl; import com.alibaba.fastjson.JSON; 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.common.constant.ErrorMessage; +import org.dromara.visor.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; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/OperatorLogApiImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/OperatorLogApiImpl.java similarity index 98% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/OperatorLogApiImpl.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/OperatorLogApiImpl.java index 1e95337b..1ddb8b16 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/OperatorLogApiImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/OperatorLogApiImpl.java @@ -25,7 +25,7 @@ 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 lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.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; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/PermissionApiImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/PermissionApiImpl.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/PermissionApiImpl.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/PermissionApiImpl.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/SystemMessageApiImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/SystemMessageApiImpl.java similarity index 98% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/SystemMessageApiImpl.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/SystemMessageApiImpl.java index 8eab309e..3c6fcc5e 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/SystemMessageApiImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/SystemMessageApiImpl.java @@ -23,7 +23,7 @@ package org.dromara.visor.module.infra.api.impl; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.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; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/SystemRoleApiImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/SystemRoleApiImpl.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/SystemRoleApiImpl.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/SystemRoleApiImpl.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/SystemUserApiImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/SystemUserApiImpl.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/SystemUserApiImpl.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/SystemUserApiImpl.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/TagRelApiImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/TagRelApiImpl.java similarity index 98% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/TagRelApiImpl.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/TagRelApiImpl.java index 33199f9d..13f5a5fc 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/TagRelApiImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/TagRelApiImpl.java @@ -23,7 +23,7 @@ package org.dromara.visor.module.infra.api.impl; import cn.orionsec.kit.lang.utils.collect.Lists; -import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.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; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/configuration/InfraWebSocketConfiguration.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/configuration/InfraWebSocketConfiguration.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/configuration/InfraWebSocketConfiguration.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/configuration/InfraWebSocketConfiguration.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/AuthenticationController.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/AuthenticationController.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/AuthenticationController.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/AuthenticationController.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/DictKeyController.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/DictKeyController.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/DictKeyController.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/DictKeyController.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/DictValueController.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/DictValueController.java similarity index 98% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/DictValueController.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/DictValueController.java index 3354529b..df192acc 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/DictValueController.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/DictValueController.java @@ -28,8 +28,8 @@ 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.common.validator.group.Page; 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; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/ExpressionController.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/ExpressionController.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/ExpressionController.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/ExpressionController.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/FavoriteController.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/FavoriteController.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/FavoriteController.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/FavoriteController.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/HistoryValueController.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/HistoryValueController.java similarity index 97% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/HistoryValueController.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/HistoryValueController.java index 88074208..bc5fb8e2 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/HistoryValueController.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/HistoryValueController.java @@ -26,7 +26,7 @@ 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.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; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/InfraStatisticsController.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/InfraStatisticsController.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/InfraStatisticsController.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/InfraStatisticsController.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/MineController.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/MineController.java similarity index 98% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/MineController.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/MineController.java index 2a3af874..22baa565 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/MineController.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/MineController.java @@ -26,8 +26,8 @@ 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.common.validator.group.Page; 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; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/OperatorLogController.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/OperatorLogController.java similarity index 98% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/OperatorLogController.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/OperatorLogController.java index a32ca845..78d869df 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/OperatorLogController.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/OperatorLogController.java @@ -27,8 +27,8 @@ 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.common.validator.group.Page; 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; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/PreferenceController.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/PreferenceController.java similarity index 75% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/PreferenceController.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/PreferenceController.java index c1c87de4..adf0a720 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/PreferenceController.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/PreferenceController.java @@ -28,7 +28,7 @@ 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.PreferenceUpdateBatchRequest; import org.dromara.visor.module.infra.entity.request.preference.PreferenceUpdateRequest; import org.dromara.visor.module.infra.service.PreferenceService; import org.springframework.validation.annotation.Validated; @@ -36,7 +36,6 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.util.List; -import java.util.Map; /** * 用户偏好 api @@ -58,23 +57,25 @@ public class PreferenceController { @PutMapping("/update") @Operation(summary = "更新用户偏好-单个") - public Integer updatePreference(@Validated @RequestBody PreferenceUpdateRequest request) { - return preferenceService.updatePreference(request); - } - - @PutMapping("/update-partial") - @Operation(summary = "更新用户偏好-部分") - public Boolean updatePreferencePartial(@Validated @RequestBody PreferenceUpdatePartialRequest request) { - preferenceService.updatePreferencePartial(request); + public Boolean updatePreference(@Validated @RequestBody PreferenceUpdateRequest request) { + preferenceService.updatePreference(request); return true; } + @PutMapping("/update-update") + @Operation(summary = "更新用户偏好-多个") + public Boolean updatePreferenceBatch(@Validated @RequestBody PreferenceUpdateBatchRequest request) { + preferenceService.updatePreferenceBatch(request); + return true; + } + + @IgnoreLog @GetMapping("/get") @Operation(summary = "查询用户偏好") @Parameter(name = "type", description = "type", required = true) @Parameter(name = "items", description = "items") - public Map getPreference(@RequestParam("type") String type, - @RequestParam(name = "items", required = false) List items) { + public Object getPreference(@RequestParam("type") String type, + @RequestParam(name = "items", required = false) List items) { return preferenceService.getPreferenceByType(type, items); } @@ -83,8 +84,8 @@ public class PreferenceController { @Operation(summary = "查询默认偏好") @Parameter(name = "type", description = "type", required = true) @Parameter(name = "items", description = "items") - public Map getDefaultPreference(@RequestParam("type") String type, - @RequestParam(name = "items", required = false) List items) { + public Object getDefaultPreference(@RequestParam("type") String type, + @RequestParam(name = "items", required = false) List items) { return preferenceService.getDefaultPreferenceByType(type, items); } diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/SystemMenuController.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/SystemMenuController.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/SystemMenuController.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/SystemMenuController.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/SystemMessageController.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/SystemMessageController.java similarity index 98% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/SystemMessageController.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/SystemMessageController.java index 1dd3818a..adee2798 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/SystemMessageController.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/SystemMessageController.java @@ -26,7 +26,7 @@ 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.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; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/SystemRoleController.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/SystemRoleController.java similarity index 98% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/SystemRoleController.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/SystemRoleController.java index af2a3a38..a24793dc 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/SystemRoleController.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/SystemRoleController.java @@ -27,8 +27,8 @@ 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.common.validator.group.Page; 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; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/SystemSettingController.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/SystemSettingController.java similarity index 68% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/SystemSettingController.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/SystemSettingController.java index 01a70260..f8d0a5b4 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/SystemSettingController.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/SystemSettingController.java @@ -32,16 +32,18 @@ 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.SystemSettingUpdateBatchRequest; 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.entity.vo.SystemSettingAggregateVO; +import org.dromara.visor.module.infra.handler.setting.model.EncryptSystemSettingModel; 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.*; import javax.annotation.Resource; -import java.util.Map; +import javax.annotation.security.PermitAll; /** * 系统设置服务 @@ -68,30 +70,49 @@ public class SystemSettingController { return systemSettingService.getAppInfo(); } + @PermitAll @IgnoreLog(IgnoreLogMode.RET) @GetMapping("/setting") + @Operation(summary = "获取系统聚合设置") + public SystemSettingAggregateVO getSystemAggregateSetting() { + return systemSettingService.getSystemAggregateSetting(); + } + + @DemoDisableApi + @IgnoreLog(IgnoreLogMode.RET) + @GetMapping("/generator-keypair") + @Operation(summary = "生成密钥对") + @PreAuthorize("@ss.hasPermission('infra:system-setting:update')") + public EncryptSystemSettingModel generatorKeypair() { + return systemSettingService.generatorKeypair(); + } + + @IgnoreLog(IgnoreLogMode.RET) + @GetMapping("/get") @Operation(summary = "查询系统设置") @Parameter(name = "type", description = "type", required = true) - public Map getSystemSettingByType(@RequestParam("type") String type) { + @PreAuthorize("@ss.hasPermission('infra:system-setting:update')") + public Object getSystemSettingByType(@RequestParam("type") String type) { return systemSettingService.getSystemSettingByType(type); } @DemoDisableApi @OperatorLog(SystemSettingOperatorType.UPDATE) @PutMapping("/update") - @Operation(summary = "更新系统设置") + @Operation(summary = "更新系统设置-单个") @PreAuthorize("@ss.hasPermission('infra:system-setting:update')") - public Integer updateSystemSetting(@Validated @RequestBody SystemSettingUpdateRequest request) { - return systemSettingService.updateSystemSetting(request); + public Boolean updateSystemSetting(@Validated @RequestBody SystemSettingUpdateRequest request) { + systemSettingService.updateSystemSetting(request); + return true; } @DemoDisableApi @OperatorLog(SystemSettingOperatorType.UPDATE) - @PutMapping("/update-partial") - @Operation(summary = "更新部分系统设置") + @PutMapping("/update-batch") + @Operation(summary = "更新系统设置-多个") @PreAuthorize("@ss.hasPermission('infra:system-setting:update')") - public Boolean updatePartialSystemSetting(@Validated @RequestBody SystemSettingUpdatePartialRequest request) { - systemSettingService.updatePartialSystemSetting(request); + public Boolean updateSystemSettingBatch(@Validated @RequestBody SystemSettingUpdateBatchRequest request) { + systemSettingService.updateSystemSettingBatch(request); return true; } diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/SystemUserController.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/SystemUserController.java similarity index 99% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/SystemUserController.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/SystemUserController.java index 0316cfaa..71532fa8 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/SystemUserController.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/SystemUserController.java @@ -28,8 +28,8 @@ 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.common.validator.group.Page; 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; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/TagController.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/TagController.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/TagController.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/TagController.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/TipsController.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/TipsController.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/TipsController.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/TipsController.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/UserAggregateController.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/UserAggregateController.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/UserAggregateController.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/UserAggregateController.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/DataExtraProviderConvert.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/DataExtraProviderConvert.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/DataExtraProviderConvert.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/DataExtraProviderConvert.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/DataGroupConvert.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/DataGroupConvert.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/DataGroupConvert.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/DataGroupConvert.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/DataGroupProviderConvert.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/DataGroupProviderConvert.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/DataGroupProviderConvert.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/DataGroupProviderConvert.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/DataGroupRelConvert.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/DataGroupRelConvert.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/DataGroupRelConvert.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/DataGroupRelConvert.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/DataPermissionConvert.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/DataPermissionConvert.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/DataPermissionConvert.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/DataPermissionConvert.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/DataPermissionProviderConvert.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/DataPermissionProviderConvert.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/DataPermissionProviderConvert.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/DataPermissionProviderConvert.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/DictKeyConvert.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/DictKeyConvert.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/DictKeyConvert.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/DictKeyConvert.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/DictValueConvert.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/DictValueConvert.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/DictValueConvert.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/DictValueConvert.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/FavoriteConvert.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/FavoriteConvert.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/FavoriteConvert.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/FavoriteConvert.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/HistoryValueConvert.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/HistoryValueConvert.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/HistoryValueConvert.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/HistoryValueConvert.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/HistoryValueProviderConvert.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/HistoryValueProviderConvert.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/HistoryValueProviderConvert.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/HistoryValueProviderConvert.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/OperatorLogConvert.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/OperatorLogConvert.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/OperatorLogConvert.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/OperatorLogConvert.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/OperatorLogProviderConvert.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/OperatorLogProviderConvert.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/OperatorLogProviderConvert.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/OperatorLogProviderConvert.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/SystemMenuConvert.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/SystemMenuConvert.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/SystemMenuConvert.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/SystemMenuConvert.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/SystemMessageConvert.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/SystemMessageConvert.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/SystemMessageConvert.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/SystemMessageConvert.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/SystemMessageProviderConvert.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/SystemMessageProviderConvert.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/SystemMessageProviderConvert.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/SystemMessageProviderConvert.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/SystemRoleConvert.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/SystemRoleConvert.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/SystemRoleConvert.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/SystemRoleConvert.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/SystemRoleProviderConvert.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/SystemRoleProviderConvert.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/SystemRoleProviderConvert.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/SystemRoleProviderConvert.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/SystemSettingConvert.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/SystemSettingConvert.java similarity index 94% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/SystemSettingConvert.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/SystemSettingConvert.java index af3c623a..5c487995 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/SystemSettingConvert.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/SystemSettingConvert.java @@ -25,7 +25,6 @@ package org.dromara.visor.module.infra.convert; 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; /** @@ -40,7 +39,6 @@ public interface SystemSettingConvert { SystemSettingConvert MAPPER = Mappers.getMapper(SystemSettingConvert.class); - @Mapping(target = "value", ignore = true) SystemSettingDO to(SystemSettingUpdateRequest request); } diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/SystemUserConvert.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/SystemUserConvert.java similarity index 97% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/SystemUserConvert.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/SystemUserConvert.java index a440a690..b12f633c 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/SystemUserConvert.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/SystemUserConvert.java @@ -22,7 +22,7 @@ */ package org.dromara.visor.module.infra.convert; -import org.dromara.visor.framework.common.security.LoginUser; +import org.dromara.visor.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.*; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/SystemUserProviderConvert.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/SystemUserProviderConvert.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/SystemUserProviderConvert.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/SystemUserProviderConvert.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/TagConvert.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/TagConvert.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/TagConvert.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/TagConvert.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/TagProviderConvert.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/TagProviderConvert.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/TagProviderConvert.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/TagProviderConvert.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/TagRelConvert.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/TagRelConvert.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/TagRelConvert.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/convert/TagRelConvert.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/DataExtraDAO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/DataExtraDAO.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/DataExtraDAO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/DataExtraDAO.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/DataGroupDAO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/DataGroupDAO.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/DataGroupDAO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/DataGroupDAO.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/DataGroupRelDAO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/DataGroupRelDAO.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/DataGroupRelDAO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/DataGroupRelDAO.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/DataPermissionDAO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/DataPermissionDAO.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/DataPermissionDAO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/DataPermissionDAO.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/DictKeyDAO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/DictKeyDAO.java similarity index 96% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/DictKeyDAO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/DictKeyDAO.java index cefa67fe..c29151c6 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/DictKeyDAO.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/DictKeyDAO.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.infra.dao; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.apache.ibatis.annotations.Mapper; -import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.common.constant.Const; import org.dromara.visor.framework.mybatis.core.mapper.IMapper; import org.dromara.visor.module.infra.entity.domain.DictKeyDO; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/DictValueDAO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/DictValueDAO.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/DictValueDAO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/DictValueDAO.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/FavoriteDAO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/FavoriteDAO.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/FavoriteDAO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/FavoriteDAO.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/HistoryValueDAO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/HistoryValueDAO.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/HistoryValueDAO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/HistoryValueDAO.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/OperatorLogDAO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/OperatorLogDAO.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/OperatorLogDAO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/OperatorLogDAO.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/PreferenceDAO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/PreferenceDAO.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/PreferenceDAO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/PreferenceDAO.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/SystemMenuDAO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/SystemMenuDAO.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/SystemMenuDAO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/SystemMenuDAO.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/SystemMessageDAO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/SystemMessageDAO.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/SystemMessageDAO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/SystemMessageDAO.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/SystemRoleDAO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/SystemRoleDAO.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/SystemRoleDAO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/SystemRoleDAO.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/SystemRoleMenuDAO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/SystemRoleMenuDAO.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/SystemRoleMenuDAO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/SystemRoleMenuDAO.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/SystemSettingDAO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/SystemSettingDAO.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/SystemSettingDAO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/SystemSettingDAO.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/SystemUserDAO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/SystemUserDAO.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/SystemUserDAO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/SystemUserDAO.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/SystemUserRoleDAO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/SystemUserRoleDAO.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/SystemUserRoleDAO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/SystemUserRoleDAO.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/TagDAO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/TagDAO.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/TagDAO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/TagDAO.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/TagRelDAO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/TagRelDAO.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/TagRelDAO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/dao/TagRelDAO.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/DataExtraCacheKeyDefine.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/DataExtraCacheKeyDefine.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/DataExtraCacheKeyDefine.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/DataExtraCacheKeyDefine.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/DataGroupCacheKeyDefine.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/DataGroupCacheKeyDefine.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/DataGroupCacheKeyDefine.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/DataGroupCacheKeyDefine.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/DataPermissionCacheKeyDefine.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/DataPermissionCacheKeyDefine.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/DataPermissionCacheKeyDefine.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/DataPermissionCacheKeyDefine.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/DictCacheKeyDefine.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/DictCacheKeyDefine.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/DictCacheKeyDefine.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/DictCacheKeyDefine.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/FavoriteCacheKeyDefine.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/FavoriteCacheKeyDefine.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/FavoriteCacheKeyDefine.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/FavoriteCacheKeyDefine.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/FileUploadCacheKeyDefine.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/FileUploadCacheKeyDefine.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/FileUploadCacheKeyDefine.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/FileUploadCacheKeyDefine.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/InfraStatisticsCacheKeyDefine.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/InfraStatisticsCacheKeyDefine.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/InfraStatisticsCacheKeyDefine.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/InfraStatisticsCacheKeyDefine.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/PreferenceCacheKeyDefine.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/PreferenceCacheKeyDefine.java similarity index 89% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/PreferenceCacheKeyDefine.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/PreferenceCacheKeyDefine.java index 844a3593..5f6a1d89 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/PreferenceCacheKeyDefine.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/PreferenceCacheKeyDefine.java @@ -25,7 +25,7 @@ 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 cn.orionsec.kit.lang.define.wrapper.Ref; +import org.json.JSONObject; import java.util.concurrent.TimeUnit; @@ -39,10 +39,10 @@ import java.util.concurrent.TimeUnit; public interface PreferenceCacheKeyDefine { CacheKeyDefine PREFERENCE = new CacheKeyBuilder() - .key("user:preference:{}:{}") + .key("user:prefer:{}:{}") .desc("用户偏好 ${userId} ${type}") - .type(Ref.class) - .struct(RedisCacheStruct.HASH) + .type(JSONObject.class) + .struct(RedisCacheStruct.STRING) .timeout(8, TimeUnit.HOURS) .build(); diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/SystemSettingKeyDefine.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/SystemSettingKeyDefine.java similarity index 82% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/SystemSettingKeyDefine.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/SystemSettingKeyDefine.java index 22580202..f2caa62b 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/SystemSettingKeyDefine.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/SystemSettingKeyDefine.java @@ -25,12 +25,12 @@ 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 cn.orionsec.kit.lang.define.wrapper.Ref; +import org.dromara.visor.module.infra.entity.vo.SystemSettingAggregateVO; import java.util.concurrent.TimeUnit; /** - * 系统配置缓存 key + * 系统设置缓存 key * * @author Jiahang Li * @version 1.0.0 @@ -39,10 +39,10 @@ import java.util.concurrent.TimeUnit; public interface SystemSettingKeyDefine { CacheKeyDefine SETTING = new CacheKeyBuilder() - .key("system:setting:{}") - .desc("系统设置 ${type}") - .type(Ref.class) - .struct(RedisCacheStruct.HASH) + .key("system:setting:agg") + .desc("系统聚合设置") + .type(SystemSettingAggregateVO.class) + .struct(RedisCacheStruct.STRING) .timeout(8, TimeUnit.HOURS) .build(); diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/TagCacheKeyDefine.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/TagCacheKeyDefine.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/TagCacheKeyDefine.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/TagCacheKeyDefine.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/TipsCacheKeyDefine.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/TipsCacheKeyDefine.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/TipsCacheKeyDefine.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/TipsCacheKeyDefine.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/UserCacheKeyDefine.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/UserCacheKeyDefine.java similarity index 94% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/UserCacheKeyDefine.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/UserCacheKeyDefine.java index bce2180e..ff179ef0 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/UserCacheKeyDefine.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/UserCacheKeyDefine.java @@ -25,7 +25,7 @@ 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 org.dromara.visor.framework.common.security.LoginUser; +import org.dromara.visor.common.security.LoginUser; import org.dromara.visor.module.infra.entity.dto.LoginTokenDTO; import org.dromara.visor.module.infra.entity.dto.UserInfoDTO; @@ -68,7 +68,7 @@ public interface UserCacheKeyDefine { .desc("用户登录 token ${id} ${time}") .type(LoginTokenDTO.class) .struct(RedisCacheStruct.STRING) - .timeout(24, TimeUnit.HOURS) + .timeout(24 * 60, TimeUnit.MINUTES) .build(); CacheKeyDefine LOGIN_REFRESH = new CacheKeyBuilder() @@ -76,7 +76,7 @@ public interface UserCacheKeyDefine { .desc("用户刷新 token ${id} ${time}") .type(LoginTokenDTO.class) .struct(RedisCacheStruct.STRING) - .timeout(32, TimeUnit.HOURS) + .timeout(32 * 60, TimeUnit.MINUTES) .build(); } diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/config/AppAuthenticationConfig.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/config/AppAuthenticationConfig.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/config/AppAuthenticationConfig.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/config/AppAuthenticationConfig.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/message/SystemUserMessageDefine.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/message/SystemUserMessageDefine.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/message/SystemUserMessageDefine.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/message/SystemUserMessageDefine.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/operator/AuthenticationOperatorType.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/operator/AuthenticationOperatorType.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/operator/AuthenticationOperatorType.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/operator/AuthenticationOperatorType.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/operator/DictKeyOperatorType.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/operator/DictKeyOperatorType.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/operator/DictKeyOperatorType.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/operator/DictKeyOperatorType.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/operator/DictValueOperatorType.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/operator/DictValueOperatorType.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/operator/DictValueOperatorType.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/operator/DictValueOperatorType.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/operator/OperatorLogOperatorType.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/operator/OperatorLogOperatorType.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/operator/OperatorLogOperatorType.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/operator/OperatorLogOperatorType.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/operator/SystemMenuOperatorType.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/operator/SystemMenuOperatorType.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/operator/SystemMenuOperatorType.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/operator/SystemMenuOperatorType.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/operator/SystemRoleOperatorType.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/operator/SystemRoleOperatorType.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/operator/SystemRoleOperatorType.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/operator/SystemRoleOperatorType.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/operator/SystemSettingOperatorType.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/operator/SystemSettingOperatorType.java similarity index 96% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/operator/SystemSettingOperatorType.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/operator/SystemSettingOperatorType.java index 7058a37e..a6cf3da3 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/operator/SystemSettingOperatorType.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/operator/SystemSettingOperatorType.java @@ -40,7 +40,7 @@ public class SystemSettingOperatorType extends InitializingOperatorTypes { public static final String UPDATE_TEXT = "{} - {} - {}"; - public static final String UPDATE_PARTIAL_TEXT = "{}"; + public static final String UPDATE_BATCH_TEXT = "{}"; public static final String UPDATE = "system-setting:update"; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/operator/SystemUserOperatorType.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/operator/SystemUserOperatorType.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/operator/SystemUserOperatorType.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/operator/SystemUserOperatorType.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/DataExtraDO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/DataExtraDO.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/DataExtraDO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/DataExtraDO.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/DataGroupDO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/DataGroupDO.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/DataGroupDO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/DataGroupDO.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/DataGroupRelDO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/DataGroupRelDO.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/DataGroupRelDO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/DataGroupRelDO.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/DataPermissionDO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/DataPermissionDO.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/DataPermissionDO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/DataPermissionDO.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/DictKeyDO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/DictKeyDO.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/DictKeyDO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/DictKeyDO.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/DictValueDO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/DictValueDO.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/DictValueDO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/DictValueDO.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/FavoriteDO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/FavoriteDO.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/FavoriteDO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/FavoriteDO.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/HistoryValueDO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/HistoryValueDO.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/HistoryValueDO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/HistoryValueDO.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/OperatorLogDO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/OperatorLogDO.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/OperatorLogDO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/OperatorLogDO.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/PreferenceDO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/PreferenceDO.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/PreferenceDO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/PreferenceDO.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemMenuDO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemMenuDO.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemMenuDO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemMenuDO.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemMessageDO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemMessageDO.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemMessageDO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemMessageDO.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemRoleDO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemRoleDO.java similarity index 95% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemRoleDO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemRoleDO.java index 52717490..127147f1 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemRoleDO.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemRoleDO.java @@ -64,4 +64,8 @@ public class SystemRoleDO extends BaseDO { @TableField("status") private Integer status; + @Schema(description = "描述") + @TableField("description") + private String description; + } diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemRoleMenuDO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemRoleMenuDO.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemRoleMenuDO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemRoleMenuDO.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemSettingDO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemSettingDO.java similarity index 95% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemSettingDO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemSettingDO.java index a38e8c17..aef3cf84 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemSettingDO.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemSettingDO.java @@ -52,6 +52,10 @@ public class SystemSettingDO extends BaseDO { @TableId(value = "id", type = IdType.AUTO) private Long id; + @Schema(description = "配置key") + @TableField("config_key") + private String configKey; + @Schema(description = "配置类型") @TableField("type") private String type; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemUserDO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemUserDO.java similarity index 96% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemUserDO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemUserDO.java index 2fbbfb0a..7c553286 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemUserDO.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemUserDO.java @@ -94,4 +94,8 @@ public class SystemUserDO extends BaseDO { @TableField("last_login_time") private Date lastLoginTime; + @Schema(description = "描述") + @TableField("description") + private String description; + } diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemUserRoleDO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemUserRoleDO.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemUserRoleDO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/SystemUserRoleDO.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/TagDO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/TagDO.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/TagDO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/TagDO.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/TagRelDO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/TagRelDO.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/TagRelDO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/domain/TagRelDO.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/DataGroupCacheDTO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/DataGroupCacheDTO.java similarity index 96% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/DataGroupCacheDTO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/DataGroupCacheDTO.java index 57ad142d..b4a50dc8 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/DataGroupCacheDTO.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/DataGroupCacheDTO.java @@ -28,7 +28,7 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import org.dromara.visor.framework.common.entity.TreeNode; +import org.dromara.visor.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/org/dromara/visor/module/infra/entity/dto/DataGroupRelCacheDTO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/DataGroupRelCacheDTO.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/DataGroupRelCacheDTO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/DataGroupRelCacheDTO.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/DictKeyCacheDTO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/DictKeyCacheDTO.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/DictKeyCacheDTO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/DictKeyCacheDTO.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/DictKeyExtraSchemaDTO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/DictKeyExtraSchemaDTO.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/DictKeyExtraSchemaDTO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/DictKeyExtraSchemaDTO.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/FileUploadTokenDTO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/FileUploadTokenDTO.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/FileUploadTokenDTO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/FileUploadTokenDTO.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/LoginTokenDTO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/LoginTokenDTO.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/LoginTokenDTO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/LoginTokenDTO.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/LoginTokenIdentityDTO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/LoginTokenIdentityDTO.java similarity index 95% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/LoginTokenIdentityDTO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/LoginTokenIdentityDTO.java index c508df88..989c352d 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/LoginTokenIdentityDTO.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/LoginTokenIdentityDTO.java @@ -25,7 +25,7 @@ package org.dromara.visor.module.infra.entity.dto; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.dromara.visor.framework.common.entity.RequestIdentity; +import org.dromara.visor.common.entity.RequestIdentity; /** * 身份信息 diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/SystemMenuCacheDTO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/SystemMenuCacheDTO.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/SystemMenuCacheDTO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/SystemMenuCacheDTO.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/TagCacheDTO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/TagCacheDTO.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/TagCacheDTO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/TagCacheDTO.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/UserInfoDTO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/UserInfoDTO.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/UserInfoDTO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/dto/UserInfoDTO.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/po/OperatorLogCountPO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/po/OperatorLogCountPO.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/po/OperatorLogCountPO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/po/OperatorLogCountPO.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/po/SystemMessageCountPO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/po/SystemMessageCountPO.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/po/SystemMessageCountPO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/po/SystemMessageCountPO.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/data/DataExtraQueryRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/data/DataExtraQueryRequest.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/data/DataExtraQueryRequest.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/data/DataExtraQueryRequest.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/data/DataExtraSetRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/data/DataExtraSetRequest.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/data/DataExtraSetRequest.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/data/DataExtraSetRequest.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/data/DataGroupCreateRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/data/DataGroupCreateRequest.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/data/DataGroupCreateRequest.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/data/DataGroupCreateRequest.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/data/DataGroupMoveRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/data/DataGroupMoveRequest.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/data/DataGroupMoveRequest.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/data/DataGroupMoveRequest.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/data/DataGroupRenameRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/data/DataGroupRenameRequest.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/data/DataGroupRenameRequest.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/data/DataGroupRenameRequest.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/data/DataPermissionUpdateRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/data/DataPermissionUpdateRequest.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/data/DataPermissionUpdateRequest.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/data/DataPermissionUpdateRequest.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictKeyCreateRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictKeyCreateRequest.java similarity index 95% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictKeyCreateRequest.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictKeyCreateRequest.java index c2980fe2..a5e5252a 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictKeyCreateRequest.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictKeyCreateRequest.java @@ -27,7 +27,7 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import org.dromara.visor.framework.common.constant.ValidConst; +import org.dromara.visor.common.constant.ValidConst; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Pattern; @@ -63,7 +63,7 @@ public class DictKeyCreateRequest implements Serializable { private String extraSchema; @NotBlank - @Size(max = 64) + @Size(max = 255) @Schema(description = "配置描述") private String description; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictKeyQueryRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictKeyQueryRequest.java similarity index 95% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictKeyQueryRequest.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictKeyQueryRequest.java index ed5059a1..f0032e36 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictKeyQueryRequest.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictKeyQueryRequest.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.infra.entity.request.dict; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import org.dromara.visor.framework.common.entity.PageRequest; +import org.dromara.visor.common.entity.PageRequest; import javax.validation.constraints.Size; @@ -53,7 +53,7 @@ public class DictKeyQueryRequest extends PageRequest { @Schema(description = "配置项") private String keyName; - @Size(max = 64) + @Size(max = 255) @Schema(description = "配置描述") private String description; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictKeyUpdateRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictKeyUpdateRequest.java similarity index 96% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictKeyUpdateRequest.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictKeyUpdateRequest.java index 6f2311ae..acf68f95 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictKeyUpdateRequest.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictKeyUpdateRequest.java @@ -27,7 +27,7 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import org.dromara.visor.framework.common.constant.ValidConst; +import org.dromara.visor.common.constant.ValidConst; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; @@ -68,7 +68,7 @@ public class DictKeyUpdateRequest implements Serializable { private String extraSchema; @NotBlank - @Size(max = 64) + @Size(max = 255) @Schema(description = "配置描述") private String description; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictValueCreateRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictValueCreateRequest.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictValueCreateRequest.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictValueCreateRequest.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictValueQueryRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictValueQueryRequest.java similarity index 96% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictValueQueryRequest.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictValueQueryRequest.java index facdad3c..c36aeba1 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictValueQueryRequest.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictValueQueryRequest.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.infra.entity.request.dict; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import org.dromara.visor.framework.common.entity.PageRequest; +import org.dromara.visor.common.entity.PageRequest; import javax.validation.constraints.Size; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictValueRollbackRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictValueRollbackRequest.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictValueRollbackRequest.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictValueRollbackRequest.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictValueUpdateRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictValueUpdateRequest.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictValueUpdateRequest.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/dict/DictValueUpdateRequest.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/exoression/CronNextRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/exoression/CronNextRequest.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/exoression/CronNextRequest.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/exoression/CronNextRequest.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/favorite/FavoriteOperatorRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/favorite/FavoriteOperatorRequest.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/favorite/FavoriteOperatorRequest.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/favorite/FavoriteOperatorRequest.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/favorite/FavoriteQueryRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/favorite/FavoriteQueryRequest.java similarity index 95% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/favorite/FavoriteQueryRequest.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/favorite/FavoriteQueryRequest.java index 051e193e..d95a81ae 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/favorite/FavoriteQueryRequest.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/favorite/FavoriteQueryRequest.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.infra.entity.request.favorite; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import org.dromara.visor.framework.common.entity.PageRequest; +import org.dromara.visor.common.entity.PageRequest; /** * 收藏 查询请求对象 diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/history/HistoryValueCreateRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/history/HistoryValueCreateRequest.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/history/HistoryValueCreateRequest.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/history/HistoryValueCreateRequest.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/history/HistoryValueQueryRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/history/HistoryValueQueryRequest.java similarity index 96% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/history/HistoryValueQueryRequest.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/history/HistoryValueQueryRequest.java index 9013adbf..fef7d424 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/history/HistoryValueQueryRequest.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/history/HistoryValueQueryRequest.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.infra.entity.request.history; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import org.dromara.visor.framework.common.entity.PageRequest; +import org.dromara.visor.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/org/dromara/visor/module/infra/entity/request/menu/SystemMenuCreateRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/menu/SystemMenuCreateRequest.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/menu/SystemMenuCreateRequest.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/menu/SystemMenuCreateRequest.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/menu/SystemMenuQueryRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/menu/SystemMenuQueryRequest.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/menu/SystemMenuQueryRequest.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/menu/SystemMenuQueryRequest.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/menu/SystemMenuUpdateRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/menu/SystemMenuUpdateRequest.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/menu/SystemMenuUpdateRequest.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/menu/SystemMenuUpdateRequest.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/menu/SystemMenuUpdateStatusRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/menu/SystemMenuUpdateStatusRequest.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/menu/SystemMenuUpdateStatusRequest.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/menu/SystemMenuUpdateStatusRequest.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/menu/SystemMenuValidFunctionRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/menu/SystemMenuValidFunctionRequest.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/menu/SystemMenuValidFunctionRequest.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/menu/SystemMenuValidFunctionRequest.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/menu/SystemMenuValidMenuRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/menu/SystemMenuValidMenuRequest.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/menu/SystemMenuValidMenuRequest.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/menu/SystemMenuValidMenuRequest.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/menu/SystemRoleGrantMenuRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/menu/SystemRoleGrantMenuRequest.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/menu/SystemRoleGrantMenuRequest.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/menu/SystemRoleGrantMenuRequest.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/message/SystemMessageCreateRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/message/SystemMessageCreateRequest.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/message/SystemMessageCreateRequest.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/message/SystemMessageCreateRequest.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/message/SystemMessageQueryRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/message/SystemMessageQueryRequest.java similarity index 96% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/message/SystemMessageQueryRequest.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/message/SystemMessageQueryRequest.java index bfc02cfc..2d7fb580 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/message/SystemMessageQueryRequest.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/message/SystemMessageQueryRequest.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.infra.entity.request.message; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import org.dromara.visor.framework.common.entity.PageRequest; +import org.dromara.visor.common.entity.PageRequest; /** * 系统消息 查询请求对象 diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/operator/OperatorLogClearRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/operator/OperatorLogClearRequest.java similarity index 95% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/operator/OperatorLogClearRequest.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/operator/OperatorLogClearRequest.java index 06e86a08..0e2c121a 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/operator/OperatorLogClearRequest.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/operator/OperatorLogClearRequest.java @@ -25,7 +25,7 @@ package org.dromara.visor.module.infra.entity.request.operator; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; -import org.dromara.visor.framework.common.entity.DataClearRequest; +import org.dromara.visor.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/org/dromara/visor/module/infra/entity/request/operator/OperatorLogQueryRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/operator/OperatorLogQueryRequest.java similarity index 97% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/operator/OperatorLogQueryRequest.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/operator/OperatorLogQueryRequest.java index 958fec9a..50a3df60 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/operator/OperatorLogQueryRequest.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/operator/OperatorLogQueryRequest.java @@ -25,7 +25,7 @@ package org.dromara.visor.module.infra.entity.request.operator; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import org.dromara.visor.framework.common.entity.PageRequest; +import org.dromara.visor.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/org/dromara/visor/module/infra/entity/request/preference/PreferenceUpdatePartialRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/preference/PreferenceUpdateBatchRequest.java similarity index 85% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/preference/PreferenceUpdatePartialRequest.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/preference/PreferenceUpdateBatchRequest.java index a71656aa..78e0b698 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/preference/PreferenceUpdatePartialRequest.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/preference/PreferenceUpdateBatchRequest.java @@ -35,7 +35,7 @@ import java.io.Serializable; import java.util.Map; /** - * 用户偏好 部分更新请求对象 + * 用户偏好 批量更新请求对象 * * @author Jiahang Li * @version 1.0.0 @@ -45,8 +45,8 @@ import java.util.Map; @Builder @NoArgsConstructor @AllArgsConstructor -@Schema(name = "PreferenceUpdatePartialRequest", description = "用户偏好 部分更新请求对象") -public class PreferenceUpdatePartialRequest implements Serializable { +@Schema(name = "PreferenceUpdateBatchRequest", description = "用户偏好 批量更新请求对象") +public class PreferenceUpdateBatchRequest implements Serializable { @NotBlank @Size(max = 16) @@ -55,6 +55,6 @@ public class PreferenceUpdatePartialRequest implements Serializable { @NotEmpty @Schema(description = "偏好配置") - private Map config; + private Map config; } diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/preference/PreferenceUpdateRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/preference/PreferenceUpdateRequest.java similarity index 98% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/preference/PreferenceUpdateRequest.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/preference/PreferenceUpdateRequest.java index 5b6e0440..59fc84b7 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/preference/PreferenceUpdateRequest.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/preference/PreferenceUpdateRequest.java @@ -57,6 +57,6 @@ public class PreferenceUpdateRequest implements Serializable { private String item; @Schema(description = "偏好配置") - private Object value; + private String value; } diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/role/SystemRoleCreateRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/role/SystemRoleCreateRequest.java similarity index 94% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/role/SystemRoleCreateRequest.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/role/SystemRoleCreateRequest.java index e498c4ba..6c34a56f 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/role/SystemRoleCreateRequest.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/role/SystemRoleCreateRequest.java @@ -56,4 +56,8 @@ public class SystemRoleCreateRequest implements Serializable { @Schema(description = "角色编码") private String code; + @Size(max = 255) + @Schema(description = "描述") + private String description; + } diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/role/SystemRoleQueryRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/role/SystemRoleQueryRequest.java similarity index 91% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/role/SystemRoleQueryRequest.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/role/SystemRoleQueryRequest.java index 9085d923..db62934d 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/role/SystemRoleQueryRequest.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/role/SystemRoleQueryRequest.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.infra.entity.request.role; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import org.dromara.visor.framework.common.entity.PageRequest; +import org.dromara.visor.common.entity.PageRequest; import javax.validation.constraints.Size; @@ -57,4 +57,8 @@ public class SystemRoleQueryRequest extends PageRequest { @Schema(description = "状态 0停用 1启用") private Integer status; + @Size(max = 255) + @Schema(description = "描述") + private String description; + } diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/role/SystemRoleStatusRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/role/SystemRoleStatusRequest.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/role/SystemRoleStatusRequest.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/role/SystemRoleStatusRequest.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/role/SystemRoleUpdateRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/role/SystemRoleUpdateRequest.java similarity index 94% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/role/SystemRoleUpdateRequest.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/role/SystemRoleUpdateRequest.java index 6b0d9332..588d58b2 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/role/SystemRoleUpdateRequest.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/role/SystemRoleUpdateRequest.java @@ -56,4 +56,8 @@ public class SystemRoleUpdateRequest implements Serializable { @Schema(description = "角色名称") private String name; + @Size(max = 255) + @Schema(description = "描述") + private String description; + } diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/system/SystemSettingUpdatePartialRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/system/SystemSettingUpdateBatchRequest.java similarity index 85% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/system/SystemSettingUpdatePartialRequest.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/system/SystemSettingUpdateBatchRequest.java index 97b76d04..bd7ebbe9 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/system/SystemSettingUpdatePartialRequest.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/system/SystemSettingUpdateBatchRequest.java @@ -35,7 +35,7 @@ import java.io.Serializable; import java.util.Map; /** - * 系统设置部分 更新请求对象 + * 系统设置 批量更新请求对象 * * @author Jiahang Li * @version 3.0.0 @@ -45,8 +45,8 @@ import java.util.Map; @Builder @NoArgsConstructor @AllArgsConstructor -@Schema(name = "SystemSettingUpdatePartialRequest", description = "系统设置部分 更新请求对象") -public class SystemSettingUpdatePartialRequest implements Serializable { +@Schema(name = "SystemSettingUpdateBatchRequest", description = "系统设置 批量更新请求对象") +public class SystemSettingUpdateBatchRequest implements Serializable { private static final long serialVersionUID = 1L; @@ -57,6 +57,6 @@ public class SystemSettingUpdatePartialRequest implements Serializable { @NotEmpty @Schema(description = "配置") - private Map settings; + private Map settings; } diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/system/SystemSettingUpdateRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/system/SystemSettingUpdateRequest.java similarity index 98% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/system/SystemSettingUpdateRequest.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/system/SystemSettingUpdateRequest.java index 213b0116..e6f90bd2 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/system/SystemSettingUpdateRequest.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/system/SystemSettingUpdateRequest.java @@ -59,6 +59,6 @@ public class SystemSettingUpdateRequest implements Serializable { private String item; @Schema(description = "配置值") - private Object value; + private String value; } diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/tag/TagCreateRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/tag/TagCreateRequest.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/tag/TagCreateRequest.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/tag/TagCreateRequest.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/tag/TagQueryRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/tag/TagQueryRequest.java similarity index 95% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/tag/TagQueryRequest.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/tag/TagQueryRequest.java index a0bc2368..85999e24 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/tag/TagQueryRequest.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/tag/TagQueryRequest.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.infra.entity.request.tag; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import org.dromara.visor.framework.common.entity.PageRequest; +import org.dromara.visor.common.entity.PageRequest; import javax.validation.constraints.Size; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/tag/TagRelQueryRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/tag/TagRelQueryRequest.java similarity index 96% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/tag/TagRelQueryRequest.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/tag/TagRelQueryRequest.java index a855055e..7ae30530 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/tag/TagRelQueryRequest.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/tag/TagRelQueryRequest.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.infra.entity.request.tag; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import org.dromara.visor.framework.common.entity.PageRequest; +import org.dromara.visor.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/org/dromara/visor/module/infra/entity/request/tag/TagUpdateRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/tag/TagUpdateRequest.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/tag/TagUpdateRequest.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/tag/TagUpdateRequest.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/SystemUserCreateRequest.java b/orion-visor-modules/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/org/dromara/visor/module/infra/entity/request/user/SystemUserCreateRequest.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/SystemUserCreateRequest.java index e5fe29ba..57c2ced5 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/SystemUserCreateRequest.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/SystemUserCreateRequest.java @@ -27,7 +27,7 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import org.dromara.visor.framework.common.constant.ValidConst; +import org.dromara.visor.common.constant.ValidConst; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Pattern; @@ -72,4 +72,8 @@ public class SystemUserCreateRequest implements Serializable { @Schema(description = "邮箱") private String email; + @Size(max = 255) + @Schema(description = "描述") + private String description; + } diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/SystemUserQueryRequest.java b/orion-visor-modules/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/org/dromara/visor/module/infra/entity/request/user/SystemUserQueryRequest.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/SystemUserQueryRequest.java index 02b3e83b..4ad28f12 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/SystemUserQueryRequest.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/SystemUserQueryRequest.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.infra.entity.request.user; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import org.dromara.visor.framework.common.entity.PageRequest; +import org.dromara.visor.common.entity.PageRequest; import javax.validation.constraints.Size; @@ -65,4 +65,8 @@ public class SystemUserQueryRequest extends PageRequest { @Schema(description = "用户状态 0停用 1启用") private Integer status; + @Size(max = 255) + @Schema(description = "描述") + private String description; + } diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/SystemUserUpdateRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/SystemUserUpdateRequest.java similarity index 95% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/SystemUserUpdateRequest.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/SystemUserUpdateRequest.java index 636426b8..06772963 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/SystemUserUpdateRequest.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/SystemUserUpdateRequest.java @@ -62,4 +62,8 @@ public class SystemUserUpdateRequest implements Serializable { @Schema(description = "邮箱") private String email; + @Size(max = 255) + @Schema(description = "描述") + private String description; + } diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/SystemUserUpdateRoleRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/SystemUserUpdateRoleRequest.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/SystemUserUpdateRoleRequest.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/SystemUserUpdateRoleRequest.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/SystemUserUpdateStatusRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/SystemUserUpdateStatusRequest.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/SystemUserUpdateStatusRequest.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/SystemUserUpdateStatusRequest.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/UserLoginRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/UserLoginRequest.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/UserLoginRequest.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/UserLoginRequest.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/UserResetPasswordRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/UserResetPasswordRequest.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/UserResetPasswordRequest.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/UserResetPasswordRequest.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/UserSessionOfflineRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/UserSessionOfflineRequest.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/UserSessionOfflineRequest.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/UserSessionOfflineRequest.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/UserUpdatePasswordRequest.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/UserUpdatePasswordRequest.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/UserUpdatePasswordRequest.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/request/user/UserUpdatePasswordRequest.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/AppInfoVO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/AppInfoVO.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/AppInfoVO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/AppInfoVO.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/CronNextVO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/CronNextVO.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/CronNextVO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/CronNextVO.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/DataGroupVO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/DataGroupVO.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/DataGroupVO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/DataGroupVO.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/DictKeyVO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/DictKeyVO.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/DictKeyVO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/DictKeyVO.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/DictValueEnumVO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/DictValueEnumVO.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/DictValueEnumVO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/DictValueEnumVO.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/DictValueVO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/DictValueVO.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/DictValueVO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/DictValueVO.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/FavoriteVO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/FavoriteVO.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/FavoriteVO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/FavoriteVO.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/HistoryValueVO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/HistoryValueVO.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/HistoryValueVO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/HistoryValueVO.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/InfraWorkplaceStatisticsVO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/InfraWorkplaceStatisticsVO.java similarity index 96% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/InfraWorkplaceStatisticsVO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/InfraWorkplaceStatisticsVO.java index 17ab0135..e3644245 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/InfraWorkplaceStatisticsVO.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/InfraWorkplaceStatisticsVO.java @@ -27,7 +27,7 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import org.dromara.visor.framework.common.entity.chart.LineSingleChartData; +import org.dromara.visor.common.entity.chart.LineSingleChartData; import java.util.Date; import java.util.List; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/LoginHistoryVO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/LoginHistoryVO.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/LoginHistoryVO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/LoginHistoryVO.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/OperatorLogVO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/OperatorLogVO.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/OperatorLogVO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/OperatorLogVO.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/SystemMenuVO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/SystemMenuVO.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/SystemMenuVO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/SystemMenuVO.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/SystemMessageVO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/SystemMessageVO.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/SystemMessageVO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/SystemMessageVO.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/SystemRoleVO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/SystemRoleVO.java similarity index 96% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/SystemRoleVO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/SystemRoleVO.java index a6cc7967..1a51d552 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/SystemRoleVO.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/SystemRoleVO.java @@ -59,6 +59,9 @@ public class SystemRoleVO implements Serializable { @Schema(description = "状态 0停用 1启用") private Integer status; + @Schema(description = "描述") + private String description; + @Schema(description = "创建时间") private Date createTime; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/setting/strategy/SftpSystemSettingStrategy.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/SystemSettingAggregateVO.java similarity index 53% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/setting/strategy/SftpSystemSettingStrategy.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/SystemSettingAggregateVO.java index f82c46c7..ed810cc3 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/setting/strategy/SftpSystemSettingStrategy.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/SystemSettingAggregateVO.java @@ -20,37 +20,34 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.dromara.visor.module.infra.handler.setting.strategy; +package org.dromara.visor.module.infra.entity.vo; -import cn.orionsec.kit.lang.utils.Exceptions; -import org.dromara.visor.framework.common.handler.data.strategy.AbstractGenericsDataStrategy; +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.handler.setting.model.EncryptSystemSettingModel; import org.dromara.visor.module.infra.handler.setting.model.SftpSystemSettingModel; -import org.springframework.stereotype.Component; /** - * SFTP 系统配置策略 + * 系统设置 聚合响应对象 * * @author Jiahang Li * @version 1.0.0 - * @since 2024/10/9 11:44 + * @since 2025/1/3 17:46 */ -@Component -public class SftpSystemSettingStrategy extends AbstractGenericsDataStrategy { +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@Schema(name = "SystemSettingAggregateVO", description = "系统设置 聚合响应对象") +public class SystemSettingAggregateVO { - public SftpSystemSettingStrategy() { - super(SftpSystemSettingModel.class); - } + @Schema(description = "SFTP 设置") + private SftpSystemSettingModel sftp; - @Override - public SftpSystemSettingModel getDefault() { - return SftpSystemSettingModel.builder() - .previewSize(2) - .build(); - } + @Schema(description = "加密设置") + private EncryptSystemSettingModel encrypt; - @Override - public SftpSystemSettingModel parse(String serialModel) { - throw Exceptions.unsupported(); - } - -} \ No newline at end of file +} diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/SystemUserBaseVO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/SystemUserBaseVO.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/SystemUserBaseVO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/SystemUserBaseVO.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/SystemUserVO.java b/orion-visor-modules/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/org/dromara/visor/module/infra/entity/vo/SystemUserVO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/SystemUserVO.java index ac2121ad..6b597796 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/SystemUserVO.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/SystemUserVO.java @@ -84,6 +84,9 @@ public class SystemUserVO implements Serializable { @Schema(description = "修改人") private String updater; + @Schema(description = "描述") + private String description; + @Schema(description = "用户角色") private List roles; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/TagVO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/TagVO.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/TagVO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/TagVO.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/UserAggregateVO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/UserAggregateVO.java similarity index 96% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/UserAggregateVO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/UserAggregateVO.java index fd1c9ed0..296ce9a1 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/UserAggregateVO.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/UserAggregateVO.java @@ -30,7 +30,6 @@ import lombok.NoArgsConstructor; import java.util.Collection; import java.util.List; -import java.util.Map; /** * 用户 聚合响应对象 @@ -59,7 +58,7 @@ public class UserAggregateVO { private UserUpdatePasswordVO updatePassword; @Schema(description = "系统偏好") - private Map systemPreference; + private Object systemPreference; @Schema(description = "已经提示的key") private List tippedKeys; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/UserLoginVO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/UserLoginVO.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/UserLoginVO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/UserLoginVO.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/UserSessionVO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/UserSessionVO.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/UserSessionVO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/UserSessionVO.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/UserUpdatePasswordVO.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/UserUpdatePasswordVO.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/UserUpdatePasswordVO.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/entity/vo/UserUpdatePasswordVO.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/DictValueTypeEnum.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/DictValueTypeEnum.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/DictValueTypeEnum.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/DictValueTypeEnum.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/LoginTokenStatusEnum.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/LoginTokenStatusEnum.java similarity index 97% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/LoginTokenStatusEnum.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/LoginTokenStatusEnum.java index 5beef2bf..0fcfc3df 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/LoginTokenStatusEnum.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/LoginTokenStatusEnum.java @@ -25,7 +25,7 @@ package org.dromara.visor.module.infra.enums; 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.common.constant.ErrorCode; import org.dromara.visor.module.infra.entity.dto.LoginTokenDTO; import org.dromara.visor.module.infra.entity.dto.LoginTokenIdentityDTO; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/MenuStatusEnum.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/MenuStatusEnum.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/MenuStatusEnum.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/MenuStatusEnum.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/MenuTypeEnum.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/MenuTypeEnum.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/MenuTypeEnum.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/MenuTypeEnum.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/MenuVisibleEnum.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/MenuVisibleEnum.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/MenuVisibleEnum.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/MenuVisibleEnum.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/MessageStatusEnum.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/MessageStatusEnum.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/MessageStatusEnum.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/MessageStatusEnum.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/PreferenceTypeEnum.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/PreferenceTypeEnum.java similarity index 70% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/PreferenceTypeEnum.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/PreferenceTypeEnum.java index ec7dc044..219be175 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/PreferenceTypeEnum.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/PreferenceTypeEnum.java @@ -23,9 +23,11 @@ package org.dromara.visor.module.infra.enums; import lombok.Getter; -import org.dromara.visor.framework.common.handler.data.GenericsStrategyDefinition; -import org.dromara.visor.framework.common.handler.data.model.GenericsDataModel; -import org.dromara.visor.framework.common.handler.data.strategy.GenericsDataStrategy; +import org.dromara.visor.common.handler.data.GenericsStrategyDefinition; +import org.dromara.visor.common.handler.data.model.GenericsDataModel; +import org.dromara.visor.common.handler.data.strategy.GenericsDataStrategy; +import org.dromara.visor.module.infra.handler.preference.model.SystemPreferenceModel; +import org.dromara.visor.module.infra.handler.preference.model.TerminalPreferenceModel; import org.dromara.visor.module.infra.handler.preference.strategy.SystemPreferenceStrategy; import org.dromara.visor.module.infra.handler.preference.strategy.TerminalPreferenceStrategy; @@ -42,22 +44,26 @@ public enum PreferenceTypeEnum implements GenericsStrategyDefinition { /** * 系统偏好 */ - SYSTEM(SystemPreferenceStrategy.class), + SYSTEM(SystemPreferenceModel.class, SystemPreferenceStrategy.class), /** * 终端偏好 */ - TERMINAL(TerminalPreferenceStrategy.class), + TERMINAL(TerminalPreferenceModel.class, TerminalPreferenceStrategy.class), ; - PreferenceTypeEnum(Class> strategyClass) { + PreferenceTypeEnum(Class modelClass, + Class> strategyClass) { this.type = this.name(); + this.modelClass = modelClass; this.strategyClass = strategyClass; } private final String type; + private final Class modelClass; + private final Class> strategyClass; public static PreferenceTypeEnum of(String type) { diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/RoleStatusEnum.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/RoleStatusEnum.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/RoleStatusEnum.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/RoleStatusEnum.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/SystemSettingTypeEnum.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/SystemSettingTypeEnum.java similarity index 55% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/SystemSettingTypeEnum.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/SystemSettingTypeEnum.java index 17ad4cdf..97b7615e 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/SystemSettingTypeEnum.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/SystemSettingTypeEnum.java @@ -22,15 +22,17 @@ */ package org.dromara.visor.module.infra.enums; +import com.alibaba.fastjson.JSON; import lombok.AllArgsConstructor; import lombok.Getter; -import org.dromara.visor.framework.common.handler.data.GenericsStrategyDefinition; -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; +import org.dromara.visor.common.constant.Const; +import org.dromara.visor.module.infra.handler.setting.model.EncryptSystemSettingModel; +import org.dromara.visor.module.infra.handler.setting.model.SftpSystemSettingModel; + +import java.util.Map; /** - * 系统配置类型枚举 + * 系统设置类型枚举 * * @author Jiahang Li * @version 1.0.0 @@ -38,34 +40,55 @@ import org.dromara.visor.module.infra.handler.setting.strategy.SftpSystemSetting */ @Getter @AllArgsConstructor -public enum SystemSettingTypeEnum implements GenericsStrategyDefinition { +public enum SystemSettingTypeEnum { /** * SFTP 配置 */ - SFTP(SftpSystemSettingStrategy.class), + SFTP("sftp", SftpSystemSettingModel.class), + + /** + * 加密配置 + */ + ENCRYPT("encrypt", EncryptSystemSettingModel.class), ; - SystemSettingTypeEnum(Class> strategyClass) { - this.type = this.name(); - this.strategyClass = strategyClass; + private final String prefix; + + private final Class modelClass; + + /** + * 解析 + * + * @param settings settings + * @return model + */ + @SuppressWarnings("unchecked") + public T parseModel(Map settings) { + return (T) JSON.parseObject(JSON.toJSONString(settings)).toJavaObject(modelClass); } - private final String type; - - private final Class> strategyClass; - public static SystemSettingTypeEnum of(String type) { if (type == null) { return null; } for (SystemSettingTypeEnum value : values()) { - if (value.type.equals(type)) { + if (value.name().equals(type)) { return value; } } return null; } + /** + * 获取 key + * + * @param item item + * @return key + */ + public String getConfigKey(String item) { + return prefix + Const.DOT + item; + } + } diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/UpdatePasswordReasonEnum.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/UpdatePasswordReasonEnum.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/UpdatePasswordReasonEnum.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/UpdatePasswordReasonEnum.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/UpdatePasswordStatusEnum.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/UpdatePasswordStatusEnum.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/UpdatePasswordStatusEnum.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/UpdatePasswordStatusEnum.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/UserStatusEnum.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/UserStatusEnum.java similarity index 96% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/UserStatusEnum.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/UserStatusEnum.java index 4292ab75..8a5d272e 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/UserStatusEnum.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/enums/UserStatusEnum.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.infra.enums; import lombok.AllArgsConstructor; import lombok.Getter; -import org.dromara.visor.framework.common.constant.ErrorCode; +import org.dromara.visor.common.constant.ErrorCode; /** * 用户状态枚举 diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/framework/service/impl/ConfigFrameworkServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/framework/service/impl/ConfigFrameworkServiceImpl.java new file mode 100644 index 00000000..bbf65d35 --- /dev/null +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/framework/service/impl/ConfigFrameworkServiceImpl.java @@ -0,0 +1,60 @@ +/* + * Copyright (c) 2023 - present Dromara, All rights reserved. + * + * https://visor.dromara.org + * https://visor.dromara.org.cn + * https://visor.orionsec.cn + * + * Members: + * Jiahang Li - ljh1553488six@139.com - author + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.dromara.visor.module.infra.framework.service.impl; + +import cn.orionsec.kit.lang.function.Functions; +import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.framework.config.core.service.ConfigFrameworkService; +import org.dromara.visor.module.infra.dao.SystemSettingDAO; +import org.dromara.visor.module.infra.entity.domain.SystemSettingDO; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * 配置框架服务实现 + * + * @author Jiahang Li + * @version 1.0.0 + * @since 2025/1/6 23:35 + */ +@Slf4j +@Service +public class ConfigFrameworkServiceImpl implements ConfigFrameworkService { + + @Resource + private SystemSettingDAO systemSettingDAO; + + @Override + public Map getAllConfig() { + return systemSettingDAO.of() + .stream() + .collect(Collectors.toMap( + SystemSettingDO::getConfigKey, + SystemSettingDO::getValue, + Functions.right())); + } + +} diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/framework/service/impl/OperatorLogFrameworkServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/framework/service/impl/OperatorLogFrameworkServiceImpl.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/framework/service/impl/OperatorLogFrameworkServiceImpl.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/framework/service/impl/OperatorLogFrameworkServiceImpl.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/framework/service/impl/SecurityFrameworkServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/framework/service/impl/SecurityFrameworkServiceImpl.java similarity index 98% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/framework/service/impl/SecurityFrameworkServiceImpl.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/framework/service/impl/SecurityFrameworkServiceImpl.java index ddcaaa17..7676fb26 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/framework/service/impl/SecurityFrameworkServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/framework/service/impl/SecurityFrameworkServiceImpl.java @@ -22,7 +22,7 @@ */ package org.dromara.visor.module.infra.framework.service.impl; -import org.dromara.visor.framework.common.security.LoginUser; +import org.dromara.visor.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; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/preference/model/SystemPreferenceModel.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/preference/model/SystemPreferenceModel.java similarity index 86% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/preference/model/SystemPreferenceModel.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/preference/model/SystemPreferenceModel.java index a5863853..b5013e1d 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/preference/model/SystemPreferenceModel.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/preference/model/SystemPreferenceModel.java @@ -26,7 +26,7 @@ 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.common.handler.data.model.GenericsDataModel; /** * 系统偏好模型 @@ -86,4 +86,19 @@ public class SystemPreferenceModel implements GenericsDataModel { */ private Integer defaultCardPageSize; + /** + * 主机视图 + */ + private String hostView; + + /** + * 主机密钥视图 + */ + private String hostKeyView; + + /** + * 主机身份视图 + */ + private String hostIdentityView; + } diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/preference/model/TerminalPreferenceModel.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/preference/model/TerminalPreferenceModel.java similarity index 98% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/preference/model/TerminalPreferenceModel.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/preference/model/TerminalPreferenceModel.java index 7f16237b..d7ad9a5a 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/preference/model/TerminalPreferenceModel.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/preference/model/TerminalPreferenceModel.java @@ -28,7 +28,7 @@ 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.common.handler.data.model.GenericsDataModel; import java.util.List; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/preference/strategy/SystemPreferenceStrategy.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/preference/strategy/SystemPreferenceStrategy.java similarity index 86% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/preference/strategy/SystemPreferenceStrategy.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/preference/strategy/SystemPreferenceStrategy.java index db7dc1cc..2233c650 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/preference/strategy/SystemPreferenceStrategy.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/preference/strategy/SystemPreferenceStrategy.java @@ -22,8 +22,7 @@ */ package org.dromara.visor.module.infra.handler.preference.strategy; -import cn.orionsec.kit.lang.utils.Exceptions; -import org.dromara.visor.framework.common.handler.data.strategy.AbstractGenericsDataStrategy; +import org.dromara.visor.common.handler.data.strategy.AbstractGenericsDataStrategy; import org.dromara.visor.module.infra.handler.preference.model.SystemPreferenceModel; import org.springframework.stereotype.Component; @@ -37,6 +36,8 @@ import org.springframework.stereotype.Component; @Component public class SystemPreferenceStrategy extends AbstractGenericsDataStrategy { + private static final String DEFAULT_VIEW = "table"; + public SystemPreferenceStrategy() { super(SystemPreferenceModel.class); } @@ -53,12 +54,10 @@ public class SystemPreferenceStrategy extends AbstractGenericsDataStrategy T * @return rows */ - Map getPreferenceByType(String type, List items); + T getPreferenceByType(String type, List items); /** * 查询默认偏好 * * @param type type * @param items items + * @param T * @return rows */ - Map getDefaultPreferenceByType(String type, List items); + T getDefaultPreferenceByType(String type, List items); /** * 获取用户偏好 * * @param userId userId * @param type type + * @param T * @return 偏好 */ - Future> getPreferenceAsync(Long userId, PreferenceTypeEnum type); + Future getPreferenceAsync(Long userId, PreferenceTypeEnum type); /** * 删除用户偏好 diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/SystemMenuService.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/SystemMenuService.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/SystemMenuService.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/SystemMenuService.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/SystemMessageService.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/SystemMessageService.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/SystemMessageService.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/SystemMessageService.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/SystemRoleMenuService.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/SystemRoleMenuService.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/SystemRoleMenuService.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/SystemRoleMenuService.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/SystemRoleService.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/SystemRoleService.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/SystemRoleService.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/SystemRoleService.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/SystemSettingService.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/SystemSettingService.java similarity index 70% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/SystemSettingService.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/SystemSettingService.java index 32d28c72..62fa03e7 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/SystemSettingService.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/SystemSettingService.java @@ -22,11 +22,11 @@ */ package org.dromara.visor.module.infra.service; -import org.dromara.visor.module.infra.entity.request.system.SystemSettingUpdatePartialRequest; +import org.dromara.visor.module.infra.entity.request.system.SystemSettingUpdateBatchRequest; import org.dromara.visor.module.infra.entity.request.system.SystemSettingUpdateRequest; import org.dromara.visor.module.infra.entity.vo.AppInfoVO; - -import java.util.Map; +import org.dromara.visor.module.infra.entity.vo.SystemSettingAggregateVO; +import org.dromara.visor.module.infra.handler.setting.model.EncryptSystemSettingModel; /** * 系统设置服务 @@ -45,26 +45,40 @@ public interface SystemSettingService { AppInfoVO getAppInfo(); /** - * 更新系统设置 + * 获取系统聚合设置 * - * @param request request - * @return effect + * @return setting */ - Integer updateSystemSetting(SystemSettingUpdateRequest request); + SystemSettingAggregateVO getSystemAggregateSetting(); + + /** + * 生成密钥对 + * + * @return keypair + */ + EncryptSystemSettingModel generatorKeypair(); + + /** + * 通过类型查询系统设置 + * + * @param type type + * @param T + * @return row + */ + T getSystemSettingByType(String type); /** * 更新部分系统设置 * * @param request request */ - void updatePartialSystemSetting(SystemSettingUpdatePartialRequest request); + void updateSystemSetting(SystemSettingUpdateRequest request); /** - * 通过类型查询系统设置 + * 更新系统设置 * - * @param type type - * @return row + * @param request request */ - Map getSystemSettingByType(String type); + void updateSystemSettingBatch(SystemSettingUpdateBatchRequest request); } diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/SystemUserManagementService.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/SystemUserManagementService.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/SystemUserManagementService.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/SystemUserManagementService.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/SystemUserRoleService.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/SystemUserRoleService.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/SystemUserRoleService.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/SystemUserRoleService.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/SystemUserService.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/SystemUserService.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/SystemUserService.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/SystemUserService.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/TagRelService.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/TagRelService.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/TagRelService.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/TagRelService.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/TagService.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/TagService.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/TagService.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/TagService.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/TipsService.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/TipsService.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/TipsService.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/TipsService.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/UserAggregateService.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/UserAggregateService.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/UserAggregateService.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/UserAggregateService.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/UserPermissionService.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/UserPermissionService.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/UserPermissionService.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/UserPermissionService.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/AuthenticationServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/AuthenticationServiceImpl.java similarity index 96% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/AuthenticationServiceImpl.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/AuthenticationServiceImpl.java index 279b771b..91bc13aa 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/AuthenticationServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/AuthenticationServiceImpl.java @@ -31,15 +31,15 @@ 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 org.dromara.visor.common.constant.Const; +import org.dromara.visor.common.constant.ErrorMessage; +import org.dromara.visor.common.constant.ExtraFieldConst; +import org.dromara.visor.common.security.LoginUser; +import org.dromara.visor.common.security.UserRole; +import org.dromara.visor.common.utils.AesEncryptUtils; +import org.dromara.visor.common.utils.IpUtils; +import org.dromara.visor.common.utils.Valid; 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; @@ -329,7 +329,7 @@ public class AuthenticationServiceImpl implements AuthenticationService { return null; } try { - String value = CryptoUtils.decryptBase62(loginToken); + String value = AesEncryptUtils.decryptBase62(loginToken); String[] pair = value.split(":"); return Pair.of(Long.valueOf(pair[0]), Long.valueOf(pair[1])); } catch (Exception e) { @@ -426,7 +426,7 @@ public class AuthenticationServiceImpl implements AuthenticationService { RedisStrings.setJson(refreshKey, UserCacheKeyDefine.LOGIN_REFRESH, loginValue); } // 返回token - return CryptoUtils.encryptBase62(id + ":" + loginTime); + return AesEncryptUtils.encryptBase62(id + ":" + loginTime); } } diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataExtraServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataExtraServiceImpl.java similarity index 99% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataExtraServiceImpl.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataExtraServiceImpl.java index 1a2e96b7..f69be9cd 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataExtraServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataExtraServiceImpl.java @@ -27,7 +27,7 @@ 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 lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.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; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataGroupRelServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataGroupRelServiceImpl.java similarity index 98% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataGroupRelServiceImpl.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataGroupRelServiceImpl.java index 0b9e1477..57c850ca 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataGroupRelServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataGroupRelServiceImpl.java @@ -27,9 +27,9 @@ 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.common.constant.ErrorMessage; +import org.dromara.visor.common.utils.Valid; 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; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataGroupServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataGroupServiceImpl.java similarity index 97% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataGroupServiceImpl.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataGroupServiceImpl.java index 3c597e24..f7f9a3fe 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataGroupServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataGroupServiceImpl.java @@ -26,12 +26,12 @@ import cn.orionsec.kit.lang.utils.collect.Lists; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.common.constant.Const; +import org.dromara.visor.common.constant.ErrorMessage; +import org.dromara.visor.common.enums.MovePosition; +import org.dromara.visor.common.utils.TreeUtils; +import org.dromara.visor.common.utils.Valid; 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; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataPermissionServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataPermissionServiceImpl.java similarity index 99% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataPermissionServiceImpl.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataPermissionServiceImpl.java index 0efc1f78..5b14a203 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataPermissionServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataPermissionServiceImpl.java @@ -25,7 +25,7 @@ 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 lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.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; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DictKeyServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DictKeyServiceImpl.java similarity index 98% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DictKeyServiceImpl.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DictKeyServiceImpl.java index cb0346de..edc92e8a 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DictKeyServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DictKeyServiceImpl.java @@ -31,10 +31,10 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.common.constant.Const; +import org.dromara.visor.common.constant.ErrorMessage; +import org.dromara.visor.common.utils.Valid; 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; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DictValueServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DictValueServiceImpl.java similarity index 98% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DictValueServiceImpl.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DictValueServiceImpl.java index 22930473..51470be3 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DictValueServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DictValueServiceImpl.java @@ -29,11 +29,11 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.common.constant.Const; +import org.dromara.visor.common.constant.ErrorMessage; +import org.dromara.visor.common.constant.FieldConst; +import org.dromara.visor.common.utils.Valid; 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; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/FavoriteServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/FavoriteServiceImpl.java similarity index 99% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/FavoriteServiceImpl.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/FavoriteServiceImpl.java index 27eddd32..4922b6f3 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/FavoriteServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/FavoriteServiceImpl.java @@ -26,7 +26,7 @@ import cn.orionsec.kit.lang.annotation.Keep; import cn.orionsec.kit.lang.utils.collect.Lists; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.utils.Valid; +import org.dromara.visor.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; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/FileUploadServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/FileUploadServiceImpl.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/FileUploadServiceImpl.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/FileUploadServiceImpl.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/HistoryValueServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/HistoryValueServiceImpl.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/HistoryValueServiceImpl.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/HistoryValueServiceImpl.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/InfraStatisticsServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/InfraStatisticsServiceImpl.java similarity index 97% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/InfraStatisticsServiceImpl.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/InfraStatisticsServiceImpl.java index 44b7782b..28f5e4da 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/InfraStatisticsServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/InfraStatisticsServiceImpl.java @@ -24,8 +24,8 @@ package org.dromara.visor.module.infra.service.impl; import cn.orionsec.kit.lang.utils.time.Dates; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.entity.StatisticsRange; -import org.dromara.visor.framework.common.entity.chart.LineSingleChartData; +import org.dromara.visor.common.entity.StatisticsRange; +import org.dromara.visor.common.entity.chart.LineSingleChartData; 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.OperatorLogDAO; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/MineServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/MineServiceImpl.java similarity index 97% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/MineServiceImpl.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/MineServiceImpl.java index 21e56d00..73677ff7 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/MineServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/MineServiceImpl.java @@ -25,8 +25,8 @@ package org.dromara.visor.module.infra.service.impl; 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.common.constant.ErrorMessage; +import org.dromara.visor.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; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/OperatorLogServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/OperatorLogServiceImpl.java similarity index 97% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/OperatorLogServiceImpl.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/OperatorLogServiceImpl.java index 9b7e440f..2024ee46 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/OperatorLogServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/OperatorLogServiceImpl.java @@ -28,10 +28,10 @@ import cn.orionsec.kit.lang.utils.Valid; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.common.constant.ErrorMessage; +import org.dromara.visor.common.utils.SqlUtils; 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; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/PermissionServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/PermissionServiceImpl.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/PermissionServiceImpl.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/PermissionServiceImpl.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/PreferenceServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/PreferenceServiceImpl.java similarity index 72% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/PreferenceServiceImpl.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/PreferenceServiceImpl.java index e2086258..ff8c3995 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/PreferenceServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/PreferenceServiceImpl.java @@ -23,18 +23,19 @@ 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.Objects1; import cn.orionsec.kit.lang.utils.collect.Lists; import cn.orionsec.kit.lang.utils.collect.Maps; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 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.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.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.PreferenceUpdateBatchRequest; 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; @@ -65,7 +66,7 @@ public class PreferenceServiceImpl implements PreferenceService { private PreferenceDAO preferenceDAO; @Override - public Integer updatePreference(PreferenceUpdateRequest request) { + public void updatePreference(PreferenceUpdateRequest request) { Long userId = SecurityUtils.getLoginUserId(); String type = request.getType(); String item = request.getItem(); @@ -78,33 +79,31 @@ public class PreferenceServiceImpl implements PreferenceService { .eq(PreferenceDO::getItem, item) .then() .getOne(); - int effect; if (preference == null) { // 插入 PreferenceDO insertRecord = new PreferenceDO(); insertRecord.setUserId(userId); insertRecord.setType(type); insertRecord.setItem(item); - insertRecord.setValue(Refs.json(request.getValue())); - effect = preferenceDAO.insert(insertRecord); + insertRecord.setValue(request.getValue()); + preferenceDAO.insert(insertRecord); } else { // 更新 PreferenceDO updateRecord = new PreferenceDO(); updateRecord.setId(preference.getId()); - updateRecord.setValue(Refs.json(request.getValue())); - effect = preferenceDAO.updateById(updateRecord); + updateRecord.setValue(request.getValue()); + preferenceDAO.updateById(updateRecord); } // 删除缓存 - RedisMaps.delete(PreferenceCacheKeyDefine.PREFERENCE.format(userId, type)); - return effect; + RedisStrings.delete(PreferenceCacheKeyDefine.PREFERENCE.format(userId, type)); } @Override @Transactional(rollbackFor = Exception.class) - public void updatePreferencePartial(PreferenceUpdatePartialRequest request) { + public void updatePreferenceBatch(PreferenceUpdateBatchRequest request) { Long userId = SecurityUtils.getLoginUserId(); String type = request.getType(); - Map config = request.getConfig(); + Map config = request.getConfig(); Valid.valid(PreferenceTypeEnum::of, type); // 查询配置 LambdaQueryWrapper wrapper = preferenceDAO.lambda() @@ -125,7 +124,7 @@ public class PreferenceServiceImpl implements PreferenceService { .map(s -> { PreferenceDO update = new PreferenceDO(); update.setId(items.get(s).getId()); - update.setValue(Refs.json(config.get(s))); + update.setValue(config.get(s)); return update; }).collect(Collectors.toList()); preferenceDAO.updateBatch(updateRecords); @@ -138,46 +137,35 @@ public class PreferenceServiceImpl implements PreferenceService { insert.setUserId(userId); insert.setType(type); insert.setItem(s); - insert.setValue(Refs.json(config.get(s))); + insert.setValue(config.get(s)); return insert; }).collect(Collectors.toList()); preferenceDAO.insertBatch(insertRecords); // 删除缓存 - RedisMaps.delete(PreferenceCacheKeyDefine.PREFERENCE.format(userId, type)); + RedisStrings.delete(PreferenceCacheKeyDefine.PREFERENCE.format(userId, type)); } @Override - public Map getPreferenceByType(String type, List items) { + public T getPreferenceByType(String type, List items) { Long userId = SecurityUtils.getLoginUserId(); PreferenceTypeEnum typeEnum = Valid.valid(PreferenceTypeEnum::of, type); // 查询缓存 - Map preference = this.getPreferenceByCache(userId, typeEnum); - if (Lists.isEmpty(items)) { - return preference; - } - Map partial = Maps.newMap(); - items.forEach(s -> partial.put(s, preference.get(s))); - return partial; + return this.getPreferenceByCache(userId, typeEnum, items); } @Override - public Map getDefaultPreferenceByType(String type, List items) { + public T getDefaultPreferenceByType(String type, List items) { PreferenceTypeEnum preferenceType = Valid.valid(PreferenceTypeEnum::of, type); // 获取默认值 - Map defaultModel = preferenceType.getDefault().toMap(); - Map result = Maps.newMap(); - if (Lists.isEmpty(items)) { - defaultModel.forEach((k, v) -> result.put(k, defaultModel.get(k))); - } else { - items.forEach(s -> result.put(s, defaultModel.get(s))); - } - return result; + JSONObject config = JSONObject.parseObject(preferenceType.getDefault().serial()); + // 解析 + return this.parsePreference(preferenceType, config, items); } @Override @Async("asyncExecutor") - public Future> getPreferenceAsync(Long userId, PreferenceTypeEnum type) { - Map config = this.getPreferenceByCache(userId, type); + public Future getPreferenceAsync(Long userId, PreferenceTypeEnum type) { + T config = this.getPreferenceByCache(userId, type, null); return CompletableFuture.completedFuture(config); } @@ -205,7 +193,7 @@ public class PreferenceServiceImpl implements PreferenceService { // .map(s -> PreferenceCacheKeyDefine.PREFERENCE.format(userId, s)) // .forEach(deleteKeys::add); // } - // RedisMaps.delete(deleteKeys); + // RedisStrings.delete(deleteKeys); } /** @@ -213,33 +201,33 @@ public class PreferenceServiceImpl implements PreferenceService { * * @param userId userId * @param type type + * @param items items * @return config */ - private Map getPreferenceByCache(Long userId, PreferenceTypeEnum type) { + private T getPreferenceByCache(Long userId, PreferenceTypeEnum type, List items) { String typeValue = type.getType(); - // 查询缓存 用 string 防止数据类型丢失 - String key = PreferenceCacheKeyDefine.PREFERENCE.format(userId, type); - Map config = RedisMaps.entities(key); + // 查询缓存 + String key = PreferenceCacheKeyDefine.PREFERENCE.format(userId, typeValue); + JSONObject config = RedisStrings.getJson(key); boolean setCache = Maps.isEmpty(config); // 查询数据库 - if (Maps.isEmpty(config)) { + if (config == null || Maps.isEmpty(config)) { config = preferenceDAO.of() .createWrapper() .eq(PreferenceDO::getUserId, userId) - .eq(PreferenceDO::getType, type) + .eq(PreferenceDO::getType, typeValue) .then() .stream() .collect(Collectors.toMap( PreferenceDO::getItem, PreferenceDO::getValue, - Functions.right()) - ); + Functions.right(), + JSONObject::new)); } // 初始化 if (Maps.isEmpty(config)) { // 获取默认值 - Map defaultConfig = type.getDefault().toMap(); - config = Maps.map(defaultConfig, Function.identity(), Refs::json); + config = JSONObject.parseObject(type.getDefault().serial()); // 插入默认值 List entities = config .entrySet() @@ -249,17 +237,40 @@ public class PreferenceServiceImpl implements PreferenceService { entity.setUserId(userId); entity.setType(typeValue); entity.setItem(s.getKey()); - entity.setValue(s.getValue()); + entity.setValue(Objects1.toString(s.getValue())); return entity; }).collect(Collectors.toList()); preferenceDAO.insertBatch(entities); } // 设置缓存 if (setCache) { - RedisMaps.putAll(key, PreferenceCacheKeyDefine.PREFERENCE, config); + RedisStrings.setJson(key, PreferenceCacheKeyDefine.PREFERENCE, config); } - // unRef - return Maps.map(config, Function.identity(), Refs::unref); + // 获取偏好 + return this.parsePreference(type, config, items); + } + + /** + * 解析偏好 + * + * @param type type + * @param config config + * @param items items + * @param T + * @return prefer + */ + @SuppressWarnings("unchecked") + private T parsePreference(PreferenceTypeEnum type, JSONObject config, List items) { + // 设置返回的键 + if (!Lists.isEmpty(items)) { + JSONObject configItems = new JSONObject(); + for (String item : items) { + configItems.put(item, config.get(item)); + } + config = configItems; + } + // 解析 + return (T) config.toJavaObject(type.getModelClass()); } } diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemMenuServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemMenuServiceImpl.java similarity index 98% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemMenuServiceImpl.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemMenuServiceImpl.java index 7785908a..e48dd218 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemMenuServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemMenuServiceImpl.java @@ -26,10 +26,10 @@ import cn.orionsec.kit.lang.utils.Strings; import cn.orionsec.kit.lang.utils.collect.Lists; import com.alibaba.fastjson.JSON; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.common.constant.Const; +import org.dromara.visor.common.constant.ErrorMessage; +import org.dromara.visor.common.utils.Valid; 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; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemMessageServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemMessageServiceImpl.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemMessageServiceImpl.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemMessageServiceImpl.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemRoleMenuServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemRoleMenuServiceImpl.java similarity index 96% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemRoleMenuServiceImpl.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemRoleMenuServiceImpl.java index 90a3ff17..d08515cf 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemRoleMenuServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemRoleMenuServiceImpl.java @@ -25,10 +25,10 @@ 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 lombok.extern.slf4j.Slf4j; +import org.dromara.visor.common.constant.ErrorCode; +import org.dromara.visor.common.constant.ErrorMessage; +import org.dromara.visor.common.utils.Valid; 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; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemRoleServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemRoleServiceImpl.java similarity index 98% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemRoleServiceImpl.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemRoleServiceImpl.java index 031863b9..401749d5 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemRoleServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemRoleServiceImpl.java @@ -27,9 +27,9 @@ import cn.orionsec.kit.lang.utils.collect.Lists; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.common.constant.ErrorMessage; +import org.dromara.visor.common.utils.Valid; 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; @@ -171,9 +171,10 @@ public class SystemRoleServiceImpl implements SystemRoleService { // 构造条件 LambdaQueryWrapper wrapper = systemRoleDAO.wrapper() .eq(SystemRoleDO::getId, request.getId()) - .like(SystemRoleDO::getName, request.getName()) .eq(SystemRoleDO::getCode, request.getCode()) - .eq(SystemRoleDO::getStatus, request.getStatus()); + .eq(SystemRoleDO::getStatus, request.getStatus()) + .like(SystemRoleDO::getName, request.getName()) + .like(SystemRoleDO::getDescription, request.getDescription()); // 查询 return systemRoleDAO.of(wrapper) .page(request) diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemSettingServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemSettingServiceImpl.java similarity index 56% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemSettingServiceImpl.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemSettingServiceImpl.java index b298085c..7995e2ee 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemSettingServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemSettingServiceImpl.java @@ -23,38 +23,46 @@ package org.dromara.visor.module.infra.service.impl; import cn.orionsec.kit.ext.process.ProcessAwaitExecutor; +import cn.orionsec.kit.lang.define.wrapper.Pair; 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.Objects1; import cn.orionsec.kit.lang.utils.Strings; -import cn.orionsec.kit.lang.utils.collect.Maps; +import cn.orionsec.kit.lang.utils.crypto.Keys; +import cn.orionsec.kit.lang.utils.crypto.RSA; import cn.orionsec.kit.lang.utils.crypto.Signatures; import cn.orionsec.kit.lang.utils.io.Streams; +import cn.orionsec.kit.spring.SpringHolder; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import org.dromara.visor.common.constant.AppConst; +import org.dromara.visor.common.constant.Const; +import org.dromara.visor.common.constant.ErrorMessage; +import org.dromara.visor.common.utils.Valid; 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.config.core.event.ConfigUpdateEvent; +import org.dromara.visor.framework.redis.core.utils.RedisStrings; 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.SystemSettingUpdateBatchRequest; 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.entity.vo.SystemSettingAggregateVO; import org.dromara.visor.module.infra.enums.SystemSettingTypeEnum; +import org.dromara.visor.module.infra.handler.setting.model.EncryptSystemSettingModel; +import org.dromara.visor.module.infra.handler.setting.model.SftpSystemSettingModel; import org.dromara.visor.module.infra.service.SystemSettingService; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.io.ByteArrayOutputStream; +import java.security.interfaces.RSAPrivateKey; +import java.security.interfaces.RSAPublicKey; import java.util.List; import java.util.Map; -import java.util.function.Function; import java.util.stream.Collectors; /** @@ -81,28 +89,103 @@ public class SystemSettingServiceImpl implements SystemSettingService { } @Override - public Integer updateSystemSetting(SystemSettingUpdateRequest request) { - String type = request.getType(); - String item = request.getItem(); - Object value = request.getValue(); - // 更新 - SystemSettingDO update = new SystemSettingDO(); - update.setValue(Refs.json(value)); - LambdaQueryWrapper wrapper = systemSettingDAO.lambda() - .eq(SystemSettingDO::getType, type) - .eq(SystemSettingDO::getItem, item); - int effect = systemSettingDAO.update(update, wrapper); - // 删除缓存 - RedisUtils.delete(SystemSettingKeyDefine.SETTING.format(type)); - // 设置日志参数 - OperatorLogs.add(OperatorLogs.TEXT, Strings.format(SystemSettingOperatorType.UPDATE_TEXT, type, item, value)); - return effect; + public SystemSettingAggregateVO getSystemAggregateSetting() { + // 查询缓存 + SystemSettingAggregateVO cache = RedisStrings.getJson(SystemSettingKeyDefine.SETTING); + SystemSettingAggregateVO result = Objects1.def(cache, SystemSettingAggregateVO::new); + if (cache == null) { + // 查询数据库 + Map> typeGroup = systemSettingDAO.of() + .createWrapper() + .select(SystemSettingDO::getType, + SystemSettingDO::getItem, + SystemSettingDO::getValue) + .in(SystemSettingDO::getType, + SystemSettingTypeEnum.SFTP.name(), + SystemSettingTypeEnum.ENCRYPT.name()) + .then() + .stream() + .collect(Collectors.groupingBy(SystemSettingDO::getType)); + // 数据组合 + typeGroup.forEach((k, v) -> { + // 类型数据 + SystemSettingTypeEnum settingType = SystemSettingTypeEnum.of(k); + Map typeSettings = v.stream() + .collect(Collectors.toMap( + SystemSettingDO::getItem, + SystemSettingDO::getValue, + Functions.right())); + Object setting = settingType.parseModel(typeSettings); + if (SystemSettingTypeEnum.SFTP.equals(settingType)) { + // SFTP 设置 + result.setSftp((SftpSystemSettingModel) setting); + } else if (SystemSettingTypeEnum.ENCRYPT.equals(settingType)) { + // 加密设置 + EncryptSystemSettingModel encryptSetting = (EncryptSystemSettingModel) setting; + encryptSetting.setPrivateKey(null); + result.setEncrypt(encryptSetting); + } + }); + // 设置缓存 + RedisStrings.setJson(SystemSettingKeyDefine.SETTING, result); + } + return result; } @Override - public void updatePartialSystemSetting(SystemSettingUpdatePartialRequest request) { + public EncryptSystemSettingModel generatorKeypair() { + // 生成密钥对 + Pair pair = RSA.generatorKeys(); + return EncryptSystemSettingModel.builder() + .publicKey(Keys.getPublicKey(pair.getKey())) + .privateKey(Keys.getPrivateKey(pair.getValue())) + .build(); + } + + @Override + public T getSystemSettingByType(String type) { + SystemSettingTypeEnum settingType = SystemSettingTypeEnum.of(type); + Valid.notNull(settingType, ErrorMessage.ERROR_TYPE); + // 查询数据库 + Map settings = systemSettingDAO.of() + .createWrapper() + .eq(SystemSettingDO::getType, type) + .then() + .stream() + .collect(Collectors.toMap( + SystemSettingDO::getItem, + SystemSettingDO::getValue, + Functions.right())); + // 解析 + return settingType.parseModel(settings); + } + + @Override + public void updateSystemSetting(SystemSettingUpdateRequest request) { String type = request.getType(); - Map settings = request.getSettings(); + SystemSettingTypeEnum settingType = Valid.valid(SystemSettingTypeEnum::of, type); + String item = request.getItem(); + String value = request.getValue(); + // 更新 + SystemSettingDO update = new SystemSettingDO(); + update.setValue(value); + LambdaQueryWrapper wrapper = systemSettingDAO.lambda() + .eq(SystemSettingDO::getType, type) + .eq(SystemSettingDO::getItem, item); + systemSettingDAO.update(update, wrapper); + // 删除缓存 + RedisUtils.delete(SystemSettingKeyDefine.SETTING); + // 设置日志参数 + OperatorLogs.add(OperatorLogs.TEXT, Strings.format(SystemSettingOperatorType.UPDATE_TEXT, type, item, value)); + // 触发修改事件 + SpringHolder.publishEvent(ConfigUpdateEvent.of(settingType.getConfigKey(item), value)); + } + + @Override + public void updateSystemSettingBatch(SystemSettingUpdateBatchRequest request) { + String type = request.getType(); + SystemSettingTypeEnum settingType = Valid.valid(SystemSettingTypeEnum::of, type); + Map settings = request.getSettings(); // 删除 LambdaQueryWrapper deleteWrapper = systemSettingDAO.lambda() .eq(SystemSettingDO::getType, type) @@ -112,63 +195,25 @@ public class SystemSettingServiceImpl implements SystemSettingService { List rows = settings.entrySet() .stream() .map(s -> SystemSettingDO.builder() + .configKey(settingType.getConfigKey(s.getKey())) .type(type) .item(s.getKey()) - .value(Refs.json(s.getValue())) + .value(s.getValue()) .build()) .collect(Collectors.toList()); // 插入 systemSettingDAO.insertBatch(rows); // 删除缓存 - RedisUtils.delete(SystemSettingKeyDefine.SETTING.format(type)); + RedisUtils.delete(SystemSettingKeyDefine.SETTING); // 设置日志参数 - OperatorLogs.add(OperatorLogs.TEXT, Strings.format(SystemSettingOperatorType.UPDATE_PARTIAL_TEXT, type)); - } - - @Override - public Map getSystemSettingByType(String type) { - SystemSettingTypeEnum settingType = SystemSettingTypeEnum.of(type); - Valid.notNull(settingType, ErrorMessage.ERROR_TYPE); - // 查询缓存 - String key = SystemSettingKeyDefine.SETTING.format(type); - Map settings = RedisMaps.entities(key); - boolean setCache = Maps.isEmpty(settings); - // 查询数据库 - if (Maps.isEmpty(settings)) { - settings = systemSettingDAO.of() - .createWrapper() - .eq(SystemSettingDO::getType, type) - .then() - .stream() - .collect(Collectors.toMap( - SystemSettingDO::getItem, - SystemSettingDO::getValue, - Functions.right())); - } - // 初始化 - if (Maps.isEmpty(settings)) { - // 获取默认值 - Map defaultConfig = settingType.getDefault().toMap(); - settings = Maps.map(defaultConfig, Function.identity(), Refs::json); - // 插入默认值 - List entities = settings - .entrySet() - .stream() - .map(s -> { - SystemSettingDO entity = new SystemSettingDO(); - entity.setType(type); - entity.setItem(s.getKey()); - entity.setValue(s.getValue()); - return entity; - }).collect(Collectors.toList()); - systemSettingDAO.insertBatch(entities); - } - // 设置缓存 - if (setCache) { - RedisMaps.putAll(key, SystemSettingKeyDefine.SETTING, settings); - } - // unRef - return Maps.map(settings, Function.identity(), Refs::unref); + OperatorLogs.add(OperatorLogs.TEXT, Strings.format(SystemSettingOperatorType.UPDATE_BATCH_TEXT, type)); + // 触发修改事件 + Map eventConfig = rows.stream() + .collect(Collectors.toMap( + SystemSettingDO::getConfigKey, + SystemSettingDO::getValue, + Functions.right())); + SpringHolder.publishEvent(ConfigUpdateEvent.of(eventConfig)); } /** diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemUserManagementServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemUserManagementServiceImpl.java similarity index 96% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemUserManagementServiceImpl.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemUserManagementServiceImpl.java index 7b5c0a6e..01a19ef1 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemUserManagementServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemUserManagementServiceImpl.java @@ -24,10 +24,10 @@ package org.dromara.visor.module.infra.service.impl; import cn.orionsec.kit.lang.utils.collect.Lists; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.common.constant.ErrorMessage; +import org.dromara.visor.common.utils.Requests; +import org.dromara.visor.common.utils.Valid; 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; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemUserRoleServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemUserRoleServiceImpl.java similarity index 96% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemUserRoleServiceImpl.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemUserRoleServiceImpl.java index 43c7be51..284237ef 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemUserRoleServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemUserRoleServiceImpl.java @@ -24,11 +24,11 @@ package org.dromara.visor.module.infra.service.impl; import cn.orionsec.kit.lang.utils.collect.Lists; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.common.constant.ErrorMessage; +import org.dromara.visor.common.security.LoginUser; +import org.dromara.visor.common.security.UserRole; +import org.dromara.visor.common.utils.Valid; 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; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemUserServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemUserServiceImpl.java similarity index 97% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemUserServiceImpl.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemUserServiceImpl.java index 187f9d56..817ca392 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemUserServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemUserServiceImpl.java @@ -29,12 +29,12 @@ import cn.orionsec.kit.spring.SpringHolder; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; +import org.dromara.visor.common.constant.Const; +import org.dromara.visor.common.constant.ErrorCode; +import org.dromara.visor.common.constant.ErrorMessage; +import org.dromara.visor.common.security.LoginUser; +import org.dromara.visor.common.utils.Valid; 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; @@ -395,11 +395,12 @@ public class SystemUserServiceImpl implements SystemUserService { public LambdaQueryWrapper buildQueryWrapper(SystemUserQueryRequest request) { return systemUserDAO.wrapper() .eq(SystemUserDO::getId, request.getId()) + .eq(SystemUserDO::getStatus, request.getStatus()) .like(SystemUserDO::getUsername, request.getUsername()) .like(SystemUserDO::getNickname, request.getNickname()) .like(SystemUserDO::getMobile, request.getMobile()) .like(SystemUserDO::getEmail, request.getEmail()) - .eq(SystemUserDO::getStatus, request.getStatus()); + .like(SystemUserDO::getDescription, request.getDescription()); } } diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/TagRelServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/TagRelServiceImpl.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/TagRelServiceImpl.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/TagRelServiceImpl.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/TagServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/TagServiceImpl.java similarity index 99% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/TagServiceImpl.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/TagServiceImpl.java index dd12efae..8f08410c 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/TagServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/TagServiceImpl.java @@ -25,7 +25,7 @@ package org.dromara.visor.module.infra.service.impl; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.constant.Const; +import org.dromara.visor.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; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/TipsServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/TipsServiceImpl.java similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/TipsServiceImpl.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/TipsServiceImpl.java diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/UserAggregateServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/UserAggregateServiceImpl.java similarity index 97% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/UserAggregateServiceImpl.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/UserAggregateServiceImpl.java index c08d4b55..dbe33deb 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/UserAggregateServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/UserAggregateServiceImpl.java @@ -90,7 +90,7 @@ public class UserAggregateServiceImpl implements UserAggregateService { // 获取用户信息 Long userId = SecurityUtils.getLoginUserId(); // 获取用户系统偏好 - Future> systemPreference = preferenceService.getPreferenceAsync(userId, PreferenceTypeEnum.SYSTEM); + Future systemPreference = preferenceService.getPreferenceAsync(userId, PreferenceTypeEnum.SYSTEM); // 查询用户信息 SystemUserDO user = systemUserDAO.selectById(userId); // 修改密码信息 diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/UserPermissionServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/UserPermissionServiceImpl.java similarity index 98% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/UserPermissionServiceImpl.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/UserPermissionServiceImpl.java index a0e2a58b..433cd9f2 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/UserPermissionServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/UserPermissionServiceImpl.java @@ -28,8 +28,8 @@ import cn.orionsec.kit.lang.utils.collect.Lists; import cn.orionsec.kit.lang.utils.collect.Maps; import lombok.Getter; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.security.LoginUser; -import org.dromara.visor.framework.common.security.UserRole; +import org.dromara.visor.common.security.LoginUser; +import org.dromara.visor.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.dao.SystemMenuDAO; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/task/TagAutoClearTask.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/task/TagAutoClearTask.java similarity index 96% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/task/TagAutoClearTask.java rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/task/TagAutoClearTask.java index 37572ba3..3c617637 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/task/TagAutoClearTask.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/task/TagAutoClearTask.java @@ -23,7 +23,7 @@ package org.dromara.visor.module.infra.task; import lombok.extern.slf4j.Slf4j; -import org.dromara.visor.framework.common.utils.LockerUtils; +import org.dromara.visor.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-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/META-INF/additional-spring-configuration-metadata.json similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/META-INF/additional-spring-configuration-metadata.json rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/META-INF/additional-spring-configuration-metadata.json diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/DataExtraMapper.xml b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/DataExtraMapper.xml similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/DataExtraMapper.xml rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/DataExtraMapper.xml diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/DataGroupMapper.xml b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/DataGroupMapper.xml similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/DataGroupMapper.xml rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/DataGroupMapper.xml diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/DataGroupRelMapper.xml b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/DataGroupRelMapper.xml similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/DataGroupRelMapper.xml rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/DataGroupRelMapper.xml diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/DataPermissionMapper.xml b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/DataPermissionMapper.xml similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/DataPermissionMapper.xml rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/DataPermissionMapper.xml diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/DictKeyMapper.xml b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/DictKeyMapper.xml similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/DictKeyMapper.xml rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/DictKeyMapper.xml diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/DictValueMapper.xml b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/DictValueMapper.xml similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/DictValueMapper.xml rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/DictValueMapper.xml diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/FavoriteMapper.xml b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/FavoriteMapper.xml similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/FavoriteMapper.xml rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/FavoriteMapper.xml diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/HistoryValueMapper.xml b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/HistoryValueMapper.xml similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/HistoryValueMapper.xml rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/HistoryValueMapper.xml diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/OperatorLogMapper.xml b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/OperatorLogMapper.xml similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/OperatorLogMapper.xml rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/OperatorLogMapper.xml diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/PreferenceMapper.xml b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/PreferenceMapper.xml similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/PreferenceMapper.xml rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/PreferenceMapper.xml diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/SystemMenuMapper.xml b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/SystemMenuMapper.xml similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/SystemMenuMapper.xml rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/SystemMenuMapper.xml diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/SystemMessageMapper.xml b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/SystemMessageMapper.xml similarity index 100% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/SystemMessageMapper.xml rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/SystemMessageMapper.xml diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/SystemRoleMapper.xml b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/SystemRoleMapper.xml similarity index 93% rename from orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/SystemRoleMapper.xml rename to orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/SystemRoleMapper.xml index 50ca80cf..7cf951d7 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/SystemRoleMapper.xml +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/resources/mapper/SystemRoleMapper.xml @@ -5,19 +5,20 @@ + + + + - - - - id, name, code, status, create_time, update_time, creator, updater, deleted + id, name, code, status, description, create_time, update_time, creator, updater, deleted