From 0b7fea93cdeb476bd41099dd49bab34d72c0f78e Mon Sep 17 00:00:00 2001 From: DaxPay Dev Date: Fri, 10 Jul 2026 15:22:04 +0800 Subject: [PATCH] =?UTF-8?q?refactor(system):=20=E8=A1=A5=E9=BD=90=E5=B9=B3?= =?UTF-8?q?=E5=8F=B0=20OSS/=E5=AE=89=E5=85=A8=E9=85=8D=E7=BD=AE=E7=A7=BB?= =?UTF-8?q?=E5=8C=85=E8=87=B3=20infra/security=20=E5=AD=90=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 将 PlatformOss*、PlatformSecurity* 及安全 Result 从扁平 config 包迁入 config.infra / config.security，并更新 IAM/Notify 等消费方 import。 --- .../iam/auth/service/IamSecurityConfigService.java | 2 +- .../open/platform/iam/enums/SocialClientEnum.java | 2 +- .../controller/wechat/WechatConfigController.java | 6 +++--- .../controller/wechat/WechatMessageController.java | 2 +- .../{ => infra}/PlatformOssConfigController.java | 8 ++++---- .../PlatformSecurityConfigController.java | 6 +++--- .../{ => config/infra}/PlatformOssConfigConvert.java | 8 ++++---- .../security}/PlatformSecurityConfigConvert.java | 4 ++-- .../platform/{ => infra}/PlatformOssConfig.java | 2 +- .../config/{ => infra}/PlatformOssConfigParam.java | 2 +- .../system/provider/OssConfigProviderImpl.java | 4 ++-- .../{platform => infra}/PlatformOssConfigResult.java | 2 +- .../PlatformAnomalyDetectionConfigResult.java | 2 +- .../PlatformLoginSecurityConfigResult.java | 2 +- .../PlatformPasswordPolicyConfigResult.java | 2 +- .../PlatformSessionManagementConfigResult.java | 2 +- .../PlatformTwoFactorAuthConfigResult.java | 2 +- .../config/{ => infra}/PlatformOssConfigService.java | 11 ++++++----- .../{ => security}/PlatformSecurityConfigService.java | 7 ++++--- 19 files changed, 39 insertions(+), 37 deletions(-) rename daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/controller/config/{ => infra}/PlatformOssConfigController.java (81%) rename daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/controller/config/{ => security}/PlatformSecurityConfigController.java (95%) rename daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/convert/{ => config/infra}/PlatformOssConfigConvert.java (68%) rename daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/convert/{ => config/security}/PlatformSecurityConfigConvert.java (93%) rename daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/entity/config/platform/{ => infra}/PlatformOssConfig.java (93%) rename daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/param/config/{ => infra}/PlatformOssConfigParam.java (97%) rename daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/result/config/{platform => infra}/PlatformOssConfigResult.java (96%) rename daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/result/config/{platform => security}/PlatformAnomalyDetectionConfigResult.java (94%) rename daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/result/config/{platform => security}/PlatformLoginSecurityConfigResult.java (94%) rename daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/result/config/{platform => security}/PlatformPasswordPolicyConfigResult.java (95%) rename daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/result/config/{platform => security}/PlatformSessionManagementConfigResult.java (92%) rename daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/result/config/{platform => security}/PlatformTwoFactorAuthConfigResult.java (91%) rename daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/service/config/{ => infra}/PlatformOssConfigService.java (70%) rename daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/service/config/{ => security}/PlatformSecurityConfigService.java (94%) diff --git a/daxpay-platform/daxpay-platform-service/service-iam/src/main/java/cn/daxpay/open/platform/iam/auth/service/IamSecurityConfigService.java b/daxpay-platform/daxpay-platform-service/service-iam/src/main/java/cn/daxpay/open/platform/iam/auth/service/IamSecurityConfigService.java index 0236d5e5e..39387a990 100644 --- a/daxpay-platform/daxpay-platform-service/service-iam/src/main/java/cn/daxpay/open/platform/iam/auth/service/IamSecurityConfigService.java +++ b/daxpay-platform/daxpay-platform-service/service-iam/src/main/java/cn/daxpay/open/platform/iam/auth/service/IamSecurityConfigService.java @@ -4,7 +4,7 @@ import cn.daxpay.open.platform.system.entity.config.platform.security.PlatformLo import cn.daxpay.open.platform.system.entity.config.platform.security.PlatformPasswordPolicyConfig; import cn.daxpay.open.platform.system.entity.config.platform.security.PlatformSessionManagementConfig; import cn.daxpay.open.platform.system.entity.config.platform.security.PlatformTwoFactorAuthConfig; -import cn.daxpay.open.platform.system.service.config.PlatformSecurityConfigService; +import cn.daxpay.open.platform.system.service.config.security.PlatformSecurityConfigService; import cn.hutool.core.util.StrUtil; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/daxpay-platform/daxpay-platform-service/service-iam/src/main/java/cn/daxpay/open/platform/iam/enums/SocialClientEnum.java b/daxpay-platform/daxpay-platform-service/service-iam/src/main/java/cn/daxpay/open/platform/iam/enums/SocialClientEnum.java index b898ff3be..d05d26d5d 100644 --- a/daxpay-platform/daxpay-platform-service/service-iam/src/main/java/cn/daxpay/open/platform/iam/enums/SocialClientEnum.java +++ b/daxpay-platform/daxpay-platform-service/service-iam/src/main/java/cn/daxpay/open/platform/iam/enums/SocialClientEnum.java @@ -2,7 +2,7 @@ package cn.daxpay.open.platform.iam.enums; import java.util.Arrays; -import cn.daxpay.open.platform.system.entity.config.platform.PlatformUrlConfig; +import cn.daxpay.open.platform.system.entity.config.platform.infra.PlatformUrlConfig; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/daxpay-platform/daxpay-platform-service/service-notify/src/main/java/cn/daxpay/open/platform/notify/controller/wechat/WechatConfigController.java b/daxpay-platform/daxpay-platform-service/service-notify/src/main/java/cn/daxpay/open/platform/notify/controller/wechat/WechatConfigController.java index 2ba758b5a..bda8a771e 100644 --- a/daxpay-platform/daxpay-platform-service/service-notify/src/main/java/cn/daxpay/open/platform/notify/controller/wechat/WechatConfigController.java +++ b/daxpay-platform/daxpay-platform-service/service-notify/src/main/java/cn/daxpay/open/platform/notify/controller/wechat/WechatConfigController.java @@ -3,9 +3,9 @@ package cn.daxpay.open.platform.notify.controller.wechat; import cn.daxpay.open.platform.core.annotation.PermCode; import cn.daxpay.open.platform.core.rest.Res; import cn.daxpay.open.platform.core.rest.result.Result; -import cn.daxpay.open.platform.system.param.config.PlatformWechatNotifyConfigParam; -import cn.daxpay.open.platform.system.result.config.platform.PlatformWechatNotifyConfigResult; -import cn.daxpay.open.platform.system.service.config.PlatformWechatNotifyConfigService; +import cn.daxpay.open.platform.system.param.config.notify.PlatformWechatNotifyConfigParam; +import cn.daxpay.open.platform.system.result.config.notify.PlatformWechatNotifyConfigResult; +import cn.daxpay.open.platform.system.service.config.notify.PlatformWechatNotifyConfigService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/daxpay-platform/daxpay-platform-service/service-notify/src/main/java/cn/daxpay/open/platform/notify/controller/wechat/WechatMessageController.java b/daxpay-platform/daxpay-platform-service/service-notify/src/main/java/cn/daxpay/open/platform/notify/controller/wechat/WechatMessageController.java index 125918532..5b95f08d4 100644 --- a/daxpay-platform/daxpay-platform-service/service-notify/src/main/java/cn/daxpay/open/platform/notify/controller/wechat/WechatMessageController.java +++ b/daxpay-platform/daxpay-platform-service/service-notify/src/main/java/cn/daxpay/open/platform/notify/controller/wechat/WechatMessageController.java @@ -11,7 +11,7 @@ import cn.daxpay.open.platform.notify.param.wechat.WechatMessageQuery; import cn.daxpay.open.platform.notify.result.wechat.WechatMessageRecordResult; import cn.daxpay.open.platform.notify.service.wechat.WechatMessageRecordService; import cn.daxpay.open.platform.notify.service.wechat.WechatNotifyService; -import cn.daxpay.open.platform.system.service.config.PlatformWechatNotifyConfigService; +import cn.daxpay.open.platform.system.service.config.notify.PlatformWechatNotifyConfigService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.constraints.NotNull; diff --git a/daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/controller/config/PlatformOssConfigController.java b/daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/controller/config/infra/PlatformOssConfigController.java similarity index 81% rename from daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/controller/config/PlatformOssConfigController.java rename to daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/controller/config/infra/PlatformOssConfigController.java index ed17b07c0..f83a0ff05 100644 --- a/daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/controller/config/PlatformOssConfigController.java +++ b/daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/controller/config/infra/PlatformOssConfigController.java @@ -1,11 +1,11 @@ -package cn.daxpay.open.platform.system.controller.config; +package cn.daxpay.open.platform.system.controller.config.infra; import cn.daxpay.open.platform.core.annotation.PermCode; import cn.daxpay.open.platform.core.rest.Res; import cn.daxpay.open.platform.core.rest.result.Result; -import cn.daxpay.open.platform.system.param.config.PlatformOssConfigParam; -import cn.daxpay.open.platform.system.result.config.platform.PlatformOssConfigResult; -import cn.daxpay.open.platform.system.service.config.PlatformOssConfigService; +import cn.daxpay.open.platform.system.param.config.infra.PlatformOssConfigParam; +import cn.daxpay.open.platform.system.result.config.infra.PlatformOssConfigResult; +import cn.daxpay.open.platform.system.service.config.infra.PlatformOssConfigService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/controller/config/PlatformSecurityConfigController.java b/daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/controller/config/security/PlatformSecurityConfigController.java similarity index 95% rename from daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/controller/config/PlatformSecurityConfigController.java rename to daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/controller/config/security/PlatformSecurityConfigController.java index 7b929c72d..95522d710 100644 --- a/daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/controller/config/PlatformSecurityConfigController.java +++ b/daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/controller/config/security/PlatformSecurityConfigController.java @@ -1,12 +1,12 @@ -package cn.daxpay.open.platform.system.controller.config; +package cn.daxpay.open.platform.system.controller.config.security; import cn.daxpay.open.platform.core.annotation.IgnoreAuth; import cn.daxpay.open.platform.core.annotation.PermCode; import cn.daxpay.open.platform.core.rest.Res; import cn.daxpay.open.platform.core.rest.result.Result; import cn.daxpay.open.platform.system.param.config.security.*; -import cn.daxpay.open.platform.system.result.config.platform.*; -import cn.daxpay.open.platform.system.service.config.PlatformSecurityConfigService; +import cn.daxpay.open.platform.system.result.config.security.*; +import cn.daxpay.open.platform.system.service.config.security.PlatformSecurityConfigService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; diff --git a/daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/convert/PlatformOssConfigConvert.java b/daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/convert/config/infra/PlatformOssConfigConvert.java similarity index 68% rename from daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/convert/PlatformOssConfigConvert.java rename to daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/convert/config/infra/PlatformOssConfigConvert.java index b8c2c46e2..df0041a9c 100644 --- a/daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/convert/PlatformOssConfigConvert.java +++ b/daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/convert/config/infra/PlatformOssConfigConvert.java @@ -1,8 +1,8 @@ -package cn.daxpay.open.platform.system.convert; +package cn.daxpay.open.platform.system.convert.config.infra; -import cn.daxpay.open.platform.system.entity.config.platform.PlatformOssConfig; -import cn.daxpay.open.platform.system.param.config.PlatformOssConfigParam; -import cn.daxpay.open.platform.system.result.config.platform.PlatformOssConfigResult; +import cn.daxpay.open.platform.system.entity.config.platform.infra.PlatformOssConfig; +import cn.daxpay.open.platform.system.param.config.infra.PlatformOssConfigParam; +import cn.daxpay.open.platform.system.result.config.infra.PlatformOssConfigResult; import org.mapstruct.BeanMapping; import org.mapstruct.Mapper; import org.mapstruct.MappingTarget; diff --git a/daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/convert/PlatformSecurityConfigConvert.java b/daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/convert/config/security/PlatformSecurityConfigConvert.java similarity index 93% rename from daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/convert/PlatformSecurityConfigConvert.java rename to daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/convert/config/security/PlatformSecurityConfigConvert.java index 2985c7508..5a9c99ebb 100644 --- a/daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/convert/PlatformSecurityConfigConvert.java +++ b/daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/convert/config/security/PlatformSecurityConfigConvert.java @@ -1,8 +1,8 @@ -package cn.daxpay.open.platform.system.convert; +package cn.daxpay.open.platform.system.convert.config.security; import cn.daxpay.open.platform.system.entity.config.platform.security.*; import cn.daxpay.open.platform.system.param.config.security.*; -import cn.daxpay.open.platform.system.result.config.platform.*; +import cn.daxpay.open.platform.system.result.config.security.*; import org.mapstruct.Mapper; import org.mapstruct.MappingTarget; import org.mapstruct.factory.Mappers; diff --git a/daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/entity/config/platform/PlatformOssConfig.java b/daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/entity/config/platform/infra/PlatformOssConfig.java similarity index 93% rename from daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/entity/config/platform/PlatformOssConfig.java rename to daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/entity/config/platform/infra/PlatformOssConfig.java index ae5bba808..bedb985ff 100644 --- a/daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/entity/config/platform/PlatformOssConfig.java +++ b/daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/entity/config/platform/infra/PlatformOssConfig.java @@ -1,4 +1,4 @@ -package cn.daxpay.open.platform.system.entity.config.platform; +package cn.daxpay.open.platform.system.entity.config.platform.infra; import lombok.Data; import lombok.experimental.Accessors; diff --git a/daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/param/config/PlatformOssConfigParam.java b/daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/param/config/infra/PlatformOssConfigParam.java similarity index 97% rename from daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/param/config/PlatformOssConfigParam.java rename to daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/param/config/infra/PlatformOssConfigParam.java index 2b8aa3902..260d4c04c 100644 --- a/daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/param/config/PlatformOssConfigParam.java +++ b/daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/param/config/infra/PlatformOssConfigParam.java @@ -1,4 +1,4 @@ -package cn.daxpay.open.platform.system.param.config; +package cn.daxpay.open.platform.system.param.config.infra; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/provider/OssConfigProviderImpl.java b/daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/provider/OssConfigProviderImpl.java index a56cb71fe..2bfeffdc1 100644 --- a/daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/provider/OssConfigProviderImpl.java +++ b/daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/provider/OssConfigProviderImpl.java @@ -2,8 +2,8 @@ package cn.daxpay.open.platform.system.provider; import cn.daxpay.open.platform.capability.file.entity.FileStorageConfig; import cn.daxpay.open.platform.capability.file.provider.OssConfigProvider; -import cn.daxpay.open.platform.system.entity.config.platform.PlatformOssConfig; -import cn.daxpay.open.platform.system.service.config.PlatformOssConfigService; +import cn.daxpay.open.platform.system.entity.config.platform.infra.PlatformOssConfig; +import cn.daxpay.open.platform.system.service.config.infra.PlatformOssConfigService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/result/config/platform/PlatformOssConfigResult.java b/daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/result/config/infra/PlatformOssConfigResult.java similarity index 96% rename from daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/result/config/platform/PlatformOssConfigResult.java rename to daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/result/config/infra/PlatformOssConfigResult.java index c37d6d133..6e9143723 100644 --- a/daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/result/config/platform/PlatformOssConfigResult.java +++ b/daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/result/config/infra/PlatformOssConfigResult.java @@ -1,4 +1,4 @@ -package cn.daxpay.open.platform.system.result.config.platform; +package cn.daxpay.open.platform.system.result.config.infra; import cn.daxpay.open.platform.common.json.sensitive.SensitiveInfo; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/result/config/platform/PlatformAnomalyDetectionConfigResult.java b/daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/result/config/security/PlatformAnomalyDetectionConfigResult.java similarity index 94% rename from daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/result/config/platform/PlatformAnomalyDetectionConfigResult.java rename to daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/result/config/security/PlatformAnomalyDetectionConfigResult.java index 6609ca3a8..c93c31cae 100644 --- a/daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/result/config/platform/PlatformAnomalyDetectionConfigResult.java +++ b/daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/result/config/security/PlatformAnomalyDetectionConfigResult.java @@ -1,4 +1,4 @@ -package cn.daxpay.open.platform.system.result.config.platform; +package cn.daxpay.open.platform.system.result.config.security; import cn.daxpay.open.platform.core.result.BaseResult; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/result/config/platform/PlatformLoginSecurityConfigResult.java b/daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/result/config/security/PlatformLoginSecurityConfigResult.java similarity index 94% rename from daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/result/config/platform/PlatformLoginSecurityConfigResult.java rename to daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/result/config/security/PlatformLoginSecurityConfigResult.java index 573be336a..136c1cbcd 100644 --- a/daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/result/config/platform/PlatformLoginSecurityConfigResult.java +++ b/daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/result/config/security/PlatformLoginSecurityConfigResult.java @@ -1,4 +1,4 @@ -package cn.daxpay.open.platform.system.result.config.platform; +package cn.daxpay.open.platform.system.result.config.security; import cn.daxpay.open.platform.core.result.BaseResult; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/result/config/platform/PlatformPasswordPolicyConfigResult.java b/daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/result/config/security/PlatformPasswordPolicyConfigResult.java similarity index 95% rename from daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/result/config/platform/PlatformPasswordPolicyConfigResult.java rename to daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/result/config/security/PlatformPasswordPolicyConfigResult.java index 6c14693e8..c456a7624 100644 --- a/daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/result/config/platform/PlatformPasswordPolicyConfigResult.java +++ b/daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/result/config/security/PlatformPasswordPolicyConfigResult.java @@ -1,4 +1,4 @@ -package cn.daxpay.open.platform.system.result.config.platform; +package cn.daxpay.open.platform.system.result.config.security; import cn.daxpay.open.platform.core.result.BaseResult; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/result/config/platform/PlatformSessionManagementConfigResult.java b/daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/result/config/security/PlatformSessionManagementConfigResult.java similarity index 92% rename from daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/result/config/platform/PlatformSessionManagementConfigResult.java rename to daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/result/config/security/PlatformSessionManagementConfigResult.java index 658998f21..679173fe1 100644 --- a/daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/result/config/platform/PlatformSessionManagementConfigResult.java +++ b/daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/result/config/security/PlatformSessionManagementConfigResult.java @@ -1,4 +1,4 @@ -package cn.daxpay.open.platform.system.result.config.platform; +package cn.daxpay.open.platform.system.result.config.security; import cn.daxpay.open.platform.core.result.BaseResult; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/result/config/platform/PlatformTwoFactorAuthConfigResult.java b/daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/result/config/security/PlatformTwoFactorAuthConfigResult.java similarity index 91% rename from daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/result/config/platform/PlatformTwoFactorAuthConfigResult.java rename to daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/result/config/security/PlatformTwoFactorAuthConfigResult.java index 4d999c893..a10cf3b1d 100644 --- a/daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/result/config/platform/PlatformTwoFactorAuthConfigResult.java +++ b/daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/result/config/security/PlatformTwoFactorAuthConfigResult.java @@ -1,4 +1,4 @@ -package cn.daxpay.open.platform.system.result.config.platform; +package cn.daxpay.open.platform.system.result.config.security; import cn.daxpay.open.platform.core.result.BaseResult; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/service/config/PlatformOssConfigService.java b/daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/service/config/infra/PlatformOssConfigService.java similarity index 70% rename from daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/service/config/PlatformOssConfigService.java rename to daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/service/config/infra/PlatformOssConfigService.java index a1e7a53cd..041de9d57 100644 --- a/daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/service/config/PlatformOssConfigService.java +++ b/daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/service/config/infra/PlatformOssConfigService.java @@ -1,10 +1,11 @@ -package cn.daxpay.open.platform.system.service.config; +package cn.daxpay.open.platform.system.service.config.infra; -import cn.daxpay.open.platform.system.convert.PlatformOssConfigConvert; -import cn.daxpay.open.platform.system.entity.config.platform.PlatformOssConfig; +import cn.daxpay.open.platform.system.convert.config.infra.PlatformOssConfigConvert; +import cn.daxpay.open.platform.system.entity.config.platform.infra.PlatformOssConfig; import cn.daxpay.open.platform.system.enums.EncryptPlatformConfigTypeEnum; -import cn.daxpay.open.platform.system.param.config.PlatformOssConfigParam; -import cn.daxpay.open.platform.system.result.config.platform.PlatformOssConfigResult; +import cn.daxpay.open.platform.system.param.config.infra.PlatformOssConfigParam; +import cn.daxpay.open.platform.system.result.config.infra.PlatformOssConfigResult; +import cn.daxpay.open.platform.system.service.config.SystemPlatformEncryptConfigService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/service/config/PlatformSecurityConfigService.java b/daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/service/config/security/PlatformSecurityConfigService.java similarity index 94% rename from daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/service/config/PlatformSecurityConfigService.java rename to daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/service/config/security/PlatformSecurityConfigService.java index ab11a8182..fe19c37dc 100644 --- a/daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/service/config/PlatformSecurityConfigService.java +++ b/daxpay-platform/daxpay-platform-service/service-system/src/main/java/cn/daxpay/open/platform/system/service/config/security/PlatformSecurityConfigService.java @@ -1,10 +1,11 @@ -package cn.daxpay.open.platform.system.service.config; +package cn.daxpay.open.platform.system.service.config.security; -import cn.daxpay.open.platform.system.convert.PlatformSecurityConfigConvert; +import cn.daxpay.open.platform.system.convert.config.security.PlatformSecurityConfigConvert; import cn.daxpay.open.platform.system.entity.config.platform.security.*; import cn.daxpay.open.platform.system.enums.PlatformConfigTypeEnum; import cn.daxpay.open.platform.system.param.config.security.*; -import cn.daxpay.open.platform.system.result.config.platform.*; +import cn.daxpay.open.platform.system.result.config.security.*; +import cn.daxpay.open.platform.system.service.config.SystemPlatformConfigService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service;