From e7947c57c79bcdc5a0f5dc59194135e2e43960f7 Mon Sep 17 00:00:00 2001 From: 3y Date: Thu, 30 Oct 2025 20:39:44 +0800 Subject: [PATCH] =?UTF-8?q?feature#=E4=BB=8Efastjson1.x=20=E5=8D=87?= =?UTF-8?q?=E7=BA=A7fastjson2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- austin-cron/pom.xml | 4 ++++ .../cron/dto/getui/GeTuiTokenResultDTO.java | 2 +- .../cron/dto/getui/QueryTokenParamDTO.java | 2 +- .../handler/NightShieldLazyPendingHandler.java | 6 +++--- .../RefreshDingDingAccessTokenHandler.java | 2 +- .../handler/RefreshGeTuiAccessTokenHandler.java | 2 +- .../xxl/service/impl/CronTaskServiceImpl.java | 4 ++-- austin-handler/pom.xml | 4 ++++ .../austin/handler/action/DiscardAction.java | 4 ++-- .../austin/handler/action/ShieldAction.java | 6 +++--- .../deduplication/DeduplicationParam.java | 2 +- .../build/AbstractDeduplicationBuilder.java | 4 ++-- .../service/ContentDeduplicationService.java | 2 +- .../domain/dingding/DingDingRobotParam.java | 2 +- .../handler/domain/feishu/FeiShuRobotParam.java | 2 +- .../handler/domain/feishu/FeiShuRobotResult.java | 2 +- .../domain/push/getui/BatchSendPushParam.java | 2 +- .../handler/domain/push/getui/SendPushParam.java | 2 +- .../domain/push/getui/SendPushResult.java | 4 ++-- .../handler/domain/sms/LinTongSendResult.java | 2 +- .../handler/domain/sms/YunPianSendResult.java | 2 +- .../wechat/robot/EnterpriseWeChatRobotParam.java | 2 +- .../wechat/robot/EnterpriseWeChatRootResult.java | 2 +- .../handler/flowcontrol/FlowControlFactory.java | 4 ++-- .../impl/AlipayMiniProgramAccountHandler.java | 2 +- .../handler/impl/DingDingRobotHandler.java | 2 +- .../handler/impl/DingDingWorkNoticeHandler.java | 2 +- .../handler/impl/EnterpriseWeChatHandler.java | 2 +- .../impl/EnterpriseWeChatRobotHandler.java | 2 +- .../handler/handler/impl/FeiShuRobotHandler.java | 2 +- .../handler/impl/MiniProgramAccountHandler.java | 2 +- .../handler/impl/OfficialAccountHandler.java | 2 +- .../austin/handler/handler/impl/PushHandler.java | 2 +- .../austin/handler/handler/impl/SmsHandler.java | 4 ++-- .../stater/impl/SmsPullReceiptStarterImpl.java | 2 +- .../austin/handler/receiver/kafka/Receiver.java | 2 +- .../receiver/rabbit/RabbitMqReceiver.java | 2 +- .../handler/receiver/redis/RedisReceiver.java | 2 +- .../receiver/rocketmq/RocketMqBizReceiver.java | 2 +- .../rocketmq/RocketMqRecallReceiver.java | 2 +- .../SpringEventBusReceiverListener.java | 2 +- .../handler/script/impl/LinTongSmsScript.java | 2 +- .../handler/script/impl/TencentSmsScript.java | 2 +- .../handler/script/impl/YunPianSmsScript.java | 2 +- austin-service-api-impl/pom.xml | 4 ++++ .../api/impl/action/recall/RecallMqAction.java | 6 +++--- .../impl/action/send/SendAfterCheckAction.java | 2 +- .../api/impl/action/send/SendAssembleAction.java | 4 ++-- .../api/impl/action/send/SendMqAction.java | 6 +++--- .../api/impl/service/TraceServiceImpl.java | 2 +- austin-stream/pom.xml | 4 ++++ .../stream/function/AustinFlatMapFunction.java | 2 +- .../java3y/austin/stream/sink/AustinSink.java | 2 +- austin-support/pom.xml | 4 ++-- .../austin/support/dto/GeTuiTokenResultDTO.java | 2 +- .../austin/support/dto/QueryTokenParamDTO.java | 2 +- .../mq/eventbus/EventBusSendMqServiceImpl.java | 2 +- .../austin/support/utils/AccessTokenUtils.java | 2 +- .../austin/support/utils/AccountUtils.java | 2 +- .../java3y/austin/support/utils/LogUtils.java | 2 +- austin-web/pom.xml | 8 ++++++++ .../java3y/austin/web/aspect/AustinAspect.java | 4 ++-- .../controller/MessageTemplateController.java | 4 ++-- .../controller/OfficialAccountController.java | 2 +- .../austin/web/handler/SubscribeHandler.java | 2 +- .../austin/web/service/impl/DataServiceImpl.java | 2 +- .../web/service/impl/MaterialServiceImpl.java | 2 +- .../java3y/austin/web/utils/Convert4Amis.java | 4 ++-- .../com/java3y/austin/web/vo/RequestLogDTO.java | 2 +- .../java3y/austin/web/vo/amis/CommonAmisVo.java | 2 +- pom.xml | 16 +++++++++++----- 71 files changed, 119 insertions(+), 89 deletions(-) diff --git a/austin-cron/pom.xml b/austin-cron/pom.xml index 6c8db46..f2f8dbb 100644 --- a/austin-cron/pom.xml +++ b/austin-cron/pom.xml @@ -37,6 +37,10 @@ org.springframework.boot spring-boot-configuration-processor + + com.alibaba.fastjson2 + fastjson2 + \ No newline at end of file diff --git a/austin-cron/src/main/java/com/java3y/austin/cron/dto/getui/GeTuiTokenResultDTO.java b/austin-cron/src/main/java/com/java3y/austin/cron/dto/getui/GeTuiTokenResultDTO.java index ef8de29..67140ca 100644 --- a/austin-cron/src/main/java/com/java3y/austin/cron/dto/getui/GeTuiTokenResultDTO.java +++ b/austin-cron/src/main/java/com/java3y/austin/cron/dto/getui/GeTuiTokenResultDTO.java @@ -1,6 +1,6 @@ package com.java3y.austin.cron.dto.getui; -import com.alibaba.fastjson.annotation.JSONField; +import com.alibaba.fastjson2.annotation.JSONField; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/austin-cron/src/main/java/com/java3y/austin/cron/dto/getui/QueryTokenParamDTO.java b/austin-cron/src/main/java/com/java3y/austin/cron/dto/getui/QueryTokenParamDTO.java index 03bfa14..906ff9a 100644 --- a/austin-cron/src/main/java/com/java3y/austin/cron/dto/getui/QueryTokenParamDTO.java +++ b/austin-cron/src/main/java/com/java3y/austin/cron/dto/getui/QueryTokenParamDTO.java @@ -1,6 +1,6 @@ package com.java3y.austin.cron.dto.getui; -import com.alibaba.fastjson.annotation.JSONField; +import com.alibaba.fastjson2.annotation.JSONField; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/austin-cron/src/main/java/com/java3y/austin/cron/handler/NightShieldLazyPendingHandler.java b/austin-cron/src/main/java/com/java3y/austin/cron/handler/NightShieldLazyPendingHandler.java index d70953f..9f1006a 100644 --- a/austin-cron/src/main/java/com/java3y/austin/cron/handler/NightShieldLazyPendingHandler.java +++ b/austin-cron/src/main/java/com/java3y/austin/cron/handler/NightShieldLazyPendingHandler.java @@ -1,8 +1,8 @@ package com.java3y.austin.cron.handler; import cn.hutool.core.text.CharSequenceUtil; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.serializer.SerializerFeature; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONWriter; import com.google.common.base.Throwables; import com.java3y.austin.common.domain.TaskInfo; import com.java3y.austin.support.config.SupportThreadPoolConfig; @@ -49,7 +49,7 @@ public class NightShieldLazyPendingHandler { if (CharSequenceUtil.isNotBlank(taskInfo)) { try { kafkaTemplate.send(topicName, JSON.toJSONString(Collections.singletonList(JSON.parseObject(taskInfo, TaskInfo.class)) - , SerializerFeature.WriteClassName)); + , JSONWriter.Feature.WriteClassName)); } catch (Exception e) { log.error("nightShieldLazyJob send kafka fail! e:{},params:{}", Throwables.getStackTraceAsString(e), taskInfo); } diff --git a/austin-cron/src/main/java/com/java3y/austin/cron/handler/RefreshDingDingAccessTokenHandler.java b/austin-cron/src/main/java/com/java3y/austin/cron/handler/RefreshDingDingAccessTokenHandler.java index 9e9746a..5d16ccc 100644 --- a/austin-cron/src/main/java/com/java3y/austin/cron/handler/RefreshDingDingAccessTokenHandler.java +++ b/austin-cron/src/main/java/com/java3y/austin/cron/handler/RefreshDingDingAccessTokenHandler.java @@ -1,7 +1,7 @@ package com.java3y.austin.cron.handler; import cn.hutool.core.text.CharSequenceUtil; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.java3y.austin.common.constant.CommonConstant; import com.java3y.austin.common.dto.account.DingDingWorkNoticeAccount; import com.java3y.austin.common.enums.ChannelType; diff --git a/austin-cron/src/main/java/com/java3y/austin/cron/handler/RefreshGeTuiAccessTokenHandler.java b/austin-cron/src/main/java/com/java3y/austin/cron/handler/RefreshGeTuiAccessTokenHandler.java index fcff2a5..da5815a 100644 --- a/austin-cron/src/main/java/com/java3y/austin/cron/handler/RefreshGeTuiAccessTokenHandler.java +++ b/austin-cron/src/main/java/com/java3y/austin/cron/handler/RefreshGeTuiAccessTokenHandler.java @@ -1,7 +1,7 @@ package com.java3y.austin.cron.handler; import cn.hutool.core.text.CharSequenceUtil; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.java3y.austin.common.constant.CommonConstant; import com.java3y.austin.common.dto.account.GeTuiAccount; import com.java3y.austin.common.enums.ChannelType; diff --git a/austin-cron/src/main/java/com/java3y/austin/cron/xxl/service/impl/CronTaskServiceImpl.java b/austin-cron/src/main/java/com/java3y/austin/cron/xxl/service/impl/CronTaskServiceImpl.java index 27a69dc..9ac83cf 100644 --- a/austin-cron/src/main/java/com/java3y/austin/cron/xxl/service/impl/CronTaskServiceImpl.java +++ b/austin-cron/src/main/java/com/java3y/austin/cron/xxl/service/impl/CronTaskServiceImpl.java @@ -5,8 +5,8 @@ import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.http.HttpRequest; import cn.hutool.http.HttpResponse; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.TypeReference; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.TypeReference; import com.google.common.base.Throwables; import com.java3y.austin.common.enums.RespStatusEnum; import com.java3y.austin.common.vo.BasicResultVO; diff --git a/austin-handler/pom.xml b/austin-handler/pom.xml index 73ef4de..28601fb 100644 --- a/austin-handler/pom.xml +++ b/austin-handler/pom.xml @@ -51,5 +51,9 @@ com.alipay.sdk alipay-sdk-java + + com.alibaba.fastjson2 + fastjson2 + diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/action/DiscardAction.java b/austin-handler/src/main/java/com/java3y/austin/handler/action/DiscardAction.java index 7e54f47..1ea288d 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/action/DiscardAction.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/action/DiscardAction.java @@ -1,7 +1,7 @@ package com.java3y.austin.handler.action; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONArray; import com.java3y.austin.common.constant.CommonConstant; import com.java3y.austin.common.domain.AnchorInfo; import com.java3y.austin.common.domain.TaskInfo; diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/action/ShieldAction.java b/austin-handler/src/main/java/com/java3y/austin/handler/action/ShieldAction.java index 9230243..e4c78f8 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/action/ShieldAction.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/action/ShieldAction.java @@ -1,7 +1,7 @@ package com.java3y.austin.handler.action; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.serializer.SerializerFeature; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONWriter; import com.java3y.austin.common.domain.AnchorInfo; import com.java3y.austin.common.domain.TaskInfo; import com.java3y.austin.common.enums.AnchorState; @@ -57,7 +57,7 @@ public class ShieldAction implements BusinessProcess { } if (ShieldType.NIGHT_SHIELD_BUT_NEXT_DAY_SEND.getCode().equals(taskInfo.getShieldType())) { redisUtils.lPush(NIGHT_SHIELD_BUT_NEXT_DAY_SEND_KEY, JSON.toJSONString(taskInfo, - SerializerFeature.WriteClassName), + JSONWriter.Feature.WriteClassName), SECONDS_OF_A_DAY); logUtils.print(AnchorInfo.builder().state(AnchorState.NIGHT_SHIELD_NEXT_SEND.getCode()).bizId(taskInfo.getBizId()).messageId(taskInfo.getMessageId()).businessId(taskInfo.getBusinessId()).ids(taskInfo.getReceiver()).build()); } diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/DeduplicationParam.java b/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/DeduplicationParam.java index fe74595..f4b5e67 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/DeduplicationParam.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/DeduplicationParam.java @@ -1,6 +1,6 @@ package com.java3y.austin.handler.deduplication; -import com.alibaba.fastjson.annotation.JSONField; +import com.alibaba.fastjson2.annotation.JSONField; import com.java3y.austin.common.domain.TaskInfo; import com.java3y.austin.common.enums.AnchorState; import lombok.AllArgsConstructor; diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/build/AbstractDeduplicationBuilder.java b/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/build/AbstractDeduplicationBuilder.java index a783a8e..2ba17de 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/build/AbstractDeduplicationBuilder.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/build/AbstractDeduplicationBuilder.java @@ -1,7 +1,7 @@ package com.java3y.austin.handler.deduplication.build; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; import com.java3y.austin.common.domain.TaskInfo; import com.java3y.austin.handler.deduplication.DeduplicationHolder; import com.java3y.austin.handler.deduplication.DeduplicationParam; diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/service/ContentDeduplicationService.java b/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/service/ContentDeduplicationService.java index 6daaddd..2757c56 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/service/ContentDeduplicationService.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/service/ContentDeduplicationService.java @@ -1,7 +1,7 @@ package com.java3y.austin.handler.deduplication.service; import cn.hutool.crypto.digest.DigestUtil; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.java3y.austin.common.domain.TaskInfo; import com.java3y.austin.common.enums.DeduplicationType; import com.java3y.austin.handler.deduplication.limit.LimitService; diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/domain/dingding/DingDingRobotParam.java b/austin-handler/src/main/java/com/java3y/austin/handler/domain/dingding/DingDingRobotParam.java index c007110..6ea6a2e 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/domain/dingding/DingDingRobotParam.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/domain/dingding/DingDingRobotParam.java @@ -1,6 +1,6 @@ package com.java3y.austin.handler.domain.dingding; -import com.alibaba.fastjson.annotation.JSONField; +import com.alibaba.fastjson2.annotation.JSONField; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/domain/feishu/FeiShuRobotParam.java b/austin-handler/src/main/java/com/java3y/austin/handler/domain/feishu/FeiShuRobotParam.java index 78ba2a8..f6d1afa 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/domain/feishu/FeiShuRobotParam.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/domain/feishu/FeiShuRobotParam.java @@ -1,6 +1,6 @@ package com.java3y.austin.handler.domain.feishu; -import com.alibaba.fastjson.annotation.JSONField; +import com.alibaba.fastjson2.annotation.JSONField; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/domain/feishu/FeiShuRobotResult.java b/austin-handler/src/main/java/com/java3y/austin/handler/domain/feishu/FeiShuRobotResult.java index 6b2a768..2477f82 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/domain/feishu/FeiShuRobotResult.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/domain/feishu/FeiShuRobotResult.java @@ -1,6 +1,6 @@ package com.java3y.austin.handler.domain.feishu; -import com.alibaba.fastjson.annotation.JSONField; +import com.alibaba.fastjson2.annotation.JSONField; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/domain/push/getui/BatchSendPushParam.java b/austin-handler/src/main/java/com/java3y/austin/handler/domain/push/getui/BatchSendPushParam.java index 3afbb0a..32d7de8 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/domain/push/getui/BatchSendPushParam.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/domain/push/getui/BatchSendPushParam.java @@ -1,6 +1,6 @@ package com.java3y.austin.handler.domain.push.getui; -import com.alibaba.fastjson.annotation.JSONField; +import com.alibaba.fastjson2.annotation.JSONField; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/domain/push/getui/SendPushParam.java b/austin-handler/src/main/java/com/java3y/austin/handler/domain/push/getui/SendPushParam.java index 73b3ca1..bc8a0df 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/domain/push/getui/SendPushParam.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/domain/push/getui/SendPushParam.java @@ -1,6 +1,6 @@ package com.java3y.austin.handler.domain.push.getui; -import com.alibaba.fastjson.annotation.JSONField; +import com.alibaba.fastjson2.annotation.JSONField; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/domain/push/getui/SendPushResult.java b/austin-handler/src/main/java/com/java3y/austin/handler/domain/push/getui/SendPushResult.java index 6e2409a..b68c024 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/domain/push/getui/SendPushResult.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/domain/push/getui/SendPushResult.java @@ -1,8 +1,8 @@ package com.java3y.austin.handler.domain.push.getui; -import com.alibaba.fastjson.JSONObject; -import com.alibaba.fastjson.annotation.JSONField; +import com.alibaba.fastjson2.JSONObject; +import com.alibaba.fastjson2.annotation.JSONField; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/domain/sms/LinTongSendResult.java b/austin-handler/src/main/java/com/java3y/austin/handler/domain/sms/LinTongSendResult.java index 27d682d..b2a7bab 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/domain/sms/LinTongSendResult.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/domain/sms/LinTongSendResult.java @@ -1,6 +1,6 @@ package com.java3y.austin.handler.domain.sms; -import com.alibaba.fastjson.annotation.JSONField; +import com.alibaba.fastjson2.annotation.JSONField; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/domain/sms/YunPianSendResult.java b/austin-handler/src/main/java/com/java3y/austin/handler/domain/sms/YunPianSendResult.java index 8d4fd86..34a4bd3 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/domain/sms/YunPianSendResult.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/domain/sms/YunPianSendResult.java @@ -1,6 +1,6 @@ package com.java3y.austin.handler.domain.sms; -import com.alibaba.fastjson.annotation.JSONField; +import com.alibaba.fastjson2.annotation.JSONField; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/domain/wechat/robot/EnterpriseWeChatRobotParam.java b/austin-handler/src/main/java/com/java3y/austin/handler/domain/wechat/robot/EnterpriseWeChatRobotParam.java index f731ee7..7fdd409 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/domain/wechat/robot/EnterpriseWeChatRobotParam.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/domain/wechat/robot/EnterpriseWeChatRobotParam.java @@ -1,6 +1,6 @@ package com.java3y.austin.handler.domain.wechat.robot; -import com.alibaba.fastjson.annotation.JSONField; +import com.alibaba.fastjson2.annotation.JSONField; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/domain/wechat/robot/EnterpriseWeChatRootResult.java b/austin-handler/src/main/java/com/java3y/austin/handler/domain/wechat/robot/EnterpriseWeChatRootResult.java index b42360c..0d94846 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/domain/wechat/robot/EnterpriseWeChatRootResult.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/domain/wechat/robot/EnterpriseWeChatRootResult.java @@ -1,6 +1,6 @@ package com.java3y.austin.handler.domain.wechat.robot; -import com.alibaba.fastjson.annotation.JSONField; +import com.alibaba.fastjson2.annotation.JSONField; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/flowcontrol/FlowControlFactory.java b/austin-handler/src/main/java/com/java3y/austin/handler/flowcontrol/FlowControlFactory.java index f163c9e..8fb95e1 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/flowcontrol/FlowControlFactory.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/flowcontrol/FlowControlFactory.java @@ -1,7 +1,7 @@ package com.java3y.austin.handler.flowcontrol; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; import com.google.common.util.concurrent.RateLimiter; import com.java3y.austin.common.constant.CommonConstant; import com.java3y.austin.common.domain.TaskInfo; diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/AlipayMiniProgramAccountHandler.java b/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/AlipayMiniProgramAccountHandler.java index ecdbf60..6d10c3c 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/AlipayMiniProgramAccountHandler.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/AlipayMiniProgramAccountHandler.java @@ -1,7 +1,7 @@ package com.java3y.austin.handler.handler.impl; import cn.hutool.json.JSONUtil; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.alipay.api.AlipayClient; import com.alipay.api.domain.AlipayOpenAppMiniTemplatemessageSendModel; import com.alipay.api.request.AlipayOpenAppMiniTemplatemessageSendRequest; diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/DingDingRobotHandler.java b/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/DingDingRobotHandler.java index 6b650e0..601915f 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/DingDingRobotHandler.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/DingDingRobotHandler.java @@ -3,7 +3,7 @@ package com.java3y.austin.handler.handler.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.text.StrPool; import cn.hutool.http.HttpUtil; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.google.common.base.Throwables; import com.java3y.austin.common.constant.AustinConstant; import com.java3y.austin.common.constant.CommonConstant; diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/DingDingWorkNoticeHandler.java b/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/DingDingWorkNoticeHandler.java index 75785be..8f16d37 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/DingDingWorkNoticeHandler.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/DingDingWorkNoticeHandler.java @@ -2,7 +2,7 @@ package com.java3y.austin.handler.handler.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.text.StrPool; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.dingtalk.api.DefaultDingTalkClient; import com.dingtalk.api.DingTalkClient; import com.dingtalk.api.request.OapiMessageCorpconversationAsyncsendV2Request; diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/EnterpriseWeChatHandler.java b/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/EnterpriseWeChatHandler.java index 4ded688..3e6fcf3 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/EnterpriseWeChatHandler.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/EnterpriseWeChatHandler.java @@ -1,7 +1,7 @@ package com.java3y.austin.handler.handler.impl; import cn.hutool.core.collection.CollUtil; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.google.common.base.Throwables; import com.java3y.austin.common.constant.AustinConstant; import com.java3y.austin.common.constant.CommonConstant; diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/EnterpriseWeChatRobotHandler.java b/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/EnterpriseWeChatRobotHandler.java index 069747d..199ae54 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/EnterpriseWeChatRobotHandler.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/EnterpriseWeChatRobotHandler.java @@ -3,7 +3,7 @@ package com.java3y.austin.handler.handler.impl; import cn.hutool.http.ContentType; import cn.hutool.http.Header; import cn.hutool.http.HttpRequest; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.google.common.base.Throwables; import com.java3y.austin.common.domain.AnchorInfo; import com.java3y.austin.common.domain.RecallTaskInfo; diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/FeiShuRobotHandler.java b/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/FeiShuRobotHandler.java index 06a7f96..58ab171 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/FeiShuRobotHandler.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/FeiShuRobotHandler.java @@ -3,7 +3,7 @@ package com.java3y.austin.handler.handler.impl; import cn.hutool.http.ContentType; import cn.hutool.http.Header; import cn.hutool.http.HttpRequest; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.google.common.base.Throwables; import com.java3y.austin.common.domain.RecallTaskInfo; import com.java3y.austin.common.domain.TaskInfo; diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/MiniProgramAccountHandler.java b/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/MiniProgramAccountHandler.java index 109ba2f..f0832aa 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/MiniProgramAccountHandler.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/MiniProgramAccountHandler.java @@ -3,7 +3,7 @@ package com.java3y.austin.handler.handler.impl; import cn.binarywang.wx.miniapp.api.WxMaService; import cn.binarywang.wx.miniapp.bean.WxMaSubscribeMessage; import cn.hutool.core.collection.CollUtil; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.google.common.base.Throwables; import com.java3y.austin.common.domain.AnchorInfo; import com.java3y.austin.common.domain.RecallTaskInfo; diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/OfficialAccountHandler.java b/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/OfficialAccountHandler.java index 5cc0b67..48b511b 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/OfficialAccountHandler.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/OfficialAccountHandler.java @@ -1,7 +1,7 @@ package com.java3y.austin.handler.handler.impl; import cn.hutool.core.collection.CollUtil; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.google.common.base.Throwables; import com.java3y.austin.common.domain.AnchorInfo; import com.java3y.austin.common.domain.RecallTaskInfo; diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/PushHandler.java b/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/PushHandler.java index 1443d9c..6b3a44a 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/PushHandler.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/PushHandler.java @@ -5,7 +5,7 @@ import cn.hutool.core.util.IdUtil; import cn.hutool.http.ContentType; import cn.hutool.http.Header; import cn.hutool.http.HttpRequest; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.google.common.base.Throwables; import com.java3y.austin.common.constant.SendChanelUrlConstant; import com.java3y.austin.common.domain.RecallTaskInfo; diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/SmsHandler.java b/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/SmsHandler.java index 95defd6..a9be945 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/SmsHandler.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/SmsHandler.java @@ -2,8 +2,8 @@ package com.java3y.austin.handler.handler.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.text.CharSequenceUtil; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONArray; import com.google.common.base.Throwables; import com.java3y.austin.common.constant.CommonConstant; import com.java3y.austin.common.domain.RecallTaskInfo; diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/receipt/stater/impl/SmsPullReceiptStarterImpl.java b/austin-handler/src/main/java/com/java3y/austin/handler/receipt/stater/impl/SmsPullReceiptStarterImpl.java index 3e192ac..2056dc7 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/receipt/stater/impl/SmsPullReceiptStarterImpl.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/receipt/stater/impl/SmsPullReceiptStarterImpl.java @@ -1,7 +1,7 @@ package com.java3y.austin.handler.receipt.stater.impl; import cn.hutool.core.collection.CollUtil; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.google.common.base.Throwables; import com.java3y.austin.common.constant.CommonConstant; import com.java3y.austin.common.dto.account.sms.SmsAccount; diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/receiver/kafka/Receiver.java b/austin-handler/src/main/java/com/java3y/austin/handler/receiver/kafka/Receiver.java index 912f921..a1ba275 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/receiver/kafka/Receiver.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/receiver/kafka/Receiver.java @@ -1,7 +1,7 @@ package com.java3y.austin.handler.receiver.kafka; import cn.hutool.core.collection.CollUtil; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.java3y.austin.common.domain.RecallTaskInfo; import com.java3y.austin.common.domain.TaskInfo; import com.java3y.austin.handler.receiver.MessageReceiver; diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/receiver/rabbit/RabbitMqReceiver.java b/austin-handler/src/main/java/com/java3y/austin/handler/receiver/rabbit/RabbitMqReceiver.java index ab56379..ca4b3c4 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/receiver/rabbit/RabbitMqReceiver.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/receiver/rabbit/RabbitMqReceiver.java @@ -1,6 +1,6 @@ package com.java3y.austin.handler.receiver.rabbit; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.java3y.austin.common.domain.RecallTaskInfo; import com.java3y.austin.common.domain.TaskInfo; import com.java3y.austin.handler.receiver.MessageReceiver; diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/receiver/redis/RedisReceiver.java b/austin-handler/src/main/java/com/java3y/austin/handler/receiver/redis/RedisReceiver.java index 15cfebc..88bbeaf 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/receiver/redis/RedisReceiver.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/receiver/redis/RedisReceiver.java @@ -1,6 +1,6 @@ package com.java3y.austin.handler.receiver.redis; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.java3y.austin.common.domain.RecallTaskInfo; import com.java3y.austin.common.domain.TaskInfo; import com.java3y.austin.handler.receiver.MessageReceiver; diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/receiver/rocketmq/RocketMqBizReceiver.java b/austin-handler/src/main/java/com/java3y/austin/handler/receiver/rocketmq/RocketMqBizReceiver.java index 27a2183..6f95f95 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/receiver/rocketmq/RocketMqBizReceiver.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/receiver/rocketmq/RocketMqBizReceiver.java @@ -1,6 +1,6 @@ package com.java3y.austin.handler.receiver.rocketmq; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.java3y.austin.common.domain.TaskInfo; import com.java3y.austin.handler.receiver.MessageReceiver; import com.java3y.austin.handler.receiver.service.ConsumeService; diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/receiver/rocketmq/RocketMqRecallReceiver.java b/austin-handler/src/main/java/com/java3y/austin/handler/receiver/rocketmq/RocketMqRecallReceiver.java index 28eb289..e77f9ea 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/receiver/rocketmq/RocketMqRecallReceiver.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/receiver/rocketmq/RocketMqRecallReceiver.java @@ -1,6 +1,6 @@ package com.java3y.austin.handler.receiver.rocketmq; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.java3y.austin.common.domain.RecallTaskInfo; import com.java3y.austin.handler.receiver.MessageReceiver; import com.java3y.austin.handler.receiver.service.ConsumeService; diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/receiver/springeventbus/SpringEventBusReceiverListener.java b/austin-handler/src/main/java/com/java3y/austin/handler/receiver/springeventbus/SpringEventBusReceiverListener.java index a890d95..06cc2d8 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/receiver/springeventbus/SpringEventBusReceiverListener.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/receiver/springeventbus/SpringEventBusReceiverListener.java @@ -1,6 +1,6 @@ package com.java3y.austin.handler.receiver.springeventbus; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.java3y.austin.common.domain.RecallTaskInfo; import com.java3y.austin.common.domain.TaskInfo; import com.java3y.austin.handler.receiver.MessageReceiver; diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/script/impl/LinTongSmsScript.java b/austin-handler/src/main/java/com/java3y/austin/handler/script/impl/LinTongSmsScript.java index 59905d9..c13b7ef 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/script/impl/LinTongSmsScript.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/script/impl/LinTongSmsScript.java @@ -7,7 +7,7 @@ import cn.hutool.crypto.SecureUtil; import cn.hutool.http.Header; import cn.hutool.http.HttpRequest; import cn.hutool.json.JSONUtil; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.google.common.base.Throwables; import com.java3y.austin.common.dto.account.sms.LinTongSmsAccount; import com.java3y.austin.common.enums.SmsStatus; diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/script/impl/TencentSmsScript.java b/austin-handler/src/main/java/com/java3y/austin/handler/script/impl/TencentSmsScript.java index b08b9b7..093c7f3 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/script/impl/TencentSmsScript.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/script/impl/TencentSmsScript.java @@ -4,7 +4,7 @@ import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.IdUtil; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.google.common.base.Throwables; import com.java3y.austin.common.dto.account.sms.TencentSmsAccount; import com.java3y.austin.common.enums.SmsStatus; diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/script/impl/YunPianSmsScript.java b/austin-handler/src/main/java/com/java3y/austin/handler/script/impl/YunPianSmsScript.java index b411de4..a9331e8 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/script/impl/YunPianSmsScript.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/script/impl/YunPianSmsScript.java @@ -8,7 +8,7 @@ import cn.hutool.core.text.StrPool; import cn.hutool.core.util.ArrayUtil; import cn.hutool.http.Header; import cn.hutool.http.HttpRequest; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.google.common.base.Throwables; import com.java3y.austin.common.constant.CommonConstant; import com.java3y.austin.common.dto.account.sms.YunPianSmsAccount; diff --git a/austin-service-api-impl/pom.xml b/austin-service-api-impl/pom.xml index 5d05f55..660c17c 100644 --- a/austin-service-api-impl/pom.xml +++ b/austin-service-api-impl/pom.xml @@ -22,5 +22,9 @@ com.java3y.austin austin-support + + com.alibaba.fastjson2 + fastjson2 + \ No newline at end of file diff --git a/austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/action/recall/RecallMqAction.java b/austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/action/recall/RecallMqAction.java index 4d91fcd..7f4b56f 100644 --- a/austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/action/recall/RecallMqAction.java +++ b/austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/action/recall/RecallMqAction.java @@ -1,7 +1,7 @@ package com.java3y.austin.service.api.impl.action.recall; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.serializer.SerializerFeature; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONWriter; import com.google.common.base.Throwables; import com.java3y.austin.common.domain.RecallTaskInfo; import com.java3y.austin.common.enums.RespStatusEnum; @@ -37,7 +37,7 @@ public class RecallMqAction implements BusinessProcess { public void process(ProcessContext context) { RecallTaskInfo recallTaskInfo = context.getProcessModel().getRecallTaskInfo(); try { - String message = JSON.toJSONString(recallTaskInfo, SerializerFeature.WriteClassName); + String message = JSON.toJSONString(recallTaskInfo, JSONWriter.Feature.WriteClassName); sendMqService.send(austinRecall, message, tagId); } catch (Exception e) { context.setNeedBreak(true).setResponse(BasicResultVO.fail(RespStatusEnum.SERVICE_ERROR)); diff --git a/austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/action/send/SendAfterCheckAction.java b/austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/action/send/SendAfterCheckAction.java index 9213a7c..979bab8 100644 --- a/austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/action/send/SendAfterCheckAction.java +++ b/austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/action/send/SendAfterCheckAction.java @@ -3,7 +3,7 @@ package com.java3y.austin.service.api.impl.action.send; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ReUtil; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.java3y.austin.common.domain.TaskInfo; import com.java3y.austin.common.enums.IdType; import com.java3y.austin.common.enums.RespStatusEnum; diff --git a/austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/action/send/SendAssembleAction.java b/austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/action/send/SendAssembleAction.java index e888aef..c25a803 100644 --- a/austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/action/send/SendAssembleAction.java +++ b/austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/action/send/SendAssembleAction.java @@ -4,8 +4,8 @@ import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.core.text.StrPool; import cn.hutool.core.util.ReflectUtil; import cn.hutool.json.JSONUtil; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; import com.google.common.base.Throwables; import com.java3y.austin.common.constant.CommonConstant; import com.java3y.austin.common.domain.TaskInfo; diff --git a/austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/action/send/SendMqAction.java b/austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/action/send/SendMqAction.java index 2e07b6d..dfc2a13 100644 --- a/austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/action/send/SendMqAction.java +++ b/austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/action/send/SendMqAction.java @@ -1,8 +1,8 @@ package com.java3y.austin.service.api.impl.action.send; import cn.hutool.core.collection.CollUtil; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.serializer.SerializerFeature; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONWriter; import com.google.common.base.Throwables; import com.java3y.austin.common.domain.SimpleTaskInfo; import com.java3y.austin.common.domain.TaskInfo; @@ -47,7 +47,7 @@ public class SendMqAction implements BusinessProcess { SendTaskModel sendTaskModel = context.getProcessModel(); List taskInfo = sendTaskModel.getTaskInfo(); try { - String message = JSON.toJSONString(sendTaskModel.getTaskInfo(), SerializerFeature.WriteClassName); + String message = JSON.toJSONString(sendTaskModel.getTaskInfo(), JSONWriter.Feature.WriteClassName); sendMqService.send(sendMessageTopic, message, tagId); context.setResponse(BasicResultVO.success(taskInfo.stream().map(v -> SimpleTaskInfo.builder().businessId(v.getBusinessId()).messageId(v.getMessageId()).bizId(v.getBizId()).build()).collect(Collectors.toList()))); diff --git a/austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/service/TraceServiceImpl.java b/austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/service/TraceServiceImpl.java index daceec2..013da48 100644 --- a/austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/service/TraceServiceImpl.java +++ b/austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/service/TraceServiceImpl.java @@ -3,7 +3,7 @@ package com.java3y.austin.service.api.impl.service; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.java3y.austin.common.constant.AustinConstant; import com.java3y.austin.common.domain.SimpleAnchorInfo; import com.java3y.austin.common.enums.RespStatusEnum; diff --git a/austin-stream/pom.xml b/austin-stream/pom.xml index d8db6f6..88adc68 100644 --- a/austin-stream/pom.xml +++ b/austin-stream/pom.xml @@ -45,6 +45,10 @@ flink-connector-kafka_${scala.binary.version} ${flink.version} + + com.alibaba.fastjson2 + fastjson2 + diff --git a/austin-stream/src/main/java/com/java3y/austin/stream/function/AustinFlatMapFunction.java b/austin-stream/src/main/java/com/java3y/austin/stream/function/AustinFlatMapFunction.java index a9cbe26..a988da1 100644 --- a/austin-stream/src/main/java/com/java3y/austin/stream/function/AustinFlatMapFunction.java +++ b/austin-stream/src/main/java/com/java3y/austin/stream/function/AustinFlatMapFunction.java @@ -1,6 +1,6 @@ package com.java3y.austin.stream.function; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.java3y.austin.common.domain.AnchorInfo; import org.apache.flink.api.common.functions.FlatMapFunction; import org.apache.flink.util.Collector; diff --git a/austin-stream/src/main/java/com/java3y/austin/stream/sink/AustinSink.java b/austin-stream/src/main/java/com/java3y/austin/stream/sink/AustinSink.java index ac38924..4e0813e 100644 --- a/austin-stream/src/main/java/com/java3y/austin/stream/sink/AustinSink.java +++ b/austin-stream/src/main/java/com/java3y/austin/stream/sink/AustinSink.java @@ -3,7 +3,7 @@ package com.java3y.austin.stream.sink; import cn.hutool.core.date.DateUtil; import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.core.text.StrPool; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.google.common.base.Throwables; import com.java3y.austin.common.constant.AustinConstant; import com.java3y.austin.common.domain.AnchorInfo; diff --git a/austin-support/pom.xml b/austin-support/pom.xml index e97c6ae..e9a9c97 100644 --- a/austin-support/pom.xml +++ b/austin-support/pom.xml @@ -54,8 +54,8 @@ - com.alibaba - fastjson + com.alibaba.fastjson2 + fastjson2 diff --git a/austin-support/src/main/java/com/java3y/austin/support/dto/GeTuiTokenResultDTO.java b/austin-support/src/main/java/com/java3y/austin/support/dto/GeTuiTokenResultDTO.java index 48cae9f..12328ef 100644 --- a/austin-support/src/main/java/com/java3y/austin/support/dto/GeTuiTokenResultDTO.java +++ b/austin-support/src/main/java/com/java3y/austin/support/dto/GeTuiTokenResultDTO.java @@ -1,6 +1,6 @@ package com.java3y.austin.support.dto; -import com.alibaba.fastjson.annotation.JSONField; +import com.alibaba.fastjson2.annotation.JSONField; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/austin-support/src/main/java/com/java3y/austin/support/dto/QueryTokenParamDTO.java b/austin-support/src/main/java/com/java3y/austin/support/dto/QueryTokenParamDTO.java index dd44cc2..063b94b 100644 --- a/austin-support/src/main/java/com/java3y/austin/support/dto/QueryTokenParamDTO.java +++ b/austin-support/src/main/java/com/java3y/austin/support/dto/QueryTokenParamDTO.java @@ -1,6 +1,6 @@ package com.java3y.austin.support.dto; -import com.alibaba.fastjson.annotation.JSONField; +import com.alibaba.fastjson2.annotation.JSONField; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/austin-support/src/main/java/com/java3y/austin/support/mq/eventbus/EventBusSendMqServiceImpl.java b/austin-support/src/main/java/com/java3y/austin/support/mq/eventbus/EventBusSendMqServiceImpl.java index 4bcfedc..693785d 100644 --- a/austin-support/src/main/java/com/java3y/austin/support/mq/eventbus/EventBusSendMqServiceImpl.java +++ b/austin-support/src/main/java/com/java3y/austin/support/mq/eventbus/EventBusSendMqServiceImpl.java @@ -1,6 +1,6 @@ package com.java3y.austin.support.mq.eventbus; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.google.common.eventbus.EventBus; import com.java3y.austin.common.domain.RecallTaskInfo; import com.java3y.austin.common.domain.TaskInfo; diff --git a/austin-support/src/main/java/com/java3y/austin/support/utils/AccessTokenUtils.java b/austin-support/src/main/java/com/java3y/austin/support/utils/AccessTokenUtils.java index 7f7a726..aea6537 100644 --- a/austin-support/src/main/java/com/java3y/austin/support/utils/AccessTokenUtils.java +++ b/austin-support/src/main/java/com/java3y/austin/support/utils/AccessTokenUtils.java @@ -5,7 +5,7 @@ import cn.hutool.crypto.SecureUtil; import cn.hutool.http.ContentType; import cn.hutool.http.Header; import cn.hutool.http.HttpRequest; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.dingtalk.api.DefaultDingTalkClient; import com.dingtalk.api.DingTalkClient; import com.dingtalk.api.request.OapiGettokenRequest; diff --git a/austin-support/src/main/java/com/java3y/austin/support/utils/AccountUtils.java b/austin-support/src/main/java/com/java3y/austin/support/utils/AccountUtils.java index e1ece79..106027d 100644 --- a/austin-support/src/main/java/com/java3y/austin/support/utils/AccountUtils.java +++ b/austin-support/src/main/java/com/java3y/austin/support/utils/AccountUtils.java @@ -4,7 +4,7 @@ package com.java3y.austin.support.utils; import cn.binarywang.wx.miniapp.api.WxMaService; import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl; import cn.binarywang.wx.miniapp.config.impl.WxMaRedisBetterConfigImpl; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.google.common.base.Throwables; import com.java3y.austin.common.constant.CommonConstant; import com.java3y.austin.common.dto.account.WeChatMiniProgramAccount; diff --git a/austin-support/src/main/java/com/java3y/austin/support/utils/LogUtils.java b/austin-support/src/main/java/com/java3y/austin/support/utils/LogUtils.java index 38ccb86..4183909 100644 --- a/austin-support/src/main/java/com/java3y/austin/support/utils/LogUtils.java +++ b/austin-support/src/main/java/com/java3y/austin/support/utils/LogUtils.java @@ -2,7 +2,7 @@ package com.java3y.austin.support.utils; import cn.monitor4all.logRecord.bean.LogDTO; import cn.monitor4all.logRecord.service.CustomLogListener; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.google.common.base.Throwables; import com.java3y.austin.common.domain.AnchorInfo; import com.java3y.austin.common.domain.LogParam; diff --git a/austin-web/pom.xml b/austin-web/pom.xml index 70ec522..c9d1782 100644 --- a/austin-web/pom.xml +++ b/austin-web/pom.xml @@ -52,6 +52,14 @@ io.springfox springfox-boot-starter + + com.alibaba.fastjson2 + fastjson2 + + + com.alibaba.fastjson2 + fastjson2-extension + diff --git a/austin-web/src/main/java/com/java3y/austin/web/aspect/AustinAspect.java b/austin-web/src/main/java/com/java3y/austin/web/aspect/AustinAspect.java index 2df4a13..82a7bbd 100644 --- a/austin-web/src/main/java/com/java3y/austin/web/aspect/AustinAspect.java +++ b/austin-web/src/main/java/com/java3y/austin/web/aspect/AustinAspect.java @@ -1,8 +1,8 @@ package com.java3y.austin.web.aspect; import cn.hutool.core.util.IdUtil; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; import com.google.common.collect.Lists; import com.java3y.austin.web.vo.RequestLogDTO; import lombok.extern.slf4j.Slf4j; diff --git a/austin-web/src/main/java/com/java3y/austin/web/controller/MessageTemplateController.java b/austin-web/src/main/java/com/java3y/austin/web/controller/MessageTemplateController.java index cbd42bb..3f046ad 100644 --- a/austin-web/src/main/java/com/java3y/austin/web/controller/MessageTemplateController.java +++ b/austin-web/src/main/java/com/java3y/austin/web/controller/MessageTemplateController.java @@ -4,8 +4,8 @@ import cn.hutool.core.map.MapUtil; import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.core.text.StrPool; import cn.hutool.core.util.IdUtil; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.TypeReference; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.TypeReference; import com.google.common.base.Throwables; import com.java3y.austin.common.enums.RespStatusEnum; import com.java3y.austin.common.vo.BasicResultVO; diff --git a/austin-web/src/main/java/com/java3y/austin/web/controller/OfficialAccountController.java b/austin-web/src/main/java/com/java3y/austin/web/controller/OfficialAccountController.java index 7ed8841..bd8a7b1 100644 --- a/austin-web/src/main/java/com/java3y/austin/web/controller/OfficialAccountController.java +++ b/austin-web/src/main/java/com/java3y/austin/web/controller/OfficialAccountController.java @@ -6,7 +6,7 @@ import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.RandomUtil; import cn.hutool.http.Header; import cn.hutool.http.HttpUtil; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.google.common.base.Throwables; import com.java3y.austin.common.constant.CommonConstant; import com.java3y.austin.common.constant.OfficialAccountParamConstant; diff --git a/austin-web/src/main/java/com/java3y/austin/web/handler/SubscribeHandler.java b/austin-web/src/main/java/com/java3y/austin/web/handler/SubscribeHandler.java index e9e7bdd..91e9af7 100644 --- a/austin-web/src/main/java/com/java3y/austin/web/handler/SubscribeHandler.java +++ b/austin-web/src/main/java/com/java3y/austin/web/handler/SubscribeHandler.java @@ -1,6 +1,6 @@ package com.java3y.austin.web.handler; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.google.common.base.Throwables; import com.java3y.austin.common.constant.CommonConstant; import com.java3y.austin.common.constant.OfficialAccountParamConstant; diff --git a/austin-web/src/main/java/com/java3y/austin/web/service/impl/DataServiceImpl.java b/austin-web/src/main/java/com/java3y/austin/web/service/impl/DataServiceImpl.java index 3c9eeb4..08eb276 100644 --- a/austin-web/src/main/java/com/java3y/austin/web/service/impl/DataServiceImpl.java +++ b/austin-web/src/main/java/com/java3y/austin/web/service/impl/DataServiceImpl.java @@ -6,7 +6,7 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.map.MapUtil; import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.core.text.StrPool; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.java3y.austin.common.constant.AustinConstant; import com.java3y.austin.common.domain.SimpleAnchorInfo; import com.java3y.austin.common.enums.AnchorState; diff --git a/austin-web/src/main/java/com/java3y/austin/web/service/impl/MaterialServiceImpl.java b/austin-web/src/main/java/com/java3y/austin/web/service/impl/MaterialServiceImpl.java index ead5443..6bd8b9f 100644 --- a/austin-web/src/main/java/com/java3y/austin/web/service/impl/MaterialServiceImpl.java +++ b/austin-web/src/main/java/com/java3y/austin/web/service/impl/MaterialServiceImpl.java @@ -3,7 +3,7 @@ package com.java3y.austin.web.service.impl; import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.http.HttpRequest; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.dingtalk.api.DefaultDingTalkClient; import com.dingtalk.api.DingTalkClient; import com.dingtalk.api.request.OapiMediaUploadRequest; diff --git a/austin-web/src/main/java/com/java3y/austin/web/utils/Convert4Amis.java b/austin-web/src/main/java/com/java3y/austin/web/utils/Convert4Amis.java index 58d88de..64daff9 100644 --- a/austin-web/src/main/java/com/java3y/austin/web/utils/Convert4Amis.java +++ b/austin-web/src/main/java/com/java3y/austin/web/utils/Convert4Amis.java @@ -7,8 +7,8 @@ import cn.hutool.core.map.MapUtil; import cn.hutool.core.text.StrPool; import cn.hutool.core.util.ReflectUtil; import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; import com.alipay.api.domain.MerchantMsgTemplateVO; import com.java3y.austin.common.enums.ChannelType; import com.java3y.austin.common.enums.EnumUtil; diff --git a/austin-web/src/main/java/com/java3y/austin/web/vo/RequestLogDTO.java b/austin-web/src/main/java/com/java3y/austin/web/vo/RequestLogDTO.java index c842b14..32c7b2f 100644 --- a/austin-web/src/main/java/com/java3y/austin/web/vo/RequestLogDTO.java +++ b/austin-web/src/main/java/com/java3y/austin/web/vo/RequestLogDTO.java @@ -1,6 +1,6 @@ package com.java3y.austin.web.vo; -import com.alibaba.fastjson.annotation.JSONField; +import com.alibaba.fastjson2.annotation.JSONField; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/austin-web/src/main/java/com/java3y/austin/web/vo/amis/CommonAmisVo.java b/austin-web/src/main/java/com/java3y/austin/web/vo/amis/CommonAmisVo.java index 0d0193a..b72d385 100644 --- a/austin-web/src/main/java/com/java3y/austin/web/vo/amis/CommonAmisVo.java +++ b/austin-web/src/main/java/com/java3y/austin/web/vo/amis/CommonAmisVo.java @@ -1,7 +1,7 @@ package com.java3y.austin.web.vo.amis; -import com.alibaba.fastjson.annotation.JSONField; +import com.alibaba.fastjson2.annotation.JSONField; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/pom.xml b/pom.xml index 20fff66..e92c6bf 100644 --- a/pom.xml +++ b/pom.xml @@ -46,7 +46,7 @@ 5.7.15 31.0.1-jre 4.9.2 - 1.2.83 + 2.0.60 3.1.510 0.2.12 2.1.0 @@ -146,11 +146,17 @@ ${okhttp.version} - + - com.alibaba - fastjson - ${fastjson.version} + com.alibaba.fastjson2 + fastjson2 + ${fastjson2.version} + + + + com.alibaba.fastjson2 + fastjson2-extension + ${fastjson2.version}