From b48adf19c60101a9c184a18ef00b748f3382b15f Mon Sep 17 00:00:00 2001 From: lijiahang Date: Thu, 31 Oct 2024 09:55:43 +0800 Subject: [PATCH] =?UTF-8?q?:arrow=5Fup:=20=E5=8D=87=E7=BA=A7=20orion-kit?= =?UTF-8?q?=20=E7=89=88=E6=9C=AC.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- orion-ops-api/orion-ops-common/pom.xml | 8 +- .../java/cn/orionsec/ops/constant/Const.java | 16 +- .../cn/orionsec/ops/constant/ResultCode.java | 2 +- .../orionsec/ops/constant/SchedulerPools.java | 210 +++++++++--------- .../ops/constant/app/PipelineLogStatus.java | 2 +- .../ops/constant/env/EnvViewType.java | 2 +- .../ops/constant/system/SystemConfigKey.java | 10 +- .../ops/constant/tail/FileTailMode.java | 2 +- .../orionsec/ops/constant/ws/WsProtocol.java | 6 +- .../cn/orionsec/ops/utils/AttrConverts.java | 12 +- .../orionsec/ops/utils/AvatarPicHolder.java | 10 +- .../cn/orionsec/ops/utils/FileCleaner.java | 11 +- .../cn/orionsec/ops/utils/PathBuilders.java | 8 +- .../cn/orionsec/ops/utils/ResourceLoader.java | 8 +- .../java/cn/orionsec/ops/utils/Utils.java | 14 +- .../java/cn/orionsec/ops/utils/Valid.java | 12 +- .../java/cn/orionsec/ops/utils/ValueMix.java | 16 +- .../ops/constant/event/AddLicenseHeader.java | 10 +- .../ops/constant/event/EventClassifyTest.java | 2 +- .../ops/constant/event/EventTypeTest.java | 2 +- orion-ops-api/orion-ops-dao/pom.xml | 8 +- .../ops/entity/domain/MachineTerminalDO.java | 2 +- .../cn/orionsec/ops/utils/CodeGenerator.java | 4 +- .../java/cn/orionsec/ops/utils/DataQuery.java | 12 +- orion-ops-api/orion-ops-data/pom.xml | 2 +- .../cn/orionsec/ops/constant/ExportConst.java | 4 +- .../entity/exporter/ApplicationExportDTO.java | 8 +- .../exporter/ApplicationProfileExportDTO.java | 10 +- .../ApplicationRepositoryExportDTO.java | 8 +- .../exporter/CommandTemplateExportDTO.java | 8 +- .../entity/exporter/EventLogExportDTO.java | 12 +- .../MachineAlarmHistoryExportDTO.java | 12 +- .../entity/exporter/MachineInfoExportDTO.java | 8 +- .../exporter/MachineProxyExportDTO.java | 8 +- .../exporter/MachineTailFileExportDTO.java | 8 +- .../exporter/MachineTerminalLogExportDTO.java | 12 +- .../ops/entity/exporter/WebhookExportDTO.java | 8 +- .../entity/importer/ApplicationImportDTO.java | 4 +- .../importer/ApplicationProfileImportDTO.java | 4 +- .../ApplicationRepositoryImportDTO.java | 6 +- .../importer/CommandTemplateImportDTO.java | 4 +- .../entity/importer/MachineInfoImportDTO.java | 6 +- .../importer/MachineProxyImportDTO.java | 6 +- .../importer/MachineTailFileImportDTO.java | 4 +- .../ops/entity/importer/WebhookImportDTO.java | 4 +- .../exporter/AbstractDataExporter.java | 12 +- .../exporter/AppProfileDataExporter.java | 4 +- .../exporter/AppRepositoryDataExporter.java | 4 +- .../exporter/ApplicationDataExporter.java | 4 +- .../exporter/CommandTemplateDataExporter.java | 4 +- .../ops/handler/exporter/IDataExporter.java | 2 +- .../MachineAlarmHistoryDataExporter.java | 4 +- .../exporter/MachineInfoDataExporter.java | 4 +- .../exporter/MachineProxyDataExporter.java | 4 +- .../exporter/TailFileDataExporter.java | 4 +- .../exporter/TerminalLogDataExporter.java | 4 +- .../exporter/UserEventLogDataExporter.java | 4 +- .../handler/exporter/WebhookDataExporter.java | 4 +- .../importer/checker/AbstractDataChecker.java | 18 +- .../checker/AppProfileDataChecker.java | 2 +- .../checker/AppRepositoryDataChecker.java | 2 +- .../checker/ApplicationDataChecker.java | 2 +- .../checker/CommandTemplateDataChecker.java | 2 +- .../importer/checker/IDataChecker.java | 2 +- .../checker/MachineInfoDataChecker.java | 2 +- .../importer/checker/TailFileDataChecker.java | 2 +- .../importer/checker/WebhookDataChecker.java | 2 +- .../importer/impl/AbstractDataImporter.java | 16 +- .../importer/impl/AppProfileDataImporter.java | 2 +- .../impl/AppRepositoryDataImporter.java | 4 +- .../impl/ApplicationDataImporter.java | 2 +- .../impl/CommandTemplateDataImporter.java | 2 +- .../handler/importer/impl/IDataImporter.java | 2 +- .../impl/MachineInfoDataImporter.java | 2 +- .../impl/MachineProxyDataImporter.java | 2 +- .../importer/impl/TailFileDataImporter.java | 2 +- .../importer/impl/WebhookDataImporter.java | 2 +- .../ApplicationProfileValidator.java | 2 +- .../ApplicationRepositoryValidator.java | 4 +- .../validator/ApplicationValidator.java | 2 +- .../validator/CommandTemplateValidator.java | 2 +- .../importer/validator/FileTailValidator.java | 2 +- .../validator/MachineProxyValidator.java | 2 +- .../importer/validator/MachineValidator.java | 2 +- .../service/impl/DataClearServiceImpl.java | 2 +- .../service/impl/DataImportServiceImpl.java | 4 +- .../ops/MappingConversionProvider.java | 4 +- .../mapping/alarm/AlarmGroupConversion.java | 2 +- .../app/ApplicationActionConversion.java | 4 +- .../app/ApplicationBuildConversion.java | 4 +- .../mapping/app/ApplicationConversion.java | 2 +- .../mapping/app/ApplicationEnvConversion.java | 2 +- .../app/ApplicationMachineConversion.java | 2 +- .../app/ApplicationPipelineConversion.java | 2 +- .../ApplicationPipelineTaskConversion.java | 6 +- .../app/ApplicationProfileConversion.java | 2 +- .../app/ApplicationReleaseConversion.java | 4 +- .../app/ApplicationRepositoryConversion.java | 8 +- .../mapping/exec/CommandExecConversion.java | 4 +- .../ops/mapping/file/FileTailConversion.java | 6 +- .../file/FileTransferLogConversion.java | 4 +- .../history/HistoryValueConversion.java | 4 +- .../mapping/home/StatisticsConversion.java | 2 +- .../machine/MachineAlarmConversion.java | 4 +- .../mapping/machine/MachineConversion.java | 2 +- .../mapping/machine/MachineEnvConversion.java | 2 +- .../machine/MachineGroupConversion.java | 2 +- .../machine/MachineMonitorConversion.java | 2 +- .../machine/MachineProxyConversion.java | 2 +- .../machine/MachineSecretKeyConversion.java | 2 +- .../machine/MachineTerminalConversion.java | 4 +- .../message/WebSideMessageConversion.java | 4 +- .../scheduler/SchedulerTaskConversion.java | 6 +- .../SchedulerTaskRecordConversion.java | 4 +- .../ops/mapping/sftp/SftpConversion.java | 8 +- .../system/SystemAnalysisConversion.java | 2 +- .../mapping/system/SystemEnvConversion.java | 2 +- .../template/CommandTemplateConversion.java | 4 +- .../mapping/upload/BatchUploadConversion.java | 2 +- .../mapping/user/UserEventLogConversion.java | 4 +- .../ops/mapping/user/UserInfoConversion.java | 4 +- .../webhook/WebhookConfigConversion.java | 2 +- orion-ops-api/orion-ops-model/pom.xml | 8 +- .../entity/config/TerminalConnectConfig.java | 2 +- .../alarm/AlarmGroupNotifyRequest.java | 2 +- .../request/alarm/AlarmGroupRequest.java | 2 +- .../request/app/ApplicationBuildRequest.java | 2 +- .../request/app/ApplicationEnvRequest.java | 2 +- .../request/app/ApplicationInfoRequest.java | 2 +- .../app/ApplicationPipelineRequest.java | 2 +- .../app/ApplicationPipelineTaskRequest.java | 2 +- .../app/ApplicationProfileRequest.java | 2 +- .../app/ApplicationReleaseRequest.java | 2 +- .../app/ApplicationRepositoryRequest.java | 2 +- .../request/exec/CommandExecRequest.java | 2 +- .../entity/request/file/FileTailRequest.java | 2 +- .../request/history/HistoryValueRequest.java | 2 +- .../machine/MachineAlarmHistoryRequest.java | 2 +- .../request/machine/MachineEnvRequest.java | 2 +- .../request/machine/MachineInfoRequest.java | 2 +- .../request/machine/MachineKeyRequest.java | 2 +- .../machine/MachineMonitorRequest.java | 2 +- .../request/machine/MachineProxyRequest.java | 2 +- .../machine/MachineTerminalLogRequest.java | 2 +- .../MachineTerminalManagerRequest.java | 2 +- .../machine/MachineTerminalRequest.java | 2 +- .../message/WebSideMessageRequest.java | 2 +- .../scheduler/SchedulerTaskRecordRequest.java | 2 +- .../scheduler/SchedulerTaskRequest.java | 2 +- .../request/system/SystemEnvRequest.java | 2 +- .../template/CommandTemplateRequest.java | 2 +- .../entity/request/user/EventLogRequest.java | 2 +- .../entity/request/user/UserInfoRequest.java | 2 +- .../request/webhook/WebhookConfigRequest.java | 2 +- .../entity/vo/machine/MachineTerminalVO.java | 2 +- .../entity/vo/machine/TerminalAccessVO.java | 2 +- .../AppRepositoryStatusCleanRunner.java | 2 +- .../ops/runner/CacheKeyCleanRunner.java | 4 +- .../runner/HostMachineInitializeRunner.java | 4 +- .../runner/MachineMonitorStatusRunner.java | 4 +- .../ops/runner/SystemEnvInitializeRunner.java | 2 +- .../ops/runner/SystemSpaceAnalysisRunner.java | 4 +- .../ops/config/JsonSerializerConfig.java | 2 +- .../handler/alarm/MachineAlarmExecutor.java | 6 +- .../alarm/push/AlarmWebSideMessagePusher.java | 8 +- .../alarm/push/AlarmWebhookPusher.java | 10 +- .../app/action/AbstractActionHandler.java | 22 +- .../app/action/CheckoutActionHandler.java | 8 +- .../app/action/CommandActionHandler.java | 14 +- .../handler/app/action/IActionHandler.java | 8 +- .../app/action/MachineActionStore.java | 4 +- .../app/action/ScpTransferActionHandler.java | 22 +- .../app/action/SftpTransferActionHandler.java | 14 +- .../handler/app/build/BuildSessionHolder.java | 2 +- .../app/machine/AbstractMachineProcessor.java | 20 +- .../app/machine/BuildMachineProcessor.java | 24 +- .../app/machine/IMachineProcessor.java | 2 +- .../app/machine/ReleaseMachineProcessor.java | 10 +- .../app/pipeline/IPipelineProcessor.java | 2 +- .../app/pipeline/PipelineProcessor.java | 8 +- .../app/pipeline/PipelineSessionHolder.java | 2 +- .../pipeline/stage/AbstractStageHandler.java | 4 +- .../app/pipeline/stage/BuildStageHandler.java | 4 +- .../app/pipeline/stage/IStageHandler.java | 4 +- .../pipeline/stage/ReleaseStageHandler.java | 8 +- .../app/release/AbstractReleaseProcessor.java | 6 +- .../app/release/IReleaseProcessor.java | 8 +- .../app/release/ParallelReleaseProcessor.java | 4 +- .../app/release/ReleaseSessionHolder.java | 2 +- .../ops/handler/exec/CommandExecHandler.java | 30 +-- .../ops/handler/exec/ExecSessionHolder.java | 2 +- .../ops/handler/exec/IExecHandler.java | 4 +- .../ops/handler/http/HttpApiDefined.java | 2 +- .../ops/handler/http/HttpApiRequest.java | 6 +- .../ops/handler/http/HttpApiRequester.java | 4 +- .../handler/http/MachineMonitorHttpApi.java | 2 +- .../monitor/MonitorAgentInstallTask.java | 34 +-- .../scheduler/AbstractTaskProcessor.java | 4 +- .../ops/handler/scheduler/ITaskProcessor.java | 6 +- .../scheduler/ParallelTaskProcessor.java | 4 +- .../handler/scheduler/TaskSessionHolder.java | 2 +- .../machine/ITaskMachineHandler.java | 2 +- .../scheduler/machine/TaskMachineHandler.java | 26 +-- .../handler/sftp/FileTransferProcessor.java | 14 +- .../handler/sftp/IFileTransferProcessor.java | 8 +- .../handler/sftp/SftpBasicExecutorHolder.java | 6 +- .../ops/handler/sftp/SftpSupport.java | 8 +- .../sftp/TransferProcessorManager.java | 12 +- .../handler/sftp/direct/DirectDownloader.java | 14 +- .../sftp/impl/DownloadFileProcessor.java | 6 +- .../sftp/impl/PackageFileProcessor.java | 20 +- .../sftp/impl/UploadFileProcessor.java | 6 +- .../notify/FileTransferNotifyHandler.java | 4 +- .../ops/handler/tail/ITailHandler.java | 6 +- .../ops/handler/tail/TailFileHandler.java | 2 +- .../ops/handler/tail/TailSessionHolder.java | 6 +- .../tail/impl/ExecTailFileHandler.java | 15 +- .../tail/impl/TrackerTailFileHandler.java | 14 +- .../ops/handler/terminal/IOperateHandler.java | 2 +- .../terminal/TerminalMessageHandler.java | 4 +- .../terminal/TerminalOperateHandler.java | 21 +- .../ops/handler/terminal/TerminalUtils.java | 2 +- .../manager/TerminalSessionManager.java | 18 +- .../terminal/screen/TerminalScreenEnv.java | 2 +- .../watcher/ITerminalWatcherProcessor.java | 4 +- .../watcher/TerminalWatcherHandler.java | 2 +- .../watcher/TerminalWatcherProcessor.java | 4 +- .../ops/handler/webhook/DingRobotPusher.java | 4 +- .../interceptor/AuthenticateInterceptor.java | 8 +- .../ops/interceptor/DemoDisableApiAspect.java | 4 +- .../ExposeApiHeaderInterceptor.java | 6 +- .../FileTransferNotifyInterceptor.java | 4 +- .../ops/interceptor/IpFilterInterceptor.java | 8 +- .../ops/interceptor/LogPrintInterceptor.java | 10 +- .../ops/interceptor/RoleInterceptor.java | 8 +- .../ops/interceptor/TailFileInterceptor.java | 2 +- .../TerminalAccessInterceptor.java | 2 +- .../TerminalWatcherInterceptor.java | 2 +- .../interceptor/UserActiveInterceptor.java | 4 +- .../ops/service/api/AlarmGroupService.java | 2 +- .../service/api/ApplicationBuildService.java | 2 +- .../service/api/ApplicationEnvService.java | 4 +- .../service/api/ApplicationInfoService.java | 2 +- .../api/ApplicationPipelineService.java | 2 +- .../api/ApplicationPipelineTaskService.java | 2 +- .../api/ApplicationProfileService.java | 2 +- .../api/ApplicationReleaseService.java | 2 +- .../api/ApplicationRepositoryService.java | 4 +- .../ops/service/api/CommandExecService.java | 2 +- .../service/api/CommandTemplateService.java | 2 +- .../ops/service/api/FileTailService.java | 2 +- .../ops/service/api/HistoryValueService.java | 2 +- .../api/MachineAlarmHistoryService.java | 2 +- .../ops/service/api/MachineEnvService.java | 4 +- .../ops/service/api/MachineInfoService.java | 4 +- .../ops/service/api/MachineKeyService.java | 4 +- .../service/api/MachineMonitorService.java | 2 +- .../ops/service/api/MachineProxyService.java | 2 +- .../service/api/MachineTerminalService.java | 2 +- .../api/SchedulerTaskRecordService.java | 2 +- .../ops/service/api/SchedulerTaskService.java | 2 +- .../ops/service/api/SystemEnvService.java | 4 +- .../ops/service/api/UserEventLogService.java | 2 +- .../orionsec/ops/service/api/UserService.java | 2 +- .../service/api/WebSideMessageService.java | 2 +- .../ops/service/api/WebhookConfigService.java | 2 +- .../service/impl/AlarmGroupServiceImpl.java | 6 +- .../impl/ApplicationActionLogServiceImpl.java | 6 +- .../impl/ApplicationActionServiceImpl.java | 4 +- .../impl/ApplicationBuildServiceImpl.java | 12 +- .../impl/ApplicationEnvServiceImpl.java | 14 +- .../impl/ApplicationInfoServiceImpl.java | 10 +- .../impl/ApplicationMachineServiceImpl.java | 2 +- .../ApplicationPipelineDetailServiceImpl.java | 2 +- .../impl/ApplicationPipelineServiceImpl.java | 6 +- ...licationPipelineTaskDetailServiceImpl.java | 4 +- .../ApplicationPipelineTaskServiceImpl.java | 20 +- .../impl/ApplicationProfileServiceImpl.java | 8 +- .../ApplicationReleaseMachineServiceImpl.java | 4 +- .../impl/ApplicationReleaseServiceImpl.java | 20 +- .../ApplicationRepositoryServiceImpl.java | 24 +- .../service/impl/BatchUploadServiceImpl.java | 14 +- .../service/impl/CommandExecServiceImpl.java | 12 +- .../impl/CommandTemplateServiceImpl.java | 6 +- .../service/impl/FileDownloadServiceImpl.java | 14 +- .../ops/service/impl/FileTailServiceImpl.java | 18 +- .../service/impl/HistoryValueServiceImpl.java | 2 +- .../impl/MachineAlarmConfigServiceImpl.java | 2 +- .../impl/MachineAlarmHistoryServiceImpl.java | 4 +- .../service/impl/MachineEnvServiceImpl.java | 16 +- .../service/impl/MachineGroupServiceImpl.java | 2 +- .../service/impl/MachineInfoServiceImpl.java | 38 ++-- .../service/impl/MachineKeyServiceImpl.java | 23 +- .../MachineMonitorEndpointServiceImpl.java | 2 +- .../impl/MachineMonitorServiceImpl.java | 14 +- .../service/impl/MachineProxyServiceImpl.java | 6 +- .../impl/MachineTerminalServiceImpl.java | 14 +- .../ops/service/impl/PassportServiceImpl.java | 6 +- ...SchedulerTaskMachineRecordServiceImpl.java | 4 +- .../impl/SchedulerTaskRecordServiceImpl.java | 10 +- .../impl/SchedulerTaskServiceImpl.java | 6 +- .../ops/service/impl/SftpServiceImpl.java | 42 ++-- .../service/impl/StatisticsServiceImpl.java | 10 +- .../service/impl/SystemEnvServiceImpl.java | 14 +- .../ops/service/impl/SystemServiceImpl.java | 10 +- .../service/impl/UserEventLogServiceImpl.java | 12 +- .../ops/service/impl/UserServiceImpl.java | 24 +- .../impl/WebSideMessageServiceImpl.java | 10 +- .../impl/WebhookConfigServiceImpl.java | 6 +- .../cn/orionsec/ops/task/TaskRegister.java | 4 +- .../ops/task/fixed/AutoCleanFileTask.java | 2 +- .../task/fixed/SystemSpaceAnalysisTask.java | 2 +- .../ops/task/impl/PipelineTaskImpl.java | 4 +- .../ops/task/impl/ReleaseTaskImpl.java | 4 +- .../ops/task/impl/SchedulerTaskImpl.java | 6 +- .../java/cn/orionsec/ops/utils/Currents.java | 4 +- .../orionsec/ops/utils/EventParamsHolder.java | 10 +- .../cn/orionsec/ops/utils/RedisUtils.java | 6 +- .../cn/orionsec/ops/utils/WebSockets.java | 14 +- orion-ops-api/orion-ops-web/pom.xml | 6 + .../cn/orionsec/ops/config/SwaggerConfig.java | 2 +- .../cn/orionsec/ops/config/WebMvcConfig.java | 16 +- .../ops/config/WrapperResultConfig.java | 10 +- .../ops/controller/AlarmGroupController.java | 2 +- .../ApplicationBuildController.java | 4 +- .../controller/ApplicationEnvController.java | 10 +- .../controller/ApplicationInfoController.java | 6 +- .../ApplicationPipelineController.java | 2 +- .../ApplicationPipelineTaskController.java | 4 +- .../ApplicationProfileController.java | 2 +- .../ApplicationReleaseController.java | 4 +- .../ApplicationRepositoryController.java | 4 +- .../controller/AuthenticateController.java | 8 +- .../BatchExecCommandController.java | 4 +- .../ops/controller/BatchUploadController.java | 6 +- .../controller/CommandTemplateController.java | 2 +- .../ops/controller/CommonController.java | 4 +- .../ops/controller/DataClearController.java | 2 +- .../ops/controller/DataImportController.java | 12 +- .../ops/controller/EventLogController.java | 2 +- .../controller/FileDownloadController.java | 4 +- .../ops/controller/FileTailController.java | 18 +- .../controller/HistoryValueController.java | 4 +- .../MachineAlarmConfigController.java | 4 +- .../ops/controller/MachineEnvController.java | 10 +- .../controller/MachineGroupController.java | 2 +- .../ops/controller/MachineInfoController.java | 4 +- .../ops/controller/MachineKeyController.java | 4 +- .../controller/MachineMonitorController.java | 4 +- .../controller/MachineProxyController.java | 4 +- .../controller/MachineTerminalController.java | 14 +- .../ops/controller/SchedulerController.java | 10 +- .../controller/SchedulerRecordController.java | 4 +- .../ops/controller/SftpController.java | 10 +- .../ops/controller/SystemController.java | 4 +- .../ops/controller/SystemEnvController.java | 8 +- .../ops/controller/UserController.java | 4 +- .../controller/WebSideMessageController.java | 2 +- .../controller/WebhookConfigController.java | 2 +- .../expose/MachineAlarmExposeController.java | 2 +- .../main/resources/config/spring-common.xml | 2 +- orion-ops-api/pom.xml | 14 +- 362 files changed, 1207 insertions(+), 1165 deletions(-) diff --git a/orion-ops-api/orion-ops-common/pom.xml b/orion-ops-api/orion-ops-common/pom.xml index f40c44fc..4da6fe87 100644 --- a/orion-ops-api/orion-ops-common/pom.xml +++ b/orion-ops-api/orion-ops-common/pom.xml @@ -22,9 +22,15 @@ - io.github.lijiahangmax + cn.orionsec.kit orion-all + + + + org.springframework.boot + spring-boot-starter-web + diff --git a/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/Const.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/Const.java index 7aab5328..76a75dcd 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/Const.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/Const.java @@ -15,7 +15,7 @@ */ package cn.orionsec.ops.constant; -import com.orion.lang.utils.collect.Lists; +import cn.orionsec.kit.lang.utils.collect.Lists; import java.util.List; @@ -26,7 +26,7 @@ * @version 1.0.0 * @since 2021/3/30 10:07 */ -public class Const extends com.orion.lang.constant.Const { +public class Const implements cn.orionsec.kit.lang.constant.Const { private Const() { } @@ -177,6 +177,18 @@ private Const() { public static final String LF_3 = "\n\n\n"; + public static final Integer ENABLE = 1; + + public static final Integer DISABLE = 2; + + public static final Integer NOT_DELETED = 1; + + public static final Integer IS_DELETED = 2; + + public static final Integer INCREMENT = 1; + + public static final Integer DECREMENT = 2; + /** * 不安全的文件夹 */ diff --git a/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/ResultCode.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/ResultCode.java index cf90e55b..370b73a4 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/ResultCode.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/ResultCode.java @@ -15,7 +15,7 @@ */ package cn.orionsec.ops.constant; -import com.orion.lang.define.wrapper.CodeInfo; +import cn.orionsec.kit.lang.define.wrapper.CodeInfo; /** * wrapper 返回 code diff --git a/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/SchedulerPools.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/SchedulerPools.java index 8a863551..cb20acf9 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/SchedulerPools.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/SchedulerPools.java @@ -15,9 +15,9 @@ */ package cn.orionsec.ops.constant; -import com.orion.lang.define.thread.ExecutorBuilder; -import com.orion.lang.utils.Systems; -import com.orion.lang.utils.Threads; +import cn.orionsec.kit.lang.define.thread.ExecutorBuilder; +import cn.orionsec.kit.lang.utils.Systems; +import cn.orionsec.kit.lang.utils.Threads; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.SynchronousQueue; @@ -37,48 +37,48 @@ private SchedulerPools() { * terminal 调度线程池 */ public static final ThreadPoolExecutor TERMINAL_SCHEDULER = ExecutorBuilder.create() - .setNamedThreadFactory("terminal-thread-") - .setCorePoolSize(1) - .setMaxPoolSize(Integer.MAX_VALUE) - .setKeepAliveTime(Const.MS_S_60) - .setWorkQueue(new SynchronousQueue<>()) - .setAllowCoreThreadTimeout(true) + .namedThreadFactory("terminal-thread-") + .corePoolSize(1) + .maxPoolSize(Integer.MAX_VALUE) + .keepAliveTime(Const.MS_S_60) + .workQueue(new SynchronousQueue<>()) + .allowCoreThreadTimeout(true) .build(); /** * terminal watcher 调度线程池 */ public static final ThreadPoolExecutor TERMINAL_WATCHER_SCHEDULER = ExecutorBuilder.create() - .setNamedThreadFactory("terminal-watcher-thread-") - .setCorePoolSize(0) - .setMaxPoolSize(Integer.MAX_VALUE) - .setKeepAliveTime(Const.MS_S_30) - .setWorkQueue(new SynchronousQueue<>()) - .setAllowCoreThreadTimeout(true) + .namedThreadFactory("terminal-watcher-thread-") + .corePoolSize(0) + .maxPoolSize(Integer.MAX_VALUE) + .keepAliveTime(Const.MS_S_30) + .workQueue(new SynchronousQueue<>()) + .allowCoreThreadTimeout(true) .build(); /** * 命令执行 调度线程池 */ public static final ThreadPoolExecutor EXEC_SCHEDULER = ExecutorBuilder.create() - .setNamedThreadFactory("exec-thread-") - .setCorePoolSize(1) - .setMaxPoolSize(Integer.MAX_VALUE) - .setKeepAliveTime(Const.MS_S_30) - .setWorkQueue(new SynchronousQueue<>()) - .setAllowCoreThreadTimeout(true) + .namedThreadFactory("exec-thread-") + .corePoolSize(1) + .maxPoolSize(Integer.MAX_VALUE) + .keepAliveTime(Const.MS_S_30) + .workQueue(new SynchronousQueue<>()) + .allowCoreThreadTimeout(true) .build(); /** * tail 调度线程池 */ public static final ThreadPoolExecutor TAIL_SCHEDULER = ExecutorBuilder.create() - .setNamedThreadFactory("tail-thread-") - .setCorePoolSize(1) - .setMaxPoolSize(Integer.MAX_VALUE) - .setKeepAliveTime(Const.MS_S_60) - .setWorkQueue(new SynchronousQueue<>()) - .setAllowCoreThreadTimeout(true) + .namedThreadFactory("tail-thread-") + .corePoolSize(1) + .maxPoolSize(Integer.MAX_VALUE) + .keepAliveTime(Const.MS_S_60) + .workQueue(new SynchronousQueue<>()) + .allowCoreThreadTimeout(true) .build(); @@ -86,12 +86,12 @@ private SchedulerPools() { * sftp 传输进度线程池 */ public static final ThreadPoolExecutor SFTP_TRANSFER_RATE_SCHEDULER = ExecutorBuilder.create() - .setNamedThreadFactory("sftp-transfer-rate-thread-") - .setCorePoolSize(1) - .setMaxPoolSize(Integer.MAX_VALUE) - .setKeepAliveTime(Const.MS_S_30) - .setWorkQueue(new SynchronousQueue<>()) - .setAllowCoreThreadTimeout(true) + .namedThreadFactory("sftp-transfer-rate-thread-") + .corePoolSize(1) + .maxPoolSize(Integer.MAX_VALUE) + .keepAliveTime(Const.MS_S_30) + .workQueue(new SynchronousQueue<>()) + .allowCoreThreadTimeout(true) .build(); @@ -99,144 +99,144 @@ private SchedulerPools() { * sftp 上传线程池 */ public static final ThreadPoolExecutor SFTP_UPLOAD_SCHEDULER = ExecutorBuilder.create() - .setNamedThreadFactory("sftp-upload-thread-") - .setCorePoolSize(6) - .setMaxPoolSize(6) - .setKeepAliveTime(Const.MS_S_60) - .setWorkQueue(new LinkedBlockingQueue<>()) - .setAllowCoreThreadTimeout(true) + .namedThreadFactory("sftp-upload-thread-") + .corePoolSize(6) + .maxPoolSize(6) + .keepAliveTime(Const.MS_S_60) + .workQueue(new LinkedBlockingQueue<>()) + .allowCoreThreadTimeout(true) .build(); /** * sftp 下载线程池 */ public static final ThreadPoolExecutor SFTP_DOWNLOAD_SCHEDULER = ExecutorBuilder.create() - .setNamedThreadFactory("sftp-download-thread-") - .setCorePoolSize(6) - .setMaxPoolSize(6) - .setKeepAliveTime(Const.MS_S_60) - .setWorkQueue(new LinkedBlockingQueue<>()) - .setAllowCoreThreadTimeout(true) + .namedThreadFactory("sftp-download-thread-") + .corePoolSize(6) + .maxPoolSize(6) + .keepAliveTime(Const.MS_S_60) + .workQueue(new LinkedBlockingQueue<>()) + .allowCoreThreadTimeout(true) .build(); /** * sftp 打包线程池 */ public static final ThreadPoolExecutor SFTP_PACKAGE_SCHEDULER = ExecutorBuilder.create() - .setNamedThreadFactory("sftp-package-thread-") - .setCorePoolSize(4) - .setMaxPoolSize(4) - .setKeepAliveTime(Const.MS_S_60) - .setWorkQueue(new LinkedBlockingQueue<>()) - .setAllowCoreThreadTimeout(true) + .namedThreadFactory("sftp-package-thread-") + .corePoolSize(4) + .maxPoolSize(4) + .keepAliveTime(Const.MS_S_60) + .workQueue(new LinkedBlockingQueue<>()) + .allowCoreThreadTimeout(true) .build(); /** * 应用构建线程池 */ public static final ThreadPoolExecutor APP_BUILD_SCHEDULER = ExecutorBuilder.create() - .setNamedThreadFactory("app-build-thread-") - .setCorePoolSize(1) - .setMaxPoolSize(Integer.MAX_VALUE) - .setKeepAliveTime(Const.MS_S_30) - .setWorkQueue(new SynchronousQueue<>()) - .setAllowCoreThreadTimeout(true) + .namedThreadFactory("app-build-thread-") + .corePoolSize(1) + .maxPoolSize(Integer.MAX_VALUE) + .keepAliveTime(Const.MS_S_30) + .workQueue(new SynchronousQueue<>()) + .allowCoreThreadTimeout(true) .build(); /** * 应用发布 主线程操作线程池 */ public static final ThreadPoolExecutor RELEASE_MAIN_SCHEDULER = ExecutorBuilder.create() - .setNamedThreadFactory("release-main-thread-") - .setCorePoolSize(1) - .setMaxPoolSize(Integer.MAX_VALUE) - .setKeepAliveTime(Const.MS_S_30) - .setWorkQueue(new SynchronousQueue<>()) - .setAllowCoreThreadTimeout(true) + .namedThreadFactory("release-main-thread-") + .corePoolSize(1) + .maxPoolSize(Integer.MAX_VALUE) + .keepAliveTime(Const.MS_S_30) + .workQueue(new SynchronousQueue<>()) + .allowCoreThreadTimeout(true) .build(); /** * 应用发布 机器操作线程池 */ public static final ThreadPoolExecutor RELEASE_MACHINE_SCHEDULER = ExecutorBuilder.create() - .setNamedThreadFactory("release-machine-thread-") - .setCorePoolSize(1) - .setMaxPoolSize(Integer.MAX_VALUE) - .setKeepAliveTime(Const.MS_S_30) - .setWorkQueue(new SynchronousQueue<>()) - .setAllowCoreThreadTimeout(true) + .namedThreadFactory("release-machine-thread-") + .corePoolSize(1) + .maxPoolSize(Integer.MAX_VALUE) + .keepAliveTime(Const.MS_S_30) + .workQueue(new SynchronousQueue<>()) + .allowCoreThreadTimeout(true) .build(); /** * 调度任务 主进程操作线程池 */ public static final ThreadPoolExecutor SCHEDULER_TASK_MAIN_SCHEDULER = ExecutorBuilder.create() - .setNamedThreadFactory("scheduler-task-main-thread-") - .setCorePoolSize(1) - .setMaxPoolSize(Integer.MAX_VALUE) - .setKeepAliveTime(Const.MS_S_30) - .setWorkQueue(new SynchronousQueue<>()) - .setAllowCoreThreadTimeout(true) + .namedThreadFactory("scheduler-task-main-thread-") + .corePoolSize(1) + .maxPoolSize(Integer.MAX_VALUE) + .keepAliveTime(Const.MS_S_30) + .workQueue(new SynchronousQueue<>()) + .allowCoreThreadTimeout(true) .build(); /** * 调度任务 机器操作线程池 */ public static final ThreadPoolExecutor SCHEDULER_TASK_MACHINE_SCHEDULER = ExecutorBuilder.create() - .setNamedThreadFactory("scheduler-task-machine-thread-") - .setCorePoolSize(1) - .setMaxPoolSize(Integer.MAX_VALUE) - .setKeepAliveTime(Const.MS_S_30) - .setWorkQueue(new SynchronousQueue<>()) - .setAllowCoreThreadTimeout(true) + .namedThreadFactory("scheduler-task-machine-thread-") + .corePoolSize(1) + .maxPoolSize(Integer.MAX_VALUE) + .keepAliveTime(Const.MS_S_30) + .workQueue(new SynchronousQueue<>()) + .allowCoreThreadTimeout(true) .build(); /** * 应用流水线 线程池 */ public static final ThreadPoolExecutor PIPELINE_SCHEDULER = ExecutorBuilder.create() - .setNamedThreadFactory("pipeline-thread-") - .setCorePoolSize(1) - .setMaxPoolSize(Integer.MAX_VALUE) - .setKeepAliveTime(Const.MS_S_30) - .setWorkQueue(new SynchronousQueue<>()) - .setAllowCoreThreadTimeout(true) + .namedThreadFactory("pipeline-thread-") + .corePoolSize(1) + .maxPoolSize(Integer.MAX_VALUE) + .keepAliveTime(Const.MS_S_30) + .workQueue(new SynchronousQueue<>()) + .allowCoreThreadTimeout(true) .build(); /** * 异步导入 线程池 */ public static final ThreadPoolExecutor ASYNC_IMPORT_SCHEDULER = ExecutorBuilder.create() - .setNamedThreadFactory("async-import-thread-") - .setCorePoolSize(1) - .setMaxPoolSize(4) - .setKeepAliveTime(Const.MS_S_30) - .setWorkQueue(new LinkedBlockingQueue<>()) - .setAllowCoreThreadTimeout(true) + .namedThreadFactory("async-import-thread-") + .corePoolSize(1) + .maxPoolSize(4) + .keepAliveTime(Const.MS_S_30) + .workQueue(new LinkedBlockingQueue<>()) + .allowCoreThreadTimeout(true) .build(); /** * 插件安装 线程池 */ public static final ThreadPoolExecutor AGENT_INSTALL_SCHEDULER = ExecutorBuilder.create() - .setNamedThreadFactory("agent-install-thread-") - .setCorePoolSize(4) - .setMaxPoolSize(4) - .setKeepAliveTime(Const.MS_S_30) - .setWorkQueue(new LinkedBlockingQueue<>()) - .setAllowCoreThreadTimeout(true) + .namedThreadFactory("agent-install-thread-") + .corePoolSize(4) + .maxPoolSize(4) + .keepAliveTime(Const.MS_S_30) + .workQueue(new LinkedBlockingQueue<>()) + .allowCoreThreadTimeout(true) .build(); /** * 机器报警 线程池 */ public static final ThreadPoolExecutor MACHINE_ALARM_SCHEDULER = ExecutorBuilder.create() - .setNamedThreadFactory("machine-alarm-thread-") - .setCorePoolSize(1) - .setMaxPoolSize(Integer.MAX_VALUE) - .setKeepAliveTime(Const.MS_S_30) - .setWorkQueue(new SynchronousQueue<>()) - .setAllowCoreThreadTimeout(true) + .namedThreadFactory("machine-alarm-thread-") + .corePoolSize(1) + .maxPoolSize(Integer.MAX_VALUE) + .keepAliveTime(Const.MS_S_30) + .workQueue(new SynchronousQueue<>()) + .allowCoreThreadTimeout(true) .build(); diff --git a/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/app/PipelineLogStatus.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/app/PipelineLogStatus.java index 32b7d9b4..6cd72ad8 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/app/PipelineLogStatus.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/app/PipelineLogStatus.java @@ -15,8 +15,8 @@ */ package cn.orionsec.ops.constant.app; +import cn.orionsec.kit.lang.utils.Strings; import cn.orionsec.ops.utils.Valid; -import com.orion.lang.utils.Strings; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/env/EnvViewType.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/env/EnvViewType.java index a10f39b1..c41ff95e 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/env/EnvViewType.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/env/EnvViewType.java @@ -15,8 +15,8 @@ */ package cn.orionsec.ops.constant.env; +import cn.orionsec.kit.lang.define.collect.MutableLinkedHashMap; import cn.orionsec.ops.utils.AttrConverts; -import com.orion.lang.define.collect.MutableLinkedHashMap; import lombok.AllArgsConstructor; import java.util.Map; diff --git a/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/system/SystemConfigKey.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/system/SystemConfigKey.java index 8e992c5f..6723c8ed 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/system/SystemConfigKey.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/system/SystemConfigKey.java @@ -15,13 +15,13 @@ */ package cn.orionsec.ops.constant.system; +import cn.orionsec.kit.lang.exception.argument.InvalidArgumentException; +import cn.orionsec.kit.lang.function.Conversion; +import cn.orionsec.kit.lang.utils.Exceptions; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.Valid; import cn.orionsec.ops.constant.MessageConst; import cn.orionsec.ops.constant.common.EnableType; -import com.orion.lang.exception.argument.InvalidArgumentException; -import com.orion.lang.function.Conversion; -import com.orion.lang.utils.Exceptions; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.Valid; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/tail/FileTailMode.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/tail/FileTailMode.java index f31e5bab..7267062d 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/tail/FileTailMode.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/tail/FileTailMode.java @@ -15,8 +15,8 @@ */ package cn.orionsec.ops.constant.tail; +import cn.orionsec.kit.lang.utils.Strings; import cn.orionsec.ops.constant.system.SystemEnvAttr; -import com.orion.lang.utils.Strings; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/ws/WsProtocol.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/ws/WsProtocol.java index 82918c23..2353af82 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/ws/WsProtocol.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/constant/ws/WsProtocol.java @@ -15,9 +15,9 @@ */ package cn.orionsec.ops.constant.ws; -import com.orion.lang.utils.Exceptions; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.Valid; +import cn.orionsec.kit.lang.utils.Exceptions; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.Valid; import lombok.AllArgsConstructor; import java.io.ByteArrayOutputStream; diff --git a/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/utils/AttrConverts.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/utils/AttrConverts.java index af6a0c7f..b2d2878e 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/utils/AttrConverts.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/utils/AttrConverts.java @@ -15,17 +15,17 @@ */ package cn.orionsec.ops.utils; +import cn.orionsec.kit.lang.define.collect.MutableArrayList; +import cn.orionsec.kit.lang.define.collect.MutableLinkedHashMap; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.collect.Lists; +import cn.orionsec.kit.lang.utils.collect.Maps; +import cn.orionsec.kit.lang.utils.ext.dom.*; import cn.orionsec.ops.constant.Const; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.parser.Feature; import com.alibaba.fastjson.serializer.SerializerFeature; -import com.orion.lang.define.collect.MutableArrayList; -import com.orion.lang.define.collect.MutableLinkedHashMap; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.collect.Lists; -import com.orion.lang.utils.collect.Maps; -import com.orion.lang.utils.ext.dom.*; import org.dom4j.io.OutputFormat; import org.yaml.snakeyaml.Yaml; diff --git a/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/utils/AvatarPicHolder.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/utils/AvatarPicHolder.java index e31d50ce..88ba8418 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/utils/AvatarPicHolder.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/utils/AvatarPicHolder.java @@ -15,12 +15,12 @@ */ package cn.orionsec.ops.utils; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.codec.Base64s; +import cn.orionsec.kit.lang.utils.io.FileReaders; +import cn.orionsec.kit.lang.utils.io.Files1; import cn.orionsec.ops.constant.Const; import cn.orionsec.ops.constant.system.SystemEnvAttr; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.codec.Base64s; -import com.orion.lang.utils.io.FileReaders; -import com.orion.lang.utils.io.Files1; import lombok.extern.slf4j.Slf4j; /** @@ -105,7 +105,7 @@ public static String getBase64(String url) { if (!Files1.isFile(path)) { return null; } - return Base64s.img64Encode(FileReaders.readAllBytes(path), Files1.getSuffix(path)); + return Base64s.imgEncode(FileReaders.readAllBytes(path), Files1.getSuffix(path)); } } diff --git a/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/utils/FileCleaner.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/utils/FileCleaner.java index d8926991..b0e6cae0 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/utils/FileCleaner.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/utils/FileCleaner.java @@ -15,11 +15,11 @@ */ package cn.orionsec.ops.utils; +import cn.orionsec.kit.lang.utils.io.Files1; +import cn.orionsec.kit.lang.utils.time.Dates; import cn.orionsec.ops.constant.Const; import cn.orionsec.ops.constant.system.SystemCleanType; import cn.orionsec.ops.constant.system.SystemEnvAttr; -import com.orion.lang.utils.io.Files1; -import com.orion.lang.utils.time.Dates; import lombok.extern.slf4j.Slf4j; import java.io.File; @@ -94,7 +94,7 @@ public static void cleanDir(SystemCleanType cleanType) { case REPO_FILE: // 应用仓库 File repoPath = new File(SystemEnvAttr.REPO_PATH.getValue()); - List repoPaths = Files1.listFilesFilter(repoPath, (f, n) -> f.isDirectory() && !Const.EVENT.equals(n), false, true); + List repoPaths = Files1.listFilesFilter(repoPath, f -> f.isDirectory() && !Const.EVENT.equals(f.getName()), false, true); for (File repo : repoPaths) { releasedBytes += deletePathFiles(thresholdTime, repo); } @@ -116,7 +116,7 @@ public static void cleanDir(SystemCleanType cleanType) { * @return size */ private static long deletePathFiles(long thresholdTime, File path) { - List files = Files1.listFilesFilter(path, (p, n) -> checkLessThanThreshold(thresholdTime, p, n), true, true); + List files = Files1.listFilesFilter(path, p -> checkLessThanThreshold(thresholdTime, p), true, true); long size = files.stream().mapToLong(File::length).sum(); files.stream().filter(File::isFile).forEach(Files1::delete); files.stream().filter(File::isDirectory).forEach(Files1::delete); @@ -129,10 +129,9 @@ private static long deletePathFiles(long thresholdTime, File path) { * * @param thresholdTime 阈值 * @param file 文件 - * @param s 文件名 * @return 是否超过 */ - private static boolean checkLessThanThreshold(long thresholdTime, File file, String s) { + private static boolean checkLessThanThreshold(long thresholdTime, File file) { return file.lastModified() <= thresholdTime; } diff --git a/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/utils/PathBuilders.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/utils/PathBuilders.java index d2810ec8..cbf81010 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/utils/PathBuilders.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/utils/PathBuilders.java @@ -15,11 +15,11 @@ */ package cn.orionsec.ops.utils; +import cn.orionsec.kit.lang.id.ObjectIds; +import cn.orionsec.kit.lang.utils.Systems; +import cn.orionsec.kit.lang.utils.io.Files1; +import cn.orionsec.kit.lang.utils.time.Dates; import cn.orionsec.ops.constant.Const; -import com.orion.lang.id.ObjectIds; -import com.orion.lang.utils.Systems; -import com.orion.lang.utils.io.Files1; -import com.orion.lang.utils.time.Dates; import java.util.List; diff --git a/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/utils/ResourceLoader.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/utils/ResourceLoader.java index b8b8d547..1def0ee6 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/utils/ResourceLoader.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/utils/ResourceLoader.java @@ -15,10 +15,10 @@ */ package cn.orionsec.ops.utils; -import com.orion.lang.utils.Exceptions; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.collect.Maps; -import com.orion.lang.utils.io.Streams; +import cn.orionsec.kit.lang.utils.Exceptions; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.collect.Maps; +import cn.orionsec.kit.lang.utils.io.Streams; import lombok.extern.slf4j.Slf4j; import java.io.IOException; diff --git a/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/utils/Utils.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/utils/Utils.java index 951bb5ce..4cb3d781 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/utils/Utils.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/utils/Utils.java @@ -15,17 +15,17 @@ */ package cn.orionsec.ops.utils; +import cn.orionsec.kit.ext.location.Region; +import cn.orionsec.kit.ext.location.region.LocationRegions; +import cn.orionsec.kit.lang.id.UUIds; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.io.Files1; +import cn.orionsec.kit.lang.utils.net.IPs; +import cn.orionsec.kit.lang.utils.time.Dates; import cn.orionsec.ops.constant.CnConst; import cn.orionsec.ops.constant.Const; import cn.orionsec.ops.constant.common.StainCode; import cn.orionsec.ops.constant.system.SystemEnvAttr; -import com.orion.ext.location.Region; -import com.orion.ext.location.region.LocationRegions; -import com.orion.lang.id.UUIds; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.io.Files1; -import com.orion.lang.utils.net.IPs; -import com.orion.lang.utils.time.Dates; import java.util.List; import java.util.stream.Collectors; diff --git a/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/utils/Valid.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/utils/Valid.java index b9bd6795..bbde43e1 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/utils/Valid.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/utils/Valid.java @@ -15,14 +15,14 @@ */ package cn.orionsec.ops.utils; +import cn.orionsec.kit.lang.define.wrapper.HttpWrapper; +import cn.orionsec.kit.lang.utils.Arrays1; +import cn.orionsec.kit.lang.utils.Exceptions; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.io.Files1; import cn.orionsec.ops.constant.Const; import cn.orionsec.ops.constant.MessageConst; import cn.orionsec.ops.constant.system.SystemEnvAttr; -import com.orion.lang.define.wrapper.HttpWrapper; -import com.orion.lang.utils.Arrays1; -import com.orion.lang.utils.Exceptions; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.io.Files1; import java.util.Collection; @@ -33,7 +33,7 @@ * @version 1.0.0 * @since 2021/4/3 21:45 */ -public class Valid extends com.orion.lang.utils.Valid { +public class Valid extends cn.orionsec.kit.lang.utils.Valid { public static T notNull(T object) { return notNull(object, MessageConst.ABSENT_PARAM); diff --git a/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/utils/ValueMix.java b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/utils/ValueMix.java index 2d2bdb58..cd867477 100644 --- a/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/utils/ValueMix.java +++ b/orion-ops-api/orion-ops-common/src/main/java/cn/orionsec/ops/utils/ValueMix.java @@ -15,15 +15,15 @@ */ package cn.orionsec.ops.utils; +import cn.orionsec.kit.lang.utils.Arrays1; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.codec.Base62s; +import cn.orionsec.kit.lang.utils.crypto.Signatures; +import cn.orionsec.kit.lang.utils.crypto.enums.PaddingMode; +import cn.orionsec.kit.lang.utils.crypto.enums.WorkingMode; +import cn.orionsec.kit.lang.utils.crypto.symmetric.EcbSymmetric; +import cn.orionsec.kit.lang.utils.crypto.symmetric.SymmetricBuilder; import cn.orionsec.ops.constant.PropertiesConst; -import com.orion.lang.utils.Arrays1; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.codec.Base62s; -import com.orion.lang.utils.crypto.Signatures; -import com.orion.lang.utils.crypto.enums.PaddingMode; -import com.orion.lang.utils.crypto.enums.WorkingMode; -import com.orion.lang.utils.crypto.symmetric.EcbSymmetric; -import com.orion.lang.utils.crypto.symmetric.SymmetricBuilder; import java.util.Arrays; import java.util.Optional; diff --git a/orion-ops-api/orion-ops-common/src/test/java/cn/orionsec/ops/constant/event/AddLicenseHeader.java b/orion-ops-api/orion-ops-common/src/test/java/cn/orionsec/ops/constant/event/AddLicenseHeader.java index f3307895..7263eb21 100644 --- a/orion-ops-api/orion-ops-common/src/test/java/cn/orionsec/ops/constant/event/AddLicenseHeader.java +++ b/orion-ops-api/orion-ops-common/src/test/java/cn/orionsec/ops/constant/event/AddLicenseHeader.java @@ -15,10 +15,10 @@ */ package cn.orionsec.ops.constant.event; -import com.orion.lang.define.StopWatch; -import com.orion.lang.utils.io.FileReaders; -import com.orion.lang.utils.io.FileWriters; -import com.orion.lang.utils.io.Files1; +import cn.orionsec.kit.lang.define.StopWatch; +import cn.orionsec.kit.lang.utils.io.FileReaders; +import cn.orionsec.kit.lang.utils.io.FileWriters; +import cn.orionsec.kit.lang.utils.io.Files1; import java.io.ByteArrayOutputStream; import java.io.File; @@ -54,7 +54,7 @@ public class AddLicenseHeader { public static void main(String[] args) { StopWatch sw = StopWatch.begin(); // 扫描文件 - List files = Files1.listFilesFilter(PATH, (file, name) -> file.isFile() + List files = Files1.listFilesFilter(PATH, file -> file.isFile() && file.getName().endsWith(".java") && !file.getAbsolutePath().contains("node_modules"), true, false); sw.tag("list"); diff --git a/orion-ops-api/orion-ops-common/src/test/java/cn/orionsec/ops/constant/event/EventClassifyTest.java b/orion-ops-api/orion-ops-common/src/test/java/cn/orionsec/ops/constant/event/EventClassifyTest.java index 830284eb..3c2f99b6 100644 --- a/orion-ops-api/orion-ops-common/src/test/java/cn/orionsec/ops/constant/event/EventClassifyTest.java +++ b/orion-ops-api/orion-ops-common/src/test/java/cn/orionsec/ops/constant/event/EventClassifyTest.java @@ -18,7 +18,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.annotation.JSONField; import com.alibaba.fastjson.serializer.SerializerFeature; -import com.orion.lang.utils.collect.Maps; +import cn.orionsec.kit.lang.utils.collect.Maps; import lombok.AllArgsConstructor; import lombok.Data; import org.junit.Test; diff --git a/orion-ops-api/orion-ops-common/src/test/java/cn/orionsec/ops/constant/event/EventTypeTest.java b/orion-ops-api/orion-ops-common/src/test/java/cn/orionsec/ops/constant/event/EventTypeTest.java index b4ff24f8..62bacfb8 100644 --- a/orion-ops-api/orion-ops-common/src/test/java/cn/orionsec/ops/constant/event/EventTypeTest.java +++ b/orion-ops-api/orion-ops-common/src/test/java/cn/orionsec/ops/constant/event/EventTypeTest.java @@ -18,7 +18,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.annotation.JSONField; import com.alibaba.fastjson.serializer.SerializerFeature; -import com.orion.lang.utils.collect.Maps; +import cn.orionsec.kit.lang.utils.collect.Maps; import lombok.AllArgsConstructor; import lombok.Data; import org.junit.Test; diff --git a/orion-ops-api/orion-ops-dao/pom.xml b/orion-ops-api/orion-ops-dao/pom.xml index e46e3f78..50cdd55e 100644 --- a/orion-ops-api/orion-ops-dao/pom.xml +++ b/orion-ops-api/orion-ops-dao/pom.xml @@ -25,6 +25,12 @@ springfox-swagger2 + + + org.aspectj + aspectjweaver + + com.baomidou @@ -54,7 +60,7 @@ - io.github.lijiahangmax + cn.orionsec.kit orion-all diff --git a/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/MachineTerminalDO.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/MachineTerminalDO.java index 50e8f1c2..30349b01 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/MachineTerminalDO.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/entity/domain/MachineTerminalDO.java @@ -48,7 +48,7 @@ public class MachineTerminalDO implements Serializable { private Long machineId; /** - * @see com.orion.net.remote.TerminalType#XTERM + * @see cn.orionsec.kit.net.host.ssh.TerminalType#XTERM */ @ApiModelProperty(value = "终端类型") @TableField("terminal_type") diff --git a/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/utils/CodeGenerator.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/utils/CodeGenerator.java index 7fa8bdf0..5f2b93b4 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/utils/CodeGenerator.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/utils/CodeGenerator.java @@ -15,6 +15,8 @@ */ package cn.orionsec.ops.utils; +import cn.orionsec.kit.lang.constant.Const; +import cn.orionsec.kit.lang.utils.ext.PropertiesExt; import com.baomidou.mybatisplus.annotation.DbType; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.generator.AutoGenerator; @@ -27,8 +29,6 @@ import com.baomidou.mybatisplus.generator.config.rules.DbColumnType; import com.baomidou.mybatisplus.generator.config.rules.IColumnType; import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy; -import com.orion.lang.constant.Const; -import com.orion.lang.utils.ext.PropertiesExt; import java.io.File; diff --git a/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/utils/DataQuery.java b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/utils/DataQuery.java index 1466f652..6302b84f 100644 --- a/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/utils/DataQuery.java +++ b/orion-ops-api/orion-ops-dao/src/main/java/cn/orionsec/ops/utils/DataQuery.java @@ -15,14 +15,14 @@ */ package cn.orionsec.ops.utils; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import cn.orionsec.kit.lang.define.wrapper.PageRequest; +import cn.orionsec.kit.lang.define.wrapper.Pager; +import cn.orionsec.kit.lang.utils.Valid; +import cn.orionsec.kit.lang.utils.collect.Lists; +import cn.orionsec.kit.lang.utils.convert.Converts; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.lang.define.wrapper.PageRequest; -import com.orion.lang.define.wrapper.Pager; -import com.orion.lang.utils.Valid; -import com.orion.lang.utils.collect.Lists; -import com.orion.lang.utils.convert.Converts; import java.util.List; import java.util.Optional; diff --git a/orion-ops-api/orion-ops-data/pom.xml b/orion-ops-api/orion-ops-data/pom.xml index bbf1e608..efc14c27 100644 --- a/orion-ops-api/orion-ops-data/pom.xml +++ b/orion-ops-api/orion-ops-data/pom.xml @@ -15,7 +15,7 @@ - io.github.lijiahangmax + cn.orionsec.kit orion-all diff --git a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/constant/ExportConst.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/constant/ExportConst.java index 7897d0f5..d2119023 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/constant/ExportConst.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/constant/ExportConst.java @@ -15,8 +15,8 @@ */ package cn.orionsec.ops.constant; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.time.Dates; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.time.Dates; /** * 导出常量 diff --git a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/exporter/ApplicationExportDTO.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/exporter/ApplicationExportDTO.java index ede0960f..5aae3aac 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/exporter/ApplicationExportDTO.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/exporter/ApplicationExportDTO.java @@ -15,11 +15,11 @@ */ package cn.orionsec.ops.entity.exporter; +import cn.orionsec.kit.lang.utils.convert.TypeStore; +import cn.orionsec.kit.office.excel.annotation.ExportField; +import cn.orionsec.kit.office.excel.annotation.ExportSheet; +import cn.orionsec.kit.office.excel.annotation.ExportTitle; import cn.orionsec.ops.entity.domain.ApplicationInfoDO; -import com.orion.lang.utils.convert.TypeStore; -import com.orion.office.excel.annotation.ExportField; -import com.orion.office.excel.annotation.ExportSheet; -import com.orion.office.excel.annotation.ExportTitle; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/exporter/ApplicationProfileExportDTO.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/exporter/ApplicationProfileExportDTO.java index d6d66c33..08d19a0d 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/exporter/ApplicationProfileExportDTO.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/exporter/ApplicationProfileExportDTO.java @@ -15,14 +15,14 @@ */ package cn.orionsec.ops.entity.exporter; +import cn.orionsec.kit.lang.utils.convert.TypeStore; +import cn.orionsec.kit.office.excel.annotation.ExportField; +import cn.orionsec.kit.office.excel.annotation.ExportSheet; +import cn.orionsec.kit.office.excel.annotation.ExportTitle; +import cn.orionsec.kit.office.excel.type.ExcelAlignType; import cn.orionsec.ops.constant.CnConst; import cn.orionsec.ops.constant.Const; import cn.orionsec.ops.entity.domain.ApplicationProfileDO; -import com.orion.lang.utils.convert.TypeStore; -import com.orion.office.excel.annotation.ExportField; -import com.orion.office.excel.annotation.ExportSheet; -import com.orion.office.excel.annotation.ExportTitle; -import com.orion.office.excel.type.ExcelAlignType; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/exporter/ApplicationRepositoryExportDTO.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/exporter/ApplicationRepositoryExportDTO.java index 1e8b0183..7a2176e7 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/exporter/ApplicationRepositoryExportDTO.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/exporter/ApplicationRepositoryExportDTO.java @@ -15,15 +15,15 @@ */ package cn.orionsec.ops.entity.exporter; +import cn.orionsec.kit.lang.utils.convert.TypeStore; +import cn.orionsec.kit.office.excel.annotation.ExportField; +import cn.orionsec.kit.office.excel.annotation.ExportSheet; +import cn.orionsec.kit.office.excel.annotation.ExportTitle; import cn.orionsec.ops.constant.CnConst; import cn.orionsec.ops.constant.Const; import cn.orionsec.ops.constant.app.RepositoryAuthType; import cn.orionsec.ops.constant.app.RepositoryTokenType; import cn.orionsec.ops.entity.domain.ApplicationRepositoryDO; -import com.orion.lang.utils.convert.TypeStore; -import com.orion.office.excel.annotation.ExportField; -import com.orion.office.excel.annotation.ExportSheet; -import com.orion.office.excel.annotation.ExportTitle; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/exporter/CommandTemplateExportDTO.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/exporter/CommandTemplateExportDTO.java index f76c53b5..ebbc093f 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/exporter/CommandTemplateExportDTO.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/exporter/CommandTemplateExportDTO.java @@ -15,11 +15,11 @@ */ package cn.orionsec.ops.entity.exporter; +import cn.orionsec.kit.lang.utils.convert.TypeStore; +import cn.orionsec.kit.office.excel.annotation.ExportField; +import cn.orionsec.kit.office.excel.annotation.ExportSheet; +import cn.orionsec.kit.office.excel.annotation.ExportTitle; import cn.orionsec.ops.entity.domain.CommandTemplateDO; -import com.orion.lang.utils.convert.TypeStore; -import com.orion.office.excel.annotation.ExportField; -import com.orion.office.excel.annotation.ExportSheet; -import com.orion.office.excel.annotation.ExportTitle; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/exporter/EventLogExportDTO.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/exporter/EventLogExportDTO.java index 4967915f..b14c223d 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/exporter/EventLogExportDTO.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/exporter/EventLogExportDTO.java @@ -15,16 +15,16 @@ */ package cn.orionsec.ops.entity.exporter; +import cn.orionsec.kit.lang.utils.convert.TypeStore; +import cn.orionsec.kit.lang.utils.time.Dates; +import cn.orionsec.kit.office.excel.annotation.ExportField; +import cn.orionsec.kit.office.excel.annotation.ExportSheet; +import cn.orionsec.kit.office.excel.annotation.ExportTitle; +import cn.orionsec.kit.office.excel.type.ExcelFieldType; import cn.orionsec.ops.constant.event.EventClassify; import cn.orionsec.ops.constant.event.EventType; import cn.orionsec.ops.entity.domain.UserEventLogDO; import cn.orionsec.ops.utils.Utils; -import com.orion.lang.utils.convert.TypeStore; -import com.orion.lang.utils.time.Dates; -import com.orion.office.excel.annotation.ExportField; -import com.orion.office.excel.annotation.ExportSheet; -import com.orion.office.excel.annotation.ExportTitle; -import com.orion.office.excel.type.ExcelFieldType; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/exporter/MachineAlarmHistoryExportDTO.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/exporter/MachineAlarmHistoryExportDTO.java index 35ac4da3..0ec225cb 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/exporter/MachineAlarmHistoryExportDTO.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/exporter/MachineAlarmHistoryExportDTO.java @@ -15,14 +15,14 @@ */ package cn.orionsec.ops.entity.exporter; +import cn.orionsec.kit.lang.utils.convert.TypeStore; +import cn.orionsec.kit.lang.utils.time.Dates; +import cn.orionsec.kit.office.excel.annotation.ExportField; +import cn.orionsec.kit.office.excel.annotation.ExportFont; +import cn.orionsec.kit.office.excel.annotation.ExportSheet; +import cn.orionsec.kit.office.excel.annotation.ExportTitle; import cn.orionsec.ops.constant.machine.MachineAlarmType; import cn.orionsec.ops.entity.domain.MachineAlarmHistoryDO; -import com.orion.lang.utils.convert.TypeStore; -import com.orion.lang.utils.time.Dates; -import com.orion.office.excel.annotation.ExportField; -import com.orion.office.excel.annotation.ExportFont; -import com.orion.office.excel.annotation.ExportSheet; -import com.orion.office.excel.annotation.ExportTitle; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/exporter/MachineInfoExportDTO.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/exporter/MachineInfoExportDTO.java index 0442507d..8d9c4404 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/exporter/MachineInfoExportDTO.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/exporter/MachineInfoExportDTO.java @@ -15,13 +15,13 @@ */ package cn.orionsec.ops.entity.exporter; +import cn.orionsec.kit.lang.utils.convert.TypeStore; +import cn.orionsec.kit.office.excel.annotation.ExportField; +import cn.orionsec.kit.office.excel.annotation.ExportSheet; +import cn.orionsec.kit.office.excel.annotation.ExportTitle; import cn.orionsec.ops.constant.CnConst; import cn.orionsec.ops.constant.machine.MachineAuthType; import cn.orionsec.ops.entity.domain.MachineInfoDO; -import com.orion.lang.utils.convert.TypeStore; -import com.orion.office.excel.annotation.ExportField; -import com.orion.office.excel.annotation.ExportSheet; -import com.orion.office.excel.annotation.ExportTitle; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/exporter/MachineProxyExportDTO.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/exporter/MachineProxyExportDTO.java index e2563de6..24f947c6 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/exporter/MachineProxyExportDTO.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/exporter/MachineProxyExportDTO.java @@ -15,13 +15,13 @@ */ package cn.orionsec.ops.entity.exporter; +import cn.orionsec.kit.lang.utils.convert.TypeStore; +import cn.orionsec.kit.office.excel.annotation.ExportField; +import cn.orionsec.kit.office.excel.annotation.ExportSheet; +import cn.orionsec.kit.office.excel.annotation.ExportTitle; import cn.orionsec.ops.constant.Const; import cn.orionsec.ops.constant.machine.ProxyType; import cn.orionsec.ops.entity.domain.MachineProxyDO; -import com.orion.lang.utils.convert.TypeStore; -import com.orion.office.excel.annotation.ExportField; -import com.orion.office.excel.annotation.ExportSheet; -import com.orion.office.excel.annotation.ExportTitle; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/exporter/MachineTailFileExportDTO.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/exporter/MachineTailFileExportDTO.java index cbbefcce..679238a2 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/exporter/MachineTailFileExportDTO.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/exporter/MachineTailFileExportDTO.java @@ -15,11 +15,11 @@ */ package cn.orionsec.ops.entity.exporter; +import cn.orionsec.kit.lang.utils.convert.TypeStore; +import cn.orionsec.kit.office.excel.annotation.ExportField; +import cn.orionsec.kit.office.excel.annotation.ExportSheet; +import cn.orionsec.kit.office.excel.annotation.ExportTitle; import cn.orionsec.ops.entity.domain.FileTailListDO; -import com.orion.lang.utils.convert.TypeStore; -import com.orion.office.excel.annotation.ExportField; -import com.orion.office.excel.annotation.ExportSheet; -import com.orion.office.excel.annotation.ExportTitle; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/exporter/MachineTerminalLogExportDTO.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/exporter/MachineTerminalLogExportDTO.java index 2bcd1f4d..d0b7c74d 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/exporter/MachineTerminalLogExportDTO.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/exporter/MachineTerminalLogExportDTO.java @@ -15,13 +15,13 @@ */ package cn.orionsec.ops.entity.exporter; +import cn.orionsec.kit.lang.utils.convert.TypeStore; +import cn.orionsec.kit.lang.utils.time.Dates; +import cn.orionsec.kit.office.excel.annotation.ExportField; +import cn.orionsec.kit.office.excel.annotation.ExportSheet; +import cn.orionsec.kit.office.excel.annotation.ExportTitle; +import cn.orionsec.kit.office.excel.type.ExcelFieldType; import cn.orionsec.ops.entity.domain.MachineTerminalLogDO; -import com.orion.lang.utils.convert.TypeStore; -import com.orion.lang.utils.time.Dates; -import com.orion.office.excel.annotation.ExportField; -import com.orion.office.excel.annotation.ExportSheet; -import com.orion.office.excel.annotation.ExportTitle; -import com.orion.office.excel.type.ExcelFieldType; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/exporter/WebhookExportDTO.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/exporter/WebhookExportDTO.java index f8b02779..049c0a80 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/exporter/WebhookExportDTO.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/exporter/WebhookExportDTO.java @@ -15,12 +15,12 @@ */ package cn.orionsec.ops.entity.exporter; +import cn.orionsec.kit.lang.utils.convert.TypeStore; +import cn.orionsec.kit.office.excel.annotation.ExportField; +import cn.orionsec.kit.office.excel.annotation.ExportSheet; +import cn.orionsec.kit.office.excel.annotation.ExportTitle; import cn.orionsec.ops.constant.webhook.WebhookType; import cn.orionsec.ops.entity.domain.WebhookConfigDO; -import com.orion.lang.utils.convert.TypeStore; -import com.orion.office.excel.annotation.ExportField; -import com.orion.office.excel.annotation.ExportSheet; -import com.orion.office.excel.annotation.ExportTitle; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/importer/ApplicationImportDTO.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/importer/ApplicationImportDTO.java index 5e3a177e..f94cfd86 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/importer/ApplicationImportDTO.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/importer/ApplicationImportDTO.java @@ -15,10 +15,10 @@ */ package cn.orionsec.ops.entity.importer; +import cn.orionsec.kit.lang.utils.convert.TypeStore; +import cn.orionsec.kit.office.excel.annotation.ImportField; import cn.orionsec.ops.entity.domain.ApplicationInfoDO; import cn.orionsec.ops.entity.vo.data.DataImportCheckRowVO; -import com.orion.lang.utils.convert.TypeStore; -import com.orion.office.excel.annotation.ImportField; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/importer/ApplicationProfileImportDTO.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/importer/ApplicationProfileImportDTO.java index bed48dfc..adb9437f 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/importer/ApplicationProfileImportDTO.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/importer/ApplicationProfileImportDTO.java @@ -15,12 +15,12 @@ */ package cn.orionsec.ops.entity.importer; +import cn.orionsec.kit.lang.utils.convert.TypeStore; +import cn.orionsec.kit.office.excel.annotation.ImportField; import cn.orionsec.ops.constant.CnConst; import cn.orionsec.ops.constant.Const; import cn.orionsec.ops.entity.domain.ApplicationProfileDO; import cn.orionsec.ops.entity.vo.data.DataImportCheckRowVO; -import com.orion.lang.utils.convert.TypeStore; -import com.orion.office.excel.annotation.ImportField; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/importer/ApplicationRepositoryImportDTO.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/importer/ApplicationRepositoryImportDTO.java index e138baec..3666bd4d 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/importer/ApplicationRepositoryImportDTO.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/importer/ApplicationRepositoryImportDTO.java @@ -15,15 +15,15 @@ */ package cn.orionsec.ops.entity.importer; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.convert.TypeStore; +import cn.orionsec.kit.office.excel.annotation.ImportField; import cn.orionsec.ops.constant.app.RepositoryAuthType; import cn.orionsec.ops.constant.app.RepositoryTokenType; import cn.orionsec.ops.constant.app.RepositoryType; import cn.orionsec.ops.entity.domain.ApplicationRepositoryDO; import cn.orionsec.ops.entity.vo.data.DataImportCheckRowVO; import cn.orionsec.ops.utils.ValueMix; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.convert.TypeStore; -import com.orion.office.excel.annotation.ImportField; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/importer/CommandTemplateImportDTO.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/importer/CommandTemplateImportDTO.java index 185f92d1..be2bccf4 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/importer/CommandTemplateImportDTO.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/importer/CommandTemplateImportDTO.java @@ -15,10 +15,10 @@ */ package cn.orionsec.ops.entity.importer; +import cn.orionsec.kit.lang.utils.convert.TypeStore; +import cn.orionsec.kit.office.excel.annotation.ImportField; import cn.orionsec.ops.entity.domain.CommandTemplateDO; import cn.orionsec.ops.entity.vo.data.DataImportCheckRowVO; -import com.orion.lang.utils.convert.TypeStore; -import com.orion.office.excel.annotation.ImportField; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/importer/MachineInfoImportDTO.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/importer/MachineInfoImportDTO.java index b2888ed0..f640fa7a 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/importer/MachineInfoImportDTO.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/importer/MachineInfoImportDTO.java @@ -15,13 +15,13 @@ */ package cn.orionsec.ops.entity.importer; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.convert.TypeStore; +import cn.orionsec.kit.office.excel.annotation.ImportField; import cn.orionsec.ops.constant.machine.MachineAuthType; import cn.orionsec.ops.entity.domain.MachineInfoDO; import cn.orionsec.ops.entity.vo.data.DataImportCheckRowVO; import cn.orionsec.ops.utils.ValueMix; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.convert.TypeStore; -import com.orion.office.excel.annotation.ImportField; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/importer/MachineProxyImportDTO.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/importer/MachineProxyImportDTO.java index d83c35a8..0f827abd 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/importer/MachineProxyImportDTO.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/importer/MachineProxyImportDTO.java @@ -15,13 +15,13 @@ */ package cn.orionsec.ops.entity.importer; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.convert.TypeStore; +import cn.orionsec.kit.office.excel.annotation.ImportField; import cn.orionsec.ops.constant.machine.ProxyType; import cn.orionsec.ops.entity.domain.MachineProxyDO; import cn.orionsec.ops.entity.vo.data.DataImportCheckRowVO; import cn.orionsec.ops.utils.ValueMix; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.convert.TypeStore; -import com.orion.office.excel.annotation.ImportField; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/importer/MachineTailFileImportDTO.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/importer/MachineTailFileImportDTO.java index 403e882d..6453db8d 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/importer/MachineTailFileImportDTO.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/importer/MachineTailFileImportDTO.java @@ -15,12 +15,12 @@ */ package cn.orionsec.ops.entity.importer; +import cn.orionsec.kit.lang.utils.convert.TypeStore; +import cn.orionsec.kit.office.excel.annotation.ImportField; import cn.orionsec.ops.constant.Const; import cn.orionsec.ops.constant.tail.FileTailMode; import cn.orionsec.ops.entity.domain.FileTailListDO; import cn.orionsec.ops.entity.vo.data.DataImportCheckRowVO; -import com.orion.lang.utils.convert.TypeStore; -import com.orion.office.excel.annotation.ImportField; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/importer/WebhookImportDTO.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/importer/WebhookImportDTO.java index f0f3437f..861e910d 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/importer/WebhookImportDTO.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/entity/importer/WebhookImportDTO.java @@ -15,11 +15,11 @@ */ package cn.orionsec.ops.entity.importer; +import cn.orionsec.kit.lang.utils.convert.TypeStore; +import cn.orionsec.kit.office.excel.annotation.ImportField; import cn.orionsec.ops.constant.webhook.WebhookType; import cn.orionsec.ops.entity.domain.WebhookConfigDO; import cn.orionsec.ops.entity.vo.data.DataImportCheckRowVO; -import com.orion.lang.utils.convert.TypeStore; -import com.orion.office.excel.annotation.ImportField; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/AbstractDataExporter.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/AbstractDataExporter.java index 63f0a5eb..f4ec92e4 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/AbstractDataExporter.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/AbstractDataExporter.java @@ -15,6 +15,11 @@ */ package cn.orionsec.ops.handler.exporter; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.io.FileWriters; +import cn.orionsec.kit.lang.utils.io.Files1; +import cn.orionsec.kit.office.excel.writer.exporting.ExcelExport; +import cn.orionsec.kit.web.servlet.web.Servlets; import cn.orionsec.ops.constant.ExportType; import cn.orionsec.ops.constant.event.EventKeys; import cn.orionsec.ops.constant.system.SystemEnvAttr; @@ -22,11 +27,6 @@ import cn.orionsec.ops.utils.Currents; import cn.orionsec.ops.utils.EventParamsHolder; import cn.orionsec.ops.utils.PathBuilders; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.io.FileWriters; -import com.orion.lang.utils.io.Files1; -import com.orion.office.excel.writer.exporting.ExcelExport; -import com.orion.web.servlet.web.Servlets; import javax.servlet.http.HttpServletResponse; import java.io.ByteArrayOutputStream; @@ -93,7 +93,7 @@ public void doExport() throws IOException { */ protected void writeWorkbook() throws IOException { // 设置 http 响应头 - Servlets.setDownloadHeader(response, exportType.getNameSupplier().get()); + Servlets.setAttachmentHeader(response, exportType.getNameSupplier().get()); // 写入 workbook 到 byte ByteArrayOutputStream store = new ByteArrayOutputStream(); String password = request.getProtectPassword(); diff --git a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/AppProfileDataExporter.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/AppProfileDataExporter.java index c4866471..111baa5a 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/AppProfileDataExporter.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/AppProfileDataExporter.java @@ -15,13 +15,13 @@ */ package cn.orionsec.ops.handler.exporter; +import cn.orionsec.kit.lang.utils.convert.Converts; +import cn.orionsec.kit.spring.SpringHolder; import cn.orionsec.ops.constant.ExportType; import cn.orionsec.ops.dao.ApplicationProfileDAO; import cn.orionsec.ops.entity.domain.ApplicationProfileDO; import cn.orionsec.ops.entity.exporter.ApplicationProfileExportDTO; import cn.orionsec.ops.entity.request.data.DataExportRequest; -import com.orion.lang.utils.convert.Converts; -import com.orion.spring.SpringHolder; import javax.servlet.http.HttpServletResponse; import java.util.List; diff --git a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/AppRepositoryDataExporter.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/AppRepositoryDataExporter.java index 1e539b6e..8cab5c2f 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/AppRepositoryDataExporter.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/AppRepositoryDataExporter.java @@ -15,14 +15,14 @@ */ package cn.orionsec.ops.handler.exporter; +import cn.orionsec.kit.lang.utils.convert.Converts; +import cn.orionsec.kit.spring.SpringHolder; import cn.orionsec.ops.constant.Const; import cn.orionsec.ops.constant.ExportType; import cn.orionsec.ops.dao.ApplicationRepositoryDAO; import cn.orionsec.ops.entity.domain.ApplicationRepositoryDO; import cn.orionsec.ops.entity.exporter.ApplicationRepositoryExportDTO; import cn.orionsec.ops.entity.request.data.DataExportRequest; -import com.orion.lang.utils.convert.Converts; -import com.orion.spring.SpringHolder; import javax.servlet.http.HttpServletResponse; import java.util.List; diff --git a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/ApplicationDataExporter.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/ApplicationDataExporter.java index feca7cc7..db869cc7 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/ApplicationDataExporter.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/ApplicationDataExporter.java @@ -15,6 +15,8 @@ */ package cn.orionsec.ops.handler.exporter; +import cn.orionsec.kit.lang.utils.convert.Converts; +import cn.orionsec.kit.spring.SpringHolder; import cn.orionsec.ops.constant.ExportType; import cn.orionsec.ops.dao.ApplicationInfoDAO; import cn.orionsec.ops.dao.ApplicationRepositoryDAO; @@ -22,8 +24,6 @@ import cn.orionsec.ops.entity.domain.ApplicationRepositoryDO; import cn.orionsec.ops.entity.exporter.ApplicationExportDTO; import cn.orionsec.ops.entity.request.data.DataExportRequest; -import com.orion.lang.utils.convert.Converts; -import com.orion.spring.SpringHolder; import javax.servlet.http.HttpServletResponse; import java.util.List; diff --git a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/CommandTemplateDataExporter.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/CommandTemplateDataExporter.java index 004d6bc7..0f710599 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/CommandTemplateDataExporter.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/CommandTemplateDataExporter.java @@ -15,13 +15,13 @@ */ package cn.orionsec.ops.handler.exporter; +import cn.orionsec.kit.lang.utils.convert.Converts; +import cn.orionsec.kit.spring.SpringHolder; import cn.orionsec.ops.constant.ExportType; import cn.orionsec.ops.dao.CommandTemplateDAO; import cn.orionsec.ops.entity.domain.CommandTemplateDO; import cn.orionsec.ops.entity.exporter.CommandTemplateExportDTO; import cn.orionsec.ops.entity.request.data.DataExportRequest; -import com.orion.lang.utils.convert.Converts; -import com.orion.spring.SpringHolder; import javax.servlet.http.HttpServletResponse; import java.util.List; diff --git a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/IDataExporter.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/IDataExporter.java index 9d66c2f1..efec396f 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/IDataExporter.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/IDataExporter.java @@ -15,10 +15,10 @@ */ package cn.orionsec.ops.handler.exporter; +import cn.orionsec.kit.lang.utils.Exceptions; import cn.orionsec.ops.constant.ExportType; import cn.orionsec.ops.constant.MessageConst; import cn.orionsec.ops.entity.request.data.DataExportRequest; -import com.orion.lang.utils.Exceptions; import javax.servlet.http.HttpServletResponse; import java.io.IOException; diff --git a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/MachineAlarmHistoryDataExporter.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/MachineAlarmHistoryDataExporter.java index cbf50138..b5876e88 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/MachineAlarmHistoryDataExporter.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/MachineAlarmHistoryDataExporter.java @@ -15,6 +15,8 @@ */ package cn.orionsec.ops.handler.exporter; +import cn.orionsec.kit.lang.utils.convert.Converts; +import cn.orionsec.kit.spring.SpringHolder; import cn.orionsec.ops.constant.ExportType; import cn.orionsec.ops.constant.event.EventKeys; import cn.orionsec.ops.dao.MachineAlarmHistoryDAO; @@ -25,8 +27,6 @@ import cn.orionsec.ops.entity.request.data.DataExportRequest; import cn.orionsec.ops.utils.EventParamsHolder; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.lang.utils.convert.Converts; -import com.orion.spring.SpringHolder; import javax.servlet.http.HttpServletResponse; import java.util.List; diff --git a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/MachineInfoDataExporter.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/MachineInfoDataExporter.java index a93c81f3..d51e7b98 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/MachineInfoDataExporter.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/MachineInfoDataExporter.java @@ -15,6 +15,8 @@ */ package cn.orionsec.ops.handler.exporter; +import cn.orionsec.kit.lang.utils.convert.Converts; +import cn.orionsec.kit.spring.SpringHolder; import cn.orionsec.ops.constant.Const; import cn.orionsec.ops.constant.ExportType; import cn.orionsec.ops.dao.MachineInfoDAO; @@ -23,8 +25,6 @@ import cn.orionsec.ops.entity.domain.MachineSecretKeyDO; import cn.orionsec.ops.entity.exporter.MachineInfoExportDTO; import cn.orionsec.ops.entity.request.data.DataExportRequest; -import com.orion.lang.utils.convert.Converts; -import com.orion.spring.SpringHolder; import javax.servlet.http.HttpServletResponse; import java.util.List; diff --git a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/MachineProxyDataExporter.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/MachineProxyDataExporter.java index 81ea7697..ca8e502c 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/MachineProxyDataExporter.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/MachineProxyDataExporter.java @@ -15,14 +15,14 @@ */ package cn.orionsec.ops.handler.exporter; +import cn.orionsec.kit.lang.utils.convert.Converts; +import cn.orionsec.kit.spring.SpringHolder; import cn.orionsec.ops.constant.Const; import cn.orionsec.ops.constant.ExportType; import cn.orionsec.ops.dao.MachineProxyDAO; import cn.orionsec.ops.entity.domain.MachineProxyDO; import cn.orionsec.ops.entity.exporter.MachineProxyExportDTO; import cn.orionsec.ops.entity.request.data.DataExportRequest; -import com.orion.lang.utils.convert.Converts; -import com.orion.spring.SpringHolder; import javax.servlet.http.HttpServletResponse; import java.util.List; diff --git a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/TailFileDataExporter.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/TailFileDataExporter.java index af16b3e8..80de187d 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/TailFileDataExporter.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/TailFileDataExporter.java @@ -15,6 +15,8 @@ */ package cn.orionsec.ops.handler.exporter; +import cn.orionsec.kit.lang.utils.convert.Converts; +import cn.orionsec.kit.spring.SpringHolder; import cn.orionsec.ops.constant.ExportType; import cn.orionsec.ops.constant.event.EventKeys; import cn.orionsec.ops.dao.FileTailListDAO; @@ -25,8 +27,6 @@ import cn.orionsec.ops.entity.request.data.DataExportRequest; import cn.orionsec.ops.utils.EventParamsHolder; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.lang.utils.convert.Converts; -import com.orion.spring.SpringHolder; import javax.servlet.http.HttpServletResponse; import java.util.List; diff --git a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/TerminalLogDataExporter.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/TerminalLogDataExporter.java index b109d1b1..9d0d1b96 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/TerminalLogDataExporter.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/TerminalLogDataExporter.java @@ -15,6 +15,8 @@ */ package cn.orionsec.ops.handler.exporter; +import cn.orionsec.kit.lang.utils.convert.Converts; +import cn.orionsec.kit.spring.SpringHolder; import cn.orionsec.ops.constant.ExportType; import cn.orionsec.ops.constant.event.EventKeys; import cn.orionsec.ops.dao.MachineTerminalLogDAO; @@ -23,8 +25,6 @@ import cn.orionsec.ops.entity.request.data.DataExportRequest; import cn.orionsec.ops.utils.EventParamsHolder; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.lang.utils.convert.Converts; -import com.orion.spring.SpringHolder; import javax.servlet.http.HttpServletResponse; import java.util.List; diff --git a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/UserEventLogDataExporter.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/UserEventLogDataExporter.java index df4f2d20..4b168b5b 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/UserEventLogDataExporter.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/UserEventLogDataExporter.java @@ -15,6 +15,8 @@ */ package cn.orionsec.ops.handler.exporter; +import cn.orionsec.kit.lang.utils.convert.Converts; +import cn.orionsec.kit.spring.SpringHolder; import cn.orionsec.ops.constant.Const; import cn.orionsec.ops.constant.ExportType; import cn.orionsec.ops.constant.event.EventKeys; @@ -25,8 +27,6 @@ import cn.orionsec.ops.utils.Currents; import cn.orionsec.ops.utils.EventParamsHolder; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.lang.utils.convert.Converts; -import com.orion.spring.SpringHolder; import javax.servlet.http.HttpServletResponse; import java.util.List; diff --git a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/WebhookDataExporter.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/WebhookDataExporter.java index 6f0cba8d..5bbabff3 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/WebhookDataExporter.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/exporter/WebhookDataExporter.java @@ -15,6 +15,8 @@ */ package cn.orionsec.ops.handler.exporter; +import cn.orionsec.kit.lang.utils.convert.Converts; +import cn.orionsec.kit.spring.SpringHolder; import cn.orionsec.ops.constant.ExportType; import cn.orionsec.ops.constant.event.EventKeys; import cn.orionsec.ops.dao.WebhookConfigDAO; @@ -23,8 +25,6 @@ import cn.orionsec.ops.entity.request.data.DataExportRequest; import cn.orionsec.ops.utils.EventParamsHolder; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.lang.utils.convert.Converts; -import com.orion.spring.SpringHolder; import javax.servlet.http.HttpServletResponse; import java.util.List; diff --git a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/checker/AbstractDataChecker.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/checker/AbstractDataChecker.java index 5c770f27..f5fa8830 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/checker/AbstractDataChecker.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/checker/AbstractDataChecker.java @@ -15,6 +15,15 @@ */ package cn.orionsec.ops.handler.importer.checker; +import cn.orionsec.kit.lang.id.UUIds; +import cn.orionsec.kit.lang.utils.Exceptions; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.collect.Lists; +import cn.orionsec.kit.lang.utils.collect.Maps; +import cn.orionsec.kit.lang.utils.convert.Converts; +import cn.orionsec.kit.office.excel.Excels; +import cn.orionsec.kit.office.excel.reader.ExcelBeanReader; +import cn.orionsec.kit.spring.SpringHolder; import cn.orionsec.ops.constant.ImportType; import cn.orionsec.ops.constant.KeyConst; import cn.orionsec.ops.entity.importer.BaseDataImportDTO; @@ -26,15 +35,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.support.SFunction; -import com.orion.lang.id.UUIds; -import com.orion.lang.utils.Exceptions; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.collect.Lists; -import com.orion.lang.utils.collect.Maps; -import com.orion.lang.utils.convert.Converts; -import com.orion.office.excel.Excels; -import com.orion.office.excel.reader.ExcelBeanReader; -import com.orion.spring.SpringHolder; import org.apache.poi.ss.usermodel.Workbook; import org.springframework.data.redis.core.RedisTemplate; diff --git a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/checker/AppProfileDataChecker.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/checker/AppProfileDataChecker.java index 2a0acf6c..c14a8beb 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/checker/AppProfileDataChecker.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/checker/AppProfileDataChecker.java @@ -15,12 +15,12 @@ */ package cn.orionsec.ops.handler.importer.checker; +import cn.orionsec.kit.spring.SpringHolder; import cn.orionsec.ops.constant.ImportType; import cn.orionsec.ops.dao.ApplicationProfileDAO; import cn.orionsec.ops.entity.domain.ApplicationProfileDO; import cn.orionsec.ops.entity.importer.ApplicationProfileImportDTO; import cn.orionsec.ops.entity.vo.data.DataImportCheckVO; -import com.orion.spring.SpringHolder; import org.apache.poi.ss.usermodel.Workbook; import java.util.List; diff --git a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/checker/AppRepositoryDataChecker.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/checker/AppRepositoryDataChecker.java index 837d1a07..d8757aca 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/checker/AppRepositoryDataChecker.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/checker/AppRepositoryDataChecker.java @@ -15,12 +15,12 @@ */ package cn.orionsec.ops.handler.importer.checker; +import cn.orionsec.kit.spring.SpringHolder; import cn.orionsec.ops.constant.ImportType; import cn.orionsec.ops.dao.ApplicationRepositoryDAO; import cn.orionsec.ops.entity.domain.ApplicationRepositoryDO; import cn.orionsec.ops.entity.importer.ApplicationRepositoryImportDTO; import cn.orionsec.ops.entity.vo.data.DataImportCheckVO; -import com.orion.spring.SpringHolder; import org.apache.poi.ss.usermodel.Workbook; import java.util.List; diff --git a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/checker/ApplicationDataChecker.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/checker/ApplicationDataChecker.java index 1c19baf4..ff37709d 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/checker/ApplicationDataChecker.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/checker/ApplicationDataChecker.java @@ -15,6 +15,7 @@ */ package cn.orionsec.ops.handler.importer.checker; +import cn.orionsec.kit.spring.SpringHolder; import cn.orionsec.ops.constant.ImportType; import cn.orionsec.ops.constant.MessageConst; import cn.orionsec.ops.dao.ApplicationInfoDAO; @@ -23,7 +24,6 @@ import cn.orionsec.ops.entity.domain.ApplicationRepositoryDO; import cn.orionsec.ops.entity.importer.ApplicationImportDTO; import cn.orionsec.ops.entity.vo.data.DataImportCheckVO; -import com.orion.spring.SpringHolder; import org.apache.poi.ss.usermodel.Workbook; import java.util.List; diff --git a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/checker/CommandTemplateDataChecker.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/checker/CommandTemplateDataChecker.java index 007d9756..e05d6c55 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/checker/CommandTemplateDataChecker.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/checker/CommandTemplateDataChecker.java @@ -15,12 +15,12 @@ */ package cn.orionsec.ops.handler.importer.checker; +import cn.orionsec.kit.spring.SpringHolder; import cn.orionsec.ops.constant.ImportType; import cn.orionsec.ops.dao.CommandTemplateDAO; import cn.orionsec.ops.entity.domain.CommandTemplateDO; import cn.orionsec.ops.entity.importer.CommandTemplateImportDTO; import cn.orionsec.ops.entity.vo.data.DataImportCheckVO; -import com.orion.spring.SpringHolder; import org.apache.poi.ss.usermodel.Workbook; import java.util.List; diff --git a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/checker/IDataChecker.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/checker/IDataChecker.java index 4796fb79..a9563e59 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/checker/IDataChecker.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/checker/IDataChecker.java @@ -15,9 +15,9 @@ */ package cn.orionsec.ops.handler.importer.checker; +import cn.orionsec.kit.lang.utils.Exceptions; import cn.orionsec.ops.constant.ImportType; import cn.orionsec.ops.entity.vo.data.DataImportCheckVO; -import com.orion.lang.utils.Exceptions; import org.apache.poi.ss.usermodel.Workbook; /** diff --git a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/checker/MachineInfoDataChecker.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/checker/MachineInfoDataChecker.java index ebee14a0..e00ce5cc 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/checker/MachineInfoDataChecker.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/checker/MachineInfoDataChecker.java @@ -15,6 +15,7 @@ */ package cn.orionsec.ops.handler.importer.checker; +import cn.orionsec.kit.spring.SpringHolder; import cn.orionsec.ops.constant.ImportType; import cn.orionsec.ops.constant.MessageConst; import cn.orionsec.ops.dao.MachineInfoDAO; @@ -23,7 +24,6 @@ import cn.orionsec.ops.entity.domain.MachineSecretKeyDO; import cn.orionsec.ops.entity.importer.MachineInfoImportDTO; import cn.orionsec.ops.entity.vo.data.DataImportCheckVO; -import com.orion.spring.SpringHolder; import org.apache.poi.ss.usermodel.Workbook; import java.util.List; diff --git a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/checker/TailFileDataChecker.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/checker/TailFileDataChecker.java index 42868ff4..9c986705 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/checker/TailFileDataChecker.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/checker/TailFileDataChecker.java @@ -15,6 +15,7 @@ */ package cn.orionsec.ops.handler.importer.checker; +import cn.orionsec.kit.spring.SpringHolder; import cn.orionsec.ops.constant.ImportType; import cn.orionsec.ops.constant.MessageConst; import cn.orionsec.ops.dao.FileTailListDAO; @@ -23,7 +24,6 @@ import cn.orionsec.ops.entity.domain.MachineInfoDO; import cn.orionsec.ops.entity.importer.MachineTailFileImportDTO; import cn.orionsec.ops.entity.vo.data.DataImportCheckVO; -import com.orion.spring.SpringHolder; import org.apache.poi.ss.usermodel.Workbook; import java.util.List; diff --git a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/checker/WebhookDataChecker.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/checker/WebhookDataChecker.java index 09379997..496f970c 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/checker/WebhookDataChecker.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/checker/WebhookDataChecker.java @@ -15,12 +15,12 @@ */ package cn.orionsec.ops.handler.importer.checker; +import cn.orionsec.kit.spring.SpringHolder; import cn.orionsec.ops.constant.ImportType; import cn.orionsec.ops.dao.WebhookConfigDAO; import cn.orionsec.ops.entity.domain.WebhookConfigDO; import cn.orionsec.ops.entity.importer.WebhookImportDTO; import cn.orionsec.ops.entity.vo.data.DataImportCheckVO; -import com.orion.spring.SpringHolder; import org.apache.poi.ss.usermodel.Workbook; import java.util.List; diff --git a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/impl/AbstractDataImporter.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/impl/AbstractDataImporter.java index 9ed8f486..dec07222 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/impl/AbstractDataImporter.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/impl/AbstractDataImporter.java @@ -15,6 +15,14 @@ */ package cn.orionsec.ops.handler.importer.impl; +import cn.orionsec.kit.lang.utils.Threads; +import cn.orionsec.kit.lang.utils.Valid; +import cn.orionsec.kit.lang.utils.collect.Maps; +import cn.orionsec.kit.lang.utils.convert.Converts; +import cn.orionsec.kit.lang.utils.io.FileWriters; +import cn.orionsec.kit.lang.utils.io.Files1; +import cn.orionsec.kit.lang.utils.time.Dates; +import cn.orionsec.kit.spring.SpringHolder; import cn.orionsec.ops.constant.ImportType; import cn.orionsec.ops.constant.SchedulerPools; import cn.orionsec.ops.constant.event.EventKeys; @@ -30,14 +38,6 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.serializer.SerializerFeature; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.orion.lang.utils.Threads; -import com.orion.lang.utils.Valid; -import com.orion.lang.utils.collect.Maps; -import com.orion.lang.utils.convert.Converts; -import com.orion.lang.utils.io.FileWriters; -import com.orion.lang.utils.io.Files1; -import com.orion.lang.utils.time.Dates; -import com.orion.spring.SpringHolder; import lombok.extern.slf4j.Slf4j; import java.util.List; diff --git a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/impl/AppProfileDataImporter.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/impl/AppProfileDataImporter.java index c1b60a63..2bbd85c2 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/impl/AppProfileDataImporter.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/impl/AppProfileDataImporter.java @@ -15,11 +15,11 @@ */ package cn.orionsec.ops.handler.importer.impl; +import cn.orionsec.kit.spring.SpringHolder; import cn.orionsec.ops.dao.ApplicationProfileDAO; import cn.orionsec.ops.entity.domain.ApplicationProfileDO; import cn.orionsec.ops.entity.importer.DataImportDTO; import cn.orionsec.ops.service.api.ApplicationProfileService; -import com.orion.spring.SpringHolder; /** * 应用环境 数据导入器 diff --git a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/impl/AppRepositoryDataImporter.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/impl/AppRepositoryDataImporter.java index e2afc8b9..b4e6816d 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/impl/AppRepositoryDataImporter.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/impl/AppRepositoryDataImporter.java @@ -15,13 +15,13 @@ */ package cn.orionsec.ops.handler.importer.impl; +import cn.orionsec.kit.lang.utils.io.Files1; +import cn.orionsec.kit.spring.SpringHolder; import cn.orionsec.ops.constant.app.RepositoryStatus; import cn.orionsec.ops.dao.ApplicationRepositoryDAO; import cn.orionsec.ops.entity.domain.ApplicationRepositoryDO; import cn.orionsec.ops.entity.importer.DataImportDTO; import cn.orionsec.ops.utils.Utils; -import com.orion.lang.utils.io.Files1; -import com.orion.spring.SpringHolder; import java.io.File; diff --git a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/impl/ApplicationDataImporter.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/impl/ApplicationDataImporter.java index a4cbb962..54052f27 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/impl/ApplicationDataImporter.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/impl/ApplicationDataImporter.java @@ -15,11 +15,11 @@ */ package cn.orionsec.ops.handler.importer.impl; +import cn.orionsec.kit.spring.SpringHolder; import cn.orionsec.ops.dao.ApplicationInfoDAO; import cn.orionsec.ops.entity.domain.ApplicationInfoDO; import cn.orionsec.ops.entity.importer.DataImportDTO; import cn.orionsec.ops.service.api.ApplicationInfoService; -import com.orion.spring.SpringHolder; /** * 应用信息 数据导入器 diff --git a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/impl/CommandTemplateDataImporter.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/impl/CommandTemplateDataImporter.java index 9dc9f3e5..18453801 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/impl/CommandTemplateDataImporter.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/impl/CommandTemplateDataImporter.java @@ -15,10 +15,10 @@ */ package cn.orionsec.ops.handler.importer.impl; +import cn.orionsec.kit.spring.SpringHolder; import cn.orionsec.ops.dao.CommandTemplateDAO; import cn.orionsec.ops.entity.domain.CommandTemplateDO; import cn.orionsec.ops.entity.importer.DataImportDTO; -import com.orion.spring.SpringHolder; /** * 命令模板 数据导入器 diff --git a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/impl/IDataImporter.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/impl/IDataImporter.java index fddcbd91..d11a9eb1 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/impl/IDataImporter.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/impl/IDataImporter.java @@ -15,9 +15,9 @@ */ package cn.orionsec.ops.handler.importer.impl; +import cn.orionsec.kit.lang.utils.Exceptions; import cn.orionsec.ops.constant.ImportType; import cn.orionsec.ops.entity.importer.DataImportDTO; -import com.orion.lang.utils.Exceptions; /** * 数据导入器 接口 diff --git a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/impl/MachineInfoDataImporter.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/impl/MachineInfoDataImporter.java index 8fdaf7a1..88614cce 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/impl/MachineInfoDataImporter.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/impl/MachineInfoDataImporter.java @@ -15,11 +15,11 @@ */ package cn.orionsec.ops.handler.importer.impl; +import cn.orionsec.kit.spring.SpringHolder; import cn.orionsec.ops.dao.MachineInfoDAO; import cn.orionsec.ops.entity.domain.MachineInfoDO; import cn.orionsec.ops.entity.importer.DataImportDTO; import cn.orionsec.ops.service.api.MachineEnvService; -import com.orion.spring.SpringHolder; import java.util.Optional; diff --git a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/impl/MachineProxyDataImporter.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/impl/MachineProxyDataImporter.java index a6a66f7c..3c23ef0b 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/impl/MachineProxyDataImporter.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/impl/MachineProxyDataImporter.java @@ -15,10 +15,10 @@ */ package cn.orionsec.ops.handler.importer.impl; +import cn.orionsec.kit.spring.SpringHolder; import cn.orionsec.ops.dao.MachineProxyDAO; import cn.orionsec.ops.entity.domain.MachineProxyDO; import cn.orionsec.ops.entity.importer.DataImportDTO; -import com.orion.spring.SpringHolder; /** * 机器代理 数据导入器 diff --git a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/impl/TailFileDataImporter.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/impl/TailFileDataImporter.java index 9b51aa5c..3992363d 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/impl/TailFileDataImporter.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/impl/TailFileDataImporter.java @@ -15,10 +15,10 @@ */ package cn.orionsec.ops.handler.importer.impl; +import cn.orionsec.kit.spring.SpringHolder; import cn.orionsec.ops.dao.FileTailListDAO; import cn.orionsec.ops.entity.domain.FileTailListDO; import cn.orionsec.ops.entity.importer.DataImportDTO; -import com.orion.spring.SpringHolder; /** * 日志文件 数据导入器 diff --git a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/impl/WebhookDataImporter.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/impl/WebhookDataImporter.java index 0189facc..958aa8fe 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/impl/WebhookDataImporter.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/impl/WebhookDataImporter.java @@ -15,10 +15,10 @@ */ package cn.orionsec.ops.handler.importer.impl; +import cn.orionsec.kit.spring.SpringHolder; import cn.orionsec.ops.dao.WebhookConfigDAO; import cn.orionsec.ops.entity.domain.WebhookConfigDO; import cn.orionsec.ops.entity.importer.DataImportDTO; -import com.orion.spring.SpringHolder; /** * webhook 数据导入器 diff --git a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/validator/ApplicationProfileValidator.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/validator/ApplicationProfileValidator.java index 72d81088..8bed54f9 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/validator/ApplicationProfileValidator.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/validator/ApplicationProfileValidator.java @@ -15,10 +15,10 @@ */ package cn.orionsec.ops.handler.importer.validator; +import cn.orionsec.kit.lang.utils.Strings; import cn.orionsec.ops.constant.CnConst; import cn.orionsec.ops.entity.importer.ApplicationProfileImportDTO; import cn.orionsec.ops.utils.Valid; -import com.orion.lang.utils.Strings; /** * 应用环境表 数据验证器 diff --git a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/validator/ApplicationRepositoryValidator.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/validator/ApplicationRepositoryValidator.java index 680bb0e1..53246d14 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/validator/ApplicationRepositoryValidator.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/validator/ApplicationRepositoryValidator.java @@ -15,13 +15,13 @@ */ package cn.orionsec.ops.handler.importer.validator; +import cn.orionsec.kit.lang.utils.Exceptions; +import cn.orionsec.kit.lang.utils.Strings; import cn.orionsec.ops.constant.app.RepositoryAuthType; import cn.orionsec.ops.constant.app.RepositoryTokenType; import cn.orionsec.ops.entity.importer.ApplicationRepositoryImportDTO; import cn.orionsec.ops.utils.Valid; import cn.orionsec.ops.utils.ValueMix; -import com.orion.lang.utils.Exceptions; -import com.orion.lang.utils.Strings; import java.util.Arrays; import java.util.stream.Collectors; diff --git a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/validator/ApplicationValidator.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/validator/ApplicationValidator.java index bb98580d..7a5caee0 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/validator/ApplicationValidator.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/validator/ApplicationValidator.java @@ -15,9 +15,9 @@ */ package cn.orionsec.ops.handler.importer.validator; +import cn.orionsec.kit.lang.utils.Strings; import cn.orionsec.ops.entity.importer.ApplicationImportDTO; import cn.orionsec.ops.utils.Valid; -import com.orion.lang.utils.Strings; /** * 应用表 数据验证器 diff --git a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/validator/CommandTemplateValidator.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/validator/CommandTemplateValidator.java index ea300815..ca6a8ecf 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/validator/CommandTemplateValidator.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/validator/CommandTemplateValidator.java @@ -15,9 +15,9 @@ */ package cn.orionsec.ops.handler.importer.validator; +import cn.orionsec.kit.lang.utils.Strings; import cn.orionsec.ops.entity.importer.CommandTemplateImportDTO; import cn.orionsec.ops.utils.Valid; -import com.orion.lang.utils.Strings; /** * 命令模板 数据验证器 diff --git a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/validator/FileTailValidator.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/validator/FileTailValidator.java index 7b302ec9..1e9e5cc8 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/validator/FileTailValidator.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/validator/FileTailValidator.java @@ -15,9 +15,9 @@ */ package cn.orionsec.ops.handler.importer.validator; +import cn.orionsec.kit.lang.utils.Charsets; import cn.orionsec.ops.entity.importer.MachineTailFileImportDTO; import cn.orionsec.ops.utils.Valid; -import com.orion.lang.utils.Charsets; /** * 文件tail 数据验证器 diff --git a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/validator/MachineProxyValidator.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/validator/MachineProxyValidator.java index e319d6eb..9091314d 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/validator/MachineProxyValidator.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/validator/MachineProxyValidator.java @@ -15,11 +15,11 @@ */ package cn.orionsec.ops.handler.importer.validator; +import cn.orionsec.kit.lang.utils.Strings; import cn.orionsec.ops.constant.machine.ProxyType; import cn.orionsec.ops.entity.importer.MachineProxyImportDTO; import cn.orionsec.ops.utils.Valid; import cn.orionsec.ops.utils.ValueMix; -import com.orion.lang.utils.Strings; import java.util.Arrays; import java.util.stream.Collectors; diff --git a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/validator/MachineValidator.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/validator/MachineValidator.java index 076a9a89..b0b6648c 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/validator/MachineValidator.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/handler/importer/validator/MachineValidator.java @@ -15,11 +15,11 @@ */ package cn.orionsec.ops.handler.importer.validator; +import cn.orionsec.kit.lang.utils.Strings; import cn.orionsec.ops.constant.machine.MachineAuthType; import cn.orionsec.ops.entity.importer.MachineInfoImportDTO; import cn.orionsec.ops.utils.Valid; import cn.orionsec.ops.utils.ValueMix; -import com.orion.lang.utils.Strings; import java.util.Arrays; import java.util.stream.Collectors; diff --git a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/service/impl/DataClearServiceImpl.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/service/impl/DataClearServiceImpl.java index 09a3459c..574a87c8 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/service/impl/DataClearServiceImpl.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/service/impl/DataClearServiceImpl.java @@ -15,6 +15,7 @@ */ package cn.orionsec.ops.service.impl; +import cn.orionsec.kit.lang.utils.time.Dates; import cn.orionsec.ops.constant.Const; import cn.orionsec.ops.constant.DataClearRange; import cn.orionsec.ops.constant.app.BuildStatus; @@ -32,7 +33,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.support.SFunction; -import com.orion.lang.utils.time.Dates; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/service/impl/DataImportServiceImpl.java b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/service/impl/DataImportServiceImpl.java index 6b141f58..3a832405 100644 --- a/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/service/impl/DataImportServiceImpl.java +++ b/orion-ops-api/orion-ops-data/src/main/java/cn/orionsec/ops/service/impl/DataImportServiceImpl.java @@ -15,6 +15,8 @@ */ package cn.orionsec.ops.service.impl; +import cn.orionsec.kit.lang.utils.Exceptions; +import cn.orionsec.kit.lang.utils.Strings; import cn.orionsec.ops.constant.KeyConst; import cn.orionsec.ops.constant.MessageConst; import cn.orionsec.ops.entity.dto.user.UserDTO; @@ -22,8 +24,6 @@ import cn.orionsec.ops.service.api.DataImportService; import cn.orionsec.ops.utils.Currents; import com.alibaba.fastjson.JSON; -import com.orion.lang.utils.Exceptions; -import com.orion.lang.utils.Strings; import lombok.extern.slf4j.Slf4j; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; diff --git a/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/MappingConversionProvider.java b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/MappingConversionProvider.java index 281108c4..9379a27f 100644 --- a/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/MappingConversionProvider.java +++ b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/MappingConversionProvider.java @@ -15,8 +15,8 @@ */ package cn.orionsec.ops; -import com.orion.lang.support.Attempt; -import com.orion.lang.utils.reflect.PackageScanner; +import cn.orionsec.kit.lang.support.Attempt; +import cn.orionsec.kit.lang.utils.reflect.PackageScanner; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.InitializingBean; import org.springframework.stereotype.Component; diff --git a/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/alarm/AlarmGroupConversion.java b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/alarm/AlarmGroupConversion.java index dee2fa68..d6119442 100644 --- a/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/alarm/AlarmGroupConversion.java +++ b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/alarm/AlarmGroupConversion.java @@ -15,11 +15,11 @@ */ package cn.orionsec.ops.mapping.alarm; +import cn.orionsec.kit.lang.utils.convert.TypeStore; import cn.orionsec.ops.entity.domain.AlarmGroupDO; import cn.orionsec.ops.entity.domain.AlarmGroupUserDO; import cn.orionsec.ops.entity.vo.alarm.AlarmGroupUserVO; import cn.orionsec.ops.entity.vo.alarm.AlarmGroupVO; -import com.orion.lang.utils.convert.TypeStore; /** * 报警组 对象转换器 diff --git a/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/app/ApplicationActionConversion.java b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/app/ApplicationActionConversion.java index 7cb87932..e69073da 100644 --- a/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/app/ApplicationActionConversion.java +++ b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/app/ApplicationActionConversion.java @@ -15,12 +15,12 @@ */ package cn.orionsec.ops.mapping.app; +import cn.orionsec.kit.lang.utils.convert.TypeStore; +import cn.orionsec.kit.lang.utils.time.Dates; import cn.orionsec.ops.entity.domain.ApplicationActionDO; import cn.orionsec.ops.entity.domain.ApplicationActionLogDO; import cn.orionsec.ops.entity.vo.app.*; import cn.orionsec.ops.utils.Utils; -import com.orion.lang.utils.convert.TypeStore; -import com.orion.lang.utils.time.Dates; import java.util.Date; import java.util.Optional; diff --git a/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/app/ApplicationBuildConversion.java b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/app/ApplicationBuildConversion.java index 56d1ce70..1985bb3f 100644 --- a/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/app/ApplicationBuildConversion.java +++ b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/app/ApplicationBuildConversion.java @@ -15,13 +15,13 @@ */ package cn.orionsec.ops.mapping.app; +import cn.orionsec.kit.lang.utils.convert.TypeStore; +import cn.orionsec.kit.lang.utils.time.Dates; import cn.orionsec.ops.constant.app.BuildStatus; import cn.orionsec.ops.entity.domain.ApplicationBuildDO; import cn.orionsec.ops.entity.dto.ApplicationBuildStatisticsDTO; import cn.orionsec.ops.entity.vo.app.*; import cn.orionsec.ops.utils.Utils; -import com.orion.lang.utils.convert.TypeStore; -import com.orion.lang.utils.time.Dates; import java.util.Date; import java.util.Optional; diff --git a/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/app/ApplicationConversion.java b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/app/ApplicationConversion.java index 10cb5ba3..890b63c9 100644 --- a/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/app/ApplicationConversion.java +++ b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/app/ApplicationConversion.java @@ -15,10 +15,10 @@ */ package cn.orionsec.ops.mapping.app; +import cn.orionsec.kit.lang.utils.convert.TypeStore; import cn.orionsec.ops.entity.domain.ApplicationInfoDO; import cn.orionsec.ops.entity.vo.app.ApplicationDetailVO; import cn.orionsec.ops.entity.vo.app.ApplicationInfoVO; -import com.orion.lang.utils.convert.TypeStore; /** * 应用信息 对象转换器 diff --git a/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/app/ApplicationEnvConversion.java b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/app/ApplicationEnvConversion.java index 27fea7ae..a7d52f22 100644 --- a/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/app/ApplicationEnvConversion.java +++ b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/app/ApplicationEnvConversion.java @@ -15,11 +15,11 @@ */ package cn.orionsec.ops.mapping.app; +import cn.orionsec.kit.lang.utils.convert.TypeStore; import cn.orionsec.ops.constant.Const; import cn.orionsec.ops.constant.app.ApplicationEnvAttr; import cn.orionsec.ops.entity.domain.ApplicationEnvDO; import cn.orionsec.ops.entity.vo.app.ApplicationEnvVO; -import com.orion.lang.utils.convert.TypeStore; /** * 应用环境变量 对象转换器 diff --git a/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/app/ApplicationMachineConversion.java b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/app/ApplicationMachineConversion.java index e8a296a5..1c0f6066 100644 --- a/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/app/ApplicationMachineConversion.java +++ b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/app/ApplicationMachineConversion.java @@ -15,9 +15,9 @@ */ package cn.orionsec.ops.mapping.app; +import cn.orionsec.kit.lang.utils.convert.TypeStore; import cn.orionsec.ops.entity.domain.ApplicationMachineDO; import cn.orionsec.ops.entity.vo.app.ApplicationMachineVO; -import com.orion.lang.utils.convert.TypeStore; /** * 应用机器 对象转换器 diff --git a/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/app/ApplicationPipelineConversion.java b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/app/ApplicationPipelineConversion.java index 4afd069c..8feec260 100644 --- a/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/app/ApplicationPipelineConversion.java +++ b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/app/ApplicationPipelineConversion.java @@ -15,12 +15,12 @@ */ package cn.orionsec.ops.mapping.app; +import cn.orionsec.kit.lang.utils.convert.TypeStore; import cn.orionsec.ops.entity.domain.ApplicationPipelineDO; import cn.orionsec.ops.entity.domain.ApplicationPipelineDetailDO; import cn.orionsec.ops.entity.vo.app.ApplicationPipelineDetailVO; import cn.orionsec.ops.entity.vo.app.ApplicationPipelineStatisticsDetailVO; import cn.orionsec.ops.entity.vo.app.ApplicationPipelineVO; -import com.orion.lang.utils.convert.TypeStore; /** * 应用流水线 对象转换器 diff --git a/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/app/ApplicationPipelineTaskConversion.java b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/app/ApplicationPipelineTaskConversion.java index 3c28fe8f..4fb7b38f 100644 --- a/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/app/ApplicationPipelineTaskConversion.java +++ b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/app/ApplicationPipelineTaskConversion.java @@ -15,6 +15,9 @@ */ package cn.orionsec.ops.mapping.app; +import cn.orionsec.kit.lang.utils.convert.Converts; +import cn.orionsec.kit.lang.utils.convert.TypeStore; +import cn.orionsec.kit.lang.utils.time.Dates; import cn.orionsec.ops.constant.app.PipelineStatus; import cn.orionsec.ops.entity.domain.ApplicationPipelineTaskDO; import cn.orionsec.ops.entity.domain.ApplicationPipelineTaskDetailDO; @@ -25,9 +28,6 @@ import cn.orionsec.ops.entity.vo.app.*; import cn.orionsec.ops.utils.Utils; import com.alibaba.fastjson.JSON; -import com.orion.lang.utils.convert.Converts; -import com.orion.lang.utils.convert.TypeStore; -import com.orion.lang.utils.time.Dates; import java.util.Date; import java.util.Optional; diff --git a/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/app/ApplicationProfileConversion.java b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/app/ApplicationProfileConversion.java index 085a804f..ba89c3f0 100644 --- a/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/app/ApplicationProfileConversion.java +++ b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/app/ApplicationProfileConversion.java @@ -15,11 +15,11 @@ */ package cn.orionsec.ops.mapping.app; +import cn.orionsec.kit.lang.utils.convert.TypeStore; import cn.orionsec.ops.entity.domain.ApplicationProfileDO; import cn.orionsec.ops.entity.dto.app.ApplicationProfileDTO; import cn.orionsec.ops.entity.vo.app.ApplicationProfileFastVO; import cn.orionsec.ops.entity.vo.app.ApplicationProfileVO; -import com.orion.lang.utils.convert.TypeStore; /** * 应用环境 对象转换器 diff --git a/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/app/ApplicationReleaseConversion.java b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/app/ApplicationReleaseConversion.java index 7248e776..7f539b2a 100644 --- a/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/app/ApplicationReleaseConversion.java +++ b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/app/ApplicationReleaseConversion.java @@ -15,14 +15,14 @@ */ package cn.orionsec.ops.mapping.app; +import cn.orionsec.kit.lang.utils.convert.TypeStore; +import cn.orionsec.kit.lang.utils.time.Dates; import cn.orionsec.ops.constant.app.ReleaseStatus; import cn.orionsec.ops.entity.domain.ApplicationReleaseDO; import cn.orionsec.ops.entity.domain.ApplicationReleaseMachineDO; import cn.orionsec.ops.entity.dto.ApplicationReleaseStatisticsDTO; import cn.orionsec.ops.entity.vo.app.*; import cn.orionsec.ops.utils.Utils; -import com.orion.lang.utils.convert.TypeStore; -import com.orion.lang.utils.time.Dates; import java.util.Date; import java.util.Optional; diff --git a/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/app/ApplicationRepositoryConversion.java b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/app/ApplicationRepositoryConversion.java index ac6fd06d..5fcb02d9 100644 --- a/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/app/ApplicationRepositoryConversion.java +++ b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/app/ApplicationRepositoryConversion.java @@ -15,14 +15,14 @@ */ package cn.orionsec.ops.mapping.app; +import cn.orionsec.kit.ext.vcs.git.info.BranchInfo; +import cn.orionsec.kit.ext.vcs.git.info.LogInfo; +import cn.orionsec.kit.lang.utils.convert.TypeStore; +import cn.orionsec.kit.lang.utils.time.Dates; import cn.orionsec.ops.entity.domain.ApplicationRepositoryDO; import cn.orionsec.ops.entity.vo.app.ApplicationRepositoryBranchVO; import cn.orionsec.ops.entity.vo.app.ApplicationRepositoryCommitVO; import cn.orionsec.ops.entity.vo.app.ApplicationRepositoryVO; -import com.orion.ext.vcs.git.info.BranchInfo; -import com.orion.ext.vcs.git.info.LogInfo; -import com.orion.lang.utils.convert.TypeStore; -import com.orion.lang.utils.time.Dates; import java.util.Date; import java.util.Optional; diff --git a/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/exec/CommandExecConversion.java b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/exec/CommandExecConversion.java index 99a1cb61..ba5a551a 100644 --- a/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/exec/CommandExecConversion.java +++ b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/exec/CommandExecConversion.java @@ -15,12 +15,12 @@ */ package cn.orionsec.ops.mapping.exec; +import cn.orionsec.kit.lang.utils.convert.TypeStore; +import cn.orionsec.kit.lang.utils.time.Dates; import cn.orionsec.ops.entity.domain.CommandExecDO; import cn.orionsec.ops.entity.vo.exec.CommandExecStatusVO; import cn.orionsec.ops.entity.vo.exec.CommandExecVO; import cn.orionsec.ops.utils.Utils; -import com.orion.lang.utils.convert.TypeStore; -import com.orion.lang.utils.time.Dates; import java.util.Date; import java.util.Optional; diff --git a/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/file/FileTailConversion.java b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/file/FileTailConversion.java index 16908ece..b6f80ab0 100644 --- a/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/file/FileTailConversion.java +++ b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/file/FileTailConversion.java @@ -15,12 +15,12 @@ */ package cn.orionsec.ops.mapping.file; +import cn.orionsec.kit.lang.utils.convert.TypeStore; +import cn.orionsec.kit.lang.utils.io.Files1; +import cn.orionsec.kit.lang.utils.time.Dates; import cn.orionsec.ops.entity.domain.FileTailListDO; import cn.orionsec.ops.entity.dto.file.FileTailDTO; import cn.orionsec.ops.entity.vo.tail.FileTailVO; -import com.orion.lang.utils.convert.TypeStore; -import com.orion.lang.utils.io.Files1; -import com.orion.lang.utils.time.Dates; /** * 文件 tail 对象转换器 diff --git a/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/file/FileTransferLogConversion.java b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/file/FileTransferLogConversion.java index 8b0975d5..b9e52c30 100644 --- a/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/file/FileTransferLogConversion.java +++ b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/file/FileTransferLogConversion.java @@ -15,10 +15,10 @@ */ package cn.orionsec.ops.mapping.file; +import cn.orionsec.kit.lang.utils.convert.TypeStore; +import cn.orionsec.kit.lang.utils.io.Files1; import cn.orionsec.ops.entity.domain.FileTransferLogDO; import cn.orionsec.ops.entity.vo.sftp.FileTransferLogVO; -import com.orion.lang.utils.convert.TypeStore; -import com.orion.lang.utils.io.Files1; /** * 文件传输日志 对象转换器 diff --git a/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/history/HistoryValueConversion.java b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/history/HistoryValueConversion.java index 5d8eb586..9a6bacc2 100644 --- a/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/history/HistoryValueConversion.java +++ b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/history/HistoryValueConversion.java @@ -15,10 +15,10 @@ */ package cn.orionsec.ops.mapping.history; +import cn.orionsec.kit.lang.utils.convert.TypeStore; +import cn.orionsec.kit.lang.utils.time.Dates; import cn.orionsec.ops.entity.domain.HistoryValueSnapshotDO; import cn.orionsec.ops.entity.vo.history.HistoryValueVO; -import com.orion.lang.utils.convert.TypeStore; -import com.orion.lang.utils.time.Dates; /** * 历史值 对象转换器 diff --git a/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/home/StatisticsConversion.java b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/home/StatisticsConversion.java index d6f5840e..53e90c77 100644 --- a/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/home/StatisticsConversion.java +++ b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/home/StatisticsConversion.java @@ -15,9 +15,9 @@ */ package cn.orionsec.ops.mapping.home; +import cn.orionsec.kit.lang.utils.convert.TypeStore; import cn.orionsec.ops.entity.dto.statistic.StatisticsCountDTO; import cn.orionsec.ops.entity.vo.home.HomeStatisticsCountVO; -import com.orion.lang.utils.convert.TypeStore; /** * 统计数据 对象转换器 diff --git a/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/machine/MachineAlarmConversion.java b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/machine/MachineAlarmConversion.java index 4cf6c50f..f6c128ed 100644 --- a/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/machine/MachineAlarmConversion.java +++ b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/machine/MachineAlarmConversion.java @@ -15,12 +15,12 @@ */ package cn.orionsec.ops.mapping.machine; +import cn.orionsec.kit.lang.utils.convert.TypeStore; +import cn.orionsec.kit.lang.utils.time.Dates; import cn.orionsec.ops.entity.domain.MachineAlarmConfigDO; import cn.orionsec.ops.entity.domain.MachineAlarmHistoryDO; import cn.orionsec.ops.entity.vo.machine.MachineAlarmConfigVO; import cn.orionsec.ops.entity.vo.machine.MachineAlarmHistoryVO; -import com.orion.lang.utils.convert.TypeStore; -import com.orion.lang.utils.time.Dates; /** * 机器报警 对象转换器 diff --git a/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/machine/MachineConversion.java b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/machine/MachineConversion.java index 74a41c40..6bcb3362 100644 --- a/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/machine/MachineConversion.java +++ b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/machine/MachineConversion.java @@ -15,10 +15,10 @@ */ package cn.orionsec.ops.mapping.machine; +import cn.orionsec.kit.lang.utils.convert.TypeStore; import cn.orionsec.ops.entity.domain.MachineInfoDO; import cn.orionsec.ops.entity.request.machine.MachineInfoRequest; import cn.orionsec.ops.entity.vo.machine.MachineInfoVO; -import com.orion.lang.utils.convert.TypeStore; /** * 机器信息 对象转换器 diff --git a/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/machine/MachineEnvConversion.java b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/machine/MachineEnvConversion.java index 33042a0c..2959077c 100644 --- a/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/machine/MachineEnvConversion.java +++ b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/machine/MachineEnvConversion.java @@ -15,11 +15,11 @@ */ package cn.orionsec.ops.mapping.machine; +import cn.orionsec.kit.lang.utils.convert.TypeStore; import cn.orionsec.ops.constant.Const; import cn.orionsec.ops.constant.machine.MachineEnvAttr; import cn.orionsec.ops.entity.domain.MachineEnvDO; import cn.orionsec.ops.entity.vo.machine.MachineEnvVO; -import com.orion.lang.utils.convert.TypeStore; /** * 机器环境变量 对象转换器 diff --git a/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/machine/MachineGroupConversion.java b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/machine/MachineGroupConversion.java index a59b3d95..4e03ee18 100644 --- a/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/machine/MachineGroupConversion.java +++ b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/machine/MachineGroupConversion.java @@ -15,9 +15,9 @@ */ package cn.orionsec.ops.mapping.machine; +import cn.orionsec.kit.lang.utils.convert.TypeStore; import cn.orionsec.ops.entity.domain.MachineGroupDO; import cn.orionsec.ops.entity.vo.machine.MachineGroupTreeVO; -import com.orion.lang.utils.convert.TypeStore; /** * 机器分组 对象转换器 diff --git a/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/machine/MachineMonitorConversion.java b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/machine/MachineMonitorConversion.java index f5552959..d8fce023 100644 --- a/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/machine/MachineMonitorConversion.java +++ b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/machine/MachineMonitorConversion.java @@ -15,11 +15,11 @@ */ package cn.orionsec.ops.mapping.machine; +import cn.orionsec.kit.lang.utils.convert.TypeStore; import cn.orionsec.ops.constant.monitor.MonitorConst; import cn.orionsec.ops.entity.domain.MachineMonitorDO; import cn.orionsec.ops.entity.dto.MachineMonitorDTO; import cn.orionsec.ops.entity.vo.machine.MachineMonitorVO; -import com.orion.lang.utils.convert.TypeStore; /** * 机器监控 对象转换器 diff --git a/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/machine/MachineProxyConversion.java b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/machine/MachineProxyConversion.java index c4c73061..05dd45c4 100644 --- a/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/machine/MachineProxyConversion.java +++ b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/machine/MachineProxyConversion.java @@ -15,9 +15,9 @@ */ package cn.orionsec.ops.mapping.machine; +import cn.orionsec.kit.lang.utils.convert.TypeStore; import cn.orionsec.ops.entity.domain.MachineProxyDO; import cn.orionsec.ops.entity.vo.machine.MachineProxyVO; -import com.orion.lang.utils.convert.TypeStore; /** * 机器代理 对象转换器 diff --git a/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/machine/MachineSecretKeyConversion.java b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/machine/MachineSecretKeyConversion.java index d8679eb9..5868ffb5 100644 --- a/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/machine/MachineSecretKeyConversion.java +++ b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/machine/MachineSecretKeyConversion.java @@ -15,9 +15,9 @@ */ package cn.orionsec.ops.mapping.machine; +import cn.orionsec.kit.lang.utils.convert.TypeStore; import cn.orionsec.ops.entity.domain.MachineSecretKeyDO; import cn.orionsec.ops.entity.vo.machine.MachineSecretKeyVO; -import com.orion.lang.utils.convert.TypeStore; /** * 机器密钥 对象转换器 diff --git a/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/machine/MachineTerminalConversion.java b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/machine/MachineTerminalConversion.java index b53ce032..025606ee 100644 --- a/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/machine/MachineTerminalConversion.java +++ b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/machine/MachineTerminalConversion.java @@ -15,14 +15,14 @@ */ package cn.orionsec.ops.mapping.machine; +import cn.orionsec.kit.lang.utils.convert.TypeStore; +import cn.orionsec.kit.lang.utils.time.Dates; import cn.orionsec.ops.entity.config.TerminalConnectConfig; import cn.orionsec.ops.entity.domain.MachineTerminalDO; import cn.orionsec.ops.entity.domain.MachineTerminalLogDO; import cn.orionsec.ops.entity.vo.machine.MachineTerminalLogVO; import cn.orionsec.ops.entity.vo.machine.MachineTerminalManagerVO; import cn.orionsec.ops.entity.vo.machine.MachineTerminalVO; -import com.orion.lang.utils.convert.TypeStore; -import com.orion.lang.utils.time.Dates; import java.util.Optional; diff --git a/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/message/WebSideMessageConversion.java b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/message/WebSideMessageConversion.java index b7489939..f08d1041 100644 --- a/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/message/WebSideMessageConversion.java +++ b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/message/WebSideMessageConversion.java @@ -15,10 +15,10 @@ */ package cn.orionsec.ops.mapping.message; +import cn.orionsec.kit.lang.utils.convert.TypeStore; +import cn.orionsec.kit.lang.utils.time.Dates; import cn.orionsec.ops.entity.domain.WebSideMessageDO; import cn.orionsec.ops.entity.vo.message.WebSideMessageVO; -import com.orion.lang.utils.convert.TypeStore; -import com.orion.lang.utils.time.Dates; /** * 站内信 对象转换器 diff --git a/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/scheduler/SchedulerTaskConversion.java b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/scheduler/SchedulerTaskConversion.java index 65f9f74e..2ff84bf2 100644 --- a/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/scheduler/SchedulerTaskConversion.java +++ b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/scheduler/SchedulerTaskConversion.java @@ -15,11 +15,11 @@ */ package cn.orionsec.ops.mapping.scheduler; +import cn.orionsec.kit.lang.utils.convert.TypeStore; +import cn.orionsec.kit.lang.utils.time.cron.Cron; +import cn.orionsec.kit.lang.utils.time.cron.CronSupport; import cn.orionsec.ops.entity.domain.SchedulerTaskDO; import cn.orionsec.ops.entity.vo.scheduler.SchedulerTaskVO; -import com.orion.lang.utils.convert.TypeStore; -import com.orion.lang.utils.time.cron.Cron; -import com.orion.lang.utils.time.cron.CronSupport; /** * 定时任务配置 对象转换器 diff --git a/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/scheduler/SchedulerTaskRecordConversion.java b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/scheduler/SchedulerTaskRecordConversion.java index f4f6f6ce..4a57385a 100644 --- a/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/scheduler/SchedulerTaskRecordConversion.java +++ b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/scheduler/SchedulerTaskRecordConversion.java @@ -15,13 +15,13 @@ */ package cn.orionsec.ops.mapping.scheduler; +import cn.orionsec.kit.lang.utils.convert.TypeStore; +import cn.orionsec.kit.lang.utils.time.Dates; import cn.orionsec.ops.entity.domain.SchedulerTaskMachineRecordDO; import cn.orionsec.ops.entity.domain.SchedulerTaskRecordDO; import cn.orionsec.ops.entity.dto.SchedulerTaskRecordStatisticsDTO; import cn.orionsec.ops.entity.vo.scheduler.*; import cn.orionsec.ops.utils.Utils; -import com.orion.lang.utils.convert.TypeStore; -import com.orion.lang.utils.time.Dates; import java.util.Date; import java.util.Optional; diff --git a/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/sftp/SftpConversion.java b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/sftp/SftpConversion.java index b5f17d3c..dcedfa73 100644 --- a/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/sftp/SftpConversion.java +++ b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/sftp/SftpConversion.java @@ -15,14 +15,14 @@ */ package cn.orionsec.ops.mapping.sftp; +import cn.orionsec.kit.lang.utils.convert.TypeStore; +import cn.orionsec.kit.lang.utils.io.FileType; +import cn.orionsec.kit.lang.utils.io.Files1; +import cn.orionsec.kit.net.host.sftp.SftpFile; import cn.orionsec.ops.constant.Const; import cn.orionsec.ops.entity.dto.sftp.SftpUploadInfoDTO; import cn.orionsec.ops.entity.request.sftp.FileUploadRequest; import cn.orionsec.ops.entity.vo.sftp.FileDetailVO; -import com.orion.lang.utils.convert.TypeStore; -import com.orion.lang.utils.io.FileType; -import com.orion.lang.utils.io.Files1; -import com.orion.net.base.file.sftp.SftpFile; import java.util.Optional; diff --git a/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/system/SystemAnalysisConversion.java b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/system/SystemAnalysisConversion.java index 0d44d6ce..96b345db 100644 --- a/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/system/SystemAnalysisConversion.java +++ b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/system/SystemAnalysisConversion.java @@ -15,9 +15,9 @@ */ package cn.orionsec.ops.mapping.system; +import cn.orionsec.kit.lang.utils.convert.TypeStore; import cn.orionsec.ops.entity.dto.system.SystemSpaceAnalysisDTO; import cn.orionsec.ops.entity.vo.system.SystemAnalysisVO; -import com.orion.lang.utils.convert.TypeStore; /** * 系统统计分析 对象转换器 diff --git a/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/system/SystemEnvConversion.java b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/system/SystemEnvConversion.java index a3d2bfee..ed521107 100644 --- a/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/system/SystemEnvConversion.java +++ b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/system/SystemEnvConversion.java @@ -15,11 +15,11 @@ */ package cn.orionsec.ops.mapping.system; +import cn.orionsec.kit.lang.utils.convert.TypeStore; import cn.orionsec.ops.constant.Const; import cn.orionsec.ops.constant.system.SystemEnvAttr; import cn.orionsec.ops.entity.domain.SystemEnvDO; import cn.orionsec.ops.entity.vo.system.SystemEnvVO; -import com.orion.lang.utils.convert.TypeStore; /** * 系统环境变量 对象转换器 diff --git a/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/template/CommandTemplateConversion.java b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/template/CommandTemplateConversion.java index 553a65a2..07b77861 100644 --- a/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/template/CommandTemplateConversion.java +++ b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/template/CommandTemplateConversion.java @@ -15,10 +15,10 @@ */ package cn.orionsec.ops.mapping.template; +import cn.orionsec.kit.lang.utils.convert.TypeStore; +import cn.orionsec.kit.lang.utils.time.Dates; import cn.orionsec.ops.entity.domain.CommandTemplateDO; import cn.orionsec.ops.entity.vo.template.CommandTemplateVO; -import com.orion.lang.utils.convert.TypeStore; -import com.orion.lang.utils.time.Dates; /** * 命令模板 对象转换器 diff --git a/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/upload/BatchUploadConversion.java b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/upload/BatchUploadConversion.java index 5ab4b5fb..864e7fa0 100644 --- a/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/upload/BatchUploadConversion.java +++ b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/upload/BatchUploadConversion.java @@ -15,12 +15,12 @@ */ package cn.orionsec.ops.mapping.upload; +import cn.orionsec.kit.lang.utils.convert.TypeStore; import cn.orionsec.ops.entity.domain.MachineInfoDO; import cn.orionsec.ops.entity.dto.sftp.SftpUploadInfoDTO; import cn.orionsec.ops.entity.request.upload.BatchUploadRequest; import cn.orionsec.ops.entity.vo.upload.BatchUploadCheckFileVO; import cn.orionsec.ops.entity.vo.upload.BatchUploadCheckMachineVO; -import com.orion.lang.utils.convert.TypeStore; /** * 文件批量上传 对象转换器 diff --git a/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/user/UserEventLogConversion.java b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/user/UserEventLogConversion.java index b8a144ad..0ffffff2 100644 --- a/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/user/UserEventLogConversion.java +++ b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/user/UserEventLogConversion.java @@ -15,10 +15,10 @@ */ package cn.orionsec.ops.mapping.user; +import cn.orionsec.kit.lang.utils.convert.TypeStore; +import cn.orionsec.kit.lang.utils.time.Dates; import cn.orionsec.ops.entity.domain.UserEventLogDO; import cn.orionsec.ops.entity.vo.user.UserEventLogVO; -import com.orion.lang.utils.convert.TypeStore; -import com.orion.lang.utils.time.Dates; /** * 用户操作日志 对象转换器 diff --git a/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/user/UserInfoConversion.java b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/user/UserInfoConversion.java index 3afb1291..5918ade2 100644 --- a/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/user/UserInfoConversion.java +++ b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/user/UserInfoConversion.java @@ -15,11 +15,11 @@ */ package cn.orionsec.ops.mapping.user; +import cn.orionsec.kit.lang.utils.convert.TypeStore; +import cn.orionsec.kit.lang.utils.time.Dates; import cn.orionsec.ops.entity.domain.UserInfoDO; import cn.orionsec.ops.entity.dto.user.UserDTO; import cn.orionsec.ops.entity.vo.user.UserInfoVO; -import com.orion.lang.utils.convert.TypeStore; -import com.orion.lang.utils.time.Dates; import java.util.Date; import java.util.Optional; diff --git a/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/webhook/WebhookConfigConversion.java b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/webhook/WebhookConfigConversion.java index 66063198..f3dfd9ec 100644 --- a/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/webhook/WebhookConfigConversion.java +++ b/orion-ops-api/orion-ops-mapping/src/main/java/cn/orionsec/ops/mapping/webhook/WebhookConfigConversion.java @@ -15,9 +15,9 @@ */ package cn.orionsec.ops.mapping.webhook; +import cn.orionsec.kit.lang.utils.convert.TypeStore; import cn.orionsec.ops.entity.domain.WebhookConfigDO; import cn.orionsec.ops.entity.vo.webhook.WebhookConfigVO; -import com.orion.lang.utils.convert.TypeStore; /** * webhook 配置 对象转换器 diff --git a/orion-ops-api/orion-ops-model/pom.xml b/orion-ops-api/orion-ops-model/pom.xml index 5ad0ed6e..15efbada 100644 --- a/orion-ops-api/orion-ops-model/pom.xml +++ b/orion-ops-api/orion-ops-model/pom.xml @@ -25,9 +25,15 @@ springfox-swagger2 + + + org.aspectj + aspectjweaver + + - io.github.lijiahangmax + cn.orionsec.kit orion-all diff --git a/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/config/TerminalConnectConfig.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/config/TerminalConnectConfig.java index 1db53661..08c4aebb 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/config/TerminalConnectConfig.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/config/TerminalConnectConfig.java @@ -39,7 +39,7 @@ public class TerminalConnectConfig { private Integer cols; /** - * @see com.orion.net.remote.TerminalType + * @see cn.orionsec.kit.net.host.ssh.TerminalType */ @ApiModelProperty(value = "终端类型") private String terminalType; diff --git a/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/alarm/AlarmGroupNotifyRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/alarm/AlarmGroupNotifyRequest.java index a5adbb0d..8ff92862 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/alarm/AlarmGroupNotifyRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/alarm/AlarmGroupNotifyRequest.java @@ -15,7 +15,7 @@ */ package cn.orionsec.ops.entity.request.alarm; -import com.orion.lang.define.wrapper.PageRequest; +import cn.orionsec.kit.lang.define.wrapper.PageRequest; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/alarm/AlarmGroupRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/alarm/AlarmGroupRequest.java index d15c82fd..cec6eed3 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/alarm/AlarmGroupRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/alarm/AlarmGroupRequest.java @@ -15,7 +15,7 @@ */ package cn.orionsec.ops.entity.request.alarm; -import com.orion.lang.define.wrapper.PageRequest; +import cn.orionsec.kit.lang.define.wrapper.PageRequest; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/ApplicationBuildRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/ApplicationBuildRequest.java index 1ea5da6a..f0b59d8c 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/ApplicationBuildRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/ApplicationBuildRequest.java @@ -15,7 +15,7 @@ */ package cn.orionsec.ops.entity.request.app; -import com.orion.lang.define.wrapper.PageRequest; +import cn.orionsec.kit.lang.define.wrapper.PageRequest; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/ApplicationEnvRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/ApplicationEnvRequest.java index aac061e6..18ecc58d 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/ApplicationEnvRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/ApplicationEnvRequest.java @@ -15,7 +15,7 @@ */ package cn.orionsec.ops.entity.request.app; -import com.orion.lang.define.wrapper.PageRequest; +import cn.orionsec.kit.lang.define.wrapper.PageRequest; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/ApplicationInfoRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/ApplicationInfoRequest.java index dfe68aa0..b97bc732 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/ApplicationInfoRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/ApplicationInfoRequest.java @@ -15,7 +15,7 @@ */ package cn.orionsec.ops.entity.request.app; -import com.orion.lang.define.wrapper.PageRequest; +import cn.orionsec.kit.lang.define.wrapper.PageRequest; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/ApplicationPipelineRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/ApplicationPipelineRequest.java index 90df6367..39440c47 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/ApplicationPipelineRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/ApplicationPipelineRequest.java @@ -15,7 +15,7 @@ */ package cn.orionsec.ops.entity.request.app; -import com.orion.lang.define.wrapper.PageRequest; +import cn.orionsec.kit.lang.define.wrapper.PageRequest; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/ApplicationPipelineTaskRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/ApplicationPipelineTaskRequest.java index b64bb3d9..7ec44cc5 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/ApplicationPipelineTaskRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/ApplicationPipelineTaskRequest.java @@ -15,7 +15,7 @@ */ package cn.orionsec.ops.entity.request.app; -import com.orion.lang.define.wrapper.PageRequest; +import cn.orionsec.kit.lang.define.wrapper.PageRequest; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/ApplicationProfileRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/ApplicationProfileRequest.java index ad375ec4..6f545c10 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/ApplicationProfileRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/ApplicationProfileRequest.java @@ -15,7 +15,7 @@ */ package cn.orionsec.ops.entity.request.app; -import com.orion.lang.define.wrapper.PageRequest; +import cn.orionsec.kit.lang.define.wrapper.PageRequest; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/ApplicationReleaseRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/ApplicationReleaseRequest.java index 2fe0d209..cd3a2a38 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/ApplicationReleaseRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/ApplicationReleaseRequest.java @@ -15,7 +15,7 @@ */ package cn.orionsec.ops.entity.request.app; -import com.orion.lang.define.wrapper.PageRequest; +import cn.orionsec.kit.lang.define.wrapper.PageRequest; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/ApplicationRepositoryRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/ApplicationRepositoryRequest.java index 1d2f0e58..2e09dba1 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/ApplicationRepositoryRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/app/ApplicationRepositoryRequest.java @@ -15,7 +15,7 @@ */ package cn.orionsec.ops.entity.request.app; -import com.orion.lang.define.wrapper.PageRequest; +import cn.orionsec.kit.lang.define.wrapper.PageRequest; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/exec/CommandExecRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/exec/CommandExecRequest.java index 923c35b2..170dc352 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/exec/CommandExecRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/exec/CommandExecRequest.java @@ -15,7 +15,7 @@ */ package cn.orionsec.ops.entity.request.exec; -import com.orion.lang.define.wrapper.PageRequest; +import cn.orionsec.kit.lang.define.wrapper.PageRequest; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/file/FileTailRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/file/FileTailRequest.java index de9f5d56..78f9ec16 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/file/FileTailRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/file/FileTailRequest.java @@ -15,7 +15,7 @@ */ package cn.orionsec.ops.entity.request.file; -import com.orion.lang.define.wrapper.PageRequest; +import cn.orionsec.kit.lang.define.wrapper.PageRequest; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/history/HistoryValueRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/history/HistoryValueRequest.java index 644fccc7..a36fd6b1 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/history/HistoryValueRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/history/HistoryValueRequest.java @@ -15,7 +15,7 @@ */ package cn.orionsec.ops.entity.request.history; -import com.orion.lang.define.wrapper.PageRequest; +import cn.orionsec.kit.lang.define.wrapper.PageRequest; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineAlarmHistoryRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineAlarmHistoryRequest.java index e679ceca..26f09f0e 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineAlarmHistoryRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineAlarmHistoryRequest.java @@ -15,7 +15,7 @@ */ package cn.orionsec.ops.entity.request.machine; -import com.orion.lang.define.wrapper.PageRequest; +import cn.orionsec.kit.lang.define.wrapper.PageRequest; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineEnvRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineEnvRequest.java index 1b35e1a6..45541cab 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineEnvRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineEnvRequest.java @@ -15,7 +15,7 @@ */ package cn.orionsec.ops.entity.request.machine; -import com.orion.lang.define.wrapper.PageRequest; +import cn.orionsec.kit.lang.define.wrapper.PageRequest; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineInfoRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineInfoRequest.java index 7ba92779..839e70e2 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineInfoRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineInfoRequest.java @@ -15,7 +15,7 @@ */ package cn.orionsec.ops.entity.request.machine; -import com.orion.lang.define.wrapper.PageRequest; +import cn.orionsec.kit.lang.define.wrapper.PageRequest; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineKeyRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineKeyRequest.java index 4627d63c..3f38a400 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineKeyRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineKeyRequest.java @@ -15,7 +15,7 @@ */ package cn.orionsec.ops.entity.request.machine; -import com.orion.lang.define.wrapper.PageRequest; +import cn.orionsec.kit.lang.define.wrapper.PageRequest; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineMonitorRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineMonitorRequest.java index 5544cdb9..55d09df1 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineMonitorRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineMonitorRequest.java @@ -15,7 +15,7 @@ */ package cn.orionsec.ops.entity.request.machine; -import com.orion.lang.define.wrapper.PageRequest; +import cn.orionsec.kit.lang.define.wrapper.PageRequest; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineProxyRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineProxyRequest.java index 0d6e6116..d3663ed6 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineProxyRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineProxyRequest.java @@ -15,7 +15,7 @@ */ package cn.orionsec.ops.entity.request.machine; -import com.orion.lang.define.wrapper.PageRequest; +import cn.orionsec.kit.lang.define.wrapper.PageRequest; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineTerminalLogRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineTerminalLogRequest.java index 3a64595e..5152a993 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineTerminalLogRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineTerminalLogRequest.java @@ -15,7 +15,7 @@ */ package cn.orionsec.ops.entity.request.machine; -import com.orion.lang.define.wrapper.PageRequest; +import cn.orionsec.kit.lang.define.wrapper.PageRequest; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineTerminalManagerRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineTerminalManagerRequest.java index aa314d30..fd57a29f 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineTerminalManagerRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineTerminalManagerRequest.java @@ -15,7 +15,7 @@ */ package cn.orionsec.ops.entity.request.machine; -import com.orion.lang.define.wrapper.PageRequest; +import cn.orionsec.kit.lang.define.wrapper.PageRequest; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineTerminalRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineTerminalRequest.java index 78648d5d..65e36428 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineTerminalRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/machine/MachineTerminalRequest.java @@ -38,7 +38,7 @@ public class MachineTerminalRequest { private Long machineId; /** - * @see com.orion.net.remote.TerminalType + * @see cn.orionsec.kit.net.host.ssh.TerminalType */ @ApiModelProperty(value = "终端类型") private String terminalType; diff --git a/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/message/WebSideMessageRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/message/WebSideMessageRequest.java index 4b40c7f4..ea89c190 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/message/WebSideMessageRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/message/WebSideMessageRequest.java @@ -15,7 +15,7 @@ */ package cn.orionsec.ops.entity.request.message; -import com.orion.lang.define.wrapper.PageRequest; +import cn.orionsec.kit.lang.define.wrapper.PageRequest; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/scheduler/SchedulerTaskRecordRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/scheduler/SchedulerTaskRecordRequest.java index 45cc8441..1425c085 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/scheduler/SchedulerTaskRecordRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/scheduler/SchedulerTaskRecordRequest.java @@ -15,7 +15,7 @@ */ package cn.orionsec.ops.entity.request.scheduler; -import com.orion.lang.define.wrapper.PageRequest; +import cn.orionsec.kit.lang.define.wrapper.PageRequest; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/scheduler/SchedulerTaskRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/scheduler/SchedulerTaskRequest.java index b56ea7ee..0f31be4e 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/scheduler/SchedulerTaskRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/scheduler/SchedulerTaskRequest.java @@ -15,7 +15,7 @@ */ package cn.orionsec.ops.entity.request.scheduler; -import com.orion.lang.define.wrapper.PageRequest; +import cn.orionsec.kit.lang.define.wrapper.PageRequest; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/system/SystemEnvRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/system/SystemEnvRequest.java index ff649741..f553d855 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/system/SystemEnvRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/system/SystemEnvRequest.java @@ -15,7 +15,7 @@ */ package cn.orionsec.ops.entity.request.system; -import com.orion.lang.define.wrapper.PageRequest; +import cn.orionsec.kit.lang.define.wrapper.PageRequest; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/template/CommandTemplateRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/template/CommandTemplateRequest.java index 3bfe5b63..f11c3098 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/template/CommandTemplateRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/template/CommandTemplateRequest.java @@ -15,7 +15,7 @@ */ package cn.orionsec.ops.entity.request.template; -import com.orion.lang.define.wrapper.PageRequest; +import cn.orionsec.kit.lang.define.wrapper.PageRequest; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/user/EventLogRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/user/EventLogRequest.java index 5bc9cae9..398fbb38 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/user/EventLogRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/user/EventLogRequest.java @@ -15,7 +15,7 @@ */ package cn.orionsec.ops.entity.request.user; -import com.orion.lang.define.wrapper.PageRequest; +import cn.orionsec.kit.lang.define.wrapper.PageRequest; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/user/UserInfoRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/user/UserInfoRequest.java index fdfe0a9e..5eba3151 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/user/UserInfoRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/user/UserInfoRequest.java @@ -15,7 +15,7 @@ */ package cn.orionsec.ops.entity.request.user; -import com.orion.lang.define.wrapper.PageRequest; +import cn.orionsec.kit.lang.define.wrapper.PageRequest; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/webhook/WebhookConfigRequest.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/webhook/WebhookConfigRequest.java index 7c579ee1..244b4901 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/webhook/WebhookConfigRequest.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/request/webhook/WebhookConfigRequest.java @@ -15,7 +15,7 @@ */ package cn.orionsec.ops.entity.request.webhook; -import com.orion.lang.define.wrapper.PageRequest; +import cn.orionsec.kit.lang.define.wrapper.PageRequest; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/machine/MachineTerminalVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/machine/MachineTerminalVO.java index 4f370f68..a9d614bc 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/machine/MachineTerminalVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/machine/MachineTerminalVO.java @@ -40,7 +40,7 @@ public class MachineTerminalVO { private Long machineId; /** - * @see com.orion.net.remote.TerminalType + * @see cn.orionsec.kit.net.host.ssh.TerminalType */ @ApiModelProperty(value = "终端类型") private String terminalType; diff --git a/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/machine/TerminalAccessVO.java b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/machine/TerminalAccessVO.java index 874e12e8..7973f83b 100644 --- a/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/machine/TerminalAccessVO.java +++ b/orion-ops-api/orion-ops-model/src/main/java/cn/orionsec/ops/entity/vo/machine/TerminalAccessVO.java @@ -50,7 +50,7 @@ public class TerminalAccessVO { private String username; /** - * @see com.orion.net.remote.TerminalType + * @see cn.orionsec.kit.net.host.ssh.TerminalType */ @ApiModelProperty(value = "终端类型") private String terminalType; diff --git a/orion-ops-api/orion-ops-runner/src/main/java/cn/orionsec/ops/runner/AppRepositoryStatusCleanRunner.java b/orion-ops-api/orion-ops-runner/src/main/java/cn/orionsec/ops/runner/AppRepositoryStatusCleanRunner.java index 8d36704c..575ebc63 100644 --- a/orion-ops-api/orion-ops-runner/src/main/java/cn/orionsec/ops/runner/AppRepositoryStatusCleanRunner.java +++ b/orion-ops-api/orion-ops-runner/src/main/java/cn/orionsec/ops/runner/AppRepositoryStatusCleanRunner.java @@ -15,12 +15,12 @@ */ package cn.orionsec.ops.runner; +import cn.orionsec.kit.lang.utils.io.Files1; import cn.orionsec.ops.constant.app.RepositoryStatus; import cn.orionsec.ops.dao.ApplicationRepositoryDAO; import cn.orionsec.ops.entity.domain.ApplicationRepositoryDO; import cn.orionsec.ops.utils.Utils; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.lang.utils.io.Files1; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.CommandLineRunner; import org.springframework.core.annotation.Order; diff --git a/orion-ops-api/orion-ops-runner/src/main/java/cn/orionsec/ops/runner/CacheKeyCleanRunner.java b/orion-ops-api/orion-ops-runner/src/main/java/cn/orionsec/ops/runner/CacheKeyCleanRunner.java index 3d65009f..dbe81a24 100644 --- a/orion-ops-api/orion-ops-runner/src/main/java/cn/orionsec/ops/runner/CacheKeyCleanRunner.java +++ b/orion-ops-api/orion-ops-runner/src/main/java/cn/orionsec/ops/runner/CacheKeyCleanRunner.java @@ -15,11 +15,11 @@ */ package cn.orionsec.ops.runner; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.collect.Lists; import cn.orionsec.ops.constant.Const; import cn.orionsec.ops.constant.KeyConst; import cn.orionsec.ops.utils.RedisUtils; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.collect.Lists; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.CommandLineRunner; import org.springframework.core.annotation.Order; diff --git a/orion-ops-api/orion-ops-runner/src/main/java/cn/orionsec/ops/runner/HostMachineInitializeRunner.java b/orion-ops-api/orion-ops-runner/src/main/java/cn/orionsec/ops/runner/HostMachineInitializeRunner.java index 82a773c5..773dde54 100644 --- a/orion-ops-api/orion-ops-runner/src/main/java/cn/orionsec/ops/runner/HostMachineInitializeRunner.java +++ b/orion-ops-api/orion-ops-runner/src/main/java/cn/orionsec/ops/runner/HostMachineInitializeRunner.java @@ -15,6 +15,8 @@ */ package cn.orionsec.ops.runner; +import cn.orionsec.kit.lang.utils.Systems; +import cn.orionsec.kit.lang.utils.net.IPs; import cn.orionsec.ops.constant.Const; import cn.orionsec.ops.constant.machine.MachineAuthType; import cn.orionsec.ops.dao.MachineInfoDAO; @@ -22,8 +24,6 @@ import cn.orionsec.ops.service.api.MachineEnvService; import cn.orionsec.ops.utils.ValueMix; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.lang.utils.Systems; -import com.orion.lang.utils.net.IPs; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.CommandLineRunner; import org.springframework.core.annotation.Order; diff --git a/orion-ops-api/orion-ops-runner/src/main/java/cn/orionsec/ops/runner/MachineMonitorStatusRunner.java b/orion-ops-api/orion-ops-runner/src/main/java/cn/orionsec/ops/runner/MachineMonitorStatusRunner.java index fa0fb6e6..3a0b504a 100644 --- a/orion-ops-api/orion-ops-runner/src/main/java/cn/orionsec/ops/runner/MachineMonitorStatusRunner.java +++ b/orion-ops-api/orion-ops-runner/src/main/java/cn/orionsec/ops/runner/MachineMonitorStatusRunner.java @@ -15,6 +15,8 @@ */ package cn.orionsec.ops.runner; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.Threads; import cn.orionsec.ops.constant.monitor.MonitorConst; import cn.orionsec.ops.constant.monitor.MonitorStatus; import cn.orionsec.ops.dao.MachineMonitorDAO; @@ -23,8 +25,6 @@ import cn.orionsec.ops.entity.query.MachineMonitorQuery; import cn.orionsec.ops.service.api.MachineMonitorService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.Threads; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.CommandLineRunner; import org.springframework.core.annotation.Order; diff --git a/orion-ops-api/orion-ops-runner/src/main/java/cn/orionsec/ops/runner/SystemEnvInitializeRunner.java b/orion-ops-api/orion-ops-runner/src/main/java/cn/orionsec/ops/runner/SystemEnvInitializeRunner.java index 0932ad0a..c88964f4 100644 --- a/orion-ops-api/orion-ops-runner/src/main/java/cn/orionsec/ops/runner/SystemEnvInitializeRunner.java +++ b/orion-ops-api/orion-ops-runner/src/main/java/cn/orionsec/ops/runner/SystemEnvInitializeRunner.java @@ -15,6 +15,7 @@ */ package cn.orionsec.ops.runner; +import cn.orionsec.kit.lang.utils.io.Files1; import cn.orionsec.ops.constant.Const; import cn.orionsec.ops.constant.common.EnableType; import cn.orionsec.ops.constant.history.HistoryOperator; @@ -26,7 +27,6 @@ import cn.orionsec.ops.service.api.HistoryValueService; import cn.orionsec.ops.utils.PathBuilders; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.lang.utils.io.Files1; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.CommandLineRunner; import org.springframework.core.annotation.Order; diff --git a/orion-ops-api/orion-ops-runner/src/main/java/cn/orionsec/ops/runner/SystemSpaceAnalysisRunner.java b/orion-ops-api/orion-ops-runner/src/main/java/cn/orionsec/ops/runner/SystemSpaceAnalysisRunner.java index b103b1cd..3af9b0be 100644 --- a/orion-ops-api/orion-ops-runner/src/main/java/cn/orionsec/ops/runner/SystemSpaceAnalysisRunner.java +++ b/orion-ops-api/orion-ops-runner/src/main/java/cn/orionsec/ops/runner/SystemSpaceAnalysisRunner.java @@ -15,9 +15,9 @@ */ package cn.orionsec.ops.runner; +import cn.orionsec.kit.lang.utils.Threads; +import cn.orionsec.kit.lang.utils.time.Dates; import cn.orionsec.ops.service.api.SystemService; -import com.orion.lang.utils.Threads; -import com.orion.lang.utils.time.Dates; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.CommandLineRunner; import org.springframework.core.annotation.Order; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/config/JsonSerializerConfig.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/config/JsonSerializerConfig.java index a3cd162e..a3e0a0c7 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/config/JsonSerializerConfig.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/config/JsonSerializerConfig.java @@ -15,10 +15,10 @@ */ package cn.orionsec.ops.config; +import cn.orionsec.kit.lang.utils.collect.Lists; import com.alibaba.fastjson.serializer.SerializerFeature; import com.alibaba.fastjson.support.config.FastJsonConfig; import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter; -import com.orion.lang.utils.collect.Lists; import org.springframework.boot.autoconfigure.http.HttpMessageConverters; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/alarm/MachineAlarmExecutor.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/alarm/MachineAlarmExecutor.java index ca158a15..661fd548 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/alarm/MachineAlarmExecutor.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/alarm/MachineAlarmExecutor.java @@ -15,6 +15,9 @@ */ package cn.orionsec.ops.handler.alarm; +import cn.orionsec.kit.lang.able.Executable; +import cn.orionsec.kit.lang.utils.Threads; +import cn.orionsec.kit.spring.SpringHolder; import cn.orionsec.ops.constant.SchedulerPools; import cn.orionsec.ops.constant.alarm.AlarmGroupNotifyType; import cn.orionsec.ops.dao.UserInfoDAO; @@ -28,9 +31,6 @@ import cn.orionsec.ops.service.api.AlarmGroupUserService; import cn.orionsec.ops.service.api.MachineAlarmGroupService; import com.alibaba.fastjson.JSON; -import com.orion.lang.able.Executable; -import com.orion.lang.utils.Threads; -import com.orion.spring.SpringHolder; import lombok.extern.slf4j.Slf4j; import java.util.List; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/alarm/push/AlarmWebSideMessagePusher.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/alarm/push/AlarmWebSideMessagePusher.java index 493579fb..0b30b085 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/alarm/push/AlarmWebSideMessagePusher.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/alarm/push/AlarmWebSideMessagePusher.java @@ -15,15 +15,15 @@ */ package cn.orionsec.ops.handler.alarm.push; +import cn.orionsec.kit.lang.utils.collect.Maps; +import cn.orionsec.kit.lang.utils.math.Numbers; +import cn.orionsec.kit.lang.utils.time.Dates; +import cn.orionsec.kit.spring.SpringHolder; import cn.orionsec.ops.constant.event.EventKeys; import cn.orionsec.ops.constant.machine.MachineAlarmType; import cn.orionsec.ops.constant.message.MessageType; import cn.orionsec.ops.handler.alarm.MachineAlarmContext; import cn.orionsec.ops.service.api.WebSideMessageService; -import com.orion.lang.utils.collect.Maps; -import com.orion.lang.utils.math.Numbers; -import com.orion.lang.utils.time.Dates; -import com.orion.spring.SpringHolder; import java.util.Map; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/alarm/push/AlarmWebhookPusher.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/alarm/push/AlarmWebhookPusher.java index 261bca1d..ddb04a1f 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/alarm/push/AlarmWebhookPusher.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/alarm/push/AlarmWebhookPusher.java @@ -15,6 +15,11 @@ */ package cn.orionsec.ops.handler.alarm.push; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.collect.Maps; +import cn.orionsec.kit.lang.utils.math.Numbers; +import cn.orionsec.kit.lang.utils.time.Dates; +import cn.orionsec.kit.spring.SpringHolder; import cn.orionsec.ops.constant.event.EventKeys; import cn.orionsec.ops.constant.machine.MachineAlarmType; import cn.orionsec.ops.constant.webhook.WebhookType; @@ -24,11 +29,6 @@ import cn.orionsec.ops.handler.alarm.MachineAlarmContext; import cn.orionsec.ops.handler.webhook.DingRobotPusher; import cn.orionsec.ops.utils.ResourceLoader; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.collect.Maps; -import com.orion.lang.utils.math.Numbers; -import com.orion.lang.utils.time.Dates; -import com.orion.spring.SpringHolder; import java.util.List; import java.util.Map; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/action/AbstractActionHandler.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/action/AbstractActionHandler.java index 4df53802..6221af6e 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/action/AbstractActionHandler.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/action/AbstractActionHandler.java @@ -15,6 +15,17 @@ */ package cn.orionsec.ops.handler.app.action; +import cn.orionsec.kit.lang.constant.Letters; +import cn.orionsec.kit.lang.define.io.OutputAppender; +import cn.orionsec.kit.lang.exception.ExecuteException; +import cn.orionsec.kit.lang.exception.LogException; +import cn.orionsec.kit.lang.utils.Exceptions; +import cn.orionsec.kit.lang.utils.Strings; +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 cn.orionsec.kit.net.host.ssh.ExitCode; +import cn.orionsec.kit.spring.SpringHolder; import cn.orionsec.ops.constant.Const; import cn.orionsec.ops.constant.app.ActionStatus; import cn.orionsec.ops.constant.app.ActionType; @@ -23,17 +34,6 @@ import cn.orionsec.ops.dao.ApplicationActionLogDAO; import cn.orionsec.ops.entity.domain.ApplicationActionLogDO; import cn.orionsec.ops.utils.Utils; -import com.orion.lang.constant.Letters; -import com.orion.lang.define.io.OutputAppender; -import com.orion.lang.exception.ExecuteException; -import com.orion.lang.exception.LogException; -import com.orion.lang.utils.Exceptions; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.io.Files1; -import com.orion.lang.utils.io.Streams; -import com.orion.lang.utils.time.Dates; -import com.orion.net.remote.ExitCode; -import com.orion.spring.SpringHolder; import lombok.Getter; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/action/CheckoutActionHandler.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/action/CheckoutActionHandler.java index 4dd35dd8..b4dce80f 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/action/CheckoutActionHandler.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/action/CheckoutActionHandler.java @@ -15,6 +15,10 @@ */ package cn.orionsec.ops.handler.app.action; +import cn.orionsec.kit.lang.utils.Exceptions; +import cn.orionsec.kit.lang.utils.io.Files1; +import cn.orionsec.kit.lang.utils.io.Streams; +import cn.orionsec.kit.spring.SpringHolder; import cn.orionsec.ops.constant.Const; import cn.orionsec.ops.constant.MessageConst; import cn.orionsec.ops.constant.app.ActionType; @@ -22,10 +26,6 @@ import cn.orionsec.ops.entity.domain.ApplicationRepositoryDO; import cn.orionsec.ops.service.api.ApplicationRepositoryService; import cn.orionsec.ops.utils.Utils; -import com.orion.lang.utils.Exceptions; -import com.orion.lang.utils.io.Files1; -import com.orion.lang.utils.io.Streams; -import com.orion.spring.SpringHolder; import org.eclipse.jgit.api.CloneCommand; import org.eclipse.jgit.api.Git; import org.eclipse.jgit.api.ResetCommand; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/action/CommandActionHandler.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/action/CommandActionHandler.java index 946a7696..a7c72d16 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/action/CommandActionHandler.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/action/CommandActionHandler.java @@ -15,15 +15,15 @@ */ package cn.orionsec.ops.handler.app.action; +import cn.orionsec.kit.lang.utils.Exceptions; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.io.Streams; +import cn.orionsec.kit.net.host.ssh.ExitCode; +import cn.orionsec.kit.net.host.ssh.command.CommandExecutor; +import cn.orionsec.kit.net.host.ssh.command.CommandExecutors; import cn.orionsec.ops.constant.app.ActionType; import cn.orionsec.ops.constant.common.StainCode; import cn.orionsec.ops.utils.Utils; -import com.orion.lang.utils.Exceptions; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.io.Streams; -import com.orion.net.remote.CommandExecutors; -import com.orion.net.remote.ExitCode; -import com.orion.net.remote.channel.ssh.CommandExecutor; import lombok.Getter; /** @@ -52,7 +52,7 @@ protected void handler() throws Exception { // 打开executor this.executor = store.getSessionStore().getCommandExecutor(Strings.replaceCRLF(action.getActionCommand())); // 执行命令 - CommandExecutors.syncExecCommand(executor, appender); + CommandExecutors.execCommand(executor, appender); this.exitCode = executor.getExitCode(); if (!ExitCode.isSuccess(exitCode)) { throw Exceptions.execute("*** 命令执行失败 exitCode: " + exitCode); diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/action/IActionHandler.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/action/IActionHandler.java index e7837a84..9e37c862 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/action/IActionHandler.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/action/IActionHandler.java @@ -15,14 +15,14 @@ */ package cn.orionsec.ops.handler.app.action; +import cn.orionsec.kit.lang.able.Executable; +import cn.orionsec.kit.lang.able.SafeCloseable; +import cn.orionsec.kit.lang.function.select.Branches; +import cn.orionsec.kit.lang.function.select.Selector; import cn.orionsec.ops.constant.app.ActionStatus; import cn.orionsec.ops.constant.app.ActionType; import cn.orionsec.ops.constant.app.TransferMode; import cn.orionsec.ops.entity.domain.ApplicationActionLogDO; -import com.orion.lang.able.Executable; -import com.orion.lang.able.SafeCloseable; -import com.orion.lang.function.select.Branches; -import com.orion.lang.function.select.Selector; import java.util.List; import java.util.stream.Collectors; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/action/MachineActionStore.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/action/MachineActionStore.java index cbba4e4c..fbe9a578 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/action/MachineActionStore.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/action/MachineActionStore.java @@ -15,10 +15,10 @@ */ package cn.orionsec.ops.handler.app.action; +import cn.orionsec.kit.lang.utils.collect.Maps; +import cn.orionsec.kit.net.host.SessionStore; import cn.orionsec.ops.constant.app.TransferMode; import cn.orionsec.ops.entity.domain.ApplicationActionLogDO; -import com.orion.lang.utils.collect.Maps; -import com.orion.net.remote.channel.SessionStore; import lombok.Data; import java.io.OutputStream; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/action/ScpTransferActionHandler.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/action/ScpTransferActionHandler.java index 7dc35e8a..f1634a32 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/action/ScpTransferActionHandler.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/action/ScpTransferActionHandler.java @@ -15,6 +15,16 @@ */ package cn.orionsec.ops.handler.app.action; +import cn.orionsec.kit.lang.utils.Exceptions; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.collect.Maps; +import cn.orionsec.kit.lang.utils.io.Files1; +import cn.orionsec.kit.lang.utils.io.Streams; +import cn.orionsec.kit.net.host.SessionStore; +import cn.orionsec.kit.net.host.ssh.ExitCode; +import cn.orionsec.kit.net.host.ssh.command.CommandExecutor; +import cn.orionsec.kit.net.host.ssh.command.CommandExecutors; +import cn.orionsec.kit.spring.SpringHolder; import cn.orionsec.ops.constant.Const; import cn.orionsec.ops.constant.app.ActionType; import cn.orionsec.ops.constant.app.TransferMode; @@ -24,16 +34,6 @@ import cn.orionsec.ops.constant.system.SystemEnvAttr; import cn.orionsec.ops.service.api.MachineInfoService; import cn.orionsec.ops.utils.Utils; -import com.orion.lang.utils.Exceptions; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.collect.Maps; -import com.orion.lang.utils.io.Files1; -import com.orion.lang.utils.io.Streams; -import com.orion.net.remote.CommandExecutors; -import com.orion.net.remote.ExitCode; -import com.orion.net.remote.channel.SessionStore; -import com.orion.net.remote.channel.ssh.CommandExecutor; -import com.orion.spring.SpringHolder; import lombok.Getter; import java.io.File; @@ -93,7 +93,7 @@ protected void handler() throws Exception { // 打开executor this.executor = session.getCommandExecutor(Strings.replaceCRLF(scpCommand)); // 执行命令 - CommandExecutors.syncExecCommand(executor, appender); + CommandExecutors.execCommand(executor, appender); this.exitCode = executor.getExitCode(); this.appendLog(Const.LF); if (!ExitCode.isSuccess(exitCode)) { diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/action/SftpTransferActionHandler.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/action/SftpTransferActionHandler.java index a3e900af..cf1a6d85 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/action/SftpTransferActionHandler.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/action/SftpTransferActionHandler.java @@ -15,6 +15,12 @@ */ package cn.orionsec.ops.handler.app.action; +import cn.orionsec.kit.lang.utils.Exceptions; +import cn.orionsec.kit.lang.utils.collect.Maps; +import cn.orionsec.kit.lang.utils.io.Files1; +import cn.orionsec.kit.lang.utils.io.Streams; +import cn.orionsec.kit.net.host.sftp.SftpExecutor; +import cn.orionsec.kit.spring.SpringHolder; import cn.orionsec.ops.constant.Const; import cn.orionsec.ops.constant.app.ActionType; import cn.orionsec.ops.constant.app.TransferMode; @@ -22,12 +28,6 @@ import cn.orionsec.ops.constant.system.SystemEnvAttr; import cn.orionsec.ops.service.api.MachineEnvService; import cn.orionsec.ops.utils.Utils; -import com.orion.lang.utils.Exceptions; -import com.orion.lang.utils.collect.Maps; -import com.orion.lang.utils.io.Files1; -import com.orion.lang.utils.io.Streams; -import com.orion.net.remote.channel.sftp.SftpExecutor; -import com.orion.spring.SpringHolder; import java.io.File; import java.util.List; @@ -103,7 +103,7 @@ protected void handler() throws Exception { .append(Utils.getStainKeyWords(remoteFile, StainCode.GLOSS_BLUE)) .append(Const.LF); this.appendLog(createDirLog.toString()); - executor.mkdirs(remoteFile); + executor.makeDirectories(remoteFile); continue; } // 文件则传输 diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/build/BuildSessionHolder.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/build/BuildSessionHolder.java index c0f9b83c..1ec0684c 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/build/BuildSessionHolder.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/build/BuildSessionHolder.java @@ -15,8 +15,8 @@ */ package cn.orionsec.ops.handler.app.build; +import cn.orionsec.kit.lang.utils.collect.Maps; import cn.orionsec.ops.handler.app.machine.IMachineProcessor; -import com.orion.lang.utils.collect.Maps; import org.springframework.stereotype.Component; import java.util.concurrent.ConcurrentHashMap; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/machine/AbstractMachineProcessor.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/machine/AbstractMachineProcessor.java index 2a7d1cac..d634b6a0 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/machine/AbstractMachineProcessor.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/machine/AbstractMachineProcessor.java @@ -15,6 +15,16 @@ */ package cn.orionsec.ops.handler.app.machine; +import cn.orionsec.kit.lang.constant.Letters; +import cn.orionsec.kit.lang.exception.DisabledException; +import cn.orionsec.kit.lang.exception.LogException; +import cn.orionsec.kit.lang.utils.Exceptions; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.collect.Lists; +import cn.orionsec.kit.lang.utils.io.Files1; +import cn.orionsec.kit.lang.utils.io.Streams; +import cn.orionsec.kit.lang.utils.time.Dates; +import cn.orionsec.kit.spring.SpringHolder; import cn.orionsec.ops.constant.Const; import cn.orionsec.ops.constant.app.ActionStatus; import cn.orionsec.ops.constant.common.StainCode; @@ -22,16 +32,6 @@ import cn.orionsec.ops.handler.app.action.IActionHandler; import cn.orionsec.ops.handler.tail.TailSessionHolder; import cn.orionsec.ops.utils.Utils; -import com.orion.lang.constant.Letters; -import com.orion.lang.exception.DisabledException; -import com.orion.lang.exception.LogException; -import com.orion.lang.utils.Exceptions; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.collect.Lists; -import com.orion.lang.utils.io.Files1; -import com.orion.lang.utils.io.Streams; -import com.orion.lang.utils.time.Dates; -import com.orion.spring.SpringHolder; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/machine/BuildMachineProcessor.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/machine/BuildMachineProcessor.java index ad20c5b0..64b782bb 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/machine/BuildMachineProcessor.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/machine/BuildMachineProcessor.java @@ -15,6 +15,18 @@ */ package cn.orionsec.ops.handler.app.machine; +import cn.orionsec.kit.lang.able.Executable; +import cn.orionsec.kit.lang.utils.Exceptions; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.Threads; +import cn.orionsec.kit.lang.utils.collect.Maps; +import cn.orionsec.kit.lang.utils.io.Files1; +import cn.orionsec.kit.lang.utils.io.Streams; +import cn.orionsec.kit.lang.utils.io.compress.CompressTypeEnum; +import cn.orionsec.kit.lang.utils.io.compress.FileCompressor; +import cn.orionsec.kit.lang.utils.time.Dates; +import cn.orionsec.kit.net.host.SessionStore; +import cn.orionsec.kit.spring.SpringHolder; import cn.orionsec.ops.constant.Const; import cn.orionsec.ops.constant.SchedulerPools; import cn.orionsec.ops.constant.app.ActionType; @@ -37,18 +49,6 @@ import cn.orionsec.ops.service.api.WebSideMessageService; import cn.orionsec.ops.utils.Utils; import com.alibaba.fastjson.JSON; -import com.orion.lang.able.Executable; -import com.orion.lang.utils.Exceptions; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.Threads; -import com.orion.lang.utils.collect.Maps; -import com.orion.lang.utils.io.Files1; -import com.orion.lang.utils.io.Streams; -import com.orion.lang.utils.io.compress.CompressTypeEnum; -import com.orion.lang.utils.io.compress.FileCompressor; -import com.orion.lang.utils.time.Dates; -import com.orion.net.remote.channel.SessionStore; -import com.orion.spring.SpringHolder; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/machine/IMachineProcessor.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/machine/IMachineProcessor.java index 20d68cd5..565c2d80 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/machine/IMachineProcessor.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/machine/IMachineProcessor.java @@ -15,7 +15,7 @@ */ package cn.orionsec.ops.handler.app.machine; -import com.orion.lang.able.SafeCloseable; +import cn.orionsec.kit.lang.able.SafeCloseable; /** * 机器执行器 diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/machine/ReleaseMachineProcessor.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/machine/ReleaseMachineProcessor.java index f7b3a448..6e4dc1fd 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/machine/ReleaseMachineProcessor.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/machine/ReleaseMachineProcessor.java @@ -15,6 +15,11 @@ */ package cn.orionsec.ops.handler.app.machine; +import cn.orionsec.kit.lang.utils.Exceptions; +import cn.orionsec.kit.lang.utils.io.Streams; +import cn.orionsec.kit.lang.utils.time.Dates; +import cn.orionsec.kit.net.host.SessionStore; +import cn.orionsec.kit.spring.SpringHolder; import cn.orionsec.ops.constant.Const; import cn.orionsec.ops.constant.app.ActionStatus; import cn.orionsec.ops.constant.app.StageType; @@ -28,11 +33,6 @@ import cn.orionsec.ops.service.api.MachineInfoService; import cn.orionsec.ops.utils.Utils; import com.alibaba.fastjson.JSON; -import com.orion.lang.utils.Exceptions; -import com.orion.lang.utils.io.Streams; -import com.orion.lang.utils.time.Dates; -import com.orion.net.remote.channel.SessionStore; -import com.orion.spring.SpringHolder; import lombok.Getter; import lombok.extern.slf4j.Slf4j; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/pipeline/IPipelineProcessor.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/pipeline/IPipelineProcessor.java index 285320e2..098ee002 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/pipeline/IPipelineProcessor.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/pipeline/IPipelineProcessor.java @@ -15,7 +15,7 @@ */ package cn.orionsec.ops.handler.app.pipeline; -import com.orion.lang.able.Executable; +import cn.orionsec.kit.lang.able.Executable; /** * 流水线处理器 diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/pipeline/PipelineProcessor.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/pipeline/PipelineProcessor.java index 9af23419..013531ad 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/pipeline/PipelineProcessor.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/pipeline/PipelineProcessor.java @@ -15,6 +15,10 @@ */ package cn.orionsec.ops.handler.app.pipeline; +import cn.orionsec.kit.lang.utils.Exceptions; +import cn.orionsec.kit.lang.utils.Threads; +import cn.orionsec.kit.lang.utils.collect.Maps; +import cn.orionsec.kit.spring.SpringHolder; import cn.orionsec.ops.constant.MessageConst; import cn.orionsec.ops.constant.SchedulerPools; import cn.orionsec.ops.constant.app.PipelineDetailStatus; @@ -27,10 +31,6 @@ import cn.orionsec.ops.handler.app.pipeline.stage.IStageHandler; import cn.orionsec.ops.service.api.ApplicationPipelineTaskDetailService; import cn.orionsec.ops.service.api.WebSideMessageService; -import com.orion.lang.utils.Exceptions; -import com.orion.lang.utils.Threads; -import com.orion.lang.utils.collect.Maps; -import com.orion.spring.SpringHolder; import lombok.Getter; import lombok.extern.slf4j.Slf4j; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/pipeline/PipelineSessionHolder.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/pipeline/PipelineSessionHolder.java index b4a2b9ea..1cdc08eb 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/pipeline/PipelineSessionHolder.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/pipeline/PipelineSessionHolder.java @@ -15,7 +15,7 @@ */ package cn.orionsec.ops.handler.app.pipeline; -import com.orion.lang.utils.collect.Maps; +import cn.orionsec.kit.lang.utils.collect.Maps; import org.springframework.stereotype.Component; import java.util.concurrent.ConcurrentHashMap; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/pipeline/stage/AbstractStageHandler.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/pipeline/stage/AbstractStageHandler.java index fc9bbecd..77d4ede3 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/pipeline/stage/AbstractStageHandler.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/pipeline/stage/AbstractStageHandler.java @@ -15,6 +15,8 @@ */ package cn.orionsec.ops.handler.app.pipeline.stage; +import cn.orionsec.kit.lang.utils.Exceptions; +import cn.orionsec.kit.spring.SpringHolder; import cn.orionsec.ops.constant.app.PipelineDetailStatus; import cn.orionsec.ops.constant.app.PipelineLogStatus; import cn.orionsec.ops.constant.app.StageType; @@ -28,8 +30,6 @@ import cn.orionsec.ops.entity.domain.UserInfoDO; import cn.orionsec.ops.entity.dto.user.UserDTO; import cn.orionsec.ops.utils.UserHolder; -import com.orion.lang.utils.Exceptions; -import com.orion.spring.SpringHolder; import lombok.Getter; import lombok.extern.slf4j.Slf4j; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/pipeline/stage/BuildStageHandler.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/pipeline/stage/BuildStageHandler.java index c983545c..ba08593b 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/pipeline/stage/BuildStageHandler.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/pipeline/stage/BuildStageHandler.java @@ -15,6 +15,8 @@ */ package cn.orionsec.ops.handler.app.pipeline.stage; +import cn.orionsec.kit.lang.utils.Exceptions; +import cn.orionsec.kit.spring.SpringHolder; import cn.orionsec.ops.constant.MessageConst; import cn.orionsec.ops.constant.app.BuildStatus; import cn.orionsec.ops.constant.app.PipelineLogStatus; @@ -30,8 +32,6 @@ import cn.orionsec.ops.handler.app.machine.IMachineProcessor; import cn.orionsec.ops.service.api.ApplicationBuildService; import com.alibaba.fastjson.JSON; -import com.orion.lang.utils.Exceptions; -import com.orion.spring.SpringHolder; import lombok.extern.slf4j.Slf4j; /** diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/pipeline/stage/IStageHandler.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/pipeline/stage/IStageHandler.java index 3fee6008..4606ff61 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/pipeline/stage/IStageHandler.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/pipeline/stage/IStageHandler.java @@ -15,12 +15,12 @@ */ package cn.orionsec.ops.handler.app.pipeline.stage; +import cn.orionsec.kit.lang.able.Executable; +import cn.orionsec.kit.lang.utils.Exceptions; import cn.orionsec.ops.constant.app.PipelineDetailStatus; import cn.orionsec.ops.constant.app.StageType; import cn.orionsec.ops.entity.domain.ApplicationPipelineTaskDO; import cn.orionsec.ops.entity.domain.ApplicationPipelineTaskDetailDO; -import com.orion.lang.able.Executable; -import com.orion.lang.utils.Exceptions; /** * 流水线阶段处理器接口 diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/pipeline/stage/ReleaseStageHandler.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/pipeline/stage/ReleaseStageHandler.java index dff329b4..bcb24df9 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/pipeline/stage/ReleaseStageHandler.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/pipeline/stage/ReleaseStageHandler.java @@ -15,6 +15,10 @@ */ package cn.orionsec.ops.handler.app.pipeline.stage; +import cn.orionsec.kit.lang.utils.Exceptions; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.collect.Lists; +import cn.orionsec.kit.spring.SpringHolder; import cn.orionsec.ops.constant.CnConst; import cn.orionsec.ops.constant.Const; import cn.orionsec.ops.constant.MessageConst; @@ -31,10 +35,6 @@ import cn.orionsec.ops.service.api.ApplicationMachineService; import cn.orionsec.ops.service.api.ApplicationReleaseService; import com.alibaba.fastjson.JSON; -import com.orion.lang.utils.Exceptions; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.collect.Lists; -import com.orion.spring.SpringHolder; import lombok.extern.slf4j.Slf4j; import java.util.Date; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/release/AbstractReleaseProcessor.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/release/AbstractReleaseProcessor.java index 39ad853d..a5aa52e1 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/release/AbstractReleaseProcessor.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/release/AbstractReleaseProcessor.java @@ -15,6 +15,9 @@ */ package cn.orionsec.ops.handler.app.release; +import cn.orionsec.kit.lang.utils.Threads; +import cn.orionsec.kit.lang.utils.collect.Maps; +import cn.orionsec.kit.spring.SpringHolder; import cn.orionsec.ops.constant.SchedulerPools; import cn.orionsec.ops.constant.app.ReleaseStatus; import cn.orionsec.ops.constant.event.EventKeys; @@ -25,9 +28,6 @@ import cn.orionsec.ops.handler.app.machine.ReleaseMachineProcessor; import cn.orionsec.ops.service.api.ApplicationReleaseMachineService; import cn.orionsec.ops.service.api.WebSideMessageService; -import com.orion.lang.utils.Threads; -import com.orion.lang.utils.collect.Maps; -import com.orion.spring.SpringHolder; import lombok.Getter; import lombok.extern.slf4j.Slf4j; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/release/IReleaseProcessor.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/release/IReleaseProcessor.java index 9acc8e48..1a6e90c7 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/release/IReleaseProcessor.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/release/IReleaseProcessor.java @@ -15,12 +15,12 @@ */ package cn.orionsec.ops.handler.app.release; +import cn.orionsec.kit.lang.able.Executable; +import cn.orionsec.kit.lang.able.SafeCloseable; +import cn.orionsec.kit.lang.function.select.Branches; +import cn.orionsec.kit.lang.function.select.Selector; import cn.orionsec.ops.constant.common.SerialType; import cn.orionsec.ops.entity.domain.ApplicationReleaseDO; -import com.orion.lang.able.Executable; -import com.orion.lang.able.SafeCloseable; -import com.orion.lang.function.select.Branches; -import com.orion.lang.function.select.Selector; /** * 发布处理器 diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/release/ParallelReleaseProcessor.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/release/ParallelReleaseProcessor.java index 61b0407f..67571048 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/release/ParallelReleaseProcessor.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/release/ParallelReleaseProcessor.java @@ -15,12 +15,12 @@ */ package cn.orionsec.ops.handler.app.release; +import cn.orionsec.kit.lang.utils.Exceptions; +import cn.orionsec.kit.lang.utils.Threads; import cn.orionsec.ops.constant.MessageConst; import cn.orionsec.ops.constant.SchedulerPools; import cn.orionsec.ops.constant.app.ActionStatus; import cn.orionsec.ops.handler.app.machine.ReleaseMachineProcessor; -import com.orion.lang.utils.Exceptions; -import com.orion.lang.utils.Threads; import java.util.Collection; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/release/ReleaseSessionHolder.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/release/ReleaseSessionHolder.java index 5a5442a6..6742a9a8 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/release/ReleaseSessionHolder.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/app/release/ReleaseSessionHolder.java @@ -15,7 +15,7 @@ */ package cn.orionsec.ops.handler.app.release; -import com.orion.lang.utils.collect.Maps; +import cn.orionsec.kit.lang.utils.collect.Maps; import org.springframework.stereotype.Component; import java.util.concurrent.ConcurrentHashMap; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/exec/CommandExecHandler.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/exec/CommandExecHandler.java index f520c72b..4280e22a 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/exec/CommandExecHandler.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/exec/CommandExecHandler.java @@ -15,6 +15,20 @@ */ package cn.orionsec.ops.handler.exec; +import cn.orionsec.kit.lang.constant.Letters; +import cn.orionsec.kit.lang.exception.DisabledException; +import cn.orionsec.kit.lang.utils.Exceptions; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.Threads; +import cn.orionsec.kit.lang.utils.collect.Maps; +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 cn.orionsec.kit.net.host.SessionStore; +import cn.orionsec.kit.net.host.ssh.ExitCode; +import cn.orionsec.kit.net.host.ssh.command.CommandExecutor; +import cn.orionsec.kit.net.host.ssh.command.CommandExecutors; +import cn.orionsec.kit.spring.SpringHolder; import cn.orionsec.ops.constant.Const; import cn.orionsec.ops.constant.SchedulerPools; import cn.orionsec.ops.constant.command.ExecStatus; @@ -29,20 +43,6 @@ import cn.orionsec.ops.service.api.MachineInfoService; import cn.orionsec.ops.service.api.WebSideMessageService; import cn.orionsec.ops.utils.Utils; -import com.orion.lang.constant.Letters; -import com.orion.lang.exception.DisabledException; -import com.orion.lang.utils.Exceptions; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.Threads; -import com.orion.lang.utils.collect.Maps; -import com.orion.lang.utils.io.Files1; -import com.orion.lang.utils.io.Streams; -import com.orion.lang.utils.time.Dates; -import com.orion.net.remote.CommandExecutors; -import com.orion.net.remote.ExitCode; -import com.orion.net.remote.channel.SessionStore; -import com.orion.net.remote.channel.ssh.CommandExecutor; -import com.orion.spring.SpringHolder; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; @@ -122,7 +122,7 @@ public void run() { this.sessionStore = machineInfoService.openSessionStore(machine); this.executor = sessionStore.getCommandExecutor(Strings.replaceCRLF(record.getExecCommand())); // 执行命令 - CommandExecutors.syncExecCommand(executor, logOutputStream); + CommandExecutors.execCommand(executor, logOutputStream); } catch (Exception e) { ex = e; } diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/exec/ExecSessionHolder.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/exec/ExecSessionHolder.java index 56c4c7be..173b1b2e 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/exec/ExecSessionHolder.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/exec/ExecSessionHolder.java @@ -15,7 +15,7 @@ */ package cn.orionsec.ops.handler.exec; -import com.orion.lang.utils.collect.Maps; +import cn.orionsec.kit.lang.utils.collect.Maps; import org.springframework.stereotype.Component; import java.util.Map; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/exec/IExecHandler.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/exec/IExecHandler.java index c76373d2..98f35fa3 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/exec/IExecHandler.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/exec/IExecHandler.java @@ -15,8 +15,8 @@ */ package cn.orionsec.ops.handler.exec; -import com.orion.lang.able.Executable; -import com.orion.lang.able.SafeCloseable; +import cn.orionsec.kit.lang.able.Executable; +import cn.orionsec.kit.lang.able.SafeCloseable; /** * 命令执行器 diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/http/HttpApiDefined.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/http/HttpApiDefined.java index 1e747c6e..17ad251d 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/http/HttpApiDefined.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/http/HttpApiDefined.java @@ -15,7 +15,7 @@ */ package cn.orionsec.ops.handler.http; -import com.orion.http.support.HttpMethod; +import cn.orionsec.kit.http.support.HttpMethod; /** * http api 定义接口 diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/http/HttpApiRequest.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/http/HttpApiRequest.java index 3f31295a..ae7c6210 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/http/HttpApiRequest.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/http/HttpApiRequest.java @@ -15,11 +15,11 @@ */ package cn.orionsec.ops.handler.http; +import cn.orionsec.kit.http.ok.OkRequest; +import cn.orionsec.kit.lang.constant.StandardContentType; +import cn.orionsec.kit.lang.define.wrapper.HttpWrapper; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.TypeReference; -import com.orion.http.ok.OkRequest; -import com.orion.lang.constant.StandardContentType; -import com.orion.lang.define.wrapper.HttpWrapper; /** * http api 请求 diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/http/HttpApiRequester.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/http/HttpApiRequester.java index 8c0b6ffe..c1239402 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/http/HttpApiRequester.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/http/HttpApiRequester.java @@ -15,9 +15,9 @@ */ package cn.orionsec.ops.handler.http; +import cn.orionsec.kit.http.ok.OkResponse; +import cn.orionsec.kit.lang.define.wrapper.HttpWrapper; import com.alibaba.fastjson.TypeReference; -import com.orion.http.ok.OkResponse; -import com.orion.lang.define.wrapper.HttpWrapper; /** * http api 请求器基类 diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/http/MachineMonitorHttpApi.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/http/MachineMonitorHttpApi.java index 3b404423..4d24d083 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/http/MachineMonitorHttpApi.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/http/MachineMonitorHttpApi.java @@ -15,7 +15,7 @@ */ package cn.orionsec.ops.handler.http; -import com.orion.http.support.HttpMethod; +import cn.orionsec.kit.http.support.HttpMethod; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/monitor/MonitorAgentInstallTask.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/monitor/MonitorAgentInstallTask.java index 2a209c86..a2a1a2b4 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/monitor/MonitorAgentInstallTask.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/monitor/MonitorAgentInstallTask.java @@ -15,6 +15,21 @@ */ package cn.orionsec.ops.handler.monitor; +import cn.orionsec.kit.lang.constant.Letters; +import cn.orionsec.kit.lang.utils.Arrays1; +import cn.orionsec.kit.lang.utils.Exceptions; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.Threads; +import cn.orionsec.kit.lang.utils.collect.Maps; +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 cn.orionsec.kit.net.host.SessionStore; +import cn.orionsec.kit.net.host.sftp.SftpExecutor; +import cn.orionsec.kit.net.host.ssh.ExitCode; +import cn.orionsec.kit.net.host.ssh.command.CommandExecutor; +import cn.orionsec.kit.net.host.ssh.command.CommandExecutors; +import cn.orionsec.kit.spring.SpringHolder; import cn.orionsec.ops.constant.Const; import cn.orionsec.ops.constant.event.EventKeys; import cn.orionsec.ops.constant.message.MessageType; @@ -29,21 +44,6 @@ import cn.orionsec.ops.service.api.MachineMonitorService; import cn.orionsec.ops.service.api.WebSideMessageService; import cn.orionsec.ops.utils.PathBuilders; -import com.orion.lang.constant.Letters; -import com.orion.lang.utils.Arrays1; -import com.orion.lang.utils.Exceptions; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.Threads; -import com.orion.lang.utils.collect.Maps; -import com.orion.lang.utils.io.Files1; -import com.orion.lang.utils.io.Streams; -import com.orion.lang.utils.time.Dates; -import com.orion.net.remote.CommandExecutors; -import com.orion.net.remote.ExitCode; -import com.orion.net.remote.channel.SessionStore; -import com.orion.net.remote.channel.sftp.SftpExecutor; -import com.orion.net.remote.channel.ssh.CommandExecutor; -import com.orion.spring.SpringHolder; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; @@ -141,7 +141,7 @@ private void transferAgentFile(String pluginDirectory, String startScriptPath) { String startScript = this.getStartScript(agentPath); this.appendLog("开始生成启动脚本 path: {}, command: \n{}", agentPath, startScript); executor.write(startScriptPath, Strings.bytes(startScript)); - executor.chmod(startScriptPath, 777); + executor.changeMode(startScriptPath, 777); // 传输 agent 文件 File localAgentFile = new File(SystemEnvAttr.MACHINE_MONITOR_AGENT_PATH.getValue()); // 查询文件是否存在 @@ -175,7 +175,7 @@ private void startAgentApp(String startScriptPath) { // executor = session.getCommandExecutor("bash -l " + startScriptPath); executor = session.getCommandExecutor(startScriptPath); executor.getChannel().setPty(false); - CommandExecutors.syncExecCommand(executor, logStream); + CommandExecutors.execCommand(executor, logStream); int exitCode = executor.getExitCode(); if (!ExitCode.isSuccess(exitCode)) { throw Exceptions.runtime("执行启动失败"); diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/scheduler/AbstractTaskProcessor.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/scheduler/AbstractTaskProcessor.java index 2681f2ff..d09f8de1 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/scheduler/AbstractTaskProcessor.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/scheduler/AbstractTaskProcessor.java @@ -15,6 +15,8 @@ */ package cn.orionsec.ops.handler.scheduler; +import cn.orionsec.kit.lang.utils.collect.Maps; +import cn.orionsec.kit.spring.SpringHolder; import cn.orionsec.ops.constant.scheduler.SchedulerTaskStatus; import cn.orionsec.ops.dao.SchedulerTaskDAO; import cn.orionsec.ops.dao.SchedulerTaskRecordDAO; @@ -24,8 +26,6 @@ import cn.orionsec.ops.handler.scheduler.machine.ITaskMachineHandler; import cn.orionsec.ops.handler.scheduler.machine.TaskMachineHandler; import cn.orionsec.ops.service.api.SchedulerTaskMachineRecordService; -import com.orion.lang.utils.collect.Maps; -import com.orion.spring.SpringHolder; import lombok.extern.slf4j.Slf4j; import java.util.Date; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/scheduler/ITaskProcessor.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/scheduler/ITaskProcessor.java index 5c2930c5..4876cb21 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/scheduler/ITaskProcessor.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/scheduler/ITaskProcessor.java @@ -15,10 +15,10 @@ */ package cn.orionsec.ops.handler.scheduler; +import cn.orionsec.kit.lang.able.SafeCloseable; +import cn.orionsec.kit.lang.function.select.Branches; +import cn.orionsec.kit.lang.function.select.Selector; import cn.orionsec.ops.constant.common.SerialType; -import com.orion.lang.able.SafeCloseable; -import com.orion.lang.function.select.Branches; -import com.orion.lang.function.select.Selector; /** * 任务处理器基类 diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/scheduler/ParallelTaskProcessor.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/scheduler/ParallelTaskProcessor.java index 8080b33c..59af656b 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/scheduler/ParallelTaskProcessor.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/scheduler/ParallelTaskProcessor.java @@ -15,12 +15,12 @@ */ package cn.orionsec.ops.handler.scheduler; +import cn.orionsec.kit.lang.utils.Exceptions; +import cn.orionsec.kit.lang.utils.Threads; import cn.orionsec.ops.constant.MessageConst; import cn.orionsec.ops.constant.SchedulerPools; import cn.orionsec.ops.constant.scheduler.SchedulerTaskMachineStatus; import cn.orionsec.ops.handler.scheduler.machine.ITaskMachineHandler; -import com.orion.lang.utils.Exceptions; -import com.orion.lang.utils.Threads; import java.util.Collection; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/scheduler/TaskSessionHolder.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/scheduler/TaskSessionHolder.java index 2d7db24d..7c4c2282 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/scheduler/TaskSessionHolder.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/scheduler/TaskSessionHolder.java @@ -15,7 +15,7 @@ */ package cn.orionsec.ops.handler.scheduler; -import com.orion.lang.utils.collect.Maps; +import cn.orionsec.kit.lang.utils.collect.Maps; import org.springframework.stereotype.Component; import java.util.Map; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/scheduler/machine/ITaskMachineHandler.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/scheduler/machine/ITaskMachineHandler.java index f04c38cf..2feb5877 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/scheduler/machine/ITaskMachineHandler.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/scheduler/machine/ITaskMachineHandler.java @@ -15,8 +15,8 @@ */ package cn.orionsec.ops.handler.scheduler.machine; +import cn.orionsec.kit.lang.able.SafeCloseable; import cn.orionsec.ops.constant.scheduler.SchedulerTaskMachineStatus; -import com.orion.lang.able.SafeCloseable; /** * 机器处理器 diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/scheduler/machine/TaskMachineHandler.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/scheduler/machine/TaskMachineHandler.java index 947b588c..19ddd184 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/scheduler/machine/TaskMachineHandler.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/scheduler/machine/TaskMachineHandler.java @@ -15,6 +15,18 @@ */ package cn.orionsec.ops.handler.scheduler.machine; +import cn.orionsec.kit.lang.constant.Letters; +import cn.orionsec.kit.lang.exception.DisabledException; +import cn.orionsec.kit.lang.utils.Exceptions; +import cn.orionsec.kit.lang.utils.Strings; +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 cn.orionsec.kit.net.host.SessionStore; +import cn.orionsec.kit.net.host.ssh.ExitCode; +import cn.orionsec.kit.net.host.ssh.command.CommandExecutor; +import cn.orionsec.kit.net.host.ssh.command.CommandExecutors; +import cn.orionsec.kit.spring.SpringHolder; import cn.orionsec.ops.constant.Const; import cn.orionsec.ops.constant.common.StainCode; import cn.orionsec.ops.constant.scheduler.SchedulerTaskMachineStatus; @@ -24,18 +36,6 @@ import cn.orionsec.ops.handler.tail.TailSessionHolder; import cn.orionsec.ops.service.api.MachineInfoService; import cn.orionsec.ops.utils.Utils; -import com.orion.lang.constant.Letters; -import com.orion.lang.exception.DisabledException; -import com.orion.lang.utils.Exceptions; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.io.Files1; -import com.orion.lang.utils.io.Streams; -import com.orion.lang.utils.time.Dates; -import com.orion.net.remote.CommandExecutors; -import com.orion.net.remote.ExitCode; -import com.orion.net.remote.channel.SessionStore; -import com.orion.net.remote.channel.ssh.CommandExecutor; -import com.orion.spring.SpringHolder; import lombok.Getter; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; @@ -106,7 +106,7 @@ public void run() { // 获取执行器 this.executor = sessionStore.getCommandExecutor(Strings.replaceCRLF(machineRecord.getExecCommand())); // 开始执行 - CommandExecutors.syncExecCommand(executor, logOutputStream); + CommandExecutors.execCommand(executor, logOutputStream); this.exitCode = executor.getExitCode(); } catch (Exception e) { ex = e; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/sftp/FileTransferProcessor.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/sftp/FileTransferProcessor.java index fe20d986..7e145e70 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/sftp/FileTransferProcessor.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/sftp/FileTransferProcessor.java @@ -15,6 +15,13 @@ */ package cn.orionsec.ops.handler.sftp; +import cn.orionsec.kit.lang.support.progress.ByteTransferRateProgress; +import cn.orionsec.kit.lang.utils.Exceptions; +import cn.orionsec.kit.lang.utils.io.Files1; +import cn.orionsec.kit.lang.utils.math.Numbers; +import cn.orionsec.kit.net.host.SessionStore; +import cn.orionsec.kit.net.host.sftp.SftpExecutor; +import cn.orionsec.kit.spring.SpringHolder; import cn.orionsec.ops.constant.SchedulerPools; import cn.orionsec.ops.constant.sftp.SftpTransferStatus; import cn.orionsec.ops.dao.FileTransferLogDAO; @@ -22,13 +29,6 @@ import cn.orionsec.ops.entity.dto.sftp.FileTransferNotifyProgressDTO; import cn.orionsec.ops.service.api.MachineEnvService; import cn.orionsec.ops.service.api.MachineInfoService; -import com.orion.lang.support.progress.ByteTransferRateProgress; -import com.orion.lang.utils.Exceptions; -import com.orion.lang.utils.io.Files1; -import com.orion.lang.utils.math.Numbers; -import com.orion.net.remote.channel.SessionStore; -import com.orion.net.remote.channel.sftp.SftpExecutor; -import com.orion.spring.SpringHolder; import lombok.extern.slf4j.Slf4j; /** diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/sftp/IFileTransferProcessor.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/sftp/IFileTransferProcessor.java index eba1a90c..4d79a7de 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/sftp/IFileTransferProcessor.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/sftp/IFileTransferProcessor.java @@ -15,6 +15,10 @@ */ package cn.orionsec.ops.handler.sftp; +import cn.orionsec.kit.lang.able.Executable; +import cn.orionsec.kit.lang.able.Stoppable; +import cn.orionsec.kit.lang.function.select.Branches; +import cn.orionsec.kit.lang.function.select.Selector; import cn.orionsec.ops.constant.sftp.SftpTransferType; import cn.orionsec.ops.entity.domain.FileTransferLogDO; import cn.orionsec.ops.handler.sftp.hint.FilePackageHint; @@ -22,10 +26,6 @@ import cn.orionsec.ops.handler.sftp.impl.DownloadFileProcessor; import cn.orionsec.ops.handler.sftp.impl.PackageFileProcessor; import cn.orionsec.ops.handler.sftp.impl.UploadFileProcessor; -import com.orion.lang.able.Executable; -import com.orion.lang.able.Stoppable; -import com.orion.lang.function.select.Branches; -import com.orion.lang.function.select.Selector; /** * sftp 传输接口 diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/sftp/SftpBasicExecutorHolder.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/sftp/SftpBasicExecutorHolder.java index cef17a07..2444ba38 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/sftp/SftpBasicExecutorHolder.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/sftp/SftpBasicExecutorHolder.java @@ -15,6 +15,9 @@ */ package cn.orionsec.ops.handler.sftp; +import cn.orionsec.kit.lang.utils.collect.Maps; +import cn.orionsec.kit.net.host.SessionStore; +import cn.orionsec.kit.net.host.sftp.SftpExecutor; import cn.orionsec.ops.constant.Const; import cn.orionsec.ops.constant.event.EventKeys; import cn.orionsec.ops.entity.domain.MachineInfoDO; @@ -22,9 +25,6 @@ import cn.orionsec.ops.service.api.MachineInfoService; import cn.orionsec.ops.service.api.SftpService; import cn.orionsec.ops.utils.EventParamsHolder; -import com.orion.lang.utils.collect.Maps; -import com.orion.net.remote.channel.SessionStore; -import com.orion.net.remote.channel.sftp.SftpExecutor; import lombok.extern.slf4j.Slf4j; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/sftp/SftpSupport.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/sftp/SftpSupport.java index 3955ff22..6c8ac87c 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/sftp/SftpSupport.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/sftp/SftpSupport.java @@ -15,13 +15,13 @@ */ package cn.orionsec.ops.handler.sftp; +import cn.orionsec.kit.lang.id.UUIds; +import cn.orionsec.kit.lang.utils.Exceptions; +import cn.orionsec.kit.lang.utils.io.Files1; +import cn.orionsec.kit.net.host.sftp.SftpExecutor; import cn.orionsec.ops.constant.sftp.SftpTransferStatus; import cn.orionsec.ops.constant.system.SystemEnvAttr; import cn.orionsec.ops.handler.sftp.impl.UploadFileProcessor; -import com.orion.lang.id.UUIds; -import com.orion.lang.utils.Exceptions; -import com.orion.lang.utils.io.Files1; -import com.orion.net.remote.channel.sftp.SftpExecutor; import lombok.extern.slf4j.Slf4j; import java.io.File; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/sftp/TransferProcessorManager.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/sftp/TransferProcessorManager.java index 33c2608b..840185a3 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/sftp/TransferProcessorManager.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/sftp/TransferProcessorManager.java @@ -15,18 +15,18 @@ */ package cn.orionsec.ops.handler.sftp; +import cn.orionsec.kit.lang.utils.Exceptions; +import cn.orionsec.kit.lang.utils.Threads; +import cn.orionsec.kit.lang.utils.collect.Lists; +import cn.orionsec.kit.lang.utils.collect.Maps; +import cn.orionsec.kit.lang.utils.convert.Converts; +import cn.orionsec.kit.lang.utils.json.Jsons; import cn.orionsec.ops.constant.Const; import cn.orionsec.ops.constant.sftp.SftpNotifyType; import cn.orionsec.ops.entity.domain.FileTransferLogDO; import cn.orionsec.ops.entity.dto.sftp.FileTransferNotifyDTO; import cn.orionsec.ops.entity.dto.sftp.FileTransferNotifyProgressDTO; import cn.orionsec.ops.entity.vo.sftp.FileTransferLogVO; -import com.orion.lang.utils.Exceptions; -import com.orion.lang.utils.Threads; -import com.orion.lang.utils.collect.Lists; -import com.orion.lang.utils.collect.Maps; -import com.orion.lang.utils.convert.Converts; -import com.orion.lang.utils.json.Jsons; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; import org.springframework.web.socket.TextMessage; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/sftp/direct/DirectDownloader.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/sftp/direct/DirectDownloader.java index b2a4d3e5..8a78ce7a 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/sftp/direct/DirectDownloader.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/sftp/direct/DirectDownloader.java @@ -15,17 +15,17 @@ */ package cn.orionsec.ops.handler.sftp.direct; +import cn.orionsec.kit.lang.able.SafeCloseable; +import cn.orionsec.kit.lang.utils.Valid; +import cn.orionsec.kit.lang.utils.io.Files1; +import cn.orionsec.kit.lang.utils.io.Streams; +import cn.orionsec.kit.net.host.SessionStore; +import cn.orionsec.kit.net.host.sftp.SftpExecutor; +import cn.orionsec.kit.spring.SpringHolder; import cn.orionsec.ops.constant.MessageConst; import cn.orionsec.ops.handler.sftp.SftpSupport; import cn.orionsec.ops.service.api.MachineEnvService; import cn.orionsec.ops.service.api.MachineInfoService; -import com.orion.lang.able.SafeCloseable; -import com.orion.lang.utils.Valid; -import com.orion.lang.utils.io.Files1; -import com.orion.lang.utils.io.Streams; -import com.orion.net.remote.channel.SessionStore; -import com.orion.net.remote.channel.sftp.SftpExecutor; -import com.orion.spring.SpringHolder; import lombok.extern.slf4j.Slf4j; import java.io.IOException; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/sftp/impl/DownloadFileProcessor.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/sftp/impl/DownloadFileProcessor.java index ed674eee..39e8646d 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/sftp/impl/DownloadFileProcessor.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/sftp/impl/DownloadFileProcessor.java @@ -15,14 +15,14 @@ */ package cn.orionsec.ops.handler.sftp.impl; +import cn.orionsec.kit.lang.utils.Threads; +import cn.orionsec.kit.lang.utils.io.Files1; +import cn.orionsec.kit.net.host.sftp.transfer.SftpDownloader; import cn.orionsec.ops.constant.SchedulerPools; import cn.orionsec.ops.constant.system.SystemEnvAttr; import cn.orionsec.ops.entity.domain.FileTransferLogDO; import cn.orionsec.ops.handler.sftp.FileTransferProcessor; import com.alibaba.fastjson.JSON; -import com.orion.lang.utils.Threads; -import com.orion.lang.utils.io.Files1; -import com.orion.net.remote.channel.sftp.SftpDownloader; import lombok.extern.slf4j.Slf4j; /** diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/sftp/impl/PackageFileProcessor.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/sftp/impl/PackageFileProcessor.java index bb9126bf..11c81052 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/sftp/impl/PackageFileProcessor.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/sftp/impl/PackageFileProcessor.java @@ -15,6 +15,16 @@ */ package cn.orionsec.ops.handler.sftp.impl; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.Threads; +import cn.orionsec.kit.lang.utils.collect.Lists; +import cn.orionsec.kit.lang.utils.collect.Maps; +import cn.orionsec.kit.lang.utils.io.Files1; +import cn.orionsec.kit.lang.utils.io.Streams; +import cn.orionsec.kit.lang.utils.io.compress.CompressTypeEnum; +import cn.orionsec.kit.lang.utils.io.compress.FileCompressor; +import cn.orionsec.kit.lang.utils.math.Numbers; +import cn.orionsec.kit.spring.SpringHolder; import cn.orionsec.ops.constant.Const; import cn.orionsec.ops.constant.SchedulerPools; import cn.orionsec.ops.constant.sftp.SftpTransferStatus; @@ -26,16 +36,6 @@ import cn.orionsec.ops.handler.sftp.IFileTransferProcessor; import cn.orionsec.ops.handler.sftp.TransferProcessorManager; import com.alibaba.fastjson.JSON; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.Threads; -import com.orion.lang.utils.collect.Lists; -import com.orion.lang.utils.collect.Maps; -import com.orion.lang.utils.io.Files1; -import com.orion.lang.utils.io.Streams; -import com.orion.lang.utils.io.compress.CompressTypeEnum; -import com.orion.lang.utils.io.compress.FileCompressor; -import com.orion.lang.utils.math.Numbers; -import com.orion.spring.SpringHolder; import lombok.extern.slf4j.Slf4j; import java.io.File; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/sftp/impl/UploadFileProcessor.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/sftp/impl/UploadFileProcessor.java index 1f3626ed..fc809e09 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/sftp/impl/UploadFileProcessor.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/sftp/impl/UploadFileProcessor.java @@ -15,14 +15,14 @@ */ package cn.orionsec.ops.handler.sftp.impl; +import cn.orionsec.kit.lang.utils.Threads; +import cn.orionsec.kit.lang.utils.io.Files1; +import cn.orionsec.kit.net.host.sftp.transfer.SftpUploader; import cn.orionsec.ops.constant.SchedulerPools; import cn.orionsec.ops.constant.system.SystemEnvAttr; import cn.orionsec.ops.entity.domain.FileTransferLogDO; import cn.orionsec.ops.handler.sftp.FileTransferProcessor; import com.alibaba.fastjson.JSON; -import com.orion.lang.utils.Threads; -import com.orion.lang.utils.io.Files1; -import com.orion.net.remote.channel.sftp.SftpUploader; import lombok.extern.slf4j.Slf4j; /** diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/sftp/notify/FileTransferNotifyHandler.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/sftp/notify/FileTransferNotifyHandler.java index bf925631..ebe231a8 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/sftp/notify/FileTransferNotifyHandler.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/sftp/notify/FileTransferNotifyHandler.java @@ -15,6 +15,8 @@ */ package cn.orionsec.ops.handler.sftp.notify; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.collect.Lists; import cn.orionsec.ops.constant.Const; import cn.orionsec.ops.constant.ws.WsCloseCode; import cn.orionsec.ops.entity.dto.sftp.SftpSessionTokenDTO; @@ -23,8 +25,6 @@ import cn.orionsec.ops.service.api.PassportService; import cn.orionsec.ops.service.api.SftpService; import cn.orionsec.ops.utils.WebSockets; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.collect.Lists; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; import org.springframework.web.socket.*; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/tail/ITailHandler.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/tail/ITailHandler.java index 0a7b31f6..db48cbac 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/tail/ITailHandler.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/tail/ITailHandler.java @@ -15,12 +15,12 @@ */ package cn.orionsec.ops.handler.tail; +import cn.orionsec.kit.lang.able.SafeCloseable; +import cn.orionsec.kit.lang.function.select.Branches; +import cn.orionsec.kit.lang.function.select.Selector; import cn.orionsec.ops.constant.tail.FileTailMode; import cn.orionsec.ops.handler.tail.impl.ExecTailFileHandler; import cn.orionsec.ops.handler.tail.impl.TrackerTailFileHandler; -import com.orion.lang.able.SafeCloseable; -import com.orion.lang.function.select.Branches; -import com.orion.lang.function.select.Selector; import org.springframework.web.socket.WebSocketSession; /** diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/tail/TailFileHandler.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/tail/TailFileHandler.java index 9272ea14..18bf25a7 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/tail/TailFileHandler.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/tail/TailFileHandler.java @@ -15,13 +15,13 @@ */ package cn.orionsec.ops.handler.tail; +import cn.orionsec.kit.lang.utils.Strings; import cn.orionsec.ops.constant.Const; import cn.orionsec.ops.constant.system.SystemEnvAttr; import cn.orionsec.ops.constant.tail.FileTailMode; import cn.orionsec.ops.entity.dto.file.FileTailDTO; import cn.orionsec.ops.utils.WebSockets; import com.alibaba.fastjson.JSON; -import com.orion.lang.utils.Strings; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; import org.springframework.web.socket.CloseStatus; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/tail/TailSessionHolder.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/tail/TailSessionHolder.java index d83d4e5b..82331dbd 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/tail/TailSessionHolder.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/tail/TailSessionHolder.java @@ -15,10 +15,10 @@ */ package cn.orionsec.ops.handler.tail; +import cn.orionsec.kit.lang.utils.Threads; +import cn.orionsec.kit.lang.utils.collect.Lists; +import cn.orionsec.kit.lang.utils.collect.Maps; import cn.orionsec.ops.constant.Const; -import com.orion.lang.utils.Threads; -import com.orion.lang.utils.collect.Lists; -import com.orion.lang.utils.collect.Maps; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/tail/impl/ExecTailFileHandler.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/tail/impl/ExecTailFileHandler.java index c6a58f78..80470ea5 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/tail/impl/ExecTailFileHandler.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/tail/impl/ExecTailFileHandler.java @@ -15,6 +15,11 @@ */ package cn.orionsec.ops.handler.tail.impl; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.io.Streams; +import cn.orionsec.kit.net.host.SessionStore; +import cn.orionsec.kit.net.host.ssh.command.CommandExecutor; +import cn.orionsec.kit.spring.SpringHolder; import cn.orionsec.ops.constant.Const; import cn.orionsec.ops.constant.SchedulerPools; import cn.orionsec.ops.constant.ws.WsCloseCode; @@ -23,11 +28,6 @@ import cn.orionsec.ops.service.api.MachineInfoService; import cn.orionsec.ops.utils.WebSockets; import com.alibaba.fastjson.JSON; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.io.Streams; -import com.orion.net.remote.channel.SessionStore; -import com.orion.net.remote.channel.ssh.CommandExecutor; -import com.orion.spring.SpringHolder; import lombok.Getter; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; @@ -87,12 +87,11 @@ public void start() throws Exception { } // 打开 command this.executor = sessionStore.getCommandExecutor(Strings.replaceCRLF(hint.getCommand())); - executor.inherit(); - executor.scheduler(SchedulerPools.TAIL_SCHEDULER); + executor.merge(); executor.callback(this::callback); executor.streamHandler(this::handler); executor.connect(); - executor.exec(); + SchedulerPools.TAIL_SCHEDULER.execute(executor); log.info("tail EXEC_TAIL 监听文件开始 token: {}", token); } diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/tail/impl/TrackerTailFileHandler.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/tail/impl/TrackerTailFileHandler.java index f43c7ed3..1d0e7142 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/tail/impl/TrackerTailFileHandler.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/tail/impl/TrackerTailFileHandler.java @@ -15,6 +15,13 @@ */ package cn.orionsec.ops.handler.tail.impl; +import cn.orionsec.kit.ext.tail.Tracker; +import cn.orionsec.kit.ext.tail.delay.DelayTrackerListener; +import cn.orionsec.kit.ext.tail.handler.DataHandler; +import cn.orionsec.kit.ext.tail.mode.FileNotFoundMode; +import cn.orionsec.kit.ext.tail.mode.FileOffsetMode; +import cn.orionsec.kit.lang.define.thread.HookRunnable; +import cn.orionsec.kit.lang.utils.Threads; import cn.orionsec.ops.constant.Const; import cn.orionsec.ops.constant.SchedulerPools; import cn.orionsec.ops.constant.ws.WsCloseCode; @@ -22,13 +29,6 @@ import cn.orionsec.ops.handler.tail.TailFileHint; import cn.orionsec.ops.utils.WebSockets; import com.alibaba.fastjson.JSON; -import com.orion.ext.tail.Tracker; -import com.orion.ext.tail.delay.DelayTrackerListener; -import com.orion.ext.tail.handler.DataHandler; -import com.orion.ext.tail.mode.FileNotFoundMode; -import com.orion.ext.tail.mode.FileOffsetMode; -import com.orion.lang.define.thread.HookRunnable; -import com.orion.lang.utils.Threads; import lombok.Getter; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/terminal/IOperateHandler.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/terminal/IOperateHandler.java index 58b38cf2..261bc2e8 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/terminal/IOperateHandler.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/terminal/IOperateHandler.java @@ -15,11 +15,11 @@ */ package cn.orionsec.ops.handler.terminal; +import cn.orionsec.kit.lang.able.SafeCloseable; import cn.orionsec.ops.constant.terminal.TerminalClientOperate; import cn.orionsec.ops.entity.config.TerminalConnectConfig; import cn.orionsec.ops.handler.terminal.manager.TerminalManagementHandler; import cn.orionsec.ops.handler.terminal.watcher.ITerminalWatcherProcessor; -import com.orion.lang.able.SafeCloseable; /** * 操作处理器 diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/terminal/TerminalMessageHandler.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/terminal/TerminalMessageHandler.java index 874382f9..fa1bff29 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/terminal/TerminalMessageHandler.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/terminal/TerminalMessageHandler.java @@ -15,6 +15,8 @@ */ package cn.orionsec.ops.handler.terminal; +import cn.orionsec.kit.lang.define.wrapper.Tuple; +import cn.orionsec.kit.net.host.SessionStore; import cn.orionsec.ops.constant.terminal.TerminalClientOperate; import cn.orionsec.ops.constant.ws.WsCloseCode; import cn.orionsec.ops.constant.ws.WsProtocol; @@ -28,8 +30,6 @@ import cn.orionsec.ops.service.api.MachineTerminalService; import cn.orionsec.ops.service.api.PassportService; import cn.orionsec.ops.utils.WebSockets; -import com.orion.lang.define.wrapper.Tuple; -import com.orion.net.remote.channel.SessionStore; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; import org.springframework.web.socket.*; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/terminal/TerminalOperateHandler.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/terminal/TerminalOperateHandler.java index 0cc12f6a..47744d8d 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/terminal/TerminalOperateHandler.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/terminal/TerminalOperateHandler.java @@ -15,6 +15,14 @@ */ package cn.orionsec.ops.handler.terminal; +import cn.orionsec.kit.lang.constant.Letters; +import cn.orionsec.kit.lang.utils.Strings; +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 cn.orionsec.kit.net.host.SessionStore; +import cn.orionsec.kit.net.host.ssh.shell.ShellExecutor; +import cn.orionsec.kit.spring.SpringHolder; import cn.orionsec.ops.constant.Const; import cn.orionsec.ops.constant.SchedulerPools; import cn.orionsec.ops.constant.system.SystemEnvAttr; @@ -34,14 +42,6 @@ import cn.orionsec.ops.utils.Utils; import cn.orionsec.ops.utils.WebSockets; import com.alibaba.fastjson.JSON; -import com.orion.lang.constant.Letters; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.io.Files1; -import com.orion.lang.utils.io.Streams; -import com.orion.lang.utils.time.Dates; -import com.orion.net.remote.channel.SessionStore; -import com.orion.net.remote.channel.ssh.ShellExecutor; -import com.orion.spring.SpringHolder; import lombok.Getter; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; @@ -109,12 +109,11 @@ public TerminalOperateHandler(String token, TerminalConnectConfig hint, WebSocke @Override public void connect() { executor.connect(); - executor.scheduler(SchedulerPools.TERMINAL_SCHEDULER); executor.streamHandler(this::streamHandler); // 连接成功后初始化日志信息 this.initLog(); // 开始监听输出 - executor.exec(); + SchedulerPools.TERMINAL_SCHEDULER.execute(executor); watcher.watch(); } @@ -227,7 +226,7 @@ public void disconnect() { Streams.close(executor); Streams.close(sessionStore); } catch (Exception e) { - log.error("terminal 断开连接 失败 token: {}, {}", token, e); + log.error("terminal 断开连接 失败 token: {}", token, e); } } diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/terminal/TerminalUtils.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/terminal/TerminalUtils.java index e6da3e2b..bbb8da97 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/terminal/TerminalUtils.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/terminal/TerminalUtils.java @@ -15,9 +15,9 @@ */ package cn.orionsec.ops.handler.terminal; +import cn.orionsec.kit.lang.utils.Strings; import cn.orionsec.ops.entity.dto.terminal.TerminalConnectDTO; import cn.orionsec.ops.entity.dto.terminal.TerminalSizeDTO; -import com.orion.lang.utils.Strings; /** * 终端工具类 diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/terminal/manager/TerminalSessionManager.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/terminal/manager/TerminalSessionManager.java index d286b39b..7705aaee 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/terminal/manager/TerminalSessionManager.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/terminal/manager/TerminalSessionManager.java @@ -15,6 +15,15 @@ */ package cn.orionsec.ops.handler.terminal.manager; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import cn.orionsec.kit.lang.id.UUIds; +import cn.orionsec.kit.lang.utils.Exceptions; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.Valid; +import cn.orionsec.kit.lang.utils.collect.Lists; +import cn.orionsec.kit.lang.utils.collect.Maps; +import cn.orionsec.kit.lang.utils.convert.Converts; +import cn.orionsec.kit.lang.utils.time.DateRanges; import cn.orionsec.ops.constant.KeyConst; import cn.orionsec.ops.constant.MessageConst; import cn.orionsec.ops.constant.event.EventKeys; @@ -27,15 +36,6 @@ import cn.orionsec.ops.utils.Currents; import cn.orionsec.ops.utils.EventParamsHolder; import com.alibaba.fastjson.JSON; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.lang.id.UUIds; -import com.orion.lang.utils.Exceptions; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.Valid; -import com.orion.lang.utils.collect.Lists; -import com.orion.lang.utils.collect.Maps; -import com.orion.lang.utils.convert.Converts; -import com.orion.lang.utils.time.DateRanges; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Component; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/terminal/screen/TerminalScreenEnv.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/terminal/screen/TerminalScreenEnv.java index 3c9ee23d..39235f4a 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/terminal/screen/TerminalScreenEnv.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/terminal/screen/TerminalScreenEnv.java @@ -15,9 +15,9 @@ */ package cn.orionsec.ops.handler.terminal.screen; +import cn.orionsec.kit.net.host.ssh.TerminalType; import cn.orionsec.ops.constant.Const; import com.alibaba.fastjson.annotation.JSONField; -import com.orion.net.remote.TerminalType; import lombok.Data; /** diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/terminal/watcher/ITerminalWatcherProcessor.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/terminal/watcher/ITerminalWatcherProcessor.java index 499dc788..a3ce30fb 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/terminal/watcher/ITerminalWatcherProcessor.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/terminal/watcher/ITerminalWatcherProcessor.java @@ -15,8 +15,8 @@ */ package cn.orionsec.ops.handler.terminal.watcher; -import com.orion.lang.able.SafeCloseable; -import com.orion.lang.able.Watchable; +import cn.orionsec.kit.lang.able.SafeCloseable; +import cn.orionsec.kit.lang.able.Watchable; import org.springframework.web.socket.WebSocketSession; /** diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/terminal/watcher/TerminalWatcherHandler.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/terminal/watcher/TerminalWatcherHandler.java index fae4ab55..3e11f014 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/terminal/watcher/TerminalWatcherHandler.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/terminal/watcher/TerminalWatcherHandler.java @@ -15,6 +15,7 @@ */ package cn.orionsec.ops.handler.terminal.watcher; +import cn.orionsec.kit.lang.define.wrapper.Tuple; import cn.orionsec.ops.constant.Const; import cn.orionsec.ops.constant.terminal.TerminalClientOperate; import cn.orionsec.ops.constant.ws.WsCloseCode; @@ -24,7 +25,6 @@ import cn.orionsec.ops.handler.terminal.manager.TerminalSessionManager; import cn.orionsec.ops.service.api.PassportService; import cn.orionsec.ops.utils.WebSockets; -import com.orion.lang.define.wrapper.Tuple; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; import org.springframework.web.socket.*; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/terminal/watcher/TerminalWatcherProcessor.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/terminal/watcher/TerminalWatcherProcessor.java index 8d17fcf9..70725c74 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/terminal/watcher/TerminalWatcherProcessor.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/terminal/watcher/TerminalWatcherProcessor.java @@ -15,12 +15,12 @@ */ package cn.orionsec.ops.handler.terminal.watcher; +import cn.orionsec.kit.lang.utils.Threads; +import cn.orionsec.kit.lang.utils.collect.Maps; import cn.orionsec.ops.constant.Const; import cn.orionsec.ops.constant.SchedulerPools; import cn.orionsec.ops.constant.ws.WsCloseCode; import cn.orionsec.ops.utils.WebSockets; -import com.orion.lang.utils.Threads; -import com.orion.lang.utils.collect.Maps; import lombok.SneakyThrows; import org.springframework.web.socket.WebSocketSession; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/webhook/DingRobotPusher.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/webhook/DingRobotPusher.java index 48bfbdef..f5296745 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/webhook/DingRobotPusher.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/handler/webhook/DingRobotPusher.java @@ -15,12 +15,12 @@ */ package cn.orionsec.ops.handler.webhook; +import cn.orionsec.kit.lang.utils.Exceptions; +import cn.orionsec.kit.lang.utils.collect.Lists; import com.dingtalk.api.DefaultDingTalkClient; import com.dingtalk.api.DingTalkClient; import com.dingtalk.api.request.OapiRobotSendRequest; import com.dingtalk.api.response.OapiRobotSendResponse; -import com.orion.lang.utils.Exceptions; -import com.orion.lang.utils.collect.Lists; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.NoArgsConstructor; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/interceptor/AuthenticateInterceptor.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/interceptor/AuthenticateInterceptor.java index c0d0b96a..c83a733a 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/interceptor/AuthenticateInterceptor.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/interceptor/AuthenticateInterceptor.java @@ -15,6 +15,10 @@ */ package cn.orionsec.ops.interceptor; +import cn.orionsec.kit.lang.constant.StandardContentType; +import cn.orionsec.kit.lang.define.wrapper.HttpWrapper; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.web.servlet.web.Servlets; import cn.orionsec.ops.annotation.IgnoreAuth; import cn.orionsec.ops.constant.Const; import cn.orionsec.ops.constant.ResultCode; @@ -24,10 +28,6 @@ import cn.orionsec.ops.service.api.PassportService; import cn.orionsec.ops.utils.Currents; import cn.orionsec.ops.utils.UserHolder; -import com.orion.lang.constant.StandardContentType; -import com.orion.lang.define.wrapper.HttpWrapper; -import com.orion.lang.utils.Strings; -import com.orion.web.servlet.web.Servlets; import org.springframework.stereotype.Component; import org.springframework.web.method.HandlerMethod; import org.springframework.web.servlet.HandlerInterceptor; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/interceptor/DemoDisableApiAspect.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/interceptor/DemoDisableApiAspect.java index c680db5b..09014447 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/interceptor/DemoDisableApiAspect.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/interceptor/DemoDisableApiAspect.java @@ -15,10 +15,10 @@ */ package cn.orionsec.ops.interceptor; +import cn.orionsec.kit.lang.define.wrapper.HttpWrapper; +import cn.orionsec.kit.lang.utils.Exceptions; import cn.orionsec.ops.annotation.DemoDisableApi; import cn.orionsec.ops.constant.ResultCode; -import com.orion.lang.define.wrapper.HttpWrapper; -import com.orion.lang.utils.Exceptions; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Before; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/interceptor/ExposeApiHeaderInterceptor.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/interceptor/ExposeApiHeaderInterceptor.java index 556a4b6f..17bdcb3b 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/interceptor/ExposeApiHeaderInterceptor.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/interceptor/ExposeApiHeaderInterceptor.java @@ -15,11 +15,11 @@ */ package cn.orionsec.ops.interceptor; +import cn.orionsec.kit.lang.constant.StandardContentType; +import cn.orionsec.kit.lang.define.wrapper.HttpWrapper; +import cn.orionsec.kit.web.servlet.web.Servlets; import cn.orionsec.ops.annotation.IgnoreCheck; import cn.orionsec.ops.constant.ResultCode; -import com.orion.lang.constant.StandardContentType; -import com.orion.lang.define.wrapper.HttpWrapper; -import com.orion.web.servlet.web.Servlets; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; import org.springframework.web.method.HandlerMethod; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/interceptor/FileTransferNotifyInterceptor.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/interceptor/FileTransferNotifyInterceptor.java index c3d58bff..7c4f925e 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/interceptor/FileTransferNotifyInterceptor.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/interceptor/FileTransferNotifyInterceptor.java @@ -15,10 +15,10 @@ */ package cn.orionsec.ops.interceptor; +import cn.orionsec.kit.lang.utils.Booleans; +import cn.orionsec.kit.lang.utils.Strings; import cn.orionsec.ops.constant.KeyConst; import cn.orionsec.ops.utils.WebSockets; -import com.orion.lang.utils.Booleans; -import com.orion.lang.utils.Strings; import lombok.extern.slf4j.Slf4j; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.http.server.ServerHttpRequest; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/interceptor/IpFilterInterceptor.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/interceptor/IpFilterInterceptor.java index 8f2b58dc..8f917e65 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/interceptor/IpFilterInterceptor.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/interceptor/IpFilterInterceptor.java @@ -15,13 +15,13 @@ */ package cn.orionsec.ops.interceptor; +import cn.orionsec.kit.lang.constant.StandardContentType; +import cn.orionsec.kit.lang.define.wrapper.HttpWrapper; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.web.servlet.web.Servlets; import cn.orionsec.ops.constant.Const; import cn.orionsec.ops.constant.ResultCode; import cn.orionsec.ops.utils.Utils; -import com.orion.lang.constant.StandardContentType; -import com.orion.lang.define.wrapper.HttpWrapper; -import com.orion.lang.utils.Strings; -import com.orion.web.servlet.web.Servlets; import org.springframework.stereotype.Component; import org.springframework.web.method.HandlerMethod; import org.springframework.web.servlet.HandlerInterceptor; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/interceptor/LogPrintInterceptor.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/interceptor/LogPrintInterceptor.java index 71dcfd41..eafb8eca 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/interceptor/LogPrintInterceptor.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/interceptor/LogPrintInterceptor.java @@ -15,15 +15,15 @@ */ package cn.orionsec.ops.interceptor; +import cn.orionsec.kit.lang.id.UUIds; +import cn.orionsec.kit.lang.utils.Arrays1; +import cn.orionsec.kit.lang.utils.Exceptions; +import cn.orionsec.kit.lang.utils.time.Dates; +import cn.orionsec.kit.web.servlet.web.Servlets; import cn.orionsec.ops.constant.Const; import cn.orionsec.ops.utils.UserHolder; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.serializer.PropertyFilter; -import com.orion.lang.id.UUIds; -import com.orion.lang.utils.Arrays1; -import com.orion.lang.utils.Exceptions; -import com.orion.lang.utils.time.Dates; -import com.orion.web.servlet.web.Servlets; import lombok.extern.slf4j.Slf4j; import org.aopalliance.intercept.MethodInterceptor; import org.aopalliance.intercept.MethodInvocation; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/interceptor/RoleInterceptor.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/interceptor/RoleInterceptor.java index d161ddc6..4943f019 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/interceptor/RoleInterceptor.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/interceptor/RoleInterceptor.java @@ -15,15 +15,15 @@ */ package cn.orionsec.ops.interceptor; +import cn.orionsec.kit.lang.constant.StandardContentType; +import cn.orionsec.kit.lang.define.wrapper.HttpWrapper; +import cn.orionsec.kit.lang.utils.Arrays1; +import cn.orionsec.kit.web.servlet.web.Servlets; import cn.orionsec.ops.annotation.RequireRole; import cn.orionsec.ops.constant.ResultCode; import cn.orionsec.ops.constant.user.RoleType; import cn.orionsec.ops.entity.dto.user.UserDTO; import cn.orionsec.ops.utils.UserHolder; -import com.orion.lang.constant.StandardContentType; -import com.orion.lang.define.wrapper.HttpWrapper; -import com.orion.lang.utils.Arrays1; -import com.orion.web.servlet.web.Servlets; import org.springframework.stereotype.Component; import org.springframework.web.method.HandlerMethod; import org.springframework.web.servlet.HandlerInterceptor; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/interceptor/TailFileInterceptor.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/interceptor/TailFileInterceptor.java index be11551c..363aeab1 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/interceptor/TailFileInterceptor.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/interceptor/TailFileInterceptor.java @@ -15,11 +15,11 @@ */ package cn.orionsec.ops.interceptor; +import cn.orionsec.kit.lang.utils.Strings; import cn.orionsec.ops.constant.KeyConst; import cn.orionsec.ops.entity.dto.file.FileTailDTO; import cn.orionsec.ops.utils.WebSockets; import com.alibaba.fastjson.JSON; -import com.orion.lang.utils.Strings; import lombok.extern.slf4j.Slf4j; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.http.server.ServerHttpRequest; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/interceptor/TerminalAccessInterceptor.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/interceptor/TerminalAccessInterceptor.java index a6da98b8..748d59bf 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/interceptor/TerminalAccessInterceptor.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/interceptor/TerminalAccessInterceptor.java @@ -15,9 +15,9 @@ */ package cn.orionsec.ops.interceptor; +import cn.orionsec.kit.lang.utils.Strings; import cn.orionsec.ops.constant.KeyConst; import cn.orionsec.ops.utils.WebSockets; -import com.orion.lang.utils.Strings; import lombok.extern.slf4j.Slf4j; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.http.server.ServerHttpRequest; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/interceptor/TerminalWatcherInterceptor.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/interceptor/TerminalWatcherInterceptor.java index 4dd60d1f..b0f4b0dc 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/interceptor/TerminalWatcherInterceptor.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/interceptor/TerminalWatcherInterceptor.java @@ -15,11 +15,11 @@ */ package cn.orionsec.ops.interceptor; +import cn.orionsec.kit.lang.utils.Strings; import cn.orionsec.ops.constant.KeyConst; import cn.orionsec.ops.entity.dto.terminal.TerminalWatcherDTO; import cn.orionsec.ops.utils.WebSockets; import com.alibaba.fastjson.JSON; -import com.orion.lang.utils.Strings; import lombok.extern.slf4j.Slf4j; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.http.server.ServerHttpRequest; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/interceptor/UserActiveInterceptor.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/interceptor/UserActiveInterceptor.java index 1523e066..5f2e397a 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/interceptor/UserActiveInterceptor.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/interceptor/UserActiveInterceptor.java @@ -15,6 +15,8 @@ */ package cn.orionsec.ops.interceptor; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.collect.Maps; import cn.orionsec.ops.constant.Const; import cn.orionsec.ops.constant.KeyConst; import cn.orionsec.ops.constant.common.EnableType; @@ -26,8 +28,6 @@ import cn.orionsec.ops.service.api.UserEventLogService; import cn.orionsec.ops.utils.Currents; import cn.orionsec.ops.utils.EventParamsHolder; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.collect.Maps; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Component; import org.springframework.web.servlet.HandlerInterceptor; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/AlarmGroupService.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/AlarmGroupService.java index 88db58f8..8e490216 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/AlarmGroupService.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/AlarmGroupService.java @@ -15,9 +15,9 @@ */ package cn.orionsec.ops.service.api; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; import cn.orionsec.ops.entity.request.alarm.AlarmGroupRequest; import cn.orionsec.ops.entity.vo.alarm.AlarmGroupVO; -import com.orion.lang.define.wrapper.DataGrid; /** * 报警组服务 diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/ApplicationBuildService.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/ApplicationBuildService.java index 189c0bae..019f9d1b 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/ApplicationBuildService.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/ApplicationBuildService.java @@ -15,12 +15,12 @@ */ package cn.orionsec.ops.service.api; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; import cn.orionsec.ops.entity.domain.ApplicationBuildDO; import cn.orionsec.ops.entity.request.app.ApplicationBuildRequest; import cn.orionsec.ops.entity.vo.app.ApplicationBuildReleaseListVO; import cn.orionsec.ops.entity.vo.app.ApplicationBuildStatusVO; import cn.orionsec.ops.entity.vo.app.ApplicationBuildVO; -import com.orion.lang.define.wrapper.DataGrid; import java.util.List; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/ApplicationEnvService.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/ApplicationEnvService.java index 86e17ab5..96f0adb9 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/ApplicationEnvService.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/ApplicationEnvService.java @@ -15,12 +15,12 @@ */ package cn.orionsec.ops.service.api; +import cn.orionsec.kit.lang.define.collect.MutableLinkedHashMap; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; import cn.orionsec.ops.entity.domain.ApplicationEnvDO; import cn.orionsec.ops.entity.request.app.ApplicationConfigRequest; import cn.orionsec.ops.entity.request.app.ApplicationEnvRequest; import cn.orionsec.ops.entity.vo.app.ApplicationEnvVO; -import com.orion.lang.define.collect.MutableLinkedHashMap; -import com.orion.lang.define.wrapper.DataGrid; import java.util.List; import java.util.Map; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/ApplicationInfoService.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/ApplicationInfoService.java index 118e8909..247e4c5b 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/ApplicationInfoService.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/ApplicationInfoService.java @@ -15,12 +15,12 @@ */ package cn.orionsec.ops.service.api; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; import cn.orionsec.ops.entity.request.app.ApplicationConfigRequest; import cn.orionsec.ops.entity.request.app.ApplicationInfoRequest; import cn.orionsec.ops.entity.vo.app.ApplicationDetailVO; import cn.orionsec.ops.entity.vo.app.ApplicationInfoVO; import cn.orionsec.ops.entity.vo.app.ApplicationMachineVO; -import com.orion.lang.define.wrapper.DataGrid; import java.util.List; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/ApplicationPipelineService.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/ApplicationPipelineService.java index 7f826f0a..ea74cfeb 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/ApplicationPipelineService.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/ApplicationPipelineService.java @@ -15,9 +15,9 @@ */ package cn.orionsec.ops.service.api; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; import cn.orionsec.ops.entity.request.app.ApplicationPipelineRequest; import cn.orionsec.ops.entity.vo.app.ApplicationPipelineVO; -import com.orion.lang.define.wrapper.DataGrid; import java.util.List; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/ApplicationPipelineTaskService.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/ApplicationPipelineTaskService.java index f01e53d7..27fc4499 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/ApplicationPipelineTaskService.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/ApplicationPipelineTaskService.java @@ -15,11 +15,11 @@ */ package cn.orionsec.ops.service.api; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; import cn.orionsec.ops.entity.request.app.ApplicationPipelineTaskRequest; import cn.orionsec.ops.entity.vo.app.ApplicationPipelineTaskListVO; import cn.orionsec.ops.entity.vo.app.ApplicationPipelineTaskStatusVO; import cn.orionsec.ops.entity.vo.app.ApplicationPipelineTaskVO; -import com.orion.lang.define.wrapper.DataGrid; import java.util.Date; import java.util.List; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/ApplicationProfileService.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/ApplicationProfileService.java index f31c588c..9057e142 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/ApplicationProfileService.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/ApplicationProfileService.java @@ -15,10 +15,10 @@ */ package cn.orionsec.ops.service.api; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; import cn.orionsec.ops.entity.request.app.ApplicationProfileRequest; import cn.orionsec.ops.entity.vo.app.ApplicationProfileFastVO; import cn.orionsec.ops.entity.vo.app.ApplicationProfileVO; -import com.orion.lang.define.wrapper.DataGrid; import java.util.List; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/ApplicationReleaseService.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/ApplicationReleaseService.java index 1970110b..add5f909 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/ApplicationReleaseService.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/ApplicationReleaseService.java @@ -15,10 +15,10 @@ */ package cn.orionsec.ops.service.api; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; import cn.orionsec.ops.entity.request.app.ApplicationReleaseAuditRequest; import cn.orionsec.ops.entity.request.app.ApplicationReleaseRequest; import cn.orionsec.ops.entity.vo.app.*; -import com.orion.lang.define.wrapper.DataGrid; import java.util.Date; import java.util.List; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/ApplicationRepositoryService.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/ApplicationRepositoryService.java index 883285b5..a8a0bd46 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/ApplicationRepositoryService.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/ApplicationRepositoryService.java @@ -15,14 +15,14 @@ */ package cn.orionsec.ops.service.api; +import cn.orionsec.kit.ext.vcs.git.Gits; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; import cn.orionsec.ops.entity.domain.ApplicationRepositoryDO; import cn.orionsec.ops.entity.request.app.ApplicationRepositoryRequest; import cn.orionsec.ops.entity.vo.app.ApplicationRepositoryBranchVO; import cn.orionsec.ops.entity.vo.app.ApplicationRepositoryCommitVO; import cn.orionsec.ops.entity.vo.app.ApplicationRepositoryInfoVO; import cn.orionsec.ops.entity.vo.app.ApplicationRepositoryVO; -import com.orion.ext.vcs.git.Gits; -import com.orion.lang.define.wrapper.DataGrid; import java.util.List; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/CommandExecService.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/CommandExecService.java index e9f51b0b..ba8aa1b7 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/CommandExecService.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/CommandExecService.java @@ -15,12 +15,12 @@ */ package cn.orionsec.ops.service.api; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; import cn.orionsec.ops.entity.domain.CommandExecDO; import cn.orionsec.ops.entity.request.exec.CommandExecRequest; import cn.orionsec.ops.entity.vo.exec.CommandExecStatusVO; import cn.orionsec.ops.entity.vo.exec.CommandExecVO; import cn.orionsec.ops.entity.vo.exec.CommandTaskSubmitVO; -import com.orion.lang.define.wrapper.DataGrid; import org.springframework.web.bind.annotation.RequestBody; import java.util.List; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/CommandTemplateService.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/CommandTemplateService.java index afd55ac5..079ff909 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/CommandTemplateService.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/CommandTemplateService.java @@ -15,9 +15,9 @@ */ package cn.orionsec.ops.service.api; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; import cn.orionsec.ops.entity.request.template.CommandTemplateRequest; import cn.orionsec.ops.entity.vo.template.CommandTemplateVO; -import com.orion.lang.define.wrapper.DataGrid; import java.util.List; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/FileTailService.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/FileTailService.java index 5b63ef18..1a581302 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/FileTailService.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/FileTailService.java @@ -15,11 +15,11 @@ */ package cn.orionsec.ops.service.api; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; import cn.orionsec.ops.constant.tail.FileTailType; import cn.orionsec.ops.entity.request.file.FileTailRequest; import cn.orionsec.ops.entity.vo.tail.FileTailConfigVO; import cn.orionsec.ops.entity.vo.tail.FileTailVO; -import com.orion.lang.define.wrapper.DataGrid; import java.util.List; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/HistoryValueService.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/HistoryValueService.java index a349ccf4..9e3a44aa 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/HistoryValueService.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/HistoryValueService.java @@ -15,11 +15,11 @@ */ package cn.orionsec.ops.service.api; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; import cn.orionsec.ops.constant.history.HistoryOperator; import cn.orionsec.ops.constant.history.HistoryValueType; import cn.orionsec.ops.entity.request.history.HistoryValueRequest; import cn.orionsec.ops.entity.vo.history.HistoryValueVO; -import com.orion.lang.define.wrapper.DataGrid; /** * 历史值 api diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/MachineAlarmHistoryService.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/MachineAlarmHistoryService.java index a5852e9e..c9f863e1 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/MachineAlarmHistoryService.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/MachineAlarmHistoryService.java @@ -15,9 +15,9 @@ */ package cn.orionsec.ops.service.api; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; import cn.orionsec.ops.entity.request.machine.MachineAlarmHistoryRequest; import cn.orionsec.ops.entity.vo.machine.MachineAlarmHistoryVO; -import com.orion.lang.define.wrapper.DataGrid; /** * 机器报警历史服务 diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/MachineEnvService.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/MachineEnvService.java index 48f1b19f..ed15e1fd 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/MachineEnvService.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/MachineEnvService.java @@ -15,11 +15,11 @@ */ package cn.orionsec.ops.service.api; +import cn.orionsec.kit.lang.define.collect.MutableLinkedHashMap; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; import cn.orionsec.ops.entity.domain.MachineEnvDO; import cn.orionsec.ops.entity.request.machine.MachineEnvRequest; import cn.orionsec.ops.entity.vo.machine.MachineEnvVO; -import com.orion.lang.define.collect.MutableLinkedHashMap; -import com.orion.lang.define.wrapper.DataGrid; import java.util.List; import java.util.Map; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/MachineInfoService.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/MachineInfoService.java index 23603be1..8c0631bc 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/MachineInfoService.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/MachineInfoService.java @@ -15,11 +15,11 @@ */ package cn.orionsec.ops.service.api; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import cn.orionsec.kit.net.host.SessionStore; import cn.orionsec.ops.entity.domain.MachineInfoDO; import cn.orionsec.ops.entity.request.machine.MachineInfoRequest; import cn.orionsec.ops.entity.vo.machine.MachineInfoVO; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.net.remote.channel.SessionStore; import java.util.List; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/MachineKeyService.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/MachineKeyService.java index e6245af8..b01a51f0 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/MachineKeyService.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/MachineKeyService.java @@ -15,12 +15,12 @@ */ package cn.orionsec.ops.service.api; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import cn.orionsec.kit.lang.utils.io.Files1; import cn.orionsec.ops.constant.system.SystemEnvAttr; import cn.orionsec.ops.entity.domain.MachineSecretKeyDO; import cn.orionsec.ops.entity.request.machine.MachineKeyRequest; import cn.orionsec.ops.entity.vo.machine.MachineSecretKeyVO; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.lang.utils.io.Files1; import java.util.List; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/MachineMonitorService.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/MachineMonitorService.java index 050a875d..8a8fa271 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/MachineMonitorService.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/MachineMonitorService.java @@ -15,10 +15,10 @@ */ package cn.orionsec.ops.service.api; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; import cn.orionsec.ops.entity.domain.MachineMonitorDO; import cn.orionsec.ops.entity.request.machine.MachineMonitorRequest; import cn.orionsec.ops.entity.vo.machine.MachineMonitorVO; -import com.orion.lang.define.wrapper.DataGrid; import java.util.List; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/MachineProxyService.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/MachineProxyService.java index b38a860f..3ca4a577 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/MachineProxyService.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/MachineProxyService.java @@ -15,9 +15,9 @@ */ package cn.orionsec.ops.service.api; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; import cn.orionsec.ops.entity.request.machine.MachineProxyRequest; import cn.orionsec.ops.entity.vo.machine.MachineProxyVO; -import com.orion.lang.define.wrapper.DataGrid; import java.util.List; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/MachineTerminalService.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/MachineTerminalService.java index dde2bbd6..337f786c 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/MachineTerminalService.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/MachineTerminalService.java @@ -15,13 +15,13 @@ */ package cn.orionsec.ops.service.api; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; import cn.orionsec.ops.entity.domain.MachineTerminalLogDO; import cn.orionsec.ops.entity.request.machine.MachineTerminalLogRequest; import cn.orionsec.ops.entity.request.machine.MachineTerminalRequest; import cn.orionsec.ops.entity.vo.machine.MachineTerminalLogVO; import cn.orionsec.ops.entity.vo.machine.MachineTerminalVO; import cn.orionsec.ops.entity.vo.machine.TerminalAccessVO; -import com.orion.lang.define.wrapper.DataGrid; import java.util.List; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/SchedulerTaskRecordService.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/SchedulerTaskRecordService.java index 44c21e9f..3ff85d4d 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/SchedulerTaskRecordService.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/SchedulerTaskRecordService.java @@ -15,12 +15,12 @@ */ package cn.orionsec.ops.service.api; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; import cn.orionsec.ops.entity.request.scheduler.SchedulerTaskRecordRequest; import cn.orionsec.ops.entity.vo.scheduler.SchedulerTaskMachineRecordStatusVO; import cn.orionsec.ops.entity.vo.scheduler.SchedulerTaskMachineRecordVO; import cn.orionsec.ops.entity.vo.scheduler.SchedulerTaskRecordStatusVO; import cn.orionsec.ops.entity.vo.scheduler.SchedulerTaskRecordVO; -import com.orion.lang.define.wrapper.DataGrid; import java.util.List; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/SchedulerTaskService.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/SchedulerTaskService.java index 7437705f..ea81e342 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/SchedulerTaskService.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/SchedulerTaskService.java @@ -15,9 +15,9 @@ */ package cn.orionsec.ops.service.api; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; import cn.orionsec.ops.entity.request.scheduler.SchedulerTaskRequest; import cn.orionsec.ops.entity.vo.scheduler.SchedulerTaskVO; -import com.orion.lang.define.wrapper.DataGrid; /** *

diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/SystemEnvService.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/SystemEnvService.java index f3cd9cee..55717a85 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/SystemEnvService.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/SystemEnvService.java @@ -15,11 +15,11 @@ */ package cn.orionsec.ops.service.api; +import cn.orionsec.kit.lang.define.collect.MutableLinkedHashMap; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; import cn.orionsec.ops.entity.domain.SystemEnvDO; import cn.orionsec.ops.entity.request.system.SystemEnvRequest; import cn.orionsec.ops.entity.vo.system.SystemEnvVO; -import com.orion.lang.define.collect.MutableLinkedHashMap; -import com.orion.lang.define.wrapper.DataGrid; import java.util.List; import java.util.Map; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/UserEventLogService.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/UserEventLogService.java index 235a4c8a..baf391c3 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/UserEventLogService.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/UserEventLogService.java @@ -15,10 +15,10 @@ */ package cn.orionsec.ops.service.api; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; import cn.orionsec.ops.constant.event.EventType; import cn.orionsec.ops.entity.request.user.EventLogRequest; import cn.orionsec.ops.entity.vo.user.UserEventLogVO; -import com.orion.lang.define.wrapper.DataGrid; /** * 用户操作日志服务 diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/UserService.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/UserService.java index 95385fed..f2ae1160 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/UserService.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/UserService.java @@ -15,9 +15,9 @@ */ package cn.orionsec.ops.service.api; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; import cn.orionsec.ops.entity.request.user.UserInfoRequest; import cn.orionsec.ops.entity.vo.user.UserInfoVO; -import com.orion.lang.define.wrapper.DataGrid; /** * 用户服务 diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/WebSideMessageService.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/WebSideMessageService.java index 9f82fe2d..4fc3ca0f 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/WebSideMessageService.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/WebSideMessageService.java @@ -15,11 +15,11 @@ */ package cn.orionsec.ops.service.api; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; import cn.orionsec.ops.constant.message.MessageType; import cn.orionsec.ops.entity.request.message.WebSideMessageRequest; import cn.orionsec.ops.entity.vo.message.WebSideMessagePollVO; import cn.orionsec.ops.entity.vo.message.WebSideMessageVO; -import com.orion.lang.define.wrapper.DataGrid; import java.util.List; import java.util.Map; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/WebhookConfigService.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/WebhookConfigService.java index 1c1f1afd..f69a5166 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/WebhookConfigService.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/api/WebhookConfigService.java @@ -15,9 +15,9 @@ */ package cn.orionsec.ops.service.api; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; import cn.orionsec.ops.entity.request.webhook.WebhookConfigRequest; import cn.orionsec.ops.entity.vo.webhook.WebhookConfigVO; -import com.orion.lang.define.wrapper.DataGrid; /** * webhook 配置服务 diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/AlarmGroupServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/AlarmGroupServiceImpl.java index 7cca44cd..1774e9e4 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/AlarmGroupServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/AlarmGroupServiceImpl.java @@ -15,6 +15,9 @@ */ package cn.orionsec.ops.service.impl; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.convert.Converts; import cn.orionsec.ops.constant.MessageConst; import cn.orionsec.ops.constant.alarm.AlarmGroupNotifyType; import cn.orionsec.ops.constant.event.EventKeys; @@ -31,9 +34,6 @@ import cn.orionsec.ops.utils.EventParamsHolder; import cn.orionsec.ops.utils.Valid; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.convert.Converts; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationActionLogServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationActionLogServiceImpl.java index 56ac0311..2ed399a4 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationActionLogServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationActionLogServiceImpl.java @@ -15,6 +15,9 @@ */ package cn.orionsec.ops.service.impl; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.convert.Converts; +import cn.orionsec.kit.lang.utils.io.Files1; import cn.orionsec.ops.constant.app.ActionStatus; import cn.orionsec.ops.constant.app.StageType; import cn.orionsec.ops.constant.system.SystemEnvAttr; @@ -24,9 +27,6 @@ import cn.orionsec.ops.service.api.ApplicationActionLogService; import cn.orionsec.ops.utils.DataQuery; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.convert.Converts; -import com.orion.lang.utils.io.Files1; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationActionServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationActionServiceImpl.java index 1595b46b..86d8442f 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationActionServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationActionServiceImpl.java @@ -15,6 +15,8 @@ */ package cn.orionsec.ops.service.impl; +import cn.orionsec.kit.lang.utils.Exceptions; +import cn.orionsec.kit.lang.utils.collect.Maps; import cn.orionsec.ops.constant.app.StageType; import cn.orionsec.ops.dao.ApplicationActionDAO; import cn.orionsec.ops.entity.domain.ApplicationActionDO; @@ -23,8 +25,6 @@ import cn.orionsec.ops.entity.request.app.ApplicationConfigRequest; import cn.orionsec.ops.service.api.ApplicationActionService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.lang.utils.Exceptions; -import com.orion.lang.utils.collect.Maps; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationBuildServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationBuildServiceImpl.java index 029074b1..a5848aca 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationBuildServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationBuildServiceImpl.java @@ -15,6 +15,12 @@ */ package cn.orionsec.ops.service.impl; +import cn.orionsec.kit.lang.define.collect.MutableLinkedHashMap; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.collect.Maps; +import cn.orionsec.kit.lang.utils.convert.Converts; +import cn.orionsec.kit.lang.utils.io.Files1; import cn.orionsec.ops.constant.Const; import cn.orionsec.ops.constant.MessageConst; import cn.orionsec.ops.constant.app.*; @@ -32,12 +38,6 @@ import cn.orionsec.ops.service.api.*; import cn.orionsec.ops.utils.*; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.lang.define.collect.MutableLinkedHashMap; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.collect.Maps; -import com.orion.lang.utils.convert.Converts; -import com.orion.lang.utils.io.Files1; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationEnvServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationEnvServiceImpl.java index 4af6baf6..21f09547 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationEnvServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationEnvServiceImpl.java @@ -15,6 +15,13 @@ */ package cn.orionsec.ops.service.impl; +import cn.orionsec.kit.lang.define.collect.MutableLinkedHashMap; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.collect.Lists; +import cn.orionsec.kit.lang.utils.collect.Maps; +import cn.orionsec.kit.lang.utils.convert.Converts; +import cn.orionsec.kit.spring.SpringHolder; import cn.orionsec.ops.constant.Const; import cn.orionsec.ops.constant.MessageConst; import cn.orionsec.ops.constant.app.ApplicationEnvAttr; @@ -43,13 +50,6 @@ import cn.orionsec.ops.utils.EventParamsHolder; import cn.orionsec.ops.utils.Valid; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.lang.define.collect.MutableLinkedHashMap; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.collect.Lists; -import com.orion.lang.utils.collect.Maps; -import com.orion.lang.utils.convert.Converts; -import com.orion.spring.SpringHolder; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationInfoServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationInfoServiceImpl.java index 5dc1f83d..5c03f3bc 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationInfoServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationInfoServiceImpl.java @@ -15,6 +15,11 @@ */ package cn.orionsec.ops.service.impl; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.collect.Lists; +import cn.orionsec.kit.lang.utils.collect.Maps; +import cn.orionsec.kit.lang.utils.convert.Converts; import cn.orionsec.ops.constant.Const; import cn.orionsec.ops.constant.MessageConst; import cn.orionsec.ops.constant.app.*; @@ -35,11 +40,6 @@ import cn.orionsec.ops.utils.Valid; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.collect.Lists; -import com.orion.lang.utils.collect.Maps; -import com.orion.lang.utils.convert.Converts; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationMachineServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationMachineServiceImpl.java index 710f268e..c6c11eb5 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationMachineServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationMachineServiceImpl.java @@ -15,6 +15,7 @@ */ package cn.orionsec.ops.service.impl; +import cn.orionsec.kit.spring.SpringHolder; import cn.orionsec.ops.constant.Const; import cn.orionsec.ops.constant.MessageConst; import cn.orionsec.ops.dao.ApplicationMachineDAO; @@ -27,7 +28,6 @@ import cn.orionsec.ops.utils.DataQuery; import cn.orionsec.ops.utils.Valid; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.spring.SpringHolder; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationPipelineDetailServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationPipelineDetailServiceImpl.java index 888279e5..5c36ce94 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationPipelineDetailServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationPipelineDetailServiceImpl.java @@ -15,6 +15,7 @@ */ package cn.orionsec.ops.service.impl; +import cn.orionsec.kit.lang.utils.convert.Converts; import cn.orionsec.ops.dao.ApplicationInfoDAO; import cn.orionsec.ops.dao.ApplicationPipelineDetailDAO; import cn.orionsec.ops.entity.domain.ApplicationInfoDO; @@ -23,7 +24,6 @@ import cn.orionsec.ops.service.api.ApplicationPipelineDetailService; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.lang.utils.convert.Converts; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationPipelineServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationPipelineServiceImpl.java index 2c0c2dee..cde906b7 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationPipelineServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationPipelineServiceImpl.java @@ -15,6 +15,9 @@ */ package cn.orionsec.ops.service.impl; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.convert.Converts; import cn.orionsec.ops.constant.Const; import cn.orionsec.ops.constant.MessageConst; import cn.orionsec.ops.constant.event.EventKeys; @@ -33,9 +36,6 @@ import cn.orionsec.ops.utils.EventParamsHolder; import cn.orionsec.ops.utils.Valid; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.convert.Converts; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationPipelineTaskDetailServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationPipelineTaskDetailServiceImpl.java index 799fb3fa..1963d82d 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationPipelineTaskDetailServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationPipelineTaskDetailServiceImpl.java @@ -15,6 +15,8 @@ */ package cn.orionsec.ops.service.impl; +import cn.orionsec.kit.lang.utils.collect.Lists; +import cn.orionsec.kit.lang.utils.convert.Converts; import cn.orionsec.ops.dao.ApplicationBuildDAO; import cn.orionsec.ops.dao.ApplicationPipelineTaskDetailDAO; import cn.orionsec.ops.dao.MachineInfoDAO; @@ -28,8 +30,6 @@ import cn.orionsec.ops.utils.DataQuery; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.lang.utils.collect.Lists; -import com.orion.lang.utils.convert.Converts; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationPipelineTaskServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationPipelineTaskServiceImpl.java index 5675237e..a4a28966 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationPipelineTaskServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationPipelineTaskServiceImpl.java @@ -15,6 +15,16 @@ */ package cn.orionsec.ops.service.impl; +import cn.orionsec.kit.lang.constant.Letters; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import cn.orionsec.kit.lang.utils.Exceptions; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.collect.Lists; +import cn.orionsec.kit.lang.utils.collect.Maps; +import cn.orionsec.kit.lang.utils.collect.Sets; +import cn.orionsec.kit.lang.utils.convert.Converts; +import cn.orionsec.kit.lang.utils.time.Dates; +import cn.orionsec.kit.spring.SpringHolder; import cn.orionsec.ops.constant.CnConst; import cn.orionsec.ops.constant.Const; import cn.orionsec.ops.constant.MessageConst; @@ -45,16 +55,6 @@ import cn.orionsec.ops.utils.Valid; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.lang.constant.Letters; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.lang.utils.Exceptions; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.collect.Lists; -import com.orion.lang.utils.collect.Maps; -import com.orion.lang.utils.collect.Sets; -import com.orion.lang.utils.convert.Converts; -import com.orion.lang.utils.time.Dates; -import com.orion.spring.SpringHolder; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationProfileServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationProfileServiceImpl.java index 37dd0e77..fb0d7fd7 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationProfileServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationProfileServiceImpl.java @@ -15,6 +15,10 @@ */ package cn.orionsec.ops.service.impl; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.collect.Lists; +import cn.orionsec.kit.lang.utils.convert.Converts; import cn.orionsec.ops.constant.KeyConst; import cn.orionsec.ops.constant.MessageConst; import cn.orionsec.ops.constant.event.EventKeys; @@ -30,10 +34,6 @@ import cn.orionsec.ops.utils.Valid; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.collect.Lists; -import com.orion.lang.utils.convert.Converts; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationReleaseMachineServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationReleaseMachineServiceImpl.java index b6d0bb02..e7b21b58 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationReleaseMachineServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationReleaseMachineServiceImpl.java @@ -15,13 +15,13 @@ */ package cn.orionsec.ops.service.impl; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.io.Files1; import cn.orionsec.ops.constant.system.SystemEnvAttr; import cn.orionsec.ops.dao.ApplicationReleaseMachineDAO; import cn.orionsec.ops.entity.domain.ApplicationReleaseMachineDO; import cn.orionsec.ops.service.api.ApplicationReleaseMachineService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.io.Files1; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationReleaseServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationReleaseServiceImpl.java index 44282351..bb96b2f1 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationReleaseServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationReleaseServiceImpl.java @@ -15,6 +15,16 @@ */ package cn.orionsec.ops.service.impl; +import cn.orionsec.kit.lang.define.collect.MutableLinkedHashMap; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import cn.orionsec.kit.lang.utils.Exceptions; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.collect.Lists; +import cn.orionsec.kit.lang.utils.collect.Maps; +import cn.orionsec.kit.lang.utils.convert.Converts; +import cn.orionsec.kit.lang.utils.io.Files1; +import cn.orionsec.kit.lang.utils.time.Dates; +import cn.orionsec.kit.spring.SpringHolder; import cn.orionsec.ops.constant.CnConst; import cn.orionsec.ops.constant.Const; import cn.orionsec.ops.constant.MessageConst; @@ -41,16 +51,6 @@ import cn.orionsec.ops.utils.*; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.lang.define.collect.MutableLinkedHashMap; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.lang.utils.Exceptions; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.collect.Lists; -import com.orion.lang.utils.collect.Maps; -import com.orion.lang.utils.convert.Converts; -import com.orion.lang.utils.io.Files1; -import com.orion.lang.utils.time.Dates; -import com.orion.spring.SpringHolder; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationRepositoryServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationRepositoryServiceImpl.java index 5c08809f..d22c4a63 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationRepositoryServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/ApplicationRepositoryServiceImpl.java @@ -15,6 +15,18 @@ */ package cn.orionsec.ops.service.impl; +import cn.orionsec.kit.ext.vcs.git.Gits; +import cn.orionsec.kit.ext.vcs.git.info.BranchInfo; +import cn.orionsec.kit.ext.vcs.git.info.LogInfo; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import cn.orionsec.kit.lang.utils.Arrays1; +import cn.orionsec.kit.lang.utils.Exceptions; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.Threads; +import cn.orionsec.kit.lang.utils.collect.Maps; +import cn.orionsec.kit.lang.utils.convert.Converts; +import cn.orionsec.kit.lang.utils.io.Files1; +import cn.orionsec.kit.lang.utils.io.Streams; import cn.orionsec.ops.constant.Const; import cn.orionsec.ops.constant.MessageConst; import cn.orionsec.ops.constant.app.RepositoryAuthType; @@ -38,18 +50,6 @@ import cn.orionsec.ops.service.api.WebSideMessageService; import cn.orionsec.ops.utils.*; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.ext.vcs.git.Gits; -import com.orion.ext.vcs.git.info.BranchInfo; -import com.orion.ext.vcs.git.info.LogInfo; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.lang.utils.Arrays1; -import com.orion.lang.utils.Exceptions; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.Threads; -import com.orion.lang.utils.collect.Maps; -import com.orion.lang.utils.convert.Converts; -import com.orion.lang.utils.io.Files1; -import com.orion.lang.utils.io.Streams; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/BatchUploadServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/BatchUploadServiceImpl.java index aee19f93..6087a33c 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/BatchUploadServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/BatchUploadServiceImpl.java @@ -15,6 +15,13 @@ */ package cn.orionsec.ops.service.impl; +import cn.orionsec.kit.lang.id.UUIds; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.collect.Lists; +import cn.orionsec.kit.lang.utils.collect.Maps; +import cn.orionsec.kit.lang.utils.convert.Converts; +import cn.orionsec.kit.lang.utils.io.Files1; +import cn.orionsec.kit.net.host.sftp.SftpExecutor; import cn.orionsec.ops.constant.KeyConst; import cn.orionsec.ops.constant.event.EventKeys; import cn.orionsec.ops.constant.sftp.SftpTransferStatus; @@ -40,13 +47,6 @@ import cn.orionsec.ops.utils.Currents; import cn.orionsec.ops.utils.EventParamsHolder; import com.alibaba.fastjson.JSON; -import com.orion.lang.id.UUIds; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.collect.Lists; -import com.orion.lang.utils.collect.Maps; -import com.orion.lang.utils.convert.Converts; -import com.orion.lang.utils.io.Files1; -import com.orion.net.remote.channel.sftp.SftpExecutor; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/CommandExecServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/CommandExecServiceImpl.java index bd452e08..728b9567 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/CommandExecServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/CommandExecServiceImpl.java @@ -15,6 +15,12 @@ */ package cn.orionsec.ops.service.impl; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.collect.Lists; +import cn.orionsec.kit.lang.utils.collect.Maps; +import cn.orionsec.kit.lang.utils.convert.Converts; +import cn.orionsec.kit.lang.utils.io.Files1; import cn.orionsec.ops.constant.Const; import cn.orionsec.ops.constant.MessageConst; import cn.orionsec.ops.constant.command.ExecStatus; @@ -40,12 +46,6 @@ import cn.orionsec.ops.utils.*; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.collect.Lists; -import com.orion.lang.utils.collect.Maps; -import com.orion.lang.utils.convert.Converts; -import com.orion.lang.utils.io.Files1; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/CommandTemplateServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/CommandTemplateServiceImpl.java index 29f61383..fd649157 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/CommandTemplateServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/CommandTemplateServiceImpl.java @@ -15,6 +15,9 @@ */ package cn.orionsec.ops.service.impl; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.convert.Converts; import cn.orionsec.ops.constant.Const; import cn.orionsec.ops.constant.MessageConst; import cn.orionsec.ops.constant.event.EventKeys; @@ -29,9 +32,6 @@ import cn.orionsec.ops.utils.EventParamsHolder; import cn.orionsec.ops.utils.Valid; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.convert.Converts; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/FileDownloadServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/FileDownloadServiceImpl.java index 36ab1d2b..68ad89f1 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/FileDownloadServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/FileDownloadServiceImpl.java @@ -15,6 +15,13 @@ */ package cn.orionsec.ops.service.impl; +import cn.orionsec.kit.lang.define.wrapper.HttpWrapper; +import cn.orionsec.kit.lang.id.UUIds; +import cn.orionsec.kit.lang.utils.Exceptions; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.io.Files1; +import cn.orionsec.kit.lang.utils.io.Streams; +import cn.orionsec.kit.web.servlet.web.Servlets; import cn.orionsec.ops.constant.Const; import cn.orionsec.ops.constant.KeyConst; import cn.orionsec.ops.constant.ResultCode; @@ -29,13 +36,6 @@ import cn.orionsec.ops.service.api.*; import cn.orionsec.ops.utils.Currents; import com.alibaba.fastjson.JSON; -import com.orion.lang.define.wrapper.HttpWrapper; -import com.orion.lang.id.UUIds; -import com.orion.lang.utils.Exceptions; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.io.Files1; -import com.orion.lang.utils.io.Streams; -import com.orion.web.servlet.web.Servlets; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/FileTailServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/FileTailServiceImpl.java index bab27bde..d71ef6b4 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/FileTailServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/FileTailServiceImpl.java @@ -15,6 +15,15 @@ */ package cn.orionsec.ops.service.impl; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import cn.orionsec.kit.lang.define.wrapper.HttpWrapper; +import cn.orionsec.kit.lang.id.UUIds; +import cn.orionsec.kit.lang.utils.Exceptions; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.collect.Lists; +import cn.orionsec.kit.lang.utils.collect.Maps; +import cn.orionsec.kit.lang.utils.convert.Converts; +import cn.orionsec.kit.lang.utils.io.Files1; import cn.orionsec.ops.constant.Const; import cn.orionsec.ops.constant.KeyConst; import cn.orionsec.ops.constant.MessageConst; @@ -36,15 +45,6 @@ import cn.orionsec.ops.utils.*; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.lang.define.wrapper.HttpWrapper; -import com.orion.lang.id.UUIds; -import com.orion.lang.utils.Exceptions; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.collect.Lists; -import com.orion.lang.utils.collect.Maps; -import com.orion.lang.utils.convert.Converts; -import com.orion.lang.utils.io.Files1; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/HistoryValueServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/HistoryValueServiceImpl.java index 9a3e28e8..657692cf 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/HistoryValueServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/HistoryValueServiceImpl.java @@ -15,6 +15,7 @@ */ package cn.orionsec.ops.service.impl; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; import cn.orionsec.ops.constant.MessageConst; import cn.orionsec.ops.constant.history.HistoryOperator; import cn.orionsec.ops.constant.history.HistoryValueType; @@ -34,7 +35,6 @@ import cn.orionsec.ops.utils.DataQuery; import cn.orionsec.ops.utils.Valid; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.lang.define.wrapper.DataGrid; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/MachineAlarmConfigServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/MachineAlarmConfigServiceImpl.java index 5e69fd79..dc064af0 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/MachineAlarmConfigServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/MachineAlarmConfigServiceImpl.java @@ -15,6 +15,7 @@ */ package cn.orionsec.ops.service.impl; +import cn.orionsec.kit.lang.utils.convert.Converts; import cn.orionsec.ops.constant.MessageConst; import cn.orionsec.ops.constant.event.EventKeys; import cn.orionsec.ops.constant.machine.MachineAlarmType; @@ -34,7 +35,6 @@ import cn.orionsec.ops.utils.EventParamsHolder; import cn.orionsec.ops.utils.Valid; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.lang.utils.convert.Converts; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/MachineAlarmHistoryServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/MachineAlarmHistoryServiceImpl.java index 76c292ed..2579e10c 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/MachineAlarmHistoryServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/MachineAlarmHistoryServiceImpl.java @@ -15,6 +15,8 @@ */ package cn.orionsec.ops.service.impl; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import cn.orionsec.kit.lang.utils.Objects1; import cn.orionsec.ops.dao.MachineAlarmHistoryDAO; import cn.orionsec.ops.entity.domain.MachineAlarmHistoryDO; import cn.orionsec.ops.entity.request.machine.MachineAlarmHistoryRequest; @@ -22,8 +24,6 @@ import cn.orionsec.ops.service.api.MachineAlarmHistoryService; import cn.orionsec.ops.utils.DataQuery; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.lang.utils.Objects1; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/MachineEnvServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/MachineEnvServiceImpl.java index d63531e6..b7268ba7 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/MachineEnvServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/MachineEnvServiceImpl.java @@ -15,6 +15,14 @@ */ package cn.orionsec.ops.service.impl; +import cn.orionsec.kit.lang.define.collect.MutableLinkedHashMap; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import cn.orionsec.kit.lang.utils.Charsets; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.collect.Lists; +import cn.orionsec.kit.lang.utils.collect.Maps; +import cn.orionsec.kit.lang.utils.convert.Converts; +import cn.orionsec.kit.spring.SpringHolder; import cn.orionsec.ops.constant.Const; import cn.orionsec.ops.constant.MessageConst; import cn.orionsec.ops.constant.command.CommandConst; @@ -36,14 +44,6 @@ import cn.orionsec.ops.utils.EventParamsHolder; import cn.orionsec.ops.utils.Valid; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.lang.define.collect.MutableLinkedHashMap; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.lang.utils.Charsets; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.collect.Lists; -import com.orion.lang.utils.collect.Maps; -import com.orion.lang.utils.convert.Converts; -import com.orion.spring.SpringHolder; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/MachineGroupServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/MachineGroupServiceImpl.java index 23d49ec9..74c090ce 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/MachineGroupServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/MachineGroupServiceImpl.java @@ -15,6 +15,7 @@ */ package cn.orionsec.ops.service.impl; +import cn.orionsec.kit.lang.utils.Objects1; import cn.orionsec.ops.constant.Const; import cn.orionsec.ops.constant.KeyConst; import cn.orionsec.ops.constant.MessageConst; @@ -29,7 +30,6 @@ import cn.orionsec.ops.utils.Valid; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.lang.utils.Objects1; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/MachineInfoServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/MachineInfoServiceImpl.java index ca4307f9..25365dba 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/MachineInfoServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/MachineInfoServiceImpl.java @@ -15,6 +15,22 @@ */ package cn.orionsec.ops.service.impl; +import cn.orionsec.kit.ext.process.Processes; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import cn.orionsec.kit.lang.exception.AuthenticationException; +import cn.orionsec.kit.lang.exception.ConnectionRuntimeException; +import cn.orionsec.kit.lang.utils.Booleans; +import cn.orionsec.kit.lang.utils.Exceptions; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.Valid; +import cn.orionsec.kit.lang.utils.collect.Lists; +import cn.orionsec.kit.lang.utils.convert.Converts; +import cn.orionsec.kit.lang.utils.io.Streams; +import cn.orionsec.kit.lang.utils.net.IPs; +import cn.orionsec.kit.net.host.SessionHolder; +import cn.orionsec.kit.net.host.SessionStore; +import cn.orionsec.kit.net.host.ssh.command.CommandExecutor; +import cn.orionsec.kit.net.host.ssh.command.CommandExecutors; import cn.orionsec.ops.constant.CnConst; import cn.orionsec.ops.constant.Const; import cn.orionsec.ops.constant.MessageConst; @@ -40,22 +56,6 @@ import cn.orionsec.ops.utils.Utils; import cn.orionsec.ops.utils.ValueMix; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.ext.process.Processes; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.lang.exception.AuthenticationException; -import com.orion.lang.exception.ConnectionRuntimeException; -import com.orion.lang.utils.Booleans; -import com.orion.lang.utils.Exceptions; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.Valid; -import com.orion.lang.utils.collect.Lists; -import com.orion.lang.utils.convert.Converts; -import com.orion.lang.utils.io.Streams; -import com.orion.lang.utils.net.IPs; -import com.orion.net.remote.CommandExecutors; -import com.orion.net.remote.channel.SessionHolder; -import com.orion.net.remote.channel.SessionStore; -import com.orion.net.remote.channel.ssh.CommandExecutor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -486,9 +486,9 @@ private SessionStore connectSessionStore(MachineInfoDO machine, MachineSecretKey if (ProxyType.HTTP.equals(proxyType)) { session.httpProxy(proxy.getProxyHost(), proxy.getProxyPort(), proxy.getProxyUsername(), proxyPassword); } else if (ProxyType.SOCKS4.equals(proxyType)) { - session.sock4Proxy(proxy.getProxyHost(), proxy.getProxyPort(), proxy.getProxyUsername(), proxyPassword); + session.socks4Proxy(proxy.getProxyHost(), proxy.getProxyPort(), proxy.getProxyUsername(), proxyPassword); } else if (ProxyType.SOCKS5.equals(proxyType)) { - session.sock5Proxy(proxy.getProxyHost(), proxy.getProxyPort(), proxy.getProxyUsername(), proxyPassword); + session.socks5Proxy(proxy.getProxyHost(), proxy.getProxyPort(), proxy.getProxyUsername(), proxyPassword); } } // 连接 @@ -496,7 +496,7 @@ private SessionStore connectSessionStore(MachineInfoDO machine, MachineSecretKey log.info("远程机器建立连接-成功 {}@{}:{}", machine.getUsername(), machine.getMachineHost(), machine.getSshPort()); return session; } catch (Exception e) { - log.error("远程机器建立连接-失败 {}@{}:{} {}", machine.getUsername(), machine.getMachineHost(), machine.getSshPort(), e); + log.error("远程机器建立连接-失败 {}@{}:{}", machine.getUsername(), machine.getMachineHost(), machine.getSshPort(), e); throw e; } } diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/MachineKeyServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/MachineKeyServiceImpl.java index aec909fb..49bc2ad8 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/MachineKeyServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/MachineKeyServiceImpl.java @@ -15,6 +15,14 @@ */ package cn.orionsec.ops.service.impl; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import cn.orionsec.kit.lang.utils.Exceptions; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.codec.Base64s; +import cn.orionsec.kit.lang.utils.convert.Converts; +import cn.orionsec.kit.lang.utils.io.FileWriters; +import cn.orionsec.kit.lang.utils.io.Files1; +import cn.orionsec.kit.net.host.SessionHolder; import cn.orionsec.ops.constant.Const; import cn.orionsec.ops.constant.MessageConst; import cn.orionsec.ops.constant.event.EventKeys; @@ -28,14 +36,6 @@ import cn.orionsec.ops.utils.*; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.lang.utils.Exceptions; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.codec.Base64s; -import com.orion.lang.utils.convert.Converts; -import com.orion.lang.utils.io.FileWriters; -import com.orion.lang.utils.io.Files1; -import com.orion.net.remote.channel.SessionHolder; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -195,12 +195,13 @@ public void bindMachineKey(Long id, List machineIdList) { */ private void checkLoadKey(String path, String password) { try { + SessionHolder holder = new SessionHolder(); if (Strings.isEmpty(password)) { - SessionHolder.HOLDER.addIdentity(path); + holder.addIdentity(path); } else { - SessionHolder.HOLDER.addIdentity(path, password); + holder.addIdentity(path, password); } - SessionHolder.HOLDER.removeAllIdentity(); + holder.removeAllIdentity(); } catch (Exception e) { throw Exceptions.app(MessageConst.ILLEGAL_MACHINE_SECRET_KEY, e); } diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/MachineMonitorEndpointServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/MachineMonitorEndpointServiceImpl.java index 9d47f868..35475e33 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/MachineMonitorEndpointServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/MachineMonitorEndpointServiceImpl.java @@ -15,6 +15,7 @@ */ package cn.orionsec.ops.service.impl; +import cn.orionsec.kit.lang.define.wrapper.HttpWrapper; import cn.orionsec.ops.constant.Const; import cn.orionsec.ops.constant.MessageConst; import cn.orionsec.ops.constant.ParamConst; @@ -29,7 +30,6 @@ import cn.orionsec.ops.utils.Valid; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.orion.lang.define.wrapper.HttpWrapper; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/MachineMonitorServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/MachineMonitorServiceImpl.java index f43063bf..3e1ac6b6 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/MachineMonitorServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/MachineMonitorServiceImpl.java @@ -15,6 +15,13 @@ */ package cn.orionsec.ops.service.impl; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import cn.orionsec.kit.lang.define.wrapper.Pager; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.Threads; +import cn.orionsec.kit.lang.utils.collect.Lists; +import cn.orionsec.kit.lang.utils.convert.Converts; +import cn.orionsec.kit.lang.utils.io.Files1; import cn.orionsec.ops.constant.CnConst; import cn.orionsec.ops.constant.MessageConst; import cn.orionsec.ops.constant.SchedulerPools; @@ -40,13 +47,6 @@ import cn.orionsec.ops.utils.EventParamsHolder; import cn.orionsec.ops.utils.Valid; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.lang.define.wrapper.Pager; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.Threads; -import com.orion.lang.utils.collect.Lists; -import com.orion.lang.utils.convert.Converts; -import com.orion.lang.utils.io.Files1; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/MachineProxyServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/MachineProxyServiceImpl.java index cb0a46cc..12488b76 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/MachineProxyServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/MachineProxyServiceImpl.java @@ -15,6 +15,9 @@ */ package cn.orionsec.ops.service.impl; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.convert.Converts; import cn.orionsec.ops.constant.MessageConst; import cn.orionsec.ops.constant.event.EventKeys; import cn.orionsec.ops.dao.MachineInfoDAO; @@ -28,9 +31,6 @@ import cn.orionsec.ops.utils.Valid; import cn.orionsec.ops.utils.ValueMix; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.convert.Converts; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/MachineTerminalServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/MachineTerminalServiceImpl.java index 2289d207..d4918de1 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/MachineTerminalServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/MachineTerminalServiceImpl.java @@ -15,6 +15,13 @@ */ package cn.orionsec.ops.service.impl; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import cn.orionsec.kit.lang.id.UUIds; +import cn.orionsec.kit.lang.utils.Exceptions; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.convert.Converts; +import cn.orionsec.kit.lang.utils.io.Files1; +import cn.orionsec.kit.net.host.ssh.TerminalType; import cn.orionsec.ops.constant.Const; import cn.orionsec.ops.constant.KeyConst; import cn.orionsec.ops.constant.MessageConst; @@ -38,13 +45,6 @@ import cn.orionsec.ops.utils.EventParamsHolder; import cn.orionsec.ops.utils.Valid; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.lang.id.UUIds; -import com.orion.lang.utils.Exceptions; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.convert.Converts; -import com.orion.lang.utils.io.Files1; -import com.orion.net.remote.TerminalType; import lombok.extern.slf4j.Slf4j; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/PassportServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/PassportServiceImpl.java index f5e059df..9210c60c 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/PassportServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/PassportServiceImpl.java @@ -15,6 +15,9 @@ */ package cn.orionsec.ops.service.impl; +import cn.orionsec.kit.lang.define.wrapper.HttpWrapper; +import cn.orionsec.kit.lang.utils.Exceptions; +import cn.orionsec.kit.lang.utils.Strings; import cn.orionsec.ops.constant.Const; import cn.orionsec.ops.constant.KeyConst; import cn.orionsec.ops.constant.MessageConst; @@ -34,9 +37,6 @@ import cn.orionsec.ops.utils.*; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.lang.define.wrapper.HttpWrapper; -import com.orion.lang.utils.Exceptions; -import com.orion.lang.utils.Strings; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/SchedulerTaskMachineRecordServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/SchedulerTaskMachineRecordServiceImpl.java index 1c5bd798..9e375ce7 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/SchedulerTaskMachineRecordServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/SchedulerTaskMachineRecordServiceImpl.java @@ -15,13 +15,13 @@ */ package cn.orionsec.ops.service.impl; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.io.Files1; import cn.orionsec.ops.constant.system.SystemEnvAttr; import cn.orionsec.ops.dao.SchedulerTaskMachineRecordDAO; import cn.orionsec.ops.entity.domain.SchedulerTaskMachineRecordDO; import cn.orionsec.ops.service.api.SchedulerTaskMachineRecordService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.io.Files1; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/SchedulerTaskRecordServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/SchedulerTaskRecordServiceImpl.java index 9d7285a9..60ca3f92 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/SchedulerTaskRecordServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/SchedulerTaskRecordServiceImpl.java @@ -15,6 +15,11 @@ */ package cn.orionsec.ops.service.impl; +import cn.orionsec.kit.lang.define.collect.MutableLinkedHashMap; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.collect.Lists; +import cn.orionsec.kit.lang.utils.convert.Converts; import cn.orionsec.ops.constant.MessageConst; import cn.orionsec.ops.constant.env.EnvConst; import cn.orionsec.ops.constant.event.EventKeys; @@ -37,11 +42,6 @@ import cn.orionsec.ops.utils.PathBuilders; import cn.orionsec.ops.utils.Valid; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.lang.define.collect.MutableLinkedHashMap; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.collect.Lists; -import com.orion.lang.utils.convert.Converts; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/SchedulerTaskServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/SchedulerTaskServiceImpl.java index 35e32903..bdbbc6f3 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/SchedulerTaskServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/SchedulerTaskServiceImpl.java @@ -15,6 +15,9 @@ */ package cn.orionsec.ops.service.impl; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.convert.Converts; import cn.orionsec.ops.constant.CnConst; import cn.orionsec.ops.constant.Const; import cn.orionsec.ops.constant.MessageConst; @@ -37,9 +40,6 @@ import cn.orionsec.ops.utils.EventParamsHolder; import cn.orionsec.ops.utils.Valid; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.convert.Converts; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/SftpServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/SftpServiceImpl.java index 67ead3bb..067cc44f 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/SftpServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/SftpServiceImpl.java @@ -15,6 +15,19 @@ */ package cn.orionsec.ops.service.impl; +import cn.orionsec.kit.lang.define.io.IgnoreOutputStream; +import cn.orionsec.kit.lang.id.ObjectIds; +import cn.orionsec.kit.lang.id.UUIds; +import cn.orionsec.kit.lang.utils.Exceptions; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.collect.Lists; +import cn.orionsec.kit.lang.utils.convert.Converts; +import cn.orionsec.kit.lang.utils.io.Files1; +import cn.orionsec.kit.net.host.SessionStore; +import cn.orionsec.kit.net.host.sftp.SftpExecutor; +import cn.orionsec.kit.net.host.sftp.SftpFile; +import cn.orionsec.kit.net.host.ssh.command.CommandExecutor; +import cn.orionsec.kit.net.host.ssh.command.CommandExecutors; import cn.orionsec.ops.constant.Const; import cn.orionsec.ops.constant.KeyConst; import cn.orionsec.ops.constant.MessageConst; @@ -44,19 +57,6 @@ import cn.orionsec.ops.utils.*; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.lang.define.io.IgnoreOutputStream; -import com.orion.lang.id.ObjectIds; -import com.orion.lang.id.UUIds; -import com.orion.lang.utils.Exceptions; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.collect.Lists; -import com.orion.lang.utils.convert.Converts; -import com.orion.lang.utils.io.Files1; -import com.orion.net.base.file.sftp.SftpFile; -import com.orion.net.remote.CommandExecutors; -import com.orion.net.remote.channel.SessionStore; -import com.orion.net.remote.channel.sftp.SftpExecutor; -import com.orion.net.remote.channel.ssh.CommandExecutor; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; @@ -127,7 +127,7 @@ private FileListVO list(String path, Boolean all, SftpExecutor executor) { fileList = executor.listFilesFilter(path, f -> !f.getName().startsWith("."), false, true); } else { // 查询隐藏文件 - fileList = executor.ll(path); + fileList = executor.list(path); } // 返回 FileListVO fileListVO = new FileListVO(); @@ -158,7 +158,7 @@ public String mkdir(FileMkdirRequest request) { String path = Files1.getPath(request.getPath()); SftpExecutor executor = sftpBasicExecutorHolder.getBasicExecutor(request.getSessionToken()); synchronized (executor) { - executor.mkdirs(path); + executor.makeDirectories(path); } // 设置日志参数 EventParamsHolder.addParams(request); @@ -194,7 +194,7 @@ public String move(FileMoveRequest request) { String target = Files1.getPath(request.getTarget()); SftpExecutor executor = sftpBasicExecutorHolder.getBasicExecutor(request.getSessionToken()); synchronized (executor) { - executor.mv(source, target); + executor.move(source, target); } // 设置日志参数 EventParamsHolder.addParams(request); @@ -208,7 +208,7 @@ public void remove(FileRemoveRequest request) { synchronized (executor) { paths.stream() .map(Files1::getPath) - .forEach(executor::rm); + .forEach(executor::remove); } // 设置日志参数 EventParamsHolder.addParams(request); @@ -220,7 +220,7 @@ public String chmod(FileChmodRequest request) { String path = Files1.getPath(request.getPath()); SftpExecutor executor = sftpBasicExecutorHolder.getBasicExecutor(request.getSessionToken()); synchronized (executor) { - executor.chmod(path, request.getPermission()); + executor.changeMode(path, request.getPermission()); } // 设置日志参数 EventParamsHolder.addParams(request); @@ -233,7 +233,7 @@ public void chown(FileChownRequest request) { String path = Files1.getPath(request.getPath()); SftpExecutor executor = sftpBasicExecutorHolder.getBasicExecutor(request.getSessionToken()); synchronized (executor) { - executor.chown(path, request.getUid()); + executor.changeOwner(path, request.getUid()); } // 设置日志参数 EventParamsHolder.addParams(request); @@ -244,7 +244,7 @@ public void changeGroup(FileChangeGroupRequest request) { String path = Files1.getPath(request.getPath()); SftpExecutor executor = sftpBasicExecutorHolder.getBasicExecutor(request.getSessionToken()); synchronized (executor) { - executor.chgrp(path, request.getGid()); + executor.changeGroup(path, request.getGid()); } // 设置日志参数 EventParamsHolder.addParams(request); @@ -402,7 +402,7 @@ public void packageDownload(FileDownloadRequest request) { try (SessionStore session = machineInfoService.openSessionStore(machine); CommandExecutor executor = session.getCommandExecutor(Strings.replaceCRLF(command))) { // 执行命令 - CommandExecutors.syncExecCommand(executor, new IgnoreOutputStream()); + CommandExecutors.execCommand(executor, new IgnoreOutputStream()); } catch (Exception e) { throw Exceptions.app(MessageConst.EXECUTE_SFTP_ZIP_COMMAND_ERROR, e); } diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/StatisticsServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/StatisticsServiceImpl.java index 5505000b..c3d84ca1 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/StatisticsServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/StatisticsServiceImpl.java @@ -15,6 +15,11 @@ */ package cn.orionsec.ops.service.impl; +import cn.orionsec.kit.lang.utils.Arrays1; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.collect.Lists; +import cn.orionsec.kit.lang.utils.convert.Converts; +import cn.orionsec.kit.lang.utils.time.Dates; import cn.orionsec.ops.constant.KeyConst; import cn.orionsec.ops.constant.app.*; import cn.orionsec.ops.constant.system.SystemEnvAttr; @@ -35,11 +40,6 @@ import cn.orionsec.ops.utils.Utils; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.lang.utils.Arrays1; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.collect.Lists; -import com.orion.lang.utils.convert.Converts; -import com.orion.lang.utils.time.Dates; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/SystemEnvServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/SystemEnvServiceImpl.java index 5c2184db..e75e0eb5 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/SystemEnvServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/SystemEnvServiceImpl.java @@ -15,6 +15,13 @@ */ package cn.orionsec.ops.service.impl; +import cn.orionsec.kit.lang.define.collect.MutableLinkedHashMap; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.collect.Lists; +import cn.orionsec.kit.lang.utils.collect.Maps; +import cn.orionsec.kit.lang.utils.convert.Converts; +import cn.orionsec.kit.spring.SpringHolder; import cn.orionsec.ops.constant.Const; import cn.orionsec.ops.constant.MessageConst; import cn.orionsec.ops.constant.env.EnvConst; @@ -33,13 +40,6 @@ import cn.orionsec.ops.utils.EventParamsHolder; import cn.orionsec.ops.utils.Valid; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.lang.define.collect.MutableLinkedHashMap; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.collect.Lists; -import com.orion.lang.utils.collect.Maps; -import com.orion.lang.utils.convert.Converts; -import com.orion.spring.SpringHolder; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/SystemServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/SystemServiceImpl.java index 2b29d8ca..d4862b1d 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/SystemServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/SystemServiceImpl.java @@ -15,6 +15,11 @@ */ package cn.orionsec.ops.service.impl; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.Threads; +import cn.orionsec.kit.lang.utils.Valid; +import cn.orionsec.kit.lang.utils.convert.Converts; +import cn.orionsec.kit.lang.utils.io.Files1; import cn.orionsec.ops.constant.Const; import cn.orionsec.ops.constant.MessageConst; import cn.orionsec.ops.constant.common.EnableType; @@ -37,11 +42,6 @@ import cn.orionsec.ops.utils.FileCleaner; import cn.orionsec.ops.utils.Utils; import com.alibaba.fastjson.JSON; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.Threads; -import com.orion.lang.utils.Valid; -import com.orion.lang.utils.convert.Converts; -import com.orion.lang.utils.io.Files1; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/UserEventLogServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/UserEventLogServiceImpl.java index 3e6c7b3f..6f411bae 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/UserEventLogServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/UserEventLogServiceImpl.java @@ -15,6 +15,12 @@ */ package cn.orionsec.ops.service.impl; +import cn.orionsec.kit.lang.define.collect.MutableMap; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import cn.orionsec.kit.lang.define.wrapper.HttpWrapper; +import cn.orionsec.kit.lang.utils.Exceptions; +import cn.orionsec.kit.lang.utils.Objects1; +import cn.orionsec.kit.lang.utils.Strings; import cn.orionsec.ops.constant.Const; import cn.orionsec.ops.constant.ResultCode; import cn.orionsec.ops.constant.event.EventKeys; @@ -27,12 +33,6 @@ import cn.orionsec.ops.utils.*; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.lang.define.collect.MutableMap; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.lang.define.wrapper.HttpWrapper; -import com.orion.lang.utils.Exceptions; -import com.orion.lang.utils.Objects1; -import com.orion.lang.utils.Strings; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/UserServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/UserServiceImpl.java index 918a4f9e..faf0de3c 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/UserServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/UserServiceImpl.java @@ -15,6 +15,16 @@ */ package cn.orionsec.ops.service.impl; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import cn.orionsec.kit.lang.define.wrapper.HttpWrapper; +import cn.orionsec.kit.lang.id.UUIds; +import cn.orionsec.kit.lang.utils.Exceptions; +import cn.orionsec.kit.lang.utils.Objects1; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.codec.Base64s; +import cn.orionsec.kit.lang.utils.convert.Converts; +import cn.orionsec.kit.lang.utils.crypto.Signatures; +import cn.orionsec.kit.lang.utils.io.FileWriters; import cn.orionsec.ops.constant.CnConst; import cn.orionsec.ops.constant.Const; import cn.orionsec.ops.constant.KeyConst; @@ -33,16 +43,6 @@ import cn.orionsec.ops.utils.*; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.lang.define.wrapper.HttpWrapper; -import com.orion.lang.id.UUIds; -import com.orion.lang.utils.Exceptions; -import com.orion.lang.utils.Objects1; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.codec.Base64s; -import com.orion.lang.utils.convert.Converts; -import com.orion.lang.utils.crypto.Signatures; -import com.orion.lang.utils.io.FileWriters; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -236,9 +236,9 @@ public Integer updateAvatar(String avatar) { AvatarPicHolder.deletePic(userInfo.getAvatarPic()); } // 写入图片 - String type = Base64s.img64Type(avatar); + String type = Base64s.getMimeTypeLast(avatar); String url = AvatarPicHolder.getPicPath(userId, type); - byte[] pic = Base64s.img64Decode(avatar); + byte[] pic = Base64s.mimeTypeDecode(avatar); String fullPicPath = AvatarPicHolder.touchPicFile(userId, type); FileWriters.writeFast(fullPicPath, pic); // 更新 diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/WebSideMessageServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/WebSideMessageServiceImpl.java index b511c368..243501fa 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/WebSideMessageServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/WebSideMessageServiceImpl.java @@ -15,6 +15,11 @@ */ package cn.orionsec.ops.service.impl; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import cn.orionsec.kit.lang.utils.Objects1; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.collect.Lists; +import cn.orionsec.kit.lang.utils.convert.Converts; import cn.orionsec.ops.constant.Const; import cn.orionsec.ops.constant.MessageConst; import cn.orionsec.ops.constant.message.MessageType; @@ -30,11 +35,6 @@ import cn.orionsec.ops.utils.DataQuery; import cn.orionsec.ops.utils.Valid; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.lang.utils.Objects1; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.collect.Lists; -import com.orion.lang.utils.convert.Converts; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/WebhookConfigServiceImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/WebhookConfigServiceImpl.java index 84705d4a..b4ab38c1 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/WebhookConfigServiceImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/service/impl/WebhookConfigServiceImpl.java @@ -15,6 +15,9 @@ */ package cn.orionsec.ops.service.impl; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.convert.Converts; import cn.orionsec.ops.constant.MessageConst; import cn.orionsec.ops.constant.event.EventKeys; import cn.orionsec.ops.dao.WebhookConfigDAO; @@ -27,9 +30,6 @@ import cn.orionsec.ops.utils.EventParamsHolder; import cn.orionsec.ops.utils.Valid; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.convert.Converts; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/task/TaskRegister.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/task/TaskRegister.java index 094d1e02..94505de6 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/task/TaskRegister.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/task/TaskRegister.java @@ -15,9 +15,9 @@ */ package cn.orionsec.ops.task; +import cn.orionsec.kit.lang.utils.Exceptions; +import cn.orionsec.kit.lang.utils.collect.Maps; import cn.orionsec.ops.constant.MessageConst; -import com.orion.lang.utils.Exceptions; -import com.orion.lang.utils.collect.Maps; import org.springframework.beans.factory.DisposableBean; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.scheduling.TaskScheduler; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/task/fixed/AutoCleanFileTask.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/task/fixed/AutoCleanFileTask.java index 6aec9a93..a377b257 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/task/fixed/AutoCleanFileTask.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/task/fixed/AutoCleanFileTask.java @@ -15,10 +15,10 @@ */ package cn.orionsec.ops.task.fixed; +import cn.orionsec.kit.lang.utils.time.Dates; import cn.orionsec.ops.constant.common.EnableType; import cn.orionsec.ops.constant.system.SystemEnvAttr; import cn.orionsec.ops.utils.FileCleaner; -import com.orion.lang.utils.time.Dates; import lombok.extern.slf4j.Slf4j; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/task/fixed/SystemSpaceAnalysisTask.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/task/fixed/SystemSpaceAnalysisTask.java index e5fc0d47..6ccd41ec 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/task/fixed/SystemSpaceAnalysisTask.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/task/fixed/SystemSpaceAnalysisTask.java @@ -15,8 +15,8 @@ */ package cn.orionsec.ops.task.fixed; +import cn.orionsec.kit.lang.utils.time.Dates; import cn.orionsec.ops.service.api.SystemService; -import com.orion.lang.utils.time.Dates; import lombok.extern.slf4j.Slf4j; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/task/impl/PipelineTaskImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/task/impl/PipelineTaskImpl.java index 4f41017e..1780f11a 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/task/impl/PipelineTaskImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/task/impl/PipelineTaskImpl.java @@ -15,9 +15,9 @@ */ package cn.orionsec.ops.task.impl; +import cn.orionsec.kit.lang.utils.time.Dates; +import cn.orionsec.kit.spring.SpringHolder; import cn.orionsec.ops.service.api.ApplicationPipelineTaskService; -import com.orion.lang.utils.time.Dates; -import com.orion.spring.SpringHolder; import lombok.extern.slf4j.Slf4j; /** diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/task/impl/ReleaseTaskImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/task/impl/ReleaseTaskImpl.java index 68399174..45506348 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/task/impl/ReleaseTaskImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/task/impl/ReleaseTaskImpl.java @@ -15,9 +15,9 @@ */ package cn.orionsec.ops.task.impl; +import cn.orionsec.kit.lang.utils.time.Dates; +import cn.orionsec.kit.spring.SpringHolder; import cn.orionsec.ops.service.api.ApplicationReleaseService; -import com.orion.lang.utils.time.Dates; -import com.orion.spring.SpringHolder; import lombok.extern.slf4j.Slf4j; /** diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/task/impl/SchedulerTaskImpl.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/task/impl/SchedulerTaskImpl.java index 3ee40aac..4f1e3c1a 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/task/impl/SchedulerTaskImpl.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/task/impl/SchedulerTaskImpl.java @@ -15,15 +15,15 @@ */ package cn.orionsec.ops.task.impl; +import cn.orionsec.kit.lang.utils.Valid; +import cn.orionsec.kit.lang.utils.time.Dates; +import cn.orionsec.kit.spring.SpringHolder; import cn.orionsec.ops.constant.SchedulerPools; import cn.orionsec.ops.constant.common.SerialType; import cn.orionsec.ops.dao.SchedulerTaskDAO; import cn.orionsec.ops.entity.domain.SchedulerTaskDO; import cn.orionsec.ops.handler.scheduler.ITaskProcessor; import cn.orionsec.ops.service.api.SchedulerTaskRecordService; -import com.orion.lang.utils.Valid; -import com.orion.lang.utils.time.Dates; -import com.orion.spring.SpringHolder; import lombok.extern.slf4j.Slf4j; /** diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/utils/Currents.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/utils/Currents.java index 86820dee..18e8feb0 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/utils/Currents.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/utils/Currents.java @@ -15,12 +15,12 @@ */ package cn.orionsec.ops.utils; +import cn.orionsec.kit.lang.define.wrapper.HttpWrapper; +import cn.orionsec.kit.lang.utils.Exceptions; import cn.orionsec.ops.constant.PropertiesConst; import cn.orionsec.ops.constant.ResultCode; import cn.orionsec.ops.constant.user.RoleType; import cn.orionsec.ops.entity.dto.user.UserDTO; -import com.orion.lang.define.wrapper.HttpWrapper; -import com.orion.lang.utils.Exceptions; import javax.servlet.http.HttpServletRequest; import java.util.Optional; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/utils/EventParamsHolder.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/utils/EventParamsHolder.java index 9f92d5a8..010374e0 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/utils/EventParamsHolder.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/utils/EventParamsHolder.java @@ -15,14 +15,14 @@ */ package cn.orionsec.ops.utils; +import cn.orionsec.kit.lang.define.collect.MutableMap; +import cn.orionsec.kit.lang.utils.collect.Maps; +import cn.orionsec.kit.lang.utils.reflect.BeanMap; +import cn.orionsec.kit.lang.utils.time.Dates; +import cn.orionsec.kit.web.servlet.web.Servlets; import cn.orionsec.ops.constant.event.EventKeys; import cn.orionsec.ops.entity.dto.user.UserDTO; import cn.orionsec.ops.interceptor.LogPrintInterceptor; -import com.orion.lang.define.collect.MutableMap; -import com.orion.lang.utils.collect.Maps; -import com.orion.lang.utils.reflect.BeanMap; -import com.orion.lang.utils.time.Dates; -import com.orion.web.servlet.web.Servlets; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/utils/RedisUtils.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/utils/RedisUtils.java index 60aa7a29..725c3c05 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/utils/RedisUtils.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/utils/RedisUtils.java @@ -15,11 +15,11 @@ */ package cn.orionsec.ops.utils; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.collect.Lists; +import cn.orionsec.kit.lang.utils.io.Streams; import cn.orionsec.ops.constant.Const; import cn.orionsec.ops.constant.KeyConst; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.collect.Lists; -import com.orion.lang.utils.io.Streams; import org.springframework.data.redis.core.Cursor; import org.springframework.data.redis.core.RedisCallback; import org.springframework.data.redis.core.RedisTemplate; diff --git a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/utils/WebSockets.java b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/utils/WebSockets.java index 81e69b15..02e4851e 100644 --- a/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/utils/WebSockets.java +++ b/orion-ops-api/orion-ops-service/src/main/java/cn/orionsec/ops/utils/WebSockets.java @@ -15,15 +15,15 @@ */ package cn.orionsec.ops.utils; +import cn.orionsec.kit.lang.define.wrapper.Tuple; +import cn.orionsec.kit.lang.exception.AuthenticationException; +import cn.orionsec.kit.lang.exception.ConnectionRuntimeException; +import cn.orionsec.kit.lang.exception.DisabledException; +import cn.orionsec.kit.lang.exception.TimeoutException; +import cn.orionsec.kit.lang.utils.Exceptions; +import cn.orionsec.kit.lang.utils.Urls; import cn.orionsec.ops.constant.terminal.TerminalClientOperate; import cn.orionsec.ops.constant.ws.WsCloseCode; -import com.orion.lang.define.wrapper.Tuple; -import com.orion.lang.exception.AuthenticationException; -import com.orion.lang.exception.ConnectionRuntimeException; -import com.orion.lang.exception.DisabledException; -import com.orion.lang.exception.TimeoutException; -import com.orion.lang.utils.Exceptions; -import com.orion.lang.utils.Urls; import lombok.extern.slf4j.Slf4j; import org.springframework.http.server.ServerHttpRequest; import org.springframework.web.socket.CloseStatus; diff --git a/orion-ops-api/orion-ops-web/pom.xml b/orion-ops-api/orion-ops-web/pom.xml index ecd4007e..2e659769 100644 --- a/orion-ops-api/orion-ops-web/pom.xml +++ b/orion-ops-api/orion-ops-web/pom.xml @@ -41,6 +41,12 @@ ${project.version} + + + org.aspectj + aspectjweaver + + io.springfox diff --git a/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/config/SwaggerConfig.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/config/SwaggerConfig.java index c4749edf..90292b0e 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/config/SwaggerConfig.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/config/SwaggerConfig.java @@ -15,10 +15,10 @@ */ package cn.orionsec.ops.config; +import cn.orionsec.kit.lang.utils.collect.Lists; import cn.orionsec.ops.constant.Const; import cn.orionsec.ops.constant.PropertiesConst; import com.github.xiaoymin.knife4j.spring.annotations.EnableKnife4j; -import com.orion.lang.utils.collect.Lists; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/config/WebMvcConfig.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/config/WebMvcConfig.java index 02844613..346ceb1b 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/config/WebMvcConfig.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/config/WebMvcConfig.java @@ -15,15 +15,15 @@ */ package cn.orionsec.ops.config; +import cn.orionsec.kit.lang.define.wrapper.HttpWrapper; +import cn.orionsec.kit.lang.exception.*; +import cn.orionsec.kit.lang.exception.argument.CodeArgumentException; +import cn.orionsec.kit.lang.exception.argument.HttpWrapperException; +import cn.orionsec.kit.lang.exception.argument.InvalidArgumentException; +import cn.orionsec.kit.lang.exception.argument.RpcWrapperException; +import cn.orionsec.kit.lang.utils.Exceptions; import cn.orionsec.ops.constant.MessageConst; import cn.orionsec.ops.interceptor.*; -import com.orion.lang.define.wrapper.HttpWrapper; -import com.orion.lang.exception.*; -import com.orion.lang.exception.argument.CodeArgumentException; -import com.orion.lang.exception.argument.HttpWrapperException; -import com.orion.lang.exception.argument.InvalidArgumentException; -import com.orion.lang.exception.argument.RpcWrapperException; -import com.orion.lang.utils.Exceptions; import lombok.extern.slf4j.Slf4j; import org.apache.poi.EncryptedDocumentException; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; @@ -252,7 +252,7 @@ public HttpWrapper maxUploadSizeExceededExceptionHandler(HttpServletRequest r @ExceptionHandler(value = CodeArgumentException.class) public HttpWrapper codeArgumentExceptionHandler(CodeArgumentException ex) { - return HttpWrapper.error(ex.getCode(), ex.getMessage()); + return HttpWrapper.of(ex.getCode(), ex.getMessage()); } @ExceptionHandler(value = HttpWrapperException.class) diff --git a/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/config/WrapperResultConfig.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/config/WrapperResultConfig.java index 767bc60d..aae4dc8c 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/config/WrapperResultConfig.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/config/WrapperResultConfig.java @@ -15,13 +15,13 @@ */ package cn.orionsec.ops.config; +import cn.orionsec.kit.lang.constant.StandardContentType; +import cn.orionsec.kit.lang.define.wrapper.HttpWrapper; +import cn.orionsec.kit.lang.define.wrapper.RpcWrapper; +import cn.orionsec.kit.lang.utils.collect.Lists; +import cn.orionsec.kit.web.servlet.web.Servlets; import cn.orionsec.ops.annotation.IgnoreWrapper; import cn.orionsec.ops.annotation.RestWrapper; -import com.orion.lang.constant.StandardContentType; -import com.orion.lang.define.wrapper.HttpWrapper; -import com.orion.lang.define.wrapper.RpcWrapper; -import com.orion.lang.utils.collect.Lists; -import com.orion.web.servlet.web.Servlets; import org.springframework.context.annotation.Configuration; import org.springframework.core.MethodParameter; import org.springframework.web.context.request.NativeWebRequest; diff --git a/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/AlarmGroupController.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/AlarmGroupController.java index 58bbc54d..72aef45d 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/AlarmGroupController.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/AlarmGroupController.java @@ -15,6 +15,7 @@ */ package cn.orionsec.ops.controller; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; import cn.orionsec.ops.annotation.EventLog; import cn.orionsec.ops.annotation.RestWrapper; import cn.orionsec.ops.constant.event.EventType; @@ -22,7 +23,6 @@ import cn.orionsec.ops.entity.vo.alarm.AlarmGroupVO; import cn.orionsec.ops.service.api.AlarmGroupService; import cn.orionsec.ops.utils.Valid; -import com.orion.lang.define.wrapper.DataGrid; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.PostMapping; diff --git a/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/ApplicationBuildController.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/ApplicationBuildController.java index 70dc40de..ab4438b9 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/ApplicationBuildController.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/ApplicationBuildController.java @@ -15,6 +15,8 @@ */ package cn.orionsec.ops.controller; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import cn.orionsec.kit.lang.define.wrapper.HttpWrapper; import cn.orionsec.ops.annotation.EventLog; import cn.orionsec.ops.annotation.IgnoreLog; import cn.orionsec.ops.annotation.RestWrapper; @@ -25,8 +27,6 @@ import cn.orionsec.ops.entity.vo.app.ApplicationBuildVO; import cn.orionsec.ops.service.api.ApplicationBuildService; import cn.orionsec.ops.utils.Valid; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.lang.define.wrapper.HttpWrapper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.PostMapping; diff --git a/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/ApplicationEnvController.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/ApplicationEnvController.java index dbc61ccf..99528d22 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/ApplicationEnvController.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/ApplicationEnvController.java @@ -15,6 +15,11 @@ */ package cn.orionsec.ops.controller; +import cn.orionsec.kit.lang.define.collect.MutableLinkedHashMap; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import cn.orionsec.kit.lang.define.wrapper.HttpWrapper; +import cn.orionsec.kit.lang.utils.Exceptions; +import cn.orionsec.kit.lang.utils.collect.Maps; import cn.orionsec.ops.annotation.DemoDisableApi; import cn.orionsec.ops.annotation.EventLog; import cn.orionsec.ops.annotation.RestWrapper; @@ -26,11 +31,6 @@ import cn.orionsec.ops.entity.vo.app.ApplicationEnvVO; import cn.orionsec.ops.service.api.ApplicationEnvService; import cn.orionsec.ops.utils.Valid; -import com.orion.lang.define.collect.MutableLinkedHashMap; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.lang.define.wrapper.HttpWrapper; -import com.orion.lang.utils.Exceptions; -import com.orion.lang.utils.collect.Maps; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.PostMapping; diff --git a/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/ApplicationInfoController.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/ApplicationInfoController.java index 32544af5..e718d00e 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/ApplicationInfoController.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/ApplicationInfoController.java @@ -15,6 +15,9 @@ */ package cn.orionsec.ops.controller; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import cn.orionsec.kit.lang.define.wrapper.HttpWrapper; +import cn.orionsec.kit.lang.utils.Exceptions; import cn.orionsec.ops.annotation.DemoDisableApi; import cn.orionsec.ops.annotation.EventLog; import cn.orionsec.ops.annotation.RestWrapper; @@ -31,9 +34,6 @@ import cn.orionsec.ops.service.api.ApplicationInfoService; import cn.orionsec.ops.service.api.ApplicationMachineService; import cn.orionsec.ops.utils.Valid; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.lang.define.wrapper.HttpWrapper; -import com.orion.lang.utils.Exceptions; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.PostMapping; diff --git a/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/ApplicationPipelineController.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/ApplicationPipelineController.java index f4433a97..8f3e2c54 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/ApplicationPipelineController.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/ApplicationPipelineController.java @@ -15,6 +15,7 @@ */ package cn.orionsec.ops.controller; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; import cn.orionsec.ops.annotation.DemoDisableApi; import cn.orionsec.ops.annotation.EventLog; import cn.orionsec.ops.annotation.RestWrapper; @@ -25,7 +26,6 @@ import cn.orionsec.ops.entity.vo.app.ApplicationPipelineVO; import cn.orionsec.ops.service.api.ApplicationPipelineService; import cn.orionsec.ops.utils.Valid; -import com.orion.lang.define.wrapper.DataGrid; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.PostMapping; diff --git a/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/ApplicationPipelineTaskController.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/ApplicationPipelineTaskController.java index 85047d2d..3ee529c7 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/ApplicationPipelineTaskController.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/ApplicationPipelineTaskController.java @@ -15,6 +15,8 @@ */ package cn.orionsec.ops.controller; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import cn.orionsec.kit.lang.define.wrapper.HttpWrapper; import cn.orionsec.ops.annotation.EventLog; import cn.orionsec.ops.annotation.IgnoreLog; import cn.orionsec.ops.annotation.RequireRole; @@ -34,8 +36,6 @@ import cn.orionsec.ops.task.TaskRegister; import cn.orionsec.ops.task.TaskType; import cn.orionsec.ops.utils.Valid; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.lang.define.wrapper.HttpWrapper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.PostMapping; diff --git a/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/ApplicationProfileController.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/ApplicationProfileController.java index 7b04bfae..cd719fe7 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/ApplicationProfileController.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/ApplicationProfileController.java @@ -15,6 +15,7 @@ */ package cn.orionsec.ops.controller; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; import cn.orionsec.ops.annotation.DemoDisableApi; import cn.orionsec.ops.annotation.EventLog; import cn.orionsec.ops.annotation.RequireRole; @@ -27,7 +28,6 @@ import cn.orionsec.ops.entity.vo.app.ApplicationProfileVO; import cn.orionsec.ops.service.api.ApplicationProfileService; import cn.orionsec.ops.utils.Valid; -import com.orion.lang.define.wrapper.DataGrid; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; diff --git a/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/ApplicationReleaseController.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/ApplicationReleaseController.java index 8b181974..5de50dc6 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/ApplicationReleaseController.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/ApplicationReleaseController.java @@ -15,6 +15,8 @@ */ package cn.orionsec.ops.controller; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import cn.orionsec.kit.lang.define.wrapper.HttpWrapper; import cn.orionsec.ops.annotation.EventLog; import cn.orionsec.ops.annotation.IgnoreLog; import cn.orionsec.ops.annotation.RequireRole; @@ -32,8 +34,6 @@ import cn.orionsec.ops.task.TaskRegister; import cn.orionsec.ops.task.TaskType; import cn.orionsec.ops.utils.Valid; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.lang.define.wrapper.HttpWrapper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.PostMapping; diff --git a/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/ApplicationRepositoryController.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/ApplicationRepositoryController.java index 70c4a03c..c895c200 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/ApplicationRepositoryController.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/ApplicationRepositoryController.java @@ -15,6 +15,8 @@ */ package cn.orionsec.ops.controller; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import cn.orionsec.kit.lang.define.wrapper.HttpWrapper; import cn.orionsec.ops.annotation.DemoDisableApi; import cn.orionsec.ops.annotation.EventLog; import cn.orionsec.ops.annotation.RestWrapper; @@ -28,8 +30,6 @@ import cn.orionsec.ops.entity.vo.app.ApplicationRepositoryVO; import cn.orionsec.ops.service.api.ApplicationRepositoryService; import cn.orionsec.ops.utils.Valid; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.lang.define.wrapper.HttpWrapper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.PostMapping; diff --git a/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/AuthenticateController.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/AuthenticateController.java index aae8b535..938fe84d 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/AuthenticateController.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/AuthenticateController.java @@ -15,6 +15,10 @@ */ package cn.orionsec.ops.controller; +import cn.orionsec.kit.lang.define.wrapper.HttpWrapper; +import cn.orionsec.kit.lang.utils.Objects1; +import cn.orionsec.kit.lang.utils.convert.Converts; +import cn.orionsec.kit.web.servlet.web.Servlets; import cn.orionsec.ops.annotation.DemoDisableApi; import cn.orionsec.ops.annotation.EventLog; import cn.orionsec.ops.annotation.IgnoreAuth; @@ -27,10 +31,6 @@ import cn.orionsec.ops.service.api.PassportService; import cn.orionsec.ops.utils.Currents; import cn.orionsec.ops.utils.Valid; -import com.orion.lang.define.wrapper.HttpWrapper; -import com.orion.lang.utils.Objects1; -import com.orion.lang.utils.convert.Converts; -import com.orion.web.servlet.web.Servlets; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; diff --git a/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/BatchExecCommandController.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/BatchExecCommandController.java index 06124bf0..5c688994 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/BatchExecCommandController.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/BatchExecCommandController.java @@ -15,6 +15,8 @@ */ package cn.orionsec.ops.controller; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import cn.orionsec.kit.lang.define.wrapper.HttpWrapper; import cn.orionsec.ops.annotation.EventLog; import cn.orionsec.ops.annotation.IgnoreLog; import cn.orionsec.ops.annotation.RestWrapper; @@ -25,8 +27,6 @@ import cn.orionsec.ops.entity.vo.exec.CommandTaskSubmitVO; import cn.orionsec.ops.service.api.CommandExecService; import cn.orionsec.ops.utils.Valid; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.lang.define.wrapper.HttpWrapper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.PostMapping; diff --git a/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/BatchUploadController.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/BatchUploadController.java index 4a29c7a8..f86a331e 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/BatchUploadController.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/BatchUploadController.java @@ -15,6 +15,9 @@ */ package cn.orionsec.ops.controller; +import cn.orionsec.kit.lang.id.ObjectIds; +import cn.orionsec.kit.lang.utils.collect.Lists; +import cn.orionsec.kit.lang.utils.io.Files1; import cn.orionsec.ops.annotation.EventLog; import cn.orionsec.ops.annotation.RestWrapper; import cn.orionsec.ops.constant.event.EventType; @@ -28,9 +31,6 @@ import cn.orionsec.ops.service.api.SftpService; import cn.orionsec.ops.utils.PathBuilders; import cn.orionsec.ops.utils.Valid; -import com.orion.lang.id.ObjectIds; -import com.orion.lang.utils.collect.Lists; -import com.orion.lang.utils.io.Files1; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; diff --git a/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/CommandTemplateController.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/CommandTemplateController.java index d91e64de..0c9ddfc8 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/CommandTemplateController.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/CommandTemplateController.java @@ -15,6 +15,7 @@ */ package cn.orionsec.ops.controller; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; import cn.orionsec.ops.annotation.DemoDisableApi; import cn.orionsec.ops.annotation.EventLog; import cn.orionsec.ops.annotation.RestWrapper; @@ -23,7 +24,6 @@ import cn.orionsec.ops.entity.vo.template.CommandTemplateVO; import cn.orionsec.ops.service.api.CommandTemplateService; import cn.orionsec.ops.utils.Valid; -import com.orion.lang.define.wrapper.DataGrid; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.PostMapping; diff --git a/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/CommonController.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/CommonController.java index 0bf0eab0..243b8fd1 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/CommonController.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/CommonController.java @@ -15,6 +15,8 @@ */ package cn.orionsec.ops.controller; +import cn.orionsec.kit.lang.utils.collect.Lists; +import cn.orionsec.kit.lang.utils.io.StreamReaders; import cn.orionsec.ops.OrionApplication; import cn.orionsec.ops.annotation.RestWrapper; import cn.orionsec.ops.constant.user.RoleType; @@ -22,8 +24,6 @@ import cn.orionsec.ops.service.api.CommonService; import cn.orionsec.ops.utils.Currents; import com.alibaba.fastjson.JSON; -import com.orion.lang.utils.collect.Lists; -import com.orion.lang.utils.io.StreamReaders; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.GetMapping; diff --git a/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/DataClearController.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/DataClearController.java index 1fa4ce45..d5f452d0 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/DataClearController.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/DataClearController.java @@ -15,6 +15,7 @@ */ package cn.orionsec.ops.controller; +import cn.orionsec.kit.lang.utils.Exceptions; import cn.orionsec.ops.annotation.EventLog; import cn.orionsec.ops.annotation.RestWrapper; import cn.orionsec.ops.constant.DataClearRange; @@ -25,7 +26,6 @@ import cn.orionsec.ops.service.api.DataClearService; import cn.orionsec.ops.utils.EventParamsHolder; import cn.orionsec.ops.utils.Valid; -import com.orion.lang.utils.Exceptions; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.PostMapping; diff --git a/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/DataImportController.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/DataImportController.java index f3e10766..e0534b2c 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/DataImportController.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/DataImportController.java @@ -15,6 +15,11 @@ */ package cn.orionsec.ops.controller; +import cn.orionsec.kit.lang.define.wrapper.HttpWrapper; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.io.Streams; +import cn.orionsec.kit.office.excel.Excels; +import cn.orionsec.kit.web.servlet.web.Servlets; import cn.orionsec.ops.OrionApplication; import cn.orionsec.ops.annotation.*; import cn.orionsec.ops.constant.ImportType; @@ -29,11 +34,6 @@ import cn.orionsec.ops.service.api.DataImportService; import cn.orionsec.ops.utils.EventParamsHolder; import cn.orionsec.ops.utils.Valid; -import com.orion.lang.define.wrapper.HttpWrapper; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.io.Streams; -import com.orion.office.excel.Excels; -import com.orion.web.servlet.web.Servlets; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.poi.ss.usermodel.Workbook; @@ -70,7 +70,7 @@ public class DataImportController { public void getTemplate(Integer type, HttpServletResponse response) throws IOException { ImportType importType = Valid.notNull(ImportType.of(type)); String templateName = importType.getTemplateName(); - Servlets.setDownloadHeader(response, templateName); + Servlets.setAttachmentHeader(response, templateName); // 读取文件 InputStream in = OrionApplication.class.getResourceAsStream(importType.getTemplatePath()); ServletOutputStream out = response.getOutputStream(); diff --git a/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/EventLogController.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/EventLogController.java index 3f75c817..37163838 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/EventLogController.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/EventLogController.java @@ -15,11 +15,11 @@ */ package cn.orionsec.ops.controller; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; import cn.orionsec.ops.annotation.RestWrapper; import cn.orionsec.ops.entity.request.user.EventLogRequest; import cn.orionsec.ops.entity.vo.user.UserEventLogVO; import cn.orionsec.ops.service.api.UserEventLogService; -import com.orion.lang.define.wrapper.DataGrid; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.PostMapping; diff --git a/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/FileDownloadController.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/FileDownloadController.java index 6b251c39..066e50e3 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/FileDownloadController.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/FileDownloadController.java @@ -15,6 +15,8 @@ */ package cn.orionsec.ops.controller; +import cn.orionsec.kit.lang.exception.NotFoundException; +import cn.orionsec.kit.web.servlet.web.Servlets; import cn.orionsec.ops.annotation.IgnoreAuth; import cn.orionsec.ops.annotation.IgnoreWrapper; import cn.orionsec.ops.annotation.RestWrapper; @@ -23,8 +25,6 @@ import cn.orionsec.ops.entity.request.file.FileDownloadRequest; import cn.orionsec.ops.service.api.FileDownloadService; import cn.orionsec.ops.utils.Valid; -import com.orion.lang.exception.NotFoundException; -import com.orion.web.servlet.web.Servlets; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; diff --git a/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/FileTailController.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/FileTailController.java index fcce4c78..29d74b82 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/FileTailController.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/FileTailController.java @@ -15,6 +15,14 @@ */ package cn.orionsec.ops.controller; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import cn.orionsec.kit.lang.define.wrapper.HttpWrapper; +import cn.orionsec.kit.lang.utils.Charsets; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.collect.Lists; +import cn.orionsec.kit.lang.utils.io.Files1; +import cn.orionsec.kit.lang.utils.io.Streams; +import cn.orionsec.kit.web.servlet.web.Servlets; import cn.orionsec.ops.annotation.DemoDisableApi; import cn.orionsec.ops.annotation.EventLog; import cn.orionsec.ops.annotation.RestWrapper; @@ -28,14 +36,6 @@ import cn.orionsec.ops.service.api.FileTailService; import cn.orionsec.ops.utils.Utils; import cn.orionsec.ops.utils.Valid; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.lang.define.wrapper.HttpWrapper; -import com.orion.lang.utils.Charsets; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.collect.Lists; -import com.orion.lang.utils.io.Files1; -import com.orion.lang.utils.io.Streams; -import com.orion.web.servlet.web.Servlets; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; @@ -160,7 +160,7 @@ public void cleanAnsiCode(@RequestParam("file") MultipartFile file, HttpServletR if (fileName == null) { fileName = Utils.getRandomSuffix() + Const.DOT + Const.SUFFIX_LOG; } - Servlets.setDownloadHeader(response, fileName); + Servlets.setAttachmentHeader(response, fileName); // 读取文件 try (InputStream in = file.getInputStream()) { byte[] bytes = Streams.toByteArray(in); diff --git a/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/HistoryValueController.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/HistoryValueController.java index 3a77b90f..cc410356 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/HistoryValueController.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/HistoryValueController.java @@ -15,6 +15,8 @@ */ package cn.orionsec.ops.controller; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import cn.orionsec.kit.lang.define.wrapper.HttpWrapper; import cn.orionsec.ops.annotation.DemoDisableApi; import cn.orionsec.ops.annotation.RestWrapper; import cn.orionsec.ops.constant.history.HistoryValueType; @@ -22,8 +24,6 @@ import cn.orionsec.ops.entity.vo.history.HistoryValueVO; import cn.orionsec.ops.service.api.HistoryValueService; import cn.orionsec.ops.utils.Valid; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.lang.define.wrapper.HttpWrapper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.PostMapping; diff --git a/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/MachineAlarmConfigController.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/MachineAlarmConfigController.java index b680b375..30d58292 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/MachineAlarmConfigController.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/MachineAlarmConfigController.java @@ -15,6 +15,8 @@ */ package cn.orionsec.ops.controller; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import cn.orionsec.kit.lang.define.wrapper.HttpWrapper; import cn.orionsec.ops.annotation.EventLog; import cn.orionsec.ops.annotation.RestWrapper; import cn.orionsec.ops.constant.MessageConst; @@ -27,8 +29,6 @@ import cn.orionsec.ops.service.api.MachineAlarmHistoryService; import cn.orionsec.ops.service.api.MachineAlarmService; import cn.orionsec.ops.utils.Valid; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.lang.define.wrapper.HttpWrapper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; diff --git a/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/MachineEnvController.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/MachineEnvController.java index 79b2d268..20676d84 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/MachineEnvController.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/MachineEnvController.java @@ -15,6 +15,11 @@ */ package cn.orionsec.ops.controller; +import cn.orionsec.kit.lang.define.collect.MutableLinkedHashMap; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import cn.orionsec.kit.lang.define.wrapper.HttpWrapper; +import cn.orionsec.kit.lang.utils.Exceptions; +import cn.orionsec.kit.lang.utils.collect.Maps; import cn.orionsec.ops.annotation.DemoDisableApi; import cn.orionsec.ops.annotation.EventLog; import cn.orionsec.ops.annotation.RestWrapper; @@ -26,11 +31,6 @@ import cn.orionsec.ops.entity.vo.machine.MachineEnvVO; import cn.orionsec.ops.service.api.MachineEnvService; import cn.orionsec.ops.utils.Valid; -import com.orion.lang.define.collect.MutableLinkedHashMap; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.lang.define.wrapper.HttpWrapper; -import com.orion.lang.utils.Exceptions; -import com.orion.lang.utils.collect.Maps; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.PostMapping; diff --git a/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/MachineGroupController.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/MachineGroupController.java index 17aa3126..94dd841d 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/MachineGroupController.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/MachineGroupController.java @@ -15,6 +15,7 @@ */ package cn.orionsec.ops.controller; +import cn.orionsec.kit.lang.define.wrapper.HttpWrapper; import cn.orionsec.ops.annotation.RestWrapper; import cn.orionsec.ops.constant.common.TreeMoveType; import cn.orionsec.ops.entity.request.machine.MachineGroupRelRequest; @@ -23,7 +24,6 @@ import cn.orionsec.ops.service.api.MachineGroupRelService; import cn.orionsec.ops.service.api.MachineGroupService; import cn.orionsec.ops.utils.Valid; -import com.orion.lang.define.wrapper.HttpWrapper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; diff --git a/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/MachineInfoController.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/MachineInfoController.java index 4ad5e54e..bc2186a4 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/MachineInfoController.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/MachineInfoController.java @@ -15,6 +15,8 @@ */ package cn.orionsec.ops.controller; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import cn.orionsec.kit.lang.define.wrapper.HttpWrapper; import cn.orionsec.ops.annotation.DemoDisableApi; import cn.orionsec.ops.annotation.EventLog; import cn.orionsec.ops.annotation.RestWrapper; @@ -26,8 +28,6 @@ import cn.orionsec.ops.entity.vo.machine.MachineInfoVO; import cn.orionsec.ops.service.api.MachineInfoService; import cn.orionsec.ops.utils.Valid; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.lang.define.wrapper.HttpWrapper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.PostMapping; diff --git a/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/MachineKeyController.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/MachineKeyController.java index f15769c9..4dbb7259 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/MachineKeyController.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/MachineKeyController.java @@ -15,6 +15,8 @@ */ package cn.orionsec.ops.controller; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import cn.orionsec.kit.lang.define.wrapper.HttpWrapper; import cn.orionsec.ops.annotation.DemoDisableApi; import cn.orionsec.ops.annotation.EventLog; import cn.orionsec.ops.annotation.RestWrapper; @@ -23,8 +25,6 @@ import cn.orionsec.ops.entity.vo.machine.MachineSecretKeyVO; import cn.orionsec.ops.service.api.MachineKeyService; import cn.orionsec.ops.utils.Valid; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.lang.define.wrapper.HttpWrapper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.PostMapping; diff --git a/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/MachineMonitorController.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/MachineMonitorController.java index c6f97490..114d308d 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/MachineMonitorController.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/MachineMonitorController.java @@ -15,6 +15,8 @@ */ package cn.orionsec.ops.controller; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import cn.orionsec.kit.lang.utils.Booleans; import cn.orionsec.ops.annotation.DemoDisableApi; import cn.orionsec.ops.annotation.EventLog; import cn.orionsec.ops.annotation.RestWrapper; @@ -23,8 +25,6 @@ import cn.orionsec.ops.entity.vo.machine.MachineMonitorVO; import cn.orionsec.ops.service.api.MachineMonitorService; import cn.orionsec.ops.utils.Valid; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.lang.utils.Booleans; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; diff --git a/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/MachineProxyController.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/MachineProxyController.java index b5244086..a2db7714 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/MachineProxyController.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/MachineProxyController.java @@ -15,6 +15,8 @@ */ package cn.orionsec.ops.controller; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import cn.orionsec.kit.lang.utils.Strings; import cn.orionsec.ops.annotation.DemoDisableApi; import cn.orionsec.ops.annotation.EventLog; import cn.orionsec.ops.annotation.RestWrapper; @@ -24,8 +26,6 @@ import cn.orionsec.ops.entity.vo.machine.MachineProxyVO; import cn.orionsec.ops.service.api.MachineProxyService; import cn.orionsec.ops.utils.Valid; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.lang.utils.Strings; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.PostMapping; diff --git a/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/MachineTerminalController.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/MachineTerminalController.java index 550b323e..ffd35880 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/MachineTerminalController.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/MachineTerminalController.java @@ -15,6 +15,13 @@ */ package cn.orionsec.ops.controller; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import cn.orionsec.kit.lang.define.wrapper.HttpWrapper; +import cn.orionsec.kit.lang.utils.Exceptions; +import cn.orionsec.kit.lang.utils.Strings; +import cn.orionsec.kit.lang.utils.codec.Base64s; +import cn.orionsec.kit.lang.utils.io.FileReaders; +import cn.orionsec.kit.net.host.ssh.TerminalType; import cn.orionsec.ops.annotation.DemoDisableApi; import cn.orionsec.ops.annotation.EventLog; import cn.orionsec.ops.annotation.RequireRole; @@ -31,13 +38,6 @@ import cn.orionsec.ops.handler.terminal.manager.TerminalSessionManager; import cn.orionsec.ops.service.api.MachineTerminalService; import cn.orionsec.ops.utils.Valid; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.lang.define.wrapper.HttpWrapper; -import com.orion.lang.utils.Exceptions; -import com.orion.lang.utils.Strings; -import com.orion.lang.utils.codec.Base64s; -import com.orion.lang.utils.io.FileReaders; -import com.orion.net.remote.TerminalType; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; diff --git a/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/SchedulerController.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/SchedulerController.java index 0a49193a..b78aa5db 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/SchedulerController.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/SchedulerController.java @@ -15,6 +15,11 @@ */ package cn.orionsec.ops.controller; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import cn.orionsec.kit.lang.define.wrapper.HttpWrapper; +import cn.orionsec.kit.lang.utils.collect.Lists; +import cn.orionsec.kit.lang.utils.time.cron.Cron; +import cn.orionsec.kit.lang.utils.time.cron.CronSupport; import cn.orionsec.ops.annotation.DemoDisableApi; import cn.orionsec.ops.annotation.EventLog; import cn.orionsec.ops.annotation.RestWrapper; @@ -25,11 +30,6 @@ import cn.orionsec.ops.entity.vo.scheduler.SchedulerTaskVO; import cn.orionsec.ops.service.api.SchedulerTaskService; import cn.orionsec.ops.utils.Valid; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.lang.define.wrapper.HttpWrapper; -import com.orion.lang.utils.collect.Lists; -import com.orion.lang.utils.time.cron.Cron; -import com.orion.lang.utils.time.cron.CronSupport; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.PostMapping; diff --git a/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/SchedulerRecordController.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/SchedulerRecordController.java index 3ba457e6..f749dc9e 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/SchedulerRecordController.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/SchedulerRecordController.java @@ -15,6 +15,8 @@ */ package cn.orionsec.ops.controller; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import cn.orionsec.kit.lang.define.wrapper.HttpWrapper; import cn.orionsec.ops.annotation.EventLog; import cn.orionsec.ops.annotation.IgnoreLog; import cn.orionsec.ops.annotation.RestWrapper; @@ -26,8 +28,6 @@ import cn.orionsec.ops.entity.vo.scheduler.SchedulerTaskRecordVO; import cn.orionsec.ops.service.api.SchedulerTaskRecordService; import cn.orionsec.ops.utils.Valid; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.lang.define.wrapper.HttpWrapper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.PostMapping; diff --git a/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/SftpController.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/SftpController.java index 9a0eeee3..c3378ec9 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/SftpController.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/SftpController.java @@ -15,6 +15,11 @@ */ package cn.orionsec.ops.controller; +import cn.orionsec.kit.lang.id.ObjectIds; +import cn.orionsec.kit.lang.utils.Exceptions; +import cn.orionsec.kit.lang.utils.collect.Lists; +import cn.orionsec.kit.lang.utils.io.Files1; +import cn.orionsec.kit.net.host.sftp.SftpErrorMessage; import cn.orionsec.ops.annotation.EventLog; import cn.orionsec.ops.annotation.RestWrapper; import cn.orionsec.ops.constant.Const; @@ -32,11 +37,6 @@ import cn.orionsec.ops.utils.Currents; import cn.orionsec.ops.utils.PathBuilders; import cn.orionsec.ops.utils.Valid; -import com.orion.lang.id.ObjectIds; -import com.orion.lang.utils.Exceptions; -import com.orion.lang.utils.collect.Lists; -import com.orion.lang.utils.io.Files1; -import com.orion.net.base.file.sftp.SftpErrorMessage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; diff --git a/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/SystemController.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/SystemController.java index 0444f9dd..d3d4e7aa 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/SystemController.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/SystemController.java @@ -15,6 +15,8 @@ */ package cn.orionsec.ops.controller; +import cn.orionsec.kit.lang.define.wrapper.HttpWrapper; +import cn.orionsec.kit.web.servlet.web.Servlets; import cn.orionsec.ops.annotation.DemoDisableApi; import cn.orionsec.ops.annotation.EventLog; import cn.orionsec.ops.annotation.RequireRole; @@ -32,8 +34,6 @@ import cn.orionsec.ops.entity.vo.system.*; import cn.orionsec.ops.service.api.SystemService; import cn.orionsec.ops.utils.Valid; -import com.orion.lang.define.wrapper.HttpWrapper; -import com.orion.web.servlet.web.Servlets; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; diff --git a/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/SystemEnvController.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/SystemEnvController.java index 35a8f6ac..fb6858b6 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/SystemEnvController.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/SystemEnvController.java @@ -15,6 +15,10 @@ */ package cn.orionsec.ops.controller; +import cn.orionsec.kit.lang.define.collect.MutableLinkedHashMap; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import cn.orionsec.kit.lang.utils.Exceptions; +import cn.orionsec.kit.lang.utils.collect.Maps; import cn.orionsec.ops.annotation.DemoDisableApi; import cn.orionsec.ops.annotation.EventLog; import cn.orionsec.ops.annotation.RestWrapper; @@ -26,10 +30,6 @@ import cn.orionsec.ops.entity.vo.system.SystemEnvVO; import cn.orionsec.ops.service.api.SystemEnvService; import cn.orionsec.ops.utils.Valid; -import com.orion.lang.define.collect.MutableLinkedHashMap; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.lang.utils.Exceptions; -import com.orion.lang.utils.collect.Maps; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.PostMapping; diff --git a/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/UserController.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/UserController.java index 732cc0a7..8d4ed706 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/UserController.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/UserController.java @@ -15,6 +15,8 @@ */ package cn.orionsec.ops.controller; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; +import cn.orionsec.kit.lang.utils.Objects1; import cn.orionsec.ops.annotation.DemoDisableApi; import cn.orionsec.ops.annotation.EventLog; import cn.orionsec.ops.annotation.RequireRole; @@ -27,8 +29,6 @@ import cn.orionsec.ops.service.api.UserService; import cn.orionsec.ops.utils.Currents; import cn.orionsec.ops.utils.Valid; -import com.orion.lang.define.wrapper.DataGrid; -import com.orion.lang.utils.Objects1; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.PostMapping; diff --git a/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/WebSideMessageController.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/WebSideMessageController.java index d088b7ca..26ba1906 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/WebSideMessageController.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/WebSideMessageController.java @@ -15,6 +15,7 @@ */ package cn.orionsec.ops.controller; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; import cn.orionsec.ops.annotation.IgnoreLog; import cn.orionsec.ops.annotation.RestWrapper; import cn.orionsec.ops.entity.request.message.WebSideMessageRequest; @@ -22,7 +23,6 @@ import cn.orionsec.ops.entity.vo.message.WebSideMessageVO; import cn.orionsec.ops.service.api.WebSideMessageService; import cn.orionsec.ops.utils.Valid; -import com.orion.lang.define.wrapper.DataGrid; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; diff --git a/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/WebhookConfigController.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/WebhookConfigController.java index 32ac25ee..0a85e116 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/WebhookConfigController.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/controller/WebhookConfigController.java @@ -15,6 +15,7 @@ */ package cn.orionsec.ops.controller; +import cn.orionsec.kit.lang.define.wrapper.DataGrid; import cn.orionsec.ops.annotation.DemoDisableApi; import cn.orionsec.ops.annotation.EventLog; import cn.orionsec.ops.annotation.RestWrapper; @@ -24,7 +25,6 @@ import cn.orionsec.ops.entity.vo.webhook.WebhookConfigVO; import cn.orionsec.ops.service.api.WebhookConfigService; import cn.orionsec.ops.utils.Valid; -import com.orion.lang.define.wrapper.DataGrid; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.PostMapping; diff --git a/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/expose/MachineAlarmExposeController.java b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/expose/MachineAlarmExposeController.java index d0bcf16b..8747c87e 100644 --- a/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/expose/MachineAlarmExposeController.java +++ b/orion-ops-api/orion-ops-web/src/main/java/cn/orionsec/ops/expose/MachineAlarmExposeController.java @@ -15,6 +15,7 @@ */ package cn.orionsec.ops.expose; +import cn.orionsec.kit.lang.define.wrapper.HttpWrapper; import cn.orionsec.ops.annotation.RestWrapper; import cn.orionsec.ops.constant.machine.MachineAlarmType; import cn.orionsec.ops.entity.request.machine.MachineAlarmRequest; @@ -22,7 +23,6 @@ import cn.orionsec.ops.service.api.MachineAlarmConfigService; import cn.orionsec.ops.service.api.MachineAlarmService; import cn.orionsec.ops.utils.Valid; -import com.orion.lang.define.wrapper.HttpWrapper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; diff --git a/orion-ops-api/orion-ops-web/src/main/resources/config/spring-common.xml b/orion-ops-api/orion-ops-web/src/main/resources/config/spring-common.xml index 94150cf8..be315860 100644 --- a/orion-ops-api/orion-ops-web/src/main/resources/config/spring-common.xml +++ b/orion-ops-api/orion-ops-web/src/main/resources/config/spring-common.xml @@ -4,6 +4,6 @@ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd"> - + diff --git a/orion-ops-api/pom.xml b/orion-ops-api/pom.xml index c2a8d091..9bb0636f 100644 --- a/orion-ops-api/pom.xml +++ b/orion-ops-api/pom.xml @@ -38,8 +38,9 @@ 1.1.20 2.9.2 2.0.5 - 1.0.5 + 2.0.0 2.0.0 + 1.9.7 @@ -130,6 +131,13 @@ ${jedis.version} + + + org.aspectj + aspectjweaver + ${aspectj.version} + + io.springfox @@ -163,13 +171,13 @@ - io.github.lijiahangmax + cn.orionsec.kit orion-all ${orion.all.version} orion-log - io.github.lijiahangmax + cn.orionsec.kit