From 238ec20b7ce30079688c3d19b192a883ba3c87a0 Mon Sep 17 00:00:00 2001 From: lijiahangmax Date: Fri, 23 Jan 2026 11:14:44 +0800 Subject: [PATCH] =?UTF-8?q?:hammer:=20=E5=8D=87=E7=BA=A7=20fastjson.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../handler/data/model/GenericsDataModel.java | 2 +- .../AbstractGenericsDataStrategy.java | 2 +- .../common/json/FieldDesensitizeFilter.java | 4 +- .../visor/common/json/FieldIgnoreFilter.java | 2 +- .../common/mapstruct/JsonConversion.java | 6 +- .../OrionOperatorLogAutoConfiguration.java | 7 +- .../log/core/utils/OperatorLogFiller.java | 8 +- .../operator/log/core/utils/OperatorLogs.java | 11 +- .../biz/push/core/entity/DingRequestBody.java | 2 +- .../push/core/entity/DingResponseBody.java | 2 +- .../push/core/entity/FeiShuRequestBody.java | 2 +- .../push/core/entity/WeComRequestBody.java | 2 +- .../push/core/entity/WeComResponseBody.java | 2 +- .../biz/push/core/enums/PushChannelEnum.java | 2 +- .../push/core/service/BasePushService.java | 2 +- .../push/core/service/DingPushService.java | 2 +- .../push/core/service/FeiShuPushService.java | 2 +- .../push/core/service/WeComPushService.java | 2 +- .../core/filter/DesensitizeValueFilter.java | 6 +- .../core/context/ExecutorContext.java | 2 +- .../AbstractLogPrinterInterceptor.java | 12 +- .../interceptor/RowLogPrinterInterceptor.java | 2 +- .../core/generator/core/DictParser.java | 2 +- .../core/type/JSONArrayTypeHandler.java | 4 +- .../core/type/JSONObjectTypeHandler.java | 4 +- .../orion-server-module-service-impl.java.vm | 412 +++++++++--------- .../orion-server-provider-api-impl.java.vm | 40 +- .../redis/core/utils/RedisLists.java | 2 +- .../framework/redis/core/utils/RedisMaps.java | 2 +- .../redis/core/utils/RedisStrings.java | 6 +- .../websocket/core/utils/WebSockets.java | 2 +- .../dromara/visor/launch/ReplaceFastjson.java | 67 +++ .../module/asset/enums/HostTypeEnum.java | 2 +- .../HostAgentEndpointController.java | 2 +- .../asset/service/HostExtraService.java | 2 +- .../service/impl/HostConfigServiceImpl.java | 2 +- .../service/impl/HostExtraServiceImpl.java | 4 +- .../service/impl/HostIdentityServiceImpl.java | 2 +- .../service/impl/HostKeyServiceImpl.java | 2 +- .../asset/service/impl/HostServiceImpl.java | 2 +- .../asset/meta/TerminalThemeGenerator.java | 8 +- .../visor/module/common/utils/SftpUtils.java | 2 +- .../handler/BaseExecCommandHandler.java | 2 +- .../exec/log/tracker/ExecLogTracker.java | 4 +- .../service/impl/ExecCommandServiceImpl.java | 2 +- .../exec/service/impl/ExecJobServiceImpl.java | 2 +- .../exec/service/impl/ExecLogServiceImpl.java | 2 +- .../service/impl/ExecTemplateServiceImpl.java | 2 +- .../service/impl/UploadTaskServiceImpl.java | 2 +- .../visor/module/exec/utils/ExecUtils.java | 2 +- .../visor/module/infra/api/DictValueApi.java | 2 +- .../infra/api/impl/DictValueApiImpl.java | 2 +- .../infra/api/impl/HistoryValueApiImpl.java | 2 +- .../infra/controller/DictValueController.java | 2 +- .../define/cache/DictCacheKeyDefine.java | 2 +- .../model/TerminalPreferenceModel.java | 2 +- .../strategy/TerminalPreferenceStrategy.java | 2 +- .../upload/FileUploadMessageDispatcher.java | 2 +- .../upload/handler/FileUploadHandler.java | 2 +- .../infra/service/DictValueService.java | 2 +- .../impl/AuthenticationServiceImpl.java | 2 +- .../service/impl/DataGroupServiceImpl.java | 2 +- .../service/impl/DictKeyServiceImpl.java | 4 +- .../service/impl/DictValueServiceImpl.java | 4 +- .../service/impl/HistoryValueServiceImpl.java | 2 +- .../impl/NotifyTemplateServiceImpl.java | 2 +- .../service/impl/OperatorLogServiceImpl.java | 2 +- .../service/impl/PreferenceServiceImpl.java | 2 +- .../service/impl/SystemMenuServiceImpl.java | 2 +- .../impl/SystemMessageServiceImpl.java | 2 +- .../service/impl/SystemRoleServiceImpl.java | 2 +- .../service/impl/SystemUserServiceImpl.java | 2 +- .../infra/service/impl/TagRelServiceImpl.java | 2 +- .../infra/service/impl/TagServiceImpl.java | 2 +- .../monitor/context/MonitorAgentContext.java | 2 +- .../monitor/entity/dto/AgentMetricsDTO.java | 2 +- .../module/monitor/entity/dto/MetricsDTO.java | 2 +- .../monitor/entity/vo/AlarmEventVO.java | 2 +- .../handler/alarm/AlarmEngineContext.java | 6 +- .../handler/alarm/MetricsAlarmEngine.java | 2 +- .../service/impl/AlarmEventServiceImpl.java | 2 +- .../impl/AlarmPolicyRuleServiceImpl.java | 2 +- .../service/impl/AlarmPolicyServiceImpl.java | 2 +- .../impl/MonitorAgentEndpointServiceImpl.java | 2 +- .../service/impl/MonitorHostServiceImpl.java | 4 +- .../impl/MonitorMetricsServiceImpl.java | 2 +- .../module/monitor/utils/MetricsUtils.java | 2 +- .../terminal/entity/vo/TerminalThemeVO.java | 2 +- .../terminal/enums/InputProtocolEnum.java | 2 +- .../handler/RdpFileSystemEventHandler.java | 2 +- .../handler/TerminalConnectHandler.java | 2 +- .../sender/WebsocketSftpTerminalSender.java | 2 +- .../transfer/TransferMessageDispatcher.java | 2 +- .../handler/transfer/utils/TransferUtils.java | 2 +- .../TerminalAccessInterceptor.java | 2 +- .../impl/CommandSnippetGroupServiceImpl.java | 2 +- .../impl/CommandSnippetServiceImpl.java | 2 +- .../impl/PathBookmarkGroupServiceImpl.java | 2 +- .../service/impl/PathBookmarkServiceImpl.java | 2 +- .../impl/TerminalConnectLogServiceImpl.java | 2 +- .../impl/TerminalFileLogServiceImpl.java | 4 +- .../service/impl/TerminalServiceImpl.java | 2 +- .../terminal/meta/TerminalThemeGenerator.java | 8 +- 103 files changed, 430 insertions(+), 365 deletions(-) create mode 100644 orion-visor-launch/src/test/java/org/dromara/visor/launch/ReplaceFastjson.java diff --git a/orion-visor-common/src/main/java/org/dromara/visor/common/handler/data/model/GenericsDataModel.java b/orion-visor-common/src/main/java/org/dromara/visor/common/handler/data/model/GenericsDataModel.java index 38c403bb..016a2b58 100644 --- a/orion-visor-common/src/main/java/org/dromara/visor/common/handler/data/model/GenericsDataModel.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/handler/data/model/GenericsDataModel.java @@ -22,7 +22,7 @@ */ package org.dromara.visor.common.handler.data.model; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import java.util.Map; diff --git a/orion-visor-common/src/main/java/org/dromara/visor/common/handler/data/strategy/AbstractGenericsDataStrategy.java b/orion-visor-common/src/main/java/org/dromara/visor/common/handler/data/strategy/AbstractGenericsDataStrategy.java index 29a46fc5..dd80d9ae 100644 --- a/orion-visor-common/src/main/java/org/dromara/visor/common/handler/data/strategy/AbstractGenericsDataStrategy.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/handler/data/strategy/AbstractGenericsDataStrategy.java @@ -22,7 +22,7 @@ */ package org.dromara.visor.common.handler.data.strategy; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import org.dromara.visor.common.handler.data.model.GenericsDataModel; /** diff --git a/orion-visor-common/src/main/java/org/dromara/visor/common/json/FieldDesensitizeFilter.java b/orion-visor-common/src/main/java/org/dromara/visor/common/json/FieldDesensitizeFilter.java index fac1a124..813ec8f5 100644 --- a/orion-visor-common/src/main/java/org/dromara/visor/common/json/FieldDesensitizeFilter.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/json/FieldDesensitizeFilter.java @@ -25,7 +25,7 @@ package org.dromara.visor.common.json; import cn.orionsec.kit.lang.utils.Desensitizes; import cn.orionsec.kit.lang.utils.Objects1; import cn.orionsec.kit.lang.utils.collect.Lists; -import com.alibaba.fastjson.serializer.ValueFilter; +import com.alibaba.fastjson2.filter.ValueFilter; import java.util.List; @@ -55,7 +55,7 @@ public class FieldDesensitizeFilter implements ValueFilter { } @Override - public Object process(Object object, String name, Object value) { + public Object apply(Object object, String name, Object value) { if (Lists.isEmpty(desensitizeFields) || !desensitizeFields.contains(name)) { return value; } diff --git a/orion-visor-common/src/main/java/org/dromara/visor/common/json/FieldIgnoreFilter.java b/orion-visor-common/src/main/java/org/dromara/visor/common/json/FieldIgnoreFilter.java index 5f382942..4d8c941c 100644 --- a/orion-visor-common/src/main/java/org/dromara/visor/common/json/FieldIgnoreFilter.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/json/FieldIgnoreFilter.java @@ -23,7 +23,7 @@ package org.dromara.visor.common.json; import cn.orionsec.kit.lang.utils.collect.Lists; -import com.alibaba.fastjson.serializer.PropertyFilter; +import com.alibaba.fastjson2.filter.PropertyFilter; import java.util.List; diff --git a/orion-visor-common/src/main/java/org/dromara/visor/common/mapstruct/JsonConversion.java b/orion-visor-common/src/main/java/org/dromara/visor/common/mapstruct/JsonConversion.java index 93d5f022..8846fad1 100644 --- a/orion-visor-common/src/main/java/org/dromara/visor/common/mapstruct/JsonConversion.java +++ b/orion-visor-common/src/main/java/org/dromara/visor/common/mapstruct/JsonConversion.java @@ -22,9 +22,9 @@ */ package org.dromara.visor.common.mapstruct; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONArray; +import com.alibaba.fastjson2.JSONObject; /** * json 转换器 diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/configuration/OrionOperatorLogAutoConfiguration.java b/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/configuration/OrionOperatorLogAutoConfiguration.java index dc87d734..0866e2d1 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/configuration/OrionOperatorLogAutoConfiguration.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/configuration/OrionOperatorLogAutoConfiguration.java @@ -22,8 +22,7 @@ */ package org.dromara.visor.framework.biz.operator.log.configuration; -import com.alibaba.fastjson.serializer.SerializeFilter; -import com.alibaba.fastjson.serializer.ValueFilter; +import com.alibaba.fastjson2.filter.Filter; import org.dromara.visor.common.constant.AutoConfigureOrderConst; import org.dromara.visor.common.json.FieldDesensitizeFilter; import org.dromara.visor.common.json.FieldIgnoreFilter; @@ -55,7 +54,7 @@ import javax.annotation.Resource; public class OrionOperatorLogAutoConfiguration { @Resource - private ValueFilter desensitizeValueFilter; + private Filter desensitizeValueFilter; /** * 操作日志委托类 @@ -82,7 +81,7 @@ public class OrionOperatorLogAutoConfiguration { public OperatorLogAspect operatorLogAspect(OperatorLogConfig operatorLogConfig, OperatorLogFrameworkService service) { // 参数过滤器 - SerializeFilter[] serializeFilters = new SerializeFilter[]{ + Filter[] serializeFilters = new Filter[]{ // 忽略字段过滤器 new FieldIgnoreFilter(operatorLogConfig.getIgnore()), // 脱敏字段过滤器 diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/core/utils/OperatorLogFiller.java b/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/core/utils/OperatorLogFiller.java index a84537da..6daf3ac0 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/core/utils/OperatorLogFiller.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/core/utils/OperatorLogFiller.java @@ -27,8 +27,8 @@ import cn.orionsec.kit.lang.utils.Exceptions; import cn.orionsec.kit.lang.utils.Refs; import cn.orionsec.kit.lang.utils.Strings; import cn.orionsec.kit.lang.utils.json.matcher.ReplacementFormatters; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.serializer.SerializeFilter; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.filter.Filter; import org.dromara.visor.common.entity.RequestIdentity; import org.dromara.visor.common.enums.BooleanBit; import org.dromara.visor.common.security.LoginUser; @@ -54,7 +54,7 @@ import java.util.Optional; */ public class OperatorLogFiller implements Gettable { - private static SerializeFilter[] serializeFilters; + private static Filter[] serializeFilters; private static OperatorLogConfig operatorLogConfig; @@ -275,7 +275,7 @@ public class OperatorLogFiller implements Gettable { return model; } - public static void setSerializeFilters(SerializeFilter[] serializeFilters) { + public static void setSerializeFilters(Filter[] serializeFilters) { if (OperatorLogFiller.serializeFilters != null) { // unmodified throw Exceptions.state(); diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/core/utils/OperatorLogs.java b/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/core/utils/OperatorLogs.java index d8ea3486..84f813b9 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/core/utils/OperatorLogs.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/core/utils/OperatorLogs.java @@ -25,9 +25,8 @@ package org.dromara.visor.framework.biz.operator.log.core.utils; import cn.orionsec.kit.lang.utils.Exceptions; import cn.orionsec.kit.lang.utils.Strings; import cn.orionsec.kit.lang.utils.collect.Maps; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.alibaba.fastjson.serializer.SerializeFilter; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.filter.Filter; import org.dromara.visor.common.constant.ExtraFieldConst; import org.dromara.visor.common.security.LoginUser; @@ -44,7 +43,7 @@ public class OperatorLogs implements ExtraFieldConst { private static final String UN_SAVE_FLAG = "__un__save__"; - private static SerializeFilter[] serializeFilters; + private static Filter[] serializeFilters; /** * 拓展信息 @@ -98,7 +97,7 @@ public class OperatorLogs implements ExtraFieldConst { if (obj == null) { return; } - if (obj instanceof JSONObject || obj instanceof com.alibaba.fastjson2.JSONObject) { + if (obj instanceof com.alibaba.fastjson2.JSONObject || obj instanceof com.alibaba.fastjson2.JSONObject) { EXTRA_HOLDER.get().putAll(JSON.parseObject(toJsonString(obj))); } else if (obj instanceof Map) { EXTRA_HOLDER.get().putAll((Map) obj); @@ -204,7 +203,7 @@ public class OperatorLogs implements ExtraFieldConst { .replaceAll("
", "\n"); } - public static void setSerializeFilters(SerializeFilter[] serializeFilters) { + public static void setSerializeFilters(Filter[] serializeFilters) { if (OperatorLogs.serializeFilters != null) { // unmodified throw Exceptions.state(); diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-biz-push/src/main/java/org/dromara/visor/framework/biz/push/core/entity/DingRequestBody.java b/orion-visor-framework/orion-visor-spring-boot-starter-biz-push/src/main/java/org/dromara/visor/framework/biz/push/core/entity/DingRequestBody.java index 495757a2..cd1cc353 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-biz-push/src/main/java/org/dromara/visor/framework/biz/push/core/entity/DingRequestBody.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-biz-push/src/main/java/org/dromara/visor/framework/biz/push/core/entity/DingRequestBody.java @@ -23,7 +23,7 @@ package org.dromara.visor.framework.biz.push.core.entity; import cn.orionsec.kit.lang.able.IJsonObject; -import com.alibaba.fastjson.annotation.JSONField; +import com.alibaba.fastjson2.annotation.JSONField; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-biz-push/src/main/java/org/dromara/visor/framework/biz/push/core/entity/DingResponseBody.java b/orion-visor-framework/orion-visor-spring-boot-starter-biz-push/src/main/java/org/dromara/visor/framework/biz/push/core/entity/DingResponseBody.java index be9a318a..b149d92e 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-biz-push/src/main/java/org/dromara/visor/framework/biz/push/core/entity/DingResponseBody.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-biz-push/src/main/java/org/dromara/visor/framework/biz/push/core/entity/DingResponseBody.java @@ -22,7 +22,7 @@ */ package org.dromara.visor.framework.biz.push.core.entity; -import com.alibaba.fastjson.annotation.JSONField; +import com.alibaba.fastjson2.annotation.JSONField; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-biz-push/src/main/java/org/dromara/visor/framework/biz/push/core/entity/FeiShuRequestBody.java b/orion-visor-framework/orion-visor-spring-boot-starter-biz-push/src/main/java/org/dromara/visor/framework/biz/push/core/entity/FeiShuRequestBody.java index 361d22dc..07aa5829 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-biz-push/src/main/java/org/dromara/visor/framework/biz/push/core/entity/FeiShuRequestBody.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-biz-push/src/main/java/org/dromara/visor/framework/biz/push/core/entity/FeiShuRequestBody.java @@ -23,7 +23,7 @@ package org.dromara.visor.framework.biz.push.core.entity; import cn.orionsec.kit.lang.able.IJsonObject; -import com.alibaba.fastjson.annotation.JSONField; +import com.alibaba.fastjson2.annotation.JSONField; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-biz-push/src/main/java/org/dromara/visor/framework/biz/push/core/entity/WeComRequestBody.java b/orion-visor-framework/orion-visor-spring-boot-starter-biz-push/src/main/java/org/dromara/visor/framework/biz/push/core/entity/WeComRequestBody.java index edcec1e6..380e2b6d 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-biz-push/src/main/java/org/dromara/visor/framework/biz/push/core/entity/WeComRequestBody.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-biz-push/src/main/java/org/dromara/visor/framework/biz/push/core/entity/WeComRequestBody.java @@ -23,7 +23,7 @@ package org.dromara.visor.framework.biz.push.core.entity; import cn.orionsec.kit.lang.able.IJsonObject; -import com.alibaba.fastjson.annotation.JSONField; +import com.alibaba.fastjson2.annotation.JSONField; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-biz-push/src/main/java/org/dromara/visor/framework/biz/push/core/entity/WeComResponseBody.java b/orion-visor-framework/orion-visor-spring-boot-starter-biz-push/src/main/java/org/dromara/visor/framework/biz/push/core/entity/WeComResponseBody.java index 039b860d..8a735ba4 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-biz-push/src/main/java/org/dromara/visor/framework/biz/push/core/entity/WeComResponseBody.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-biz-push/src/main/java/org/dromara/visor/framework/biz/push/core/entity/WeComResponseBody.java @@ -22,7 +22,7 @@ */ package org.dromara.visor.framework.biz.push.core.entity; -import com.alibaba.fastjson.annotation.JSONField; +import com.alibaba.fastjson2.annotation.JSONField; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-biz-push/src/main/java/org/dromara/visor/framework/biz/push/core/enums/PushChannelEnum.java b/orion-visor-framework/orion-visor-spring-boot-starter-biz-push/src/main/java/org/dromara/visor/framework/biz/push/core/enums/PushChannelEnum.java index 7968994c..1a5ffb6f 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-biz-push/src/main/java/org/dromara/visor/framework/biz/push/core/enums/PushChannelEnum.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-biz-push/src/main/java/org/dromara/visor/framework/biz/push/core/enums/PushChannelEnum.java @@ -22,7 +22,7 @@ */ package org.dromara.visor.framework.biz.push.core.enums; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import lombok.AllArgsConstructor; import lombok.Getter; import org.dromara.visor.framework.biz.push.core.message.*; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-biz-push/src/main/java/org/dromara/visor/framework/biz/push/core/service/BasePushService.java b/orion-visor-framework/orion-visor-spring-boot-starter-biz-push/src/main/java/org/dromara/visor/framework/biz/push/core/service/BasePushService.java index e65c69c2..0204ae77 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-biz-push/src/main/java/org/dromara/visor/framework/biz/push/core/service/BasePushService.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-biz-push/src/main/java/org/dromara/visor/framework/biz/push/core/service/BasePushService.java @@ -24,7 +24,7 @@ package org.dromara.visor.framework.biz.push.core.service; import cn.orionsec.kit.lang.utils.Strings; import cn.orionsec.kit.lang.utils.collect.Lists; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.common.constant.Const; import org.dromara.visor.common.entity.PushUser; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-biz-push/src/main/java/org/dromara/visor/framework/biz/push/core/service/DingPushService.java b/orion-visor-framework/orion-visor-spring-boot-starter-biz-push/src/main/java/org/dromara/visor/framework/biz/push/core/service/DingPushService.java index 93aa021d..3906326f 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-biz-push/src/main/java/org/dromara/visor/framework/biz/push/core/service/DingPushService.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-biz-push/src/main/java/org/dromara/visor/framework/biz/push/core/service/DingPushService.java @@ -31,7 +31,7 @@ import cn.orionsec.kit.lang.utils.Strings; import cn.orionsec.kit.lang.utils.codec.Base64s; import cn.orionsec.kit.lang.utils.crypto.Signatures; import cn.orionsec.kit.lang.utils.math.Hex; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.common.constant.ErrorMessage; import org.dromara.visor.framework.biz.push.core.annotation.MessageChannel; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-biz-push/src/main/java/org/dromara/visor/framework/biz/push/core/service/FeiShuPushService.java b/orion-visor-framework/orion-visor-spring-boot-starter-biz-push/src/main/java/org/dromara/visor/framework/biz/push/core/service/FeiShuPushService.java index afb189c2..d0314faf 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-biz-push/src/main/java/org/dromara/visor/framework/biz/push/core/service/FeiShuPushService.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-biz-push/src/main/java/org/dromara/visor/framework/biz/push/core/service/FeiShuPushService.java @@ -30,7 +30,7 @@ import cn.orionsec.kit.lang.utils.Strings; import cn.orionsec.kit.lang.utils.codec.Base64s; import cn.orionsec.kit.lang.utils.crypto.Signatures; import cn.orionsec.kit.lang.utils.crypto.enums.SecretKeySpecMode; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.common.utils.Assert; import org.dromara.visor.framework.biz.push.core.annotation.MessageChannel; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-biz-push/src/main/java/org/dromara/visor/framework/biz/push/core/service/WeComPushService.java b/orion-visor-framework/orion-visor-spring-boot-starter-biz-push/src/main/java/org/dromara/visor/framework/biz/push/core/service/WeComPushService.java index 7f739c58..35a73708 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-biz-push/src/main/java/org/dromara/visor/framework/biz/push/core/service/WeComPushService.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-biz-push/src/main/java/org/dromara/visor/framework/biz/push/core/service/WeComPushService.java @@ -25,7 +25,7 @@ package org.dromara.visor.framework.biz.push.core.service; import cn.orionsec.kit.http.ok.OkRequests; import cn.orionsec.kit.http.ok.OkResponse; import cn.orionsec.kit.lang.constant.StandardContentType; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.common.utils.Assert; import org.dromara.visor.framework.biz.push.core.annotation.MessageChannel; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-desensitize/src/main/java/org/dromara/visor/framework/desensitize/core/filter/DesensitizeValueFilter.java b/orion-visor-framework/orion-visor-spring-boot-starter-desensitize/src/main/java/org/dromara/visor/framework/desensitize/core/filter/DesensitizeValueFilter.java index de32c264..774b868f 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-desensitize/src/main/java/org/dromara/visor/framework/desensitize/core/filter/DesensitizeValueFilter.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-desensitize/src/main/java/org/dromara/visor/framework/desensitize/core/filter/DesensitizeValueFilter.java @@ -28,8 +28,8 @@ import cn.orionsec.kit.lang.utils.Strings; import cn.orionsec.kit.lang.utils.collect.Maps; import cn.orionsec.kit.lang.utils.reflect.Annotations; import cn.orionsec.kit.lang.utils.reflect.Fields; -import com.alibaba.fastjson.annotation.JSONField; -import com.alibaba.fastjson.serializer.ValueFilter; +import com.alibaba.fastjson2.annotation.JSONField; +import com.alibaba.fastjson2.filter.ValueFilter; import org.dromara.visor.common.constant.Const; import org.dromara.visor.framework.desensitize.core.annotation.Desensitize; import org.dromara.visor.framework.desensitize.core.annotation.DesensitizeObject; @@ -53,7 +53,7 @@ public class DesensitizeValueFilter implements ValueFilter { private static final Map> DESENSITIZE_FIELDS = new HashMap<>(); @Override - public Object process(Object object, String name, Object value) { + public Object apply(Object object, String name, Object value) { if (object == null || value == null) { return value; } diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-executor/src/main/java/org/dromara/visor/framework/executor/core/context/ExecutorContext.java b/orion-visor-framework/orion-visor-spring-boot-starter-executor/src/main/java/org/dromara/visor/framework/executor/core/context/ExecutorContext.java index 43ee3df3..53d772a4 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-executor/src/main/java/org/dromara/visor/framework/executor/core/context/ExecutorContext.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-executor/src/main/java/org/dromara/visor/framework/executor/core/context/ExecutorContext.java @@ -24,7 +24,7 @@ package org.dromara.visor.framework.executor.core.context; import cn.orionsec.kit.lang.define.thread.RejectPolicy; import cn.orionsec.kit.lang.utils.Strings; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.common.thread.ThreadPoolMdcTaskExecutor; import org.dromara.visor.framework.executor.configuration.config.ExecutorConfig; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/org/dromara/visor/framework/log/core/interceptor/AbstractLogPrinterInterceptor.java b/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/org/dromara/visor/framework/log/core/interceptor/AbstractLogPrinterInterceptor.java index f0411deb..31dab641 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/org/dromara/visor/framework/log/core/interceptor/AbstractLogPrinterInterceptor.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/org/dromara/visor/framework/log/core/interceptor/AbstractLogPrinterInterceptor.java @@ -25,10 +25,10 @@ package org.dromara.visor.framework.log.core.interceptor; import cn.orionsec.kit.lang.utils.Strings; import cn.orionsec.kit.lang.utils.collect.Maps; import cn.orionsec.kit.lang.utils.reflect.Classes; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.serializer.SerializeFilter; -import com.alibaba.fastjson.serializer.ValueFilter; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONArray; +import com.alibaba.fastjson2.filter.Filter; +import com.alibaba.fastjson2.filter.ValueFilter; import org.aopalliance.intercept.MethodInvocation; import org.dromara.visor.common.json.FieldDesensitizeFilter; import org.dromara.visor.common.json.FieldIgnoreFilter; @@ -65,7 +65,7 @@ public abstract class AbstractLogPrinterInterceptor implements LogPrinterInterce /** * 字段过滤器 */ - protected SerializeFilter[] serializeFilters; + protected Filter[] serializeFilters; /** * 脱敏配置 @@ -91,7 +91,7 @@ public abstract class AbstractLogPrinterInterceptor implements LogPrinterInterce @Override public void init() { // 参数过滤器 - this.serializeFilters = new SerializeFilter[]{ + this.serializeFilters = new Filter[]{ // 忽略字段过滤器 new FieldIgnoreFilter(config.getField().getIgnore()), // 脱敏字段过滤器 diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/org/dromara/visor/framework/log/core/interceptor/RowLogPrinterInterceptor.java b/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/org/dromara/visor/framework/log/core/interceptor/RowLogPrinterInterceptor.java index 20d47322..16b567bf 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/org/dromara/visor/framework/log/core/interceptor/RowLogPrinterInterceptor.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/org/dromara/visor/framework/log/core/interceptor/RowLogPrinterInterceptor.java @@ -26,7 +26,7 @@ import cn.orionsec.kit.lang.utils.Exceptions; import cn.orionsec.kit.lang.utils.Strings; import cn.orionsec.kit.lang.utils.time.Dates; import cn.orionsec.kit.web.servlet.web.Servlets; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import lombok.extern.slf4j.Slf4j; import org.aopalliance.intercept.MethodInvocation; import org.dromara.visor.common.utils.IpUtils; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/generator/core/DictParser.java b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/generator/core/DictParser.java index 10f163e8..f3b8f6f9 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/generator/core/DictParser.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/generator/core/DictParser.java @@ -24,7 +24,7 @@ package org.dromara.visor.framework.mybatis.core.generator.core; import cn.orionsec.kit.lang.utils.Exceptions; import cn.orionsec.kit.lang.utils.Strings; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.baomidou.mybatisplus.generator.config.po.TableField; import com.baomidou.mybatisplus.generator.config.po.TableInfo; import org.dromara.visor.common.constant.Const; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/type/JSONArrayTypeHandler.java b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/type/JSONArrayTypeHandler.java index b9a975b9..aa224187 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/type/JSONArrayTypeHandler.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/type/JSONArrayTypeHandler.java @@ -22,8 +22,8 @@ */ package org.dromara.visor.framework.mybatis.core.type; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONArray; import org.apache.ibatis.type.JdbcType; import org.apache.ibatis.type.MappedJdbcTypes; import org.apache.ibatis.type.MappedTypes; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/type/JSONObjectTypeHandler.java b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/type/JSONObjectTypeHandler.java index b4fc6066..1cd86833 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/type/JSONObjectTypeHandler.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/type/JSONObjectTypeHandler.java @@ -22,8 +22,8 @@ */ package org.dromara.visor.framework.mybatis.core.type; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; import org.apache.ibatis.type.JdbcType; import org.apache.ibatis.type.MappedJdbcTypes; import org.apache.ibatis.type.MappedTypes; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-service-impl.java.vm b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-service-impl.java.vm index 2bec589f..df22dda3 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-service-impl.java.vm +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-service-impl.java.vm @@ -25,19 +25,19 @@ package ${package.ServiceImpl}; import cn.orionsec.kit.lang.define.wrapper.DataGrid; import cn.orionsec.kit.lang.utils.Strings; import cn.orionsec.kit.lang.utils.collect.Lists; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.common.constant.ErrorMessage; import org.dromara.visor.common.utils.Assert; -#if($meta.enableCache) -import org.dromara.visor.framework.redis.core.utils.RedisMaps; -import org.dromara.visor.framework.redis.core.utils.RedisUtils; -import org.dromara.visor.framework.redis.core.utils.barrier.CacheBarriers; -#end -#foreach($pkg in ${customModuleFilePackages}) -import ${pkg}.*; -#end + #if($meta.enableCache) + import org.dromara.visor.framework.redis.core.utils.RedisMaps; + import org.dromara.visor.framework.redis.core.utils.RedisUtils; + import org.dromara.visor.framework.redis.core.utils.barrier.CacheBarriers; + #end + #foreach($pkg in ${customModuleFilePackages}) + import ${pkg}.*; + #end import ${package.Entity}.${entity}; import ${package.Mapper}.${table.mapperName}; import ${package.Service}.${table.serviceName}; @@ -60,222 +60,222 @@ import java.util.stream.Collectors; @Service public class ${table.serviceImplName} implements ${table.serviceName} { - @Resource - private ${type}DAO ${typeLower}DAO; + @Resource + private ${type}DAO ${typeLower}DAO; - @Override - @Transactional(rollbackFor = Exception.class) - public Long create${type}(${type}CreateRequest request) { - log.info("${type}Service-create${type} request: {}", JSON.toJSONString(request)); - // 转换 - ${type}DO record = ${type}Convert.MAPPER.to(request); - // 查询数据是否冲突 - this.check${type}Present(record); - // 插入 - int effect = ${typeLower}DAO.insert(record); - Long id = record.getId(); - log.info("${type}Service-create${type} id: {}, effect: {}", id, effect); - #if($meta.enableCache) - // 删除缓存 - RedisUtils.delete(${type}CacheKeyDefine.${typeConst}); - #end - return id; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public Integer update${type}ById(${type}UpdateRequest request) { - Long id = Assert.notNull(request.getId(), ErrorMessage.ID_MISSING); - log.info("${type}Service-update${type}ById id: {}, request: {}", id, JSON.toJSONString(request)); - // 查询 - ${type}DO record = ${typeLower}DAO.selectById(id); - Assert.notNull(record, ErrorMessage.DATA_ABSENT); - // 转换 - ${type}DO updateRecord = ${type}Convert.MAPPER.to(request); - // 查询数据是否冲突 - this.check${type}Present(updateRecord); - // 更新 - int effect = ${typeLower}DAO.updateById(updateRecord); - log.info("${type}Service-update${type}ById effect: {}", effect); - #if($meta.enableCache) - // 删除缓存 - RedisUtils.delete(${type}CacheKeyDefine.${typeConst}); - #end - return effect; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public Integer update${type}(${type}QueryRequest query, ${type}UpdateRequest update) { - log.info("${type}Service.update${type} query: {}, update: {}", JSON.toJSONString(query), JSON.toJSONString(update)); - // 条件 - LambdaQueryWrapper<${type}DO> wrapper = this.buildQueryWrapper(query); - // 转换 - ${type}DO updateRecord = ${type}Convert.MAPPER.to(update); - // 更新 - int effect = ${typeLower}DAO.update(updateRecord, wrapper); - log.info("${type}Service.update${type} effect: {}", effect); - #if($meta.enableCache) - // 删除缓存 - RedisUtils.delete(${type}CacheKeyDefine.${typeConst}); - #end - return effect; - } - - @Override - public ${type}VO get${type}ById(Long id) { - // 查询 - ${type}DO record = ${typeLower}DAO.selectById(id); - Assert.notNull(record, ErrorMessage.DATA_ABSENT); - // 转换 - return ${type}Convert.MAPPER.to(record); - } - - @Override - public List<${type}VO> get${type}ByIdList(List idList) { - // 查询 - List<${type}DO> records = ${typeLower}DAO.selectBatchIds(idList); - if (records.isEmpty()) { - return Lists.empty(); + @Override + @Transactional(rollbackFor = Exception.class) + public Long create${type}(${type}CreateRequest request) { + log.info("${type}Service-create${type} request: {}", JSON.toJSONString(request)); + // 转换 + ${type}DO record = ${type}Convert.MAPPER.to(request); + // 查询数据是否冲突 + this.check${type}Present(record); + // 插入 + int effect = ${typeLower}DAO.insert(record); + Long id = record.getId(); + log.info("${type}Service-create${type} id: {}, effect: {}", id, effect); + #if($meta.enableCache) + // 删除缓存 + RedisUtils.delete(${type}CacheKeyDefine.${typeConst}); + #end + return id; } - // 转换 - return ${type}Convert.MAPPER.to(records); - } - @Override - public List<${type}VO> get${type}List(${type}QueryRequest request) { - // 条件 - LambdaQueryWrapper<${type}DO> wrapper = this.buildQueryWrapper(request); - // 查询 - return ${typeLower}DAO.of(wrapper) - .order(request, ${type}DO::getId) - .list(${type}Convert.MAPPER::to); - } + @Override + @Transactional(rollbackFor = Exception.class) + public Integer update${type}ById(${type}UpdateRequest request) { + Long id = Assert.notNull(request.getId(), ErrorMessage.ID_MISSING); + log.info("${type}Service-update${type}ById id: {}, request: {}", id, JSON.toJSONString(request)); + // 查询 + ${type}DO record = ${typeLower}DAO.selectById(id); + Assert.notNull(record, ErrorMessage.DATA_ABSENT); + // 转换 + ${type}DO updateRecord = ${type}Convert.MAPPER.to(request); + // 查询数据是否冲突 + this.check${type}Present(updateRecord); + // 更新 + int effect = ${typeLower}DAO.updateById(updateRecord); + log.info("${type}Service-update${type}ById effect: {}", effect); + #if($meta.enableCache) + // 删除缓存 + RedisUtils.delete(${type}CacheKeyDefine.${typeConst}); + #end + return effect; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Integer update${type}(${type}QueryRequest query, ${type}UpdateRequest update) { + log.info("${type}Service.update${type} query: {}, update: {}", JSON.toJSONString(query), JSON.toJSONString(update)); + // 条件 + LambdaQueryWrapper<${type}DO> wrapper = this.buildQueryWrapper(query); + // 转换 + ${type}DO updateRecord = ${type}Convert.MAPPER.to(update); + // 更新 + int effect = ${typeLower}DAO.update(updateRecord, wrapper); + log.info("${type}Service.update${type} effect: {}", effect); + #if($meta.enableCache) + // 删除缓存 + RedisUtils.delete(${type}CacheKeyDefine.${typeConst}); + #end + return effect; + } + + @Override + public ${type}VO get${type}ById(Long id) { + // 查询 + ${type}DO record = ${typeLower}DAO.selectById(id); + Assert.notNull(record, ErrorMessage.DATA_ABSENT); + // 转换 + return ${type}Convert.MAPPER.to(record); + } + + @Override + public List<${type}VO> get${type}ByIdList(List idList) { + // 查询 + List<${type}DO> records = ${typeLower}DAO.selectBatchIds(idList); + if (records.isEmpty()) { + return Lists.empty(); + } + // 转换 + return ${type}Convert.MAPPER.to(records); + } + + @Override + public List<${type}VO> get${type}List(${type}QueryRequest request) { + // 条件 + LambdaQueryWrapper<${type}DO> wrapper = this.buildQueryWrapper(request); + // 查询 + return ${typeLower}DAO.of(wrapper) + .order(request, ${type}DO::getId) + .list(${type}Convert.MAPPER::to); + } #if($meta.enableCache) - @Override - public List<${type}VO> get${type}ListByCache() { - // 查询缓存 - List<${type}CacheDTO> list = RedisMaps.valuesJson(${type}CacheKeyDefine.${typeConst}); - if (list.isEmpty()) { - // 查询数据库 - list = ${typeLower}DAO.of().list(${type}Convert.MAPPER::toCache); - // 设置屏障 防止穿透 - CacheBarriers.checkBarrier(list, ${type}CacheDTO::new); - // 设置缓存 - RedisMaps.putAllJson(${type}CacheKeyDefine.${typeConst}, s -> s.getId().toString(), list); - } - // 删除屏障 - CacheBarriers.removeBarrier(list); - // 转换 - return list.stream() - .map(${type}Convert.MAPPER::to) - .sorted(Comparator.comparing(${type}VO::getId).reversed()) - .collect(Collectors.toList()); - } + @Override + public List<${type}VO> get${type}ListByCache() { + // 查询缓存 + List<${type}CacheDTO> list = RedisMaps.valuesJson(${type}CacheKeyDefine.${typeConst}); + if (list.isEmpty()) { + // 查询数据库 + list = ${typeLower}DAO.of().list(${type}Convert.MAPPER::toCache); + // 设置屏障 防止穿透 + CacheBarriers.checkBarrier(list, ${type}CacheDTO::new); + // 设置缓存 + RedisMaps.putAllJson(${type}CacheKeyDefine.${typeConst}, s -> s.getId().toString(), list); + } + // 删除屏障 + CacheBarriers.removeBarrier(list); + // 转换 + return list.stream() + .map(${type}Convert.MAPPER::to) + .sorted(Comparator.comparing(${type}VO::getId).reversed()) + .collect(Collectors.toList()); + } #end - @Override - public DataGrid<${type}VO> get${type}Page(${type}QueryRequest request) { - // 条件 - LambdaQueryWrapper<${type}DO> wrapper = this.buildQueryWrapper(request); - // 查询 - return ${typeLower}DAO.of() - .wrapper(wrapper) - .page(request) - .order(request, ${type}DO::getId) - .dataGrid(${type}Convert.MAPPER::to); - } + @Override + public DataGrid<${type}VO> get${type}Page(${type}QueryRequest request) { + // 条件 + LambdaQueryWrapper<${type}DO> wrapper = this.buildQueryWrapper(request); + // 查询 + return ${typeLower}DAO.of() + .wrapper(wrapper) + .page(request) + .order(request, ${type}DO::getId) + .dataGrid(${type}Convert.MAPPER::to); + } - @Override - public Long get${type}Count(${type}QueryRequest request) { - // 条件 - LambdaQueryWrapper<${type}DO> wrapper = this.buildQueryWrapper(request); - // 查询 - return ${typeLower}DAO.of() - .wrapper(wrapper) - .countMax(request.getLimit()); - } + @Override + public Long get${type}Count(${type}QueryRequest request) { + // 条件 + LambdaQueryWrapper<${type}DO> wrapper = this.buildQueryWrapper(request); + // 查询 + return ${typeLower}DAO.of() + .wrapper(wrapper) + .countMax(request.getLimit()); + } - @Override - @Transactional(rollbackFor = Exception.class) - public Integer delete${type}ById(Long id) { - log.info("${type}Service-delete${type}ById id: {}", id); - // 检查数据是否存在 - ${type}DO record = ${typeLower}DAO.selectById(id); - Assert.notNull(record, ErrorMessage.DATA_ABSENT); - // 删除 - int effect = ${typeLower}DAO.deleteById(id); - log.info("${type}Service-delete${type}ById id: {}, effect: {}", id, effect); - #if($meta.enableCache) - // 删除缓存 - RedisMaps.delete(${type}CacheKeyDefine.${typeConst}, id); - #end - return effect; - } + @Override + @Transactional(rollbackFor = Exception.class) + public Integer delete${type}ById(Long id) { + log.info("${type}Service-delete${type}ById id: {}", id); + // 检查数据是否存在 + ${type}DO record = ${typeLower}DAO.selectById(id); + Assert.notNull(record, ErrorMessage.DATA_ABSENT); + // 删除 + int effect = ${typeLower}DAO.deleteById(id); + log.info("${type}Service-delete${type}ById id: {}, effect: {}", id, effect); + #if($meta.enableCache) + // 删除缓存 + RedisMaps.delete(${type}CacheKeyDefine.${typeConst}, id); + #end + return effect; + } - @Override - @Transactional(rollbackFor = Exception.class) - public Integer delete${type}ByIdList(List idList) { - log.info("${type}Service-delete${type}ByIdList idList: {}", idList); - int effect = ${typeLower}DAO.deleteBatchIds(idList); - log.info("${type}Service-delete${type}ByIdList effect: {}", effect); - #if($meta.enableCache) - // 删除缓存 - RedisMaps.delete(${type}CacheKeyDefine.${typeConst}, idList); - #end - return effect; - } + @Override + @Transactional(rollbackFor = Exception.class) + public Integer delete${type}ByIdList(List idList) { + log.info("${type}Service-delete${type}ByIdList idList: {}", idList); + int effect = ${typeLower}DAO.deleteBatchIds(idList); + log.info("${type}Service-delete${type}ByIdList effect: {}", effect); + #if($meta.enableCache) + // 删除缓存 + RedisMaps.delete(${type}CacheKeyDefine.${typeConst}, idList); + #end + return effect; + } - @Override - @Transactional(rollbackFor = Exception.class) - public Integer delete${type}(${type}QueryRequest request) { - log.info("${type}Service.delete${type} request: {}", JSON.toJSONString(request)); - // 条件 - LambdaQueryWrapper<${type}DO> wrapper = this.buildQueryWrapper(request); - // 删除 - int effect = ${typeLower}DAO.delete(wrapper); - log.info("${type}Service.delete${type} effect: {}", effect); - #if($meta.enableCache) - // 删除缓存 - RedisUtils.delete(${type}CacheKeyDefine.${typeConst}); - #end - return effect; - } + @Override + @Transactional(rollbackFor = Exception.class) + public Integer delete${type}(${type}QueryRequest request) { + log.info("${type}Service.delete${type} request: {}", JSON.toJSONString(request)); + // 条件 + LambdaQueryWrapper<${type}DO> wrapper = this.buildQueryWrapper(request); + // 删除 + int effect = ${typeLower}DAO.delete(wrapper); + log.info("${type}Service.delete${type} effect: {}", effect); + #if($meta.enableCache) + // 删除缓存 + RedisUtils.delete(${type}CacheKeyDefine.${typeConst}); + #end + return effect; + } - /** - * 检查对象是否存在 - * - * @param domain domain - */ - private void check${type}Present(${type}DO domain) { - // 构造条件 - LambdaQueryWrapper<${type}DO> wrapper = ${typeLower}DAO.wrapper() + /** + * 检查对象是否存在 + * + * @param domain domain + */ + private void check${type}Present(${type}DO domain) { + // 构造条件 + LambdaQueryWrapper<${type}DO> wrapper = ${typeLower}DAO.wrapper() // 更新时忽略当前记录 .ne(${type}DO::getId, domain.getId()) // 用其他字段做重复校验 - #foreach($field in ${table.fields}) + #foreach($field in ${table.fields}) #if("$!field.propertyName" != "id") - .eq(${type}DO::get${field.capitalName}, domain.get${field.capitalName}())#if(!$foreach.hasNext);#end + .eq(${type}DO::get${field.capitalName}, domain.get${field.capitalName}())#if(!$foreach.hasNext);#end #end - #end - // 检查是否存在 - boolean present = ${typeLower}DAO.of(wrapper).present(); - Assert.isFalse(present, ErrorMessage.DATA_PRESENT); - } + #end + // 检查是否存在 + boolean present = ${typeLower}DAO.of(wrapper).present(); + Assert.isFalse(present, ErrorMessage.DATA_PRESENT); + } - @Override - public LambdaQueryWrapper<${type}DO> buildQueryWrapper(${type}QueryRequest request) { - String searchValue = request.getSearchValue(); - return ${typeLower}DAO.wrapper() + @Override + public LambdaQueryWrapper<${type}DO> buildQueryWrapper(${type}QueryRequest request) { + String searchValue = request.getSearchValue(); + return ${typeLower}DAO.wrapper() #foreach($field in ${table.fields}) - .eq(${type}DO::get${field.capitalName}, request.get${field.capitalName}()) - #end - .and(Strings.isNotEmpty(searchValue), c -> c - #foreach($field in ${table.fields}) - .eq(${type}DO::get${field.capitalName}, searchValue)#if($foreach.hasNext).or()#end + .eq(${type}DO::get${field.capitalName}, request.get${field.capitalName}()) #end - ); - } + .and(Strings.isNotEmpty(searchValue), c -> c + #foreach($field in ${table.fields}) + .eq(${type}DO::get${field.capitalName}, searchValue)#if($foreach.hasNext).or()#end + #end + ); + } } diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-provider-api-impl.java.vm b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-provider-api-impl.java.vm index dd456cc5..8be2c969 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-provider-api-impl.java.vm +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-provider-api-impl.java.vm @@ -23,17 +23,17 @@ package ${currentPackage}; import cn.orionsec.kit.lang.utils.collect.Lists; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.common.constant.ErrorMessage; import org.dromara.visor.common.utils.Assert; -#foreach($pkg in ${customModuleFilePackages}) -import ${pkg}.*; -#end -#foreach($pkg in ${customProviderFilePackages}) -import ${pkg}.*; -#end + #foreach($pkg in ${customModuleFilePackages}) + import ${pkg}.*; + #end + #foreach($pkg in ${customProviderFilePackages}) + import ${pkg}.*; + #end import ${package.Entity}.${entity}; import ${package.Mapper}.${table.mapperName}; import ${package.Service}.${table.serviceName}; @@ -66,7 +66,7 @@ public class ${type}ApiImpl implements ${type}Api { log.info("${type}Api.create${type} dto: {}", JSON.toJSONString(dto)); Assert.valid(dto); // 转换 - ${type}CreateRequest request = ${type}ProviderConvert.MAPPER.toRequest(dto); + ${type}CreateRequest request = ${type}ProviderConvert.MAPPER.toRequest(dto); // 创建 return ${typeLower}Service.create${type}(request); } @@ -76,7 +76,7 @@ public class ${type}ApiImpl implements ${type}Api { log.info("${type}Api.update${type}ById dto: {}", JSON.toJSONString(dto)); Assert.valid(dto); // 转换 - ${type}UpdateRequest request = ${type}ProviderConvert.MAPPER.toRequest(dto); + ${type}UpdateRequest request = ${type}ProviderConvert.MAPPER.toRequest(dto); // 修改 return ${typeLower}Service.update${type}ById(request); } @@ -88,7 +88,7 @@ public class ${type}ApiImpl implements ${type}Api { Assert.valid(update); // 更新 int effect = ${typeLower}Service.update${type}(${type}ProviderConvert.MAPPER.toRequest(query), - ${type}ProviderConvert.MAPPER.toRequest(update)); + ${type}ProviderConvert.MAPPER.toRequest(update)); log.info("${type}Api.update${type} effect: {}", effect); return effect; } @@ -98,7 +98,7 @@ public class ${type}ApiImpl implements ${type}Api { log.info("${type}Api.get${type}ById id: {}", id); Assert.notNull(id, ErrorMessage.ID_MISSING); // 修改 - ${type}DO record = ${typeLower}DAO.selectById(id); + ${type}DO record = ${typeLower}DAO.selectById(id); if (record == null) { return null; } @@ -129,14 +129,14 @@ public class ${type}ApiImpl implements ${type}Api { } #if($meta.enableCache) - @Override - public List<${type}DTO> get${type}ListByCache() { - return ${typeLower}Service.get${type}ListByCache() - .stream() - .map(${type}ProviderConvert.MAPPER::to) - .sorted(Comparator.comparing(${type}DTO::getId)) - .collect(Collectors.toList()); - } + @Override + public List<${type}DTO> get${type}ListByCache() { + return ${typeLower}Service.get${type}ListByCache() + .stream() + .map(${type}ProviderConvert.MAPPER::to) + .sorted(Comparator.comparing(${type}DTO::getId)) + .collect(Collectors.toList()); + } #end @Override @@ -186,7 +186,7 @@ public class ${type}ApiImpl implements ${type}Api { * @return wrapper */ private LambdaQueryWrapper<${type}DO> buildQueryWrapper(${type}QueryDTO dto) { - return ${typeLower}DAO.wrapper() + return ${typeLower}DAO.wrapper() #foreach($field in ${table.fields}) .eq(${type}DO::get${field.capitalName}, dto.get${field.capitalName}())#if(!$foreach.hasNext);#end #end diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/core/utils/RedisLists.java b/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/core/utils/RedisLists.java index 7ec5ab11..48432d0d 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/core/utils/RedisLists.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/core/utils/RedisLists.java @@ -24,7 +24,7 @@ package org.dromara.visor.framework.redis.core.utils; import cn.orionsec.kit.lang.define.cache.key.CacheKeyDefine; import cn.orionsec.kit.lang.utils.collect.Lists; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import org.dromara.visor.common.constant.Const; import java.util.List; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/core/utils/RedisMaps.java b/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/core/utils/RedisMaps.java index d3c9f58d..bd3990c9 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/core/utils/RedisMaps.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/core/utils/RedisMaps.java @@ -27,7 +27,7 @@ import cn.orionsec.kit.lang.function.Functions; import cn.orionsec.kit.lang.utils.Objects1; import cn.orionsec.kit.lang.utils.collect.Lists; import cn.orionsec.kit.lang.utils.collect.Maps; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import org.springframework.data.redis.core.HashOperations; import java.util.List; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/core/utils/RedisStrings.java b/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/core/utils/RedisStrings.java index ff090bb0..8d0b2142 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/core/utils/RedisStrings.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/core/utils/RedisStrings.java @@ -24,9 +24,9 @@ package org.dromara.visor.framework.redis.core.utils; import cn.orionsec.kit.lang.define.cache.key.CacheKeyDefine; import cn.orionsec.kit.lang.utils.Strings; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONArray; +import com.alibaba.fastjson2.JSONObject; import java.util.ArrayList; import java.util.Collection; diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-websocket/src/main/java/org/dromara/visor/framework/websocket/core/utils/WebSockets.java b/orion-visor-framework/orion-visor-spring-boot-starter-websocket/src/main/java/org/dromara/visor/framework/websocket/core/utils/WebSockets.java index ef05e23a..c758bb88 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-websocket/src/main/java/org/dromara/visor/framework/websocket/core/utils/WebSockets.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-websocket/src/main/java/org/dromara/visor/framework/websocket/core/utils/WebSockets.java @@ -26,7 +26,7 @@ import cn.orionsec.kit.lang.constant.StandardHttpHeader; import cn.orionsec.kit.lang.utils.Exceptions; import cn.orionsec.kit.lang.utils.Threads; import cn.orionsec.kit.lang.utils.io.Streams; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.common.constant.Const; import org.dromara.visor.framework.websocket.core.constant.CloseCode; diff --git a/orion-visor-launch/src/test/java/org/dromara/visor/launch/ReplaceFastjson.java b/orion-visor-launch/src/test/java/org/dromara/visor/launch/ReplaceFastjson.java new file mode 100644 index 00000000..df1e6284 --- /dev/null +++ b/orion-visor-launch/src/test/java/org/dromara/visor/launch/ReplaceFastjson.java @@ -0,0 +1,67 @@ +package org.dromara.visor.launch; + +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.File; +import java.nio.charset.StandardCharsets; +import java.util.List; + +/** + * 替换 fastjson 版本 + * + * @author Jiahang Li + * @version 1.0.0 + * @since 2024/12/23 10:21 + */ +public class ReplaceFastjson { + + private static final String PATH = new File("").getAbsolutePath(); + + public static void main(String[] args) { + StopWatch sw = StopWatch.begin(); + // 扫描文件 + List files = Files1.listFilesFilter(PATH, file -> file.isFile() + && (file.getName().endsWith(".java") || file.getName().endsWith(".java.vm")) + && !file.getAbsolutePath().contains("generated-sources") + && !file.getAbsolutePath().contains("node_modules"), true, false); + sw.tag(" list"); + // 添加头 + files.forEach(ReplaceFastjson::replaceFastjson2ToFile); + sw.tag("replace"); + sw.stop(); + System.out.println(); + System.out.println(sw); + } + + /** + * 替换 license + * + * @param file file + */ + private static void replaceFastjson2ToFile(File file) { + String path = file.getAbsolutePath().substring(PATH.length()); + if (path.contains("ReplaceFastjson")) { + return; + } + try { + String line = FileReaders.readLine(file); + if (line == null) { + return; + } + // 替换文件内容 + byte[] bytes = new String(FileReaders.readAllBytesFast(file)) + .replaceAll("com.alibaba.fastjson\\.", "com.alibaba.fastjson2.") + .replaceAll("com.alibaba.fastjson2.JSONPath", "com.alibaba.fastjson.JSONPath") + .getBytes(StandardCharsets.UTF_8); + // 写入 + FileWriters.writeFast(file, bytes); + System.out.println("OK " + path); + } catch (Exception e) { + System.err.println("Failed " + path); + } + } + +} diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-provider/src/main/java/org/dromara/visor/module/asset/enums/HostTypeEnum.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-provider/src/main/java/org/dromara/visor/module/asset/enums/HostTypeEnum.java index 09765a0e..bc2a76cf 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-provider/src/main/java/org/dromara/visor/module/asset/enums/HostTypeEnum.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-provider/src/main/java/org/dromara/visor/module/asset/enums/HostTypeEnum.java @@ -22,7 +22,7 @@ */ package org.dromara.visor.module.asset.enums; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import lombok.AllArgsConstructor; import org.dromara.visor.common.constant.Const; import org.dromara.visor.module.asset.entity.dto.host.HostRdpConfigDTO; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/HostAgentEndpointController.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/HostAgentEndpointController.java index 14beda8d..f4bd2cec 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/HostAgentEndpointController.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/HostAgentEndpointController.java @@ -22,7 +22,7 @@ */ package org.dromara.visor.module.asset.controller; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/HostExtraService.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/HostExtraService.java index 5a167bf3..9ff60639 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/HostExtraService.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/HostExtraService.java @@ -22,7 +22,7 @@ */ package org.dromara.visor.module.asset.service; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import org.dromara.visor.common.handler.data.model.GenericsDataModel; import org.dromara.visor.module.asset.entity.request.host.HostExtraUpdateRequest; import org.dromara.visor.module.asset.handler.host.extra.HostExtraItemEnum; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostConfigServiceImpl.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostConfigServiceImpl.java index 92256b0e..440bbeb0 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostConfigServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostConfigServiceImpl.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.asset.service.impl; import cn.orionsec.kit.lang.function.Functions; import cn.orionsec.kit.lang.utils.Strings; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.common.constant.ErrorMessage; import org.dromara.visor.common.constant.ExtraFieldConst; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostExtraServiceImpl.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostExtraServiceImpl.java index 491fa256..65656ed6 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostExtraServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostExtraServiceImpl.java @@ -26,8 +26,8 @@ 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 com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.common.constant.Const; import org.dromara.visor.common.constant.ErrorMessage; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostIdentityServiceImpl.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostIdentityServiceImpl.java index f86e9647..4a271159 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostIdentityServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostIdentityServiceImpl.java @@ -25,7 +25,7 @@ package org.dromara.visor.module.asset.service.impl; import cn.orionsec.kit.lang.define.wrapper.DataGrid; import cn.orionsec.kit.lang.utils.Strings; import cn.orionsec.kit.lang.utils.collect.Lists; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostKeyServiceImpl.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostKeyServiceImpl.java index d2ad3393..f8e503f9 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostKeyServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostKeyServiceImpl.java @@ -25,7 +25,7 @@ package org.dromara.visor.module.asset.service.impl; import cn.orionsec.kit.lang.define.wrapper.DataGrid; import cn.orionsec.kit.lang.utils.Strings; import cn.orionsec.kit.lang.utils.collect.Lists; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.common.constant.Const; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostServiceImpl.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostServiceImpl.java index 505c1fab..f7f4833d 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/HostServiceImpl.java @@ -28,7 +28,7 @@ import cn.orionsec.kit.lang.utils.Booleans; import cn.orionsec.kit.lang.utils.Strings; import cn.orionsec.kit.lang.utils.collect.Lists; import cn.orionsec.kit.spring.SpringHolder; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/test/java/org/dromara/visor/module/asset/meta/TerminalThemeGenerator.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/test/java/org/dromara/visor/module/asset/meta/TerminalThemeGenerator.java index e03318ec..37d62a6e 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/test/java/org/dromara/visor/module/asset/meta/TerminalThemeGenerator.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/test/java/org/dromara/visor/module/asset/meta/TerminalThemeGenerator.java @@ -22,14 +22,14 @@ */ package org.dromara.visor.module.asset.meta; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.alibaba.fastjson.annotation.JSONField; -import com.alibaba.fastjson.serializer.ValueFilter; import cn.orionsec.kit.lang.utils.Colors; import cn.orionsec.kit.lang.utils.collect.Lists; import cn.orionsec.kit.lang.utils.io.FileReaders; import cn.orionsec.kit.lang.utils.io.Files1; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; +import com.alibaba.fastjson2.annotation.JSONField; +import com.alibaba.fastjson2.filter.ValueFilter; import lombok.Data; import java.io.File; diff --git a/orion-visor-modules/orion-visor-module-common/src/main/java/org/dromara/visor/module/common/utils/SftpUtils.java b/orion-visor-modules/orion-visor-module-common/src/main/java/org/dromara/visor/module/common/utils/SftpUtils.java index 6dda7b46..939aeaa3 100644 --- a/orion-visor-modules/orion-visor-module-common/src/main/java/org/dromara/visor/module/common/utils/SftpUtils.java +++ b/orion-visor-modules/orion-visor-module-common/src/main/java/org/dromara/visor/module/common/utils/SftpUtils.java @@ -27,7 +27,7 @@ import cn.orionsec.kit.lang.utils.Strings; import cn.orionsec.kit.net.host.sftp.SftpExecutor; import cn.orionsec.kit.net.host.sftp.SftpFile; import cn.orionsec.kit.spring.SpringHolder; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import org.dromara.visor.module.common.config.AppSftpConfig; import org.dromara.visor.module.common.entity.dto.SftpFileBackupDTO; diff --git a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/handler/exec/command/handler/BaseExecCommandHandler.java b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/handler/exec/command/handler/BaseExecCommandHandler.java index 04effaac..9b37227a 100644 --- a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/handler/exec/command/handler/BaseExecCommandHandler.java +++ b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/handler/exec/command/handler/BaseExecCommandHandler.java @@ -37,7 +37,7 @@ import cn.orionsec.kit.net.host.SessionStore; import cn.orionsec.kit.net.host.sftp.SftpExecutor; import cn.orionsec.kit.net.host.ssh.command.CommandExecutor; import cn.orionsec.kit.spring.SpringHolder; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import lombok.Getter; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.common.constant.ErrorMessage; diff --git a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/handler/exec/log/tracker/ExecLogTracker.java b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/handler/exec/log/tracker/ExecLogTracker.java index dde69604..280d374e 100644 --- a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/handler/exec/log/tracker/ExecLogTracker.java +++ b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/handler/exec/log/tracker/ExecLogTracker.java @@ -32,8 +32,8 @@ import cn.orionsec.kit.lang.utils.io.FileReaders; import cn.orionsec.kit.lang.utils.io.Files1; import cn.orionsec.kit.lang.utils.io.Streams; import cn.orionsec.kit.spring.SpringHolder; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; import lombok.Getter; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.common.constant.Const; diff --git a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/ExecCommandServiceImpl.java b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/ExecCommandServiceImpl.java index b1ccf14f..dc4f993c 100644 --- a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/ExecCommandServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/ExecCommandServiceImpl.java @@ -25,7 +25,7 @@ package org.dromara.visor.module.exec.service.impl; import cn.orionsec.kit.lang.utils.Strings; import cn.orionsec.kit.lang.utils.collect.Lists; import cn.orionsec.kit.spring.SpringHolder; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.common.constant.Const; import org.dromara.visor.common.constant.ErrorMessage; diff --git a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/ExecJobServiceImpl.java b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/ExecJobServiceImpl.java index cba640e8..f13eddd1 100644 --- a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/ExecJobServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/ExecJobServiceImpl.java @@ -28,7 +28,7 @@ import cn.orionsec.kit.lang.utils.Strings; import cn.orionsec.kit.lang.utils.collect.Lists; import cn.orionsec.kit.lang.utils.time.cron.Cron; import cn.orionsec.kit.spring.SpringHolder; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.common.constant.Const; diff --git a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/ExecLogServiceImpl.java b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/ExecLogServiceImpl.java index b1a1cd7d..83a73727 100644 --- a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/ExecLogServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/ExecLogServiceImpl.java @@ -32,7 +32,7 @@ import cn.orionsec.kit.lang.utils.io.Files1; import cn.orionsec.kit.lang.utils.io.Streams; import cn.orionsec.kit.spring.SpringHolder; import cn.orionsec.kit.web.servlet.web.Servlets; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.common.constant.Const; diff --git a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/ExecTemplateServiceImpl.java b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/ExecTemplateServiceImpl.java index 41a834df..cb39886a 100644 --- a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/ExecTemplateServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/ExecTemplateServiceImpl.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.exec.service.impl; import cn.orionsec.kit.lang.define.wrapper.DataGrid; import cn.orionsec.kit.lang.utils.collect.Lists; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.common.constant.Const; diff --git a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/UploadTaskServiceImpl.java b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/UploadTaskServiceImpl.java index f5098ce5..3ff0938c 100644 --- a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/UploadTaskServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/UploadTaskServiceImpl.java @@ -29,7 +29,7 @@ import cn.orionsec.kit.lang.utils.collect.Lists; import cn.orionsec.kit.lang.utils.collect.Maps; import cn.orionsec.kit.lang.utils.io.Files1; import cn.orionsec.kit.lang.utils.time.Dates; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.common.constant.Const; diff --git a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/utils/ExecUtils.java b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/utils/ExecUtils.java index ae5a21c3..415a8360 100644 --- a/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/utils/ExecUtils.java +++ b/orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/utils/ExecUtils.java @@ -29,7 +29,7 @@ import cn.orionsec.kit.lang.utils.collect.Maps; import cn.orionsec.kit.lang.utils.json.matcher.NoMatchStrategy; import cn.orionsec.kit.lang.utils.json.matcher.ReplacementFormatter; import cn.orionsec.kit.lang.utils.json.matcher.ReplacementFormatters; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import org.dromara.visor.common.constant.Const; import org.dromara.visor.module.exec.entity.dto.ExecParameterSchemaDTO; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/DictValueApi.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/DictValueApi.java index 3c3d3c70..b0266439 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/DictValueApi.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-provider/src/main/java/org/dromara/visor/module/infra/api/DictValueApi.java @@ -22,7 +22,7 @@ */ package org.dromara.visor.module.infra.api; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import java.util.List; import java.util.Map; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DictValueApiImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DictValueApiImpl.java index 744a4d5e..2de05919 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DictValueApiImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/DictValueApiImpl.java @@ -22,7 +22,7 @@ */ package org.dromara.visor.module.infra.api.impl; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.module.infra.api.DictValueApi; import org.dromara.visor.module.infra.service.DictValueService; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/HistoryValueApiImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/HistoryValueApiImpl.java index f1780782..f4bd4c68 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/HistoryValueApiImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/api/impl/HistoryValueApiImpl.java @@ -22,7 +22,7 @@ */ package org.dromara.visor.module.infra.api.impl; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.common.constant.ErrorMessage; import org.dromara.visor.common.utils.Assert; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/DictValueController.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/DictValueController.java index df192acc..0367cb7b 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/DictValueController.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/controller/DictValueController.java @@ -23,7 +23,7 @@ package org.dromara.visor.module.infra.controller; import cn.orionsec.kit.lang.define.wrapper.DataGrid; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/DictCacheKeyDefine.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/DictCacheKeyDefine.java index c569acb6..cca973a7 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/DictCacheKeyDefine.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/DictCacheKeyDefine.java @@ -25,7 +25,7 @@ package org.dromara.visor.module.infra.define.cache; import cn.orionsec.kit.lang.define.cache.key.CacheKeyBuilder; import cn.orionsec.kit.lang.define.cache.key.CacheKeyDefine; import cn.orionsec.kit.lang.define.cache.key.struct.RedisCacheStruct; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import org.dromara.visor.module.infra.entity.dto.DictKeyCacheDTO; import java.util.concurrent.TimeUnit; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/preference/model/TerminalPreferenceModel.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/preference/model/TerminalPreferenceModel.java index 0b4c7104..6dc03561 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/preference/model/TerminalPreferenceModel.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/preference/model/TerminalPreferenceModel.java @@ -23,7 +23,7 @@ package org.dromara.visor.module.infra.handler.preference.model; import cn.orionsec.kit.lang.able.IJsonObject; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/preference/strategy/TerminalPreferenceStrategy.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/preference/strategy/TerminalPreferenceStrategy.java index d09856f3..b3e0e761 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/preference/strategy/TerminalPreferenceStrategy.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/preference/strategy/TerminalPreferenceStrategy.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.infra.handler.preference.strategy; import cn.orionsec.kit.lang.utils.collect.Lists; import cn.orionsec.kit.net.host.ssh.TerminalType; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import org.dromara.visor.common.handler.data.strategy.AbstractGenericsDataStrategy; import org.dromara.visor.module.infra.handler.preference.model.TerminalPreferenceModel; import org.springframework.stereotype.Component; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/upload/FileUploadMessageDispatcher.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/upload/FileUploadMessageDispatcher.java index ccb09581..6eb2d11e 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/upload/FileUploadMessageDispatcher.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/upload/FileUploadMessageDispatcher.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.infra.handler.upload; import cn.orionsec.kit.lang.annotation.Keep; import cn.orionsec.kit.lang.utils.io.Streams; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.common.constant.ExtraFieldConst; import org.dromara.visor.common.file.FileClient; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/upload/handler/FileUploadHandler.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/upload/handler/FileUploadHandler.java index 7d9182b9..e5714218 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/upload/handler/FileUploadHandler.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/upload/handler/FileUploadHandler.java @@ -23,7 +23,7 @@ package org.dromara.visor.module.infra.handler.upload.handler; import cn.orionsec.kit.lang.utils.io.Streams; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import org.dromara.visor.common.constant.Const; import org.dromara.visor.common.file.FileClient; import org.dromara.visor.framework.websocket.core.utils.WebSockets; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/DictValueService.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/DictValueService.java index 537a5c5e..551e3e59 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/DictValueService.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/DictValueService.java @@ -23,7 +23,7 @@ package org.dromara.visor.module.infra.service; import cn.orionsec.kit.lang.define.wrapper.DataGrid; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import org.dromara.visor.module.infra.entity.request.dict.DictValueCreateRequest; import org.dromara.visor.module.infra.entity.request.dict.DictValueQueryRequest; import org.dromara.visor.module.infra.entity.request.dict.DictValueRollbackRequest; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/AuthenticationServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/AuthenticationServiceImpl.java index 8c787ed3..64ee0f71 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/AuthenticationServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/AuthenticationServiceImpl.java @@ -27,7 +27,7 @@ import cn.orionsec.kit.lang.utils.Booleans; import cn.orionsec.kit.lang.utils.Exceptions; import cn.orionsec.kit.lang.utils.crypto.Signatures; import cn.orionsec.kit.lang.utils.time.Dates; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import org.dromara.visor.common.config.ConfigStore; import org.dromara.visor.common.constant.ConfigKeys; import org.dromara.visor.common.constant.Const; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataGroupServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataGroupServiceImpl.java index 539dda0a..4ea1e56f 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataGroupServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DataGroupServiceImpl.java @@ -23,7 +23,7 @@ package org.dromara.visor.module.infra.service.impl; import cn.orionsec.kit.lang.utils.collect.Lists; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.common.constant.Const; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DictKeyServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DictKeyServiceImpl.java index e603863d..206b1f38 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DictKeyServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DictKeyServiceImpl.java @@ -27,8 +27,8 @@ import cn.orionsec.kit.lang.utils.Objects1; import cn.orionsec.kit.lang.utils.Strings; import cn.orionsec.kit.lang.utils.collect.Lists; import cn.orionsec.kit.lang.utils.collect.Maps; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.common.constant.Const; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DictValueServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DictValueServiceImpl.java index 231341e0..8b4d421a 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DictValueServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/DictValueServiceImpl.java @@ -25,8 +25,8 @@ package org.dromara.visor.module.infra.service.impl; import cn.orionsec.kit.lang.define.wrapper.DataGrid; import cn.orionsec.kit.lang.utils.Strings; import cn.orionsec.kit.lang.utils.collect.Lists; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.common.constant.Const; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/HistoryValueServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/HistoryValueServiceImpl.java index 45f32664..e3dcc9d4 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/HistoryValueServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/HistoryValueServiceImpl.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.infra.service.impl; import cn.orionsec.kit.lang.define.wrapper.DataGrid; import cn.orionsec.kit.lang.utils.Strings; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.module.infra.convert.HistoryValueConvert; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/NotifyTemplateServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/NotifyTemplateServiceImpl.java index a8dcb7fa..b8520925 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/NotifyTemplateServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/NotifyTemplateServiceImpl.java @@ -23,7 +23,7 @@ package org.dromara.visor.module.infra.service.impl; import cn.orionsec.kit.lang.define.wrapper.DataGrid; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.common.constant.Const; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/OperatorLogServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/OperatorLogServiceImpl.java index f9fe6640..134a716a 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/OperatorLogServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/OperatorLogServiceImpl.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.infra.service.impl; import cn.orionsec.kit.lang.define.wrapper.DataGrid; import cn.orionsec.kit.lang.utils.Arrays1; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.common.constant.ErrorMessage; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/PreferenceServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/PreferenceServiceImpl.java index c065d514..bc10e64e 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/PreferenceServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/PreferenceServiceImpl.java @@ -26,7 +26,7 @@ import cn.orionsec.kit.lang.function.Functions; import cn.orionsec.kit.lang.utils.Objects1; import cn.orionsec.kit.lang.utils.collect.Lists; import cn.orionsec.kit.lang.utils.collect.Maps; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.common.utils.Assert; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemMenuServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemMenuServiceImpl.java index bf3ebf1c..c733992d 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemMenuServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemMenuServiceImpl.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.infra.service.impl; import cn.orionsec.kit.lang.utils.Strings; import cn.orionsec.kit.lang.utils.collect.Lists; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.common.constant.Const; import org.dromara.visor.common.constant.ErrorMessage; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemMessageServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemMessageServiceImpl.java index e1a71bd7..ed7fee8c 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemMessageServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemMessageServiceImpl.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.infra.service.impl; import cn.orionsec.kit.lang.function.Functions; import cn.orionsec.kit.lang.utils.Booleans; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.framework.security.core.utils.SecurityUtils; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemRoleServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemRoleServiceImpl.java index ba54487d..64ee5337 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemRoleServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemRoleServiceImpl.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.infra.service.impl; import cn.orionsec.kit.lang.define.wrapper.DataGrid; import cn.orionsec.kit.lang.utils.collect.Lists; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.common.constant.ErrorMessage; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemUserServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemUserServiceImpl.java index ef0da3b9..ab036cd0 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemUserServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/SystemUserServiceImpl.java @@ -26,7 +26,7 @@ import cn.orionsec.kit.lang.define.wrapper.DataGrid; import cn.orionsec.kit.lang.utils.collect.Lists; import cn.orionsec.kit.lang.utils.crypto.Signatures; import cn.orionsec.kit.spring.SpringHolder; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.common.constant.Const; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/TagRelServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/TagRelServiceImpl.java index ad1ec5da..1028edc7 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/TagRelServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/TagRelServiceImpl.java @@ -25,7 +25,7 @@ package org.dromara.visor.module.infra.service.impl; import cn.orionsec.kit.lang.annotation.Keep; import cn.orionsec.kit.lang.utils.collect.Lists; import cn.orionsec.kit.lang.utils.collect.Maps; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.dromara.visor.common.constant.Const; import org.dromara.visor.framework.redis.core.utils.RedisStrings; diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/TagServiceImpl.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/TagServiceImpl.java index ed61b99d..0b5b9a6b 100644 --- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/TagServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/service/impl/TagServiceImpl.java @@ -25,7 +25,7 @@ package org.dromara.visor.module.infra.service.impl; import cn.orionsec.kit.lang.define.wrapper.DataGrid; import cn.orionsec.kit.lang.utils.Objects1; import cn.orionsec.kit.lang.utils.collect.Lists; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.common.constant.Const; diff --git a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/context/MonitorAgentContext.java b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/context/MonitorAgentContext.java index deb401f6..ea884c67 100644 --- a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/context/MonitorAgentContext.java +++ b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/context/MonitorAgentContext.java @@ -25,7 +25,7 @@ package org.dromara.visor.module.monitor.context; import cn.orionsec.kit.lang.define.cache.TimedCache; import cn.orionsec.kit.lang.define.cache.TimedCacheBuilder; import cn.orionsec.kit.lang.utils.io.Streams; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.common.constant.Const; import org.dromara.visor.module.monitor.convert.MonitorHostConvert; diff --git a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/entity/dto/AgentMetricsDTO.java b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/entity/dto/AgentMetricsDTO.java index 6562d5c5..be04fdf8 100644 --- a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/entity/dto/AgentMetricsDTO.java +++ b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/entity/dto/AgentMetricsDTO.java @@ -22,7 +22,7 @@ */ package org.dromara.visor.module.monitor.entity.dto; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/entity/dto/MetricsDTO.java b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/entity/dto/MetricsDTO.java index 9419ca0c..287c4bd2 100644 --- a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/entity/dto/MetricsDTO.java +++ b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/entity/dto/MetricsDTO.java @@ -22,7 +22,7 @@ */ package org.dromara.visor.module.monitor.entity.dto; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import lombok.Data; import java.io.Serializable; diff --git a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/entity/vo/AlarmEventVO.java b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/entity/vo/AlarmEventVO.java index f6d88146..db14409c 100644 --- a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/entity/vo/AlarmEventVO.java +++ b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/entity/vo/AlarmEventVO.java @@ -22,7 +22,7 @@ */ package org.dromara.visor.module.monitor.entity.vo; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/handler/alarm/AlarmEngineContext.java b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/handler/alarm/AlarmEngineContext.java index 39a92301..c80a6419 100644 --- a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/handler/alarm/AlarmEngineContext.java +++ b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/handler/alarm/AlarmEngineContext.java @@ -24,9 +24,9 @@ package org.dromara.visor.module.monitor.handler.alarm; import cn.orionsec.kit.lang.utils.Strings; import cn.orionsec.kit.lang.utils.collect.Lists; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONArray; +import com.alibaba.fastjson2.JSONObject; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.common.constant.Const; import org.dromara.visor.module.monitor.convert.AlarmPolicyRuleConvert; diff --git a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/handler/alarm/MetricsAlarmEngine.java b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/handler/alarm/MetricsAlarmEngine.java index 10cbb429..6ef366cd 100644 --- a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/handler/alarm/MetricsAlarmEngine.java +++ b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/handler/alarm/MetricsAlarmEngine.java @@ -22,7 +22,7 @@ */ package org.dromara.visor.module.monitor.handler.alarm; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.common.constant.Const; import org.dromara.visor.common.enums.BooleanBit; diff --git a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/impl/AlarmEventServiceImpl.java b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/impl/AlarmEventServiceImpl.java index c7361b7a..695fe4f7 100644 --- a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/impl/AlarmEventServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/impl/AlarmEventServiceImpl.java @@ -27,7 +27,7 @@ import cn.orionsec.kit.lang.utils.Arrays1; import cn.orionsec.kit.lang.utils.Objects1; import cn.orionsec.kit.lang.utils.collect.Lists; import cn.orionsec.kit.lang.utils.time.Dates; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.common.constant.Const; diff --git a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/impl/AlarmPolicyRuleServiceImpl.java b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/impl/AlarmPolicyRuleServiceImpl.java index e5f64cb8..c4731431 100644 --- a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/impl/AlarmPolicyRuleServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/impl/AlarmPolicyRuleServiceImpl.java @@ -23,7 +23,7 @@ package org.dromara.visor.module.monitor.service.impl; import cn.orionsec.kit.lang.utils.Strings; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.common.constant.ErrorMessage; diff --git a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/impl/AlarmPolicyServiceImpl.java b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/impl/AlarmPolicyServiceImpl.java index c3ffb28b..dad9e115 100644 --- a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/impl/AlarmPolicyServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/impl/AlarmPolicyServiceImpl.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.monitor.service.impl; import cn.orionsec.kit.lang.define.wrapper.DataGrid; import cn.orionsec.kit.lang.utils.Booleans; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.common.constant.Const; diff --git a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/impl/MonitorAgentEndpointServiceImpl.java b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/impl/MonitorAgentEndpointServiceImpl.java index f42d7551..aa97947b 100644 --- a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/impl/MonitorAgentEndpointServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/impl/MonitorAgentEndpointServiceImpl.java @@ -27,7 +27,7 @@ import cn.orionsec.kit.lang.annotation.Keep; import cn.orionsec.kit.lang.utils.Strings; import cn.orionsec.kit.lang.utils.collect.Lists; import cn.orionsec.kit.lang.utils.collect.Maps; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.influxdb.client.domain.WritePrecision; import com.influxdb.client.write.Point; import lombok.extern.slf4j.Slf4j; diff --git a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/impl/MonitorHostServiceImpl.java b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/impl/MonitorHostServiceImpl.java index bb70dc40..a95422c3 100644 --- a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/impl/MonitorHostServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/impl/MonitorHostServiceImpl.java @@ -28,8 +28,8 @@ import cn.orionsec.kit.lang.utils.Objects1; import cn.orionsec.kit.lang.utils.Strings; import cn.orionsec.kit.lang.utils.collect.Lists; import cn.orionsec.kit.lang.utils.collect.Maps; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.common.constant.Const; import org.dromara.visor.common.constant.ErrorMessage; diff --git a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/impl/MonitorMetricsServiceImpl.java b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/impl/MonitorMetricsServiceImpl.java index f5e2bd8d..4f730bec 100644 --- a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/impl/MonitorMetricsServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/service/impl/MonitorMetricsServiceImpl.java @@ -23,7 +23,7 @@ package org.dromara.visor.module.monitor.service.impl; import cn.orionsec.kit.lang.define.wrapper.DataGrid; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.common.constant.ErrorMessage; diff --git a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/utils/MetricsUtils.java b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/utils/MetricsUtils.java index 26476a02..002a1725 100644 --- a/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/utils/MetricsUtils.java +++ b/orion-visor-modules/orion-visor-module-monitor/orion-visor-module-monitor-service/src/main/java/org/dromara/visor/module/monitor/utils/MetricsUtils.java @@ -23,7 +23,7 @@ package org.dromara.visor.module.monitor.utils; import cn.orionsec.kit.lang.utils.Strings; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.influxdb.client.write.Point; import org.dromara.visor.module.monitor.enums.MeasurementEnum; diff --git a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/entity/vo/TerminalThemeVO.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/entity/vo/TerminalThemeVO.java index 52184f6d..6879521c 100644 --- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/entity/vo/TerminalThemeVO.java +++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/entity/vo/TerminalThemeVO.java @@ -22,7 +22,7 @@ */ package org.dromara.visor.module.terminal.entity.vo; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/enums/InputProtocolEnum.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/enums/InputProtocolEnum.java index 158b24bc..bd924099 100644 --- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/enums/InputProtocolEnum.java +++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/enums/InputProtocolEnum.java @@ -23,7 +23,7 @@ package org.dromara.visor.module.terminal.handler.terminal.enums; import cn.orionsec.kit.spring.SpringHolder; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import lombok.Getter; import org.dromara.visor.module.terminal.handler.terminal.handler.*; import org.dromara.visor.module.terminal.handler.terminal.model.TerminalBasePayload; diff --git a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/handler/RdpFileSystemEventHandler.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/handler/RdpFileSystemEventHandler.java index 34f0b485..c48c734d 100644 --- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/handler/RdpFileSystemEventHandler.java +++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/handler/RdpFileSystemEventHandler.java @@ -23,7 +23,7 @@ package org.dromara.visor.module.terminal.handler.terminal.handler; import cn.orionsec.kit.lang.utils.collect.Maps; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; import org.dromara.visor.module.terminal.define.operator.TerminalOperatorType; diff --git a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/handler/TerminalConnectHandler.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/handler/TerminalConnectHandler.java index 6ed69337..1a1e380a 100644 --- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/handler/TerminalConnectHandler.java +++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/handler/TerminalConnectHandler.java @@ -28,7 +28,7 @@ import cn.orionsec.kit.lang.utils.Exceptions; import cn.orionsec.kit.lang.utils.collect.Maps; import cn.orionsec.kit.lang.utils.io.Streams; import cn.orionsec.kit.net.host.SessionStore; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.common.constant.ErrorMessage; import org.dromara.visor.common.constant.ExtraFieldConst; diff --git a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/sender/WebsocketSftpTerminalSender.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/sender/WebsocketSftpTerminalSender.java index 3935f2ef..511f28e6 100644 --- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/sender/WebsocketSftpTerminalSender.java +++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/terminal/sender/WebsocketSftpTerminalSender.java @@ -22,7 +22,7 @@ */ package org.dromara.visor.module.terminal.handler.terminal.sender; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import org.dromara.visor.common.enums.BooleanBit; import org.dromara.visor.module.terminal.handler.terminal.enums.OutputProtocolEnum; import org.dromara.visor.module.terminal.handler.terminal.model.response.*; diff --git a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/transfer/TransferMessageDispatcher.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/transfer/TransferMessageDispatcher.java index ec099bc3..c01b368e 100644 --- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/transfer/TransferMessageDispatcher.java +++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/transfer/TransferMessageDispatcher.java @@ -23,7 +23,7 @@ package org.dromara.visor.module.terminal.handler.transfer; import cn.orionsec.kit.lang.utils.io.Streams; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.common.constant.FieldConst; import org.dromara.visor.framework.websocket.core.utils.WebSockets; diff --git a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/transfer/utils/TransferUtils.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/transfer/utils/TransferUtils.java index d4b0cf2a..2c8b8451 100644 --- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/transfer/utils/TransferUtils.java +++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/handler/transfer/utils/TransferUtils.java @@ -23,7 +23,7 @@ package org.dromara.visor.module.terminal.handler.transfer.utils; import cn.orionsec.kit.lang.utils.Strings; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import org.apache.catalina.connector.ClientAbortException; import org.dromara.visor.common.constant.ErrorMessage; import org.dromara.visor.framework.websocket.core.utils.WebSockets; diff --git a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/interceptor/TerminalAccessInterceptor.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/interceptor/TerminalAccessInterceptor.java index dc5f0447..afd8c4ea 100644 --- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/interceptor/TerminalAccessInterceptor.java +++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/interceptor/TerminalAccessInterceptor.java @@ -24,7 +24,7 @@ package org.dromara.visor.module.terminal.interceptor; import cn.orionsec.kit.lang.define.collect.MutableHashMap; import cn.orionsec.kit.lang.utils.Urls; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.common.constant.FieldConst; import org.dromara.visor.common.trace.TraceIdHolder; diff --git a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/service/impl/CommandSnippetGroupServiceImpl.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/service/impl/CommandSnippetGroupServiceImpl.java index e1f72f6a..8c66019f 100644 --- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/service/impl/CommandSnippetGroupServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/service/impl/CommandSnippetGroupServiceImpl.java @@ -23,7 +23,7 @@ package org.dromara.visor.module.terminal.service.impl; import cn.orionsec.kit.lang.utils.Booleans; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.common.constant.Const; import org.dromara.visor.common.constant.ErrorMessage; diff --git a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/service/impl/CommandSnippetServiceImpl.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/service/impl/CommandSnippetServiceImpl.java index b9690feb..7360f24e 100644 --- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/service/impl/CommandSnippetServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/service/impl/CommandSnippetServiceImpl.java @@ -22,7 +22,7 @@ */ package org.dromara.visor.module.terminal.service.impl; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/service/impl/PathBookmarkGroupServiceImpl.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/service/impl/PathBookmarkGroupServiceImpl.java index 27bf82d8..49b52870 100644 --- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/service/impl/PathBookmarkGroupServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/service/impl/PathBookmarkGroupServiceImpl.java @@ -23,7 +23,7 @@ package org.dromara.visor.module.terminal.service.impl; import cn.orionsec.kit.lang.utils.Booleans; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.common.constant.Const; import org.dromara.visor.common.constant.ErrorMessage; diff --git a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/service/impl/PathBookmarkServiceImpl.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/service/impl/PathBookmarkServiceImpl.java index 236a8e0c..42d6f21e 100644 --- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/service/impl/PathBookmarkServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/service/impl/PathBookmarkServiceImpl.java @@ -22,7 +22,7 @@ */ package org.dromara.visor.module.terminal.service.impl; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/service/impl/TerminalConnectLogServiceImpl.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/service/impl/TerminalConnectLogServiceImpl.java index 8446a233..1e1d18ce 100644 --- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/service/impl/TerminalConnectLogServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/service/impl/TerminalConnectLogServiceImpl.java @@ -25,7 +25,7 @@ package org.dromara.visor.module.terminal.service.impl; import cn.orionsec.kit.lang.define.wrapper.DataGrid; import cn.orionsec.kit.lang.utils.Arrays1; import cn.orionsec.kit.lang.utils.collect.Lists; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.common.constant.Const; diff --git a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/service/impl/TerminalFileLogServiceImpl.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/service/impl/TerminalFileLogServiceImpl.java index d8516115..d8f68f91 100644 --- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/service/impl/TerminalFileLogServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/service/impl/TerminalFileLogServiceImpl.java @@ -25,8 +25,8 @@ package org.dromara.visor.module.terminal.service.impl; import cn.orionsec.kit.lang.define.wrapper.DataGrid; import cn.orionsec.kit.lang.utils.Arrays1; import cn.orionsec.kit.lang.utils.Strings; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.common.constant.ExtraFieldConst; import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs; diff --git a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/service/impl/TerminalServiceImpl.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/service/impl/TerminalServiceImpl.java index f830204d..31a20ea5 100644 --- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/service/impl/TerminalServiceImpl.java +++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/service/impl/TerminalServiceImpl.java @@ -23,7 +23,7 @@ package org.dromara.visor.module.terminal.service.impl; import cn.orionsec.kit.lang.id.UUIds; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import lombok.extern.slf4j.Slf4j; import org.dromara.visor.common.constant.ExtraFieldConst; import org.dromara.visor.common.security.LoginUser; diff --git a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/test/java/org/dromara/visor/module/terminal/meta/TerminalThemeGenerator.java b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/test/java/org/dromara/visor/module/terminal/meta/TerminalThemeGenerator.java index ad711173..55fcecd8 100644 --- a/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/test/java/org/dromara/visor/module/terminal/meta/TerminalThemeGenerator.java +++ b/orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/test/java/org/dromara/visor/module/terminal/meta/TerminalThemeGenerator.java @@ -26,10 +26,10 @@ import cn.orionsec.kit.lang.utils.Colors; import cn.orionsec.kit.lang.utils.collect.Lists; import cn.orionsec.kit.lang.utils.io.FileReaders; import cn.orionsec.kit.lang.utils.io.Files1; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.alibaba.fastjson.annotation.JSONField; -import com.alibaba.fastjson.serializer.ValueFilter; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; +import com.alibaba.fastjson2.annotation.JSONField; +import com.alibaba.fastjson2.filter.ValueFilter; import lombok.Data; import java.io.File;