From 11b5cb5288b6c9edaa1c364329460dd53cd35a91 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Fri, 31 Jul 2026 09:44:50 +0800 Subject: [PATCH] fix: 升级 Fastjson2 并排除 Fastjson1 --- yudao-dependencies/pom.xml | 37 ++++++++++++++++++++++++++++++++++--- yudao-framework/yudao-common/pom.xml | 5 +++++ yudao-module-ai/pom.xml | 4 ++++ yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/service/workflow/AiWorkflowServiceImpl.java | 4 ++-- yudao-module-pay/src/test/java/cn/iocoder/yudao/module/pay/service/channel/PayChannelServiceTest.java | 3 +-- yudao-module-report/src/main/java/cn/iocoder/yudao/module/report/framework/jmreport/core/service/JmOnlDragExternalServiceImpl.java | 7 ------- 6 files changed, 46 insertions(+), 14 deletions(-) diff --git a/yudao-dependencies/pom.xml b/yudao-dependencies/pom.xml index a81752a..6c8441f 100644 --- a/yudao-dependencies/pom.xml +++ b/yudao-dependencies/pom.xml @@ -58,8 +58,7 @@ 6.0.0-M22 1.3.0 2.4.1 - 1.2.83 - 2.0.62 + 2.0.63 33.6.0-jre 2.14.5 3.13.0 @@ -243,6 +242,12 @@ org.dromara easy-trans-anno ${easy-trans.version} + + + com.alibaba + fastjson + + @@ -314,6 +319,12 @@ org.apache.rocketmq rocketmq-spring-boot-starter ${rocketmq-spring.version} + + + com.alibaba + fastjson + + @@ -502,7 +513,7 @@ com.alibaba fastjson - ${fastjson.version} + ${fastjson2.version} com.alibaba.fastjson2 @@ -631,6 +642,12 @@ me.zhyd.oauth JustAuth ${justauth.version} + + + com.alibaba + fastjson + + com.xkcoding.justauth @@ -654,6 +671,10 @@ org.bouncycastle bcprov-jdk15on + + com.alibaba + fastjson + @@ -696,6 +717,12 @@ org.jeecgframework.jimureport jimureport-spring-boot3-starter ${jimureport.version} + + + com.alibaba + fastjson + + org.jeecgframework.jimureport @@ -710,6 +737,10 @@ cn.hutool hutool-core + + com.alibaba + fastjson + diff --git a/yudao-framework/yudao-common/pom.xml b/yudao-framework/yudao-common/pom.xml index 357c12b..c43dd2a 100644 --- a/yudao-framework/yudao-common/pom.xml +++ b/yudao-framework/yudao-common/pom.xml @@ -134,6 +134,11 @@ + com.alibaba + fastjson + + + org.dromara easy-trans-anno diff --git a/yudao-module-ai/pom.xml b/yudao-module-ai/pom.xml index 25947cf..b205413 100644 --- a/yudao-module-ai/pom.xml +++ b/yudao-module-ai/pom.xml @@ -242,6 +242,10 @@ org.slf4j slf4j-reload4j + + com.alibaba + fastjson + diff --git a/yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/service/workflow/AiWorkflowServiceImpl.java b/yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/service/workflow/AiWorkflowServiceImpl.java index ac16e87..8ee3b4e 100644 --- a/yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/service/workflow/AiWorkflowServiceImpl.java +++ b/yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/service/workflow/AiWorkflowServiceImpl.java @@ -10,8 +10,8 @@ import cn.iocoder.yudao.module.ai.controller.admin.workflow.vo.AiWorkflowTestReq import cn.iocoder.yudao.module.ai.dal.dataobject.workflow.AiWorkflowDO; import cn.iocoder.yudao.module.ai.dal.mysql.workflow.AiWorkflowMapper; import cn.iocoder.yudao.module.ai.service.model.AiModelService; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONArray; +import com.alibaba.fastjson2.JSONObject; import dev.tinyflow.core.Tinyflow; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; diff --git a/yudao-module-pay/src/test/java/cn/iocoder/yudao/module/pay/service/channel/PayChannelServiceTest.java b/yudao-module-pay/src/test/java/cn/iocoder/yudao/module/pay/service/channel/PayChannelServiceTest.java index eb8f694..67c80db 100644 --- a/yudao-module-pay/src/test/java/cn/iocoder/yudao/module/pay/service/channel/PayChannelServiceTest.java +++ b/yudao-module-pay/src/test/java/cn/iocoder/yudao/module/pay/service/channel/PayChannelServiceTest.java @@ -12,7 +12,6 @@ import cn.iocoder.yudao.module.pay.framework.pay.core.client.PayClient; import cn.iocoder.yudao.module.pay.framework.pay.core.client.PayClientFactory; import cn.iocoder.yudao.module.pay.framework.pay.core.client.impl.alipay.AlipayPayClientConfig; import cn.iocoder.yudao.module.pay.framework.pay.core.client.impl.weixin.WxPayClientConfig; -import com.alibaba.fastjson.JSON; import jakarta.annotation.Resource; import jakarta.validation.Validator; import org.junit.jupiter.api.Test; @@ -109,7 +108,7 @@ public class PayChannelServiceTest extends BaseDbUnitTest { AlipayPayClientConfig payClientPublicKeyConfig = randomAlipayPayClientConfig(); PayChannelUpdateReqVO reqVO = randomPojo(PayChannelUpdateReqVO.class, o -> { o.setStatus(CommonStatusEnum.ENABLE.getStatus()); - o.setConfig(JSON.toJSONString(payClientPublicKeyConfig)); + o.setConfig(JsonUtils.toJsonString(payClientPublicKeyConfig)); }); // 调用, 并断言异常 diff --git a/yudao-module-report/src/main/java/cn/iocoder/yudao/module/report/framework/jmreport/core/service/JmOnlDragExternalServiceImpl.java b/yudao-module-report/src/main/java/cn/iocoder/yudao/module/report/framework/jmreport/core/service/JmOnlDragExternalServiceImpl.java index a61a42f..f61512f 100644 --- a/yudao-module-report/src/main/java/cn/iocoder/yudao/module/report/framework/jmreport/core/service/JmOnlDragExternalServiceImpl.java +++ b/yudao-module-report/src/main/java/cn/iocoder/yudao/module/report/framework/jmreport/core/service/JmOnlDragExternalServiceImpl.java @@ -1,13 +1,11 @@ package cn.iocoder.yudao.module.report.framework.jmreport.core.service; -import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import org.jeecg.modules.drag.service.IOnlDragExternalService; import org.jeecg.modules.drag.vo.DragDictModel; import org.jeecg.modules.drag.vo.DragLogDTO; import java.util.List; -import java.util.Map; /** * {@link IOnlDragExternalService} 实现类，提供积木仪表盘的查询等功能 @@ -24,11 +22,6 @@ public class JmOnlDragExternalServiceImpl implements IOnlDragExternalService { // ========== DictItem 相关 ========== @Override - public Map> getManyDictItems(List codeList, List tableDictList) { - return IOnlDragExternalService.super.getManyDictItems(codeList, tableDictList); - } - - @Override public List getDictItems(String dictCode) { return IOnlDragExternalService.super.getDictItems(dictCode); } -- libgit2 0.21.4