diff --git a/docs/update/v1.1.0.md b/docs/update/v1.1.0.md index 025a1bb8..bc613339 100644 --- a/docs/update/v1.1.0.md +++ b/docs/update/v1.1.0.md @@ -19,10 +19,10 @@ MODIFY COLUMN `status` tinyint(0) NULL DEFAULT 0 COMMENT '任务状态' AFTER `p ```sql -- 删除 quartz 配置 -DELETE FROM QRTZ_TRIGGERS; -DELETE FROM QRTZ_LOCKS; -DELETE FROM QRTZ_JOB_DETAILS; DELETE FROM QRTZ_CRON_TRIGGERS; +DELETE FROM QRTZ_TRIGGERS; +DELETE FROM QRTZ_JOB_DETAILS; +DELETE FROM QRTZ_LOCKS; -- 修改计划任务为停用 UPDATE exec_job SET status = 0; ``` diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/utils/Valid.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/utils/Valid.java index baedb896..e54aab19 100644 --- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/utils/Valid.java +++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/utils/Valid.java @@ -2,8 +2,8 @@ package com.orion.visor.framework.common.utils; import com.orion.lang.utils.Arrays1; import com.orion.lang.utils.io.Files1; -import com.orion.visor.framework.common.constant.ErrorMessage; import com.orion.spring.SpringHolder; +import com.orion.visor.framework.common.constant.ErrorMessage; import javax.validation.ConstraintViolation; import javax.validation.ConstraintViolationException; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/com/orion/visor/framework/biz/operator/log/configuration/OrionOperatorLogAutoConfiguration.java b/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/com/orion/visor/framework/biz/operator/log/configuration/OrionOperatorLogAutoConfiguration.java index 5de59ecc..815cb688 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/com/orion/visor/framework/biz/operator/log/configuration/OrionOperatorLogAutoConfiguration.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/com/orion/visor/framework/biz/operator/log/configuration/OrionOperatorLogAutoConfiguration.java @@ -2,8 +2,8 @@ package com.orion.visor.framework.biz.operator.log.configuration; import com.alibaba.fastjson.serializer.SerializeFilter; import com.alibaba.fastjson.serializer.ValueFilter; -import com.orion.visor.framework.biz.operator.log.core.aspect.OperatorLogAspect; import com.orion.visor.framework.biz.operator.log.configuration.config.OperatorLogConfig; +import com.orion.visor.framework.biz.operator.log.core.aspect.OperatorLogAspect; import com.orion.visor.framework.biz.operator.log.core.service.OperatorLogFrameworkService; import com.orion.visor.framework.biz.operator.log.core.service.OperatorLogFrameworkServiceDelegate; import com.orion.visor.framework.biz.operator.log.core.utils.OperatorLogFiller; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/com/orion/visor/framework/biz/operator/log/core/aspect/OperatorLogAspect.java b/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/com/orion/visor/framework/biz/operator/log/core/aspect/OperatorLogAspect.java index 3c2ed9bb..6a992aad 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/com/orion/visor/framework/biz/operator/log/core/aspect/OperatorLogAspect.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/com/orion/visor/framework/biz/operator/log/core/aspect/OperatorLogAspect.java @@ -4,9 +4,9 @@ import com.alibaba.fastjson.serializer.SerializeFilter; import com.orion.lang.define.thread.ExecutorBuilder; import com.orion.lang.utils.Arrays1; import com.orion.lang.utils.Strings; +import com.orion.visor.framework.biz.operator.log.configuration.config.OperatorLogConfig; import com.orion.visor.framework.biz.operator.log.core.annotation.IgnoreParameter; import com.orion.visor.framework.biz.operator.log.core.annotation.OperatorLog; -import com.orion.visor.framework.biz.operator.log.configuration.config.OperatorLogConfig; import com.orion.visor.framework.biz.operator.log.core.factory.OperatorTypeHolder; import com.orion.visor.framework.biz.operator.log.core.model.OperatorLogModel; import com.orion.visor.framework.biz.operator.log.core.model.OperatorType; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/com/orion/visor/framework/log/core/interceptor/AbstractLogPrinterInterceptor.java b/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/com/orion/visor/framework/log/core/interceptor/AbstractLogPrinterInterceptor.java index 1ebcd84f..fb3a363d 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/com/orion/visor/framework/log/core/interceptor/AbstractLogPrinterInterceptor.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/com/orion/visor/framework/log/core/interceptor/AbstractLogPrinterInterceptor.java @@ -10,8 +10,8 @@ import com.orion.visor.framework.common.json.filter.FieldDesensitizeFilter; import com.orion.visor.framework.common.json.filter.FieldIgnoreFilter; import com.orion.visor.framework.common.meta.TraceIdHolder; import com.orion.visor.framework.common.security.SecurityHolder; -import com.orion.visor.framework.log.core.annotation.IgnoreLog; import com.orion.visor.framework.log.configuration.config.LogPrinterConfig; +import com.orion.visor.framework.log.core.annotation.IgnoreLog; import com.orion.visor.framework.log.core.enums.IgnoreLogMode; import org.aopalliance.intercept.MethodInvocation; import org.springframework.validation.BindingResult; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/generator/core/CodeGeneratorEngine.java b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/generator/core/CodeGeneratorEngine.java index 3a536d89..8576c186 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/generator/core/CodeGeneratorEngine.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/generator/core/CodeGeneratorEngine.java @@ -9,8 +9,8 @@ import com.orion.lang.utils.VariableStyles; import com.orion.lang.utils.io.Files1; import com.orion.lang.utils.reflect.BeanMap; import com.orion.lang.utils.reflect.Fields; -import com.orion.visor.framework.common.constant.Const; import com.orion.visor.framework.common.constant.AppConst; +import com.orion.visor.framework.common.constant.Const; import com.orion.visor.framework.mybatis.core.generator.template.Table; import org.jetbrains.annotations.NotNull; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/query/DataQuery.java b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/query/DataQuery.java index 1f961d2e..96f5cca1 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/query/DataQuery.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/query/DataQuery.java @@ -14,9 +14,9 @@ import com.orion.lang.utils.Objects1; import com.orion.lang.utils.Valid; import com.orion.lang.utils.collect.Lists; import com.orion.lang.utils.reflect.Classes; +import com.orion.spring.SpringHolder; import com.orion.visor.framework.common.constant.Const; import com.orion.visor.framework.mybatis.core.domain.BaseDO; -import com.orion.spring.SpringHolder; import java.io.Serializable; import java.util.List; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/command/handler/BaseExecCommandHandler.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/command/handler/BaseExecCommandHandler.java index 9f32ae25..d45e3467 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/command/handler/BaseExecCommandHandler.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/command/handler/BaseExecCommandHandler.java @@ -15,6 +15,7 @@ import com.orion.lang.utils.io.Streams; import com.orion.net.host.SessionStore; import com.orion.net.host.sftp.SftpExecutor; import com.orion.net.host.ssh.command.CommandExecutor; +import com.orion.spring.SpringHolder; import com.orion.visor.framework.common.file.FileClient; import com.orion.visor.module.asset.dao.ExecHostLogDAO; import com.orion.visor.module.asset.entity.domain.ExecHostLogDO; @@ -23,7 +24,6 @@ import com.orion.visor.module.asset.handler.host.exec.command.dto.ExecCommandDTO import com.orion.visor.module.asset.handler.host.exec.command.dto.ExecCommandHostDTO; import com.orion.visor.module.asset.handler.host.exec.log.manager.ExecLogManager; import com.orion.visor.module.asset.service.HostTerminalService; -import com.orion.spring.SpringHolder; import lombok.Getter; import lombok.extern.slf4j.Slf4j; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/command/handler/ExecTaskHandler.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/command/handler/ExecTaskHandler.java index 95384f2a..c7d90343 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/command/handler/ExecTaskHandler.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/command/handler/ExecTaskHandler.java @@ -9,6 +9,7 @@ import com.orion.lang.utils.collect.Lists; import com.orion.lang.utils.io.Streams; import com.orion.lang.utils.time.Dates; import com.orion.net.host.ssh.ExitCode; +import com.orion.spring.SpringHolder; import com.orion.visor.framework.common.constant.ExtraFieldConst; import com.orion.visor.module.asset.dao.ExecLogDAO; import com.orion.visor.module.asset.define.AssetThreadPools; @@ -22,7 +23,6 @@ import com.orion.visor.module.asset.handler.host.exec.command.dto.ExecCommandHos import com.orion.visor.module.asset.handler.host.exec.command.manager.ExecTaskManager; import com.orion.visor.module.infra.api.SystemMessageApi; import com.orion.visor.module.infra.entity.dto.message.SystemMessageDTO; -import com.orion.spring.SpringHolder; import lombok.Getter; import lombok.extern.slf4j.Slf4j; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/job/ExecCommandJob.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/job/ExecCommandJob.java index 87ce462c..ae44006d 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/job/ExecCommandJob.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/job/ExecCommandJob.java @@ -1,11 +1,11 @@ package com.orion.visor.module.asset.handler.host.exec.job; +import com.orion.spring.SpringHolder; import com.orion.visor.framework.biz.operator.log.core.utils.OperatorLogs; import com.orion.visor.framework.common.constant.Const; import com.orion.visor.framework.common.constant.FieldConst; import com.orion.visor.module.asset.entity.request.exec.ExecJobTriggerRequest; import com.orion.visor.module.asset.service.ExecJobService; -import com.orion.spring.SpringHolder; import lombok.extern.slf4j.Slf4j; import org.quartz.Job; import org.quartz.JobExecutionContext; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/log/tracker/ExecLogTracker.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/log/tracker/ExecLogTracker.java index bdecc62d..3ce8fd87 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/log/tracker/ExecLogTracker.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/exec/log/tracker/ExecLogTracker.java @@ -4,11 +4,11 @@ import com.orion.ext.tail.Tracker; import com.orion.ext.tail.delay.DelayTrackerListener; import com.orion.ext.tail.mode.FileNotFoundMode; import com.orion.ext.tail.mode.FileOffsetMode; +import com.orion.spring.SpringHolder; import com.orion.visor.framework.websocket.core.utils.WebSockets; import com.orion.visor.module.asset.define.config.AppTrackerConfig; import com.orion.visor.module.asset.entity.dto.ExecHostLogTailDTO; import com.orion.visor.module.asset.handler.host.exec.log.constant.LogConst; -import com.orion.spring.SpringHolder; import lombok.Getter; import lombok.extern.slf4j.Slf4j; import org.springframework.web.socket.WebSocketSession; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/enums/InputTypeEnum.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/enums/InputTypeEnum.java index bde7ecea..060952bf 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/enums/InputTypeEnum.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/enums/InputTypeEnum.java @@ -1,10 +1,10 @@ package com.orion.visor.module.asset.handler.host.terminal.enums; import com.alibaba.fastjson.JSONObject; +import com.orion.spring.SpringHolder; import com.orion.visor.module.asset.handler.host.terminal.handler.*; import com.orion.visor.module.asset.handler.host.terminal.model.TerminalBasePayload; import com.orion.visor.module.asset.handler.host.terminal.model.request.*; -import com.orion.spring.SpringHolder; import lombok.Getter; import org.springframework.stereotype.Component; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/session/TerminalSession.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/session/TerminalSession.java index d5572f29..86ea3334 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/session/TerminalSession.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/session/TerminalSession.java @@ -1,5 +1,6 @@ package com.orion.visor.module.asset.handler.host.terminal.session; +import com.orion.spring.SpringHolder; import com.orion.visor.framework.common.enums.BooleanBit; import com.orion.visor.framework.websocket.core.utils.WebSockets; import com.orion.visor.module.asset.enums.HostConnectStatusEnum; @@ -8,7 +9,6 @@ import com.orion.visor.module.asset.handler.host.terminal.enums.OutputTypeEnum; import com.orion.visor.module.asset.handler.host.terminal.model.TerminalConfig; import com.orion.visor.module.asset.handler.host.terminal.model.response.TerminalCloseResponse; import com.orion.visor.module.asset.service.HostConnectLogService; -import com.orion.spring.SpringHolder; import lombok.Getter; import lombok.extern.slf4j.Slf4j; import org.springframework.web.socket.WebSocketSession; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/transfer/handler/TransferHandler.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/transfer/handler/TransferHandler.java index c26d85b4..67a3c8bc 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/transfer/handler/TransferHandler.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/transfer/handler/TransferHandler.java @@ -3,6 +3,7 @@ package com.orion.visor.module.asset.handler.host.transfer.handler; import com.orion.lang.utils.Exceptions; import com.orion.lang.utils.io.Streams; import com.orion.net.host.SessionStore; +import com.orion.spring.SpringHolder; import com.orion.visor.framework.common.constant.ErrorMessage; import com.orion.visor.framework.common.constant.ExtraFieldConst; import com.orion.visor.framework.websocket.core.utils.WebSockets; @@ -13,7 +14,6 @@ import com.orion.visor.module.asset.handler.host.transfer.model.TransferOperator import com.orion.visor.module.asset.handler.host.transfer.session.*; import com.orion.visor.module.asset.handler.host.transfer.utils.TransferUtils; import com.orion.visor.module.asset.service.HostTerminalService; -import com.orion.spring.SpringHolder; import lombok.extern.slf4j.Slf4j; import org.springframework.web.socket.WebSocketSession; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/transfer/session/TransferHostSession.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/transfer/session/TransferHostSession.java index 14141e96..461f5380 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/transfer/session/TransferHostSession.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/transfer/session/TransferHostSession.java @@ -4,13 +4,13 @@ import com.orion.lang.utils.collect.Maps; import com.orion.lang.utils.io.Streams; import com.orion.net.host.SessionStore; import com.orion.net.host.sftp.SftpExecutor; +import com.orion.spring.SpringHolder; import com.orion.visor.framework.biz.operator.log.core.model.OperatorLogModel; import com.orion.visor.framework.biz.operator.log.core.service.OperatorLogFrameworkService; import com.orion.visor.framework.biz.operator.log.core.utils.OperatorLogs; import com.orion.visor.module.asset.define.config.AppSftpConfig; import com.orion.visor.module.asset.entity.dto.HostTerminalConnectDTO; import com.orion.visor.module.asset.handler.host.terminal.utils.TerminalUtils; -import com.orion.spring.SpringHolder; import org.springframework.web.socket.WebSocketSession; import java.util.Map; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/upload/task/FileUploadTask.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/upload/task/FileUploadTask.java index c69501e3..0aa9be38 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/upload/task/FileUploadTask.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/upload/task/FileUploadTask.java @@ -4,6 +4,7 @@ import com.orion.lang.utils.Threads; 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 com.orion.visor.framework.common.constant.Const; import com.orion.visor.framework.common.constant.ExtraFieldConst; import com.orion.visor.module.asset.dao.UploadTaskDAO; @@ -21,7 +22,6 @@ import com.orion.visor.module.asset.handler.host.upload.uploader.IFileUploader; import com.orion.visor.module.asset.service.UploadTaskService; import com.orion.visor.module.infra.api.SystemMessageApi; import com.orion.visor.module.infra.entity.dto.message.SystemMessageDTO; -import com.orion.spring.SpringHolder; import lombok.Getter; import lombok.extern.slf4j.Slf4j; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/upload/uploader/FileUploader.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/upload/uploader/FileUploader.java index 5da23c20..b4fb6ea8 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/upload/uploader/FileUploader.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/upload/uploader/FileUploader.java @@ -6,6 +6,7 @@ import com.orion.lang.utils.io.Files1; import com.orion.lang.utils.io.Streams; import com.orion.net.host.SessionStore; import com.orion.net.host.sftp.SftpExecutor; +import com.orion.spring.SpringHolder; import com.orion.visor.framework.common.constant.Const; import com.orion.visor.framework.common.file.FileClient; import com.orion.visor.framework.common.utils.PathUtils; @@ -19,7 +20,6 @@ import com.orion.visor.module.asset.handler.host.upload.dto.FileUploadFileItemDT import com.orion.visor.module.asset.service.HostTerminalService; import com.orion.visor.module.asset.service.UploadTaskService; import com.orion.visor.module.asset.utils.SftpUtils; -import com.orion.spring.SpringHolder; import lombok.Getter; import lombok.extern.slf4j.Slf4j; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/AssetDataGrantServiceImpl.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/AssetDataGrantServiceImpl.java index f85c3d60..ee4648c9 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/AssetDataGrantServiceImpl.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/AssetDataGrantServiceImpl.java @@ -1,6 +1,7 @@ package com.orion.visor.module.asset.service.impl; import com.orion.lang.utils.collect.Lists; +import com.orion.spring.SpringHolder; import com.orion.visor.framework.biz.operator.log.core.utils.OperatorLogs; import com.orion.visor.framework.common.constant.Const; import com.orion.visor.framework.common.constant.ErrorMessage; @@ -20,7 +21,6 @@ import com.orion.visor.module.infra.entity.dto.data.DataPermissionUpdateDTO; import com.orion.visor.module.infra.entity.dto.role.SystemRoleDTO; import com.orion.visor.module.infra.entity.dto.user.SystemUserDTO; import com.orion.visor.module.infra.enums.DataPermissionTypeEnum; -import com.orion.spring.SpringHolder; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/HostServiceImpl.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/HostServiceImpl.java index 52690662..22ee7a55 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/HostServiceImpl.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/HostServiceImpl.java @@ -6,6 +6,7 @@ import com.orion.lang.define.wrapper.DataGrid; import com.orion.lang.utils.Booleans; import com.orion.lang.utils.Strings; import com.orion.lang.utils.collect.Lists; +import com.orion.spring.SpringHolder; import com.orion.visor.framework.biz.operator.log.core.utils.OperatorLogs; import com.orion.visor.framework.common.constant.ErrorMessage; import com.orion.visor.framework.common.utils.Valid; @@ -34,7 +35,6 @@ import com.orion.visor.module.infra.enums.DataExtraTypeEnum; import com.orion.visor.module.infra.enums.DataGroupTypeEnum; import com.orion.visor.module.infra.enums.FavoriteTypeEnum; import com.orion.visor.module.infra.enums.TagTypeEnum; -import com.orion.spring.SpringHolder; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.springframework.scheduling.annotation.Async; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/enums/PreferenceTypeEnum.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/enums/PreferenceTypeEnum.java index 93c22a9b..83493575 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/enums/PreferenceTypeEnum.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/enums/PreferenceTypeEnum.java @@ -1,8 +1,8 @@ package com.orion.visor.module.infra.enums; +import com.orion.spring.SpringHolder; import com.orion.visor.module.infra.handler.preference.model.PreferenceModel; import com.orion.visor.module.infra.handler.preference.strategy.IPreferenceStrategy; -import com.orion.spring.SpringHolder; import lombok.Getter; /** diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/DataGroupRelServiceImpl.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/DataGroupRelServiceImpl.java index c1c06abd..dddb7bee 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/DataGroupRelServiceImpl.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/DataGroupRelServiceImpl.java @@ -2,6 +2,7 @@ package com.orion.visor.module.infra.service.impl; import com.orion.lang.utils.Strings; import com.orion.lang.utils.collect.Lists; +import com.orion.spring.SpringHolder; import com.orion.visor.framework.biz.operator.log.core.utils.OperatorLogs; import com.orion.visor.framework.common.constant.ErrorMessage; import com.orion.visor.framework.common.utils.Valid; @@ -18,7 +19,6 @@ import com.orion.visor.module.infra.entity.domain.DataGroupRelDO; import com.orion.visor.module.infra.entity.dto.DataGroupRelCacheDTO; import com.orion.visor.module.infra.entity.request.data.DataGroupRelCreateRequest; import com.orion.visor.module.infra.service.DataGroupRelService; -import com.orion.spring.SpringHolder; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/SystemUserServiceImpl.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/SystemUserServiceImpl.java index 45bf1de3..91ebe9c0 100644 --- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/SystemUserServiceImpl.java +++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/SystemUserServiceImpl.java @@ -4,6 +4,7 @@ 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.crypto.Signatures; +import com.orion.spring.SpringHolder; import com.orion.visor.framework.biz.operator.log.core.utils.OperatorLogs; import com.orion.visor.framework.common.constant.ErrorCode; import com.orion.visor.framework.common.constant.ErrorMessage; @@ -31,7 +32,6 @@ import com.orion.visor.module.infra.entity.request.user.*; import com.orion.visor.module.infra.entity.vo.SystemUserVO; import com.orion.visor.module.infra.enums.UserStatusEnum; import com.orion.visor.module.infra.service.*; -import com.orion.spring.SpringHolder; import lombok.extern.slf4j.Slf4j; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; diff --git a/orion-visor-ui/src/api/dashboard.ts b/orion-visor-ui/src/api/dashboard.ts deleted file mode 100644 index 75dc3e40..00000000 --- a/orion-visor-ui/src/api/dashboard.ts +++ /dev/null @@ -1,22 +0,0 @@ -import type { TableData } from '@arco-design/web-vue/es/table/interface'; -import axios from 'axios'; - -export interface ContentDataRecord { - x: string; - y: number; -} - -export function queryContentData() { - return axios.get('/api/content-data'); -} - -export interface PopularRecord { - key: number; - clickNumber: string; - title: string; - increases: number; -} - -export function queryPopularList(params: { type: string }) { - return axios.get('/api/popular/list', { params }); -} diff --git a/orion-visor-ui/src/api/job/exec-job-log.ts b/orion-visor-ui/src/api/job/exec-job-log.ts index 48b4445e..4d847829 100644 --- a/orion-visor-ui/src/api/job/exec-job-log.ts +++ b/orion-visor-ui/src/api/job/exec-job-log.ts @@ -1,11 +1,11 @@ import type { DataGrid } from '@/types/global'; import type { ExecHostLogQueryResponse, + ExecLogInterruptRequest, ExecLogQueryRequest, ExecLogQueryResponse, ExecLogStatusResponse, - ExecLogTailRequest, - ExecLogInterruptRequest + ExecLogTailRequest } from '../exec/exec-log'; import axios from 'axios'; import qs from 'query-string'; diff --git a/orion-visor-ui/src/components/app/setting/index.vue b/orion-visor-ui/src/components/app/setting/index.vue index f5da977b..521c8b9a 100644 --- a/orion-visor-ui/src/components/app/setting/index.vue +++ b/orion-visor-ui/src/components/app/setting/index.vue @@ -156,7 +156,7 @@ } } - .preference-containers{ + .preference-containers { padding: 0 16px; } diff --git a/orion-visor-ui/src/components/app/tab-bar/index.vue b/orion-visor-ui/src/components/app/tab-bar/index.vue index 0c181d9e..c3ff91b7 100644 --- a/orion-visor-ui/src/components/app/tab-bar/index.vue +++ b/orion-visor-ui/src/components/app/tab-bar/index.vue @@ -5,9 +5,9 @@
+ :key="tag.fullPath" + :index="index" + :item-data="tag" />
diff --git a/orion-visor-ui/src/components/exec/log/panel/log-appender.ts b/orion-visor-ui/src/components/exec/log/panel/log-appender.ts index d198487b..6944909e 100644 --- a/orion-visor-ui/src/components/exec/log/panel/log-appender.ts +++ b/orion-visor-ui/src/components/exec/log/panel/log-appender.ts @@ -1,9 +1,9 @@ import type { ExecType, ILogAppender, LogAddons, LogAppenderConf, LogDomRef } from '../const'; +import { LogAppenderOptions } from '../const'; import type { ExecLogTailRequest } from '@/api/exec/exec-log'; import { openExecLogChannel } from '@/api/exec/exec-log'; import { getExecCommandLogTailToken } from '@/api/exec/exec-command-log'; import { getExecJobLogTailToken } from '@/api/job/exec-job-log'; -import { LogAppenderOptions } from '../const'; import { Message } from '@arco-design/web-vue'; import { useDebounceFn } from '@vueuse/core'; import { addEventListen, removeEventListen } from '@/utils/event'; diff --git a/orion-visor-ui/src/components/index.ts b/orion-visor-ui/src/components/index.ts index 3ddb06ba..dfc19074 100644 --- a/orion-visor-ui/src/components/index.ts +++ b/orion-visor-ui/src/components/index.ts @@ -3,13 +3,7 @@ import { use } from 'echarts/core'; import QueryHeader from '@dangojs/a-query-header'; import { CanvasRenderer } from 'echarts/renderers'; import { BarChart, LineChart, PieChart, RadarChart } from 'echarts/charts'; -import { - GridComponent, - TooltipComponent, - LegendComponent, - DataZoomComponent, - GraphicComponent, -} from 'echarts/components'; +import { DataZoomComponent, GraphicComponent, GridComponent, LegendComponent, TooltipComponent, } from 'echarts/components'; import Breadcrumb from './app/breadcrumb/index.vue'; import Chart from './view/chart/index.vue'; import CardList from './view/card-list/index.vue'; diff --git a/orion-visor-ui/src/components/system/uploader/file-uploader.ts b/orion-visor-ui/src/components/system/uploader/file-uploader.ts index ea1757df..c09b3c1f 100644 --- a/orion-visor-ui/src/components/system/uploader/file-uploader.ts +++ b/orion-visor-ui/src/components/system/uploader/file-uploader.ts @@ -1,7 +1,7 @@ -import type { IFileUploader, ResponseMessageBody } from './const'; import type { FileItem } from '@arco-design/web-vue'; -import { openFileUploadChannel } from '@/api/system/upload'; +import type { IFileUploader, ResponseMessageBody } from './const'; import { UploadOperatorType, UploadReceiverType } from './const'; +import { openFileUploadChannel } from '@/api/system/upload'; // 512 KB export const PART_SIZE = 512 * 1024; diff --git a/orion-visor-ui/src/hooks/responsive.ts b/orion-visor-ui/src/hooks/responsive.ts index 1de9a3fd..5be0707a 100644 --- a/orion-visor-ui/src/hooks/responsive.ts +++ b/orion-visor-ui/src/hooks/responsive.ts @@ -1,4 +1,4 @@ -import { onMounted, onBeforeMount, onBeforeUnmount } from 'vue'; +import { onBeforeMount, onBeforeUnmount, onMounted } from 'vue'; import { useDebounceFn } from '@vueuse/core'; import { useAppStore } from '@/store'; import { addEventListen, removeEventListen } from '@/utils/event'; diff --git a/orion-visor-ui/src/mock/index.ts b/orion-visor-ui/src/mock/index.ts index b19afebc..8d4c1dc9 100644 --- a/orion-visor-ui/src/mock/index.ts +++ b/orion-visor-ui/src/mock/index.ts @@ -1,6 +1,5 @@ import Mock from 'mockjs'; // import './user'; - import '@/views/dashboard/workplace/mock'; Mock.setup({ diff --git a/orion-visor-ui/src/router/guard/user-login-info.ts b/orion-visor-ui/src/router/guard/user-login-info.ts index ee232792..3f7bfdbc 100644 --- a/orion-visor-ui/src/router/guard/user-login-info.ts +++ b/orion-visor-ui/src/router/guard/user-login-info.ts @@ -1,4 +1,4 @@ -import type { Router, LocationQueryRaw } from 'vue-router'; +import type { LocationQueryRaw, Router } from 'vue-router'; import NProgress from 'nprogress'; import { useUserStore } from '@/store'; import { isLogin } from '@/utils/auth'; diff --git a/orion-visor-ui/src/router/routes/types.ts b/orion-visor-ui/src/router/routes/types.ts index fa4204cc..13f08018 100644 --- a/orion-visor-ui/src/router/routes/types.ts +++ b/orion-visor-ui/src/router/routes/types.ts @@ -1,4 +1,4 @@ -import type { RouteMeta, NavigationGuard } from 'vue-router'; +import type { NavigationGuard, RouteMeta } from 'vue-router'; import { defineComponent } from 'vue'; export type Component = diff --git a/orion-visor-ui/src/store/modules/terminal/types.ts b/orion-visor-ui/src/store/modules/terminal/types.ts index 75a23c75..b0eb923d 100644 --- a/orion-visor-ui/src/store/modules/terminal/types.ts +++ b/orion-visor-ui/src/store/modules/terminal/types.ts @@ -1,4 +1,4 @@ -import type { ITerminalPanelManager, ITerminalSessionManager, ITerminalTabManager,ISftpTransferManager } from '@/views/host/terminal/types/terminal.type'; +import type { ISftpTransferManager, ITerminalPanelManager, ITerminalSessionManager, ITerminalTabManager } from '@/views/host/terminal/types/terminal.type'; import type { AuthorizedHostQueryResponse } from '@/api/asset/asset-authorized-data'; import type { TerminalTheme } from '@/api/asset/host-terminal'; diff --git a/orion-visor-ui/src/store/modules/user/index.ts b/orion-visor-ui/src/store/modules/user/index.ts index 11853c24..148b9f59 100644 --- a/orion-visor-ui/src/store/modules/user/index.ts +++ b/orion-visor-ui/src/store/modules/user/index.ts @@ -1,7 +1,7 @@ import type { UserState } from './types'; import type { LoginRequest } from '@/api/user/auth'; -import { defineStore } from 'pinia'; import { getUserPermission, login as userLogin, logout as userLogout } from '@/api/user/auth'; +import { defineStore } from 'pinia'; import { clearToken, setToken } from '@/utils/auth'; import { md5 } from '@/utils'; import { removeRouteListener } from '@/utils/route-listener'; diff --git a/orion-visor-ui/src/types/global.ts b/orion-visor-ui/src/types/global.ts index c50f80d7..383b2671 100644 --- a/orion-visor-ui/src/types/global.ts +++ b/orion-visor-ui/src/types/global.ts @@ -30,7 +30,7 @@ export interface Pagination { limit?: number; } -export interface NodeData { +export interface NodeData { [key: string]: any; } diff --git a/orion-visor-ui/src/views/base/redirect/index.vue b/orion-visor-ui/src/views/base/redirect/index.vue index 53f58888..079578be 100644 --- a/orion-visor-ui/src/views/base/redirect/index.vue +++ b/orion-visor-ui/src/views/base/redirect/index.vue @@ -3,7 +3,7 @@