From 13a1993dd27593a4649d71db9d3623c554ca501e Mon Sep 17 00:00:00 2001 From: wuKong Date: Mon, 15 Dec 2025 18:55:08 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix(system):=20=E5=BD=93=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E7=BB=91=E5=AE=9A=E5=BE=AE=E4=BF=A1=E5=B0=8F?= =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E6=97=B6=E8=8E=B7=E5=8F=96=E5=88=B0socialUse?= =?UTF-8?q?r=E4=B8=BAnull,=E4=BC=9A=E5=AF=BC=E8=87=B4=E5=8F=91=E8=B4=A7?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在发送订阅消息前增加社交用户空值判断 - 避免因社交用户信息缺失导致的空指针异常 - 完善日志记录，提高问题排查效率 --- .../yudao/module/system/api/social/SocialClientApiImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/api/social/SocialClientApiImpl.java b/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/api/social/SocialClientApiImpl.java index 30b0bb9a1..aeb7865cb 100644 --- a/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/api/social/SocialClientApiImpl.java +++ b/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/api/social/SocialClientApiImpl.java @@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.system.api.social; import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjUtil; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; @@ -86,7 +87,7 @@ public class SocialClientApiImpl implements SocialClientApi { // 2. 获得社交用户 SocialUserRespDTO socialUser = socialUserService.getSocialUserByUserId(reqDTO.getUserType(), reqDTO.getUserId(), SocialTypeEnum.WECHAT_MINI_PROGRAM.getType()); - if (StrUtil.isBlankIfStr(socialUser.getOpenid())) { + if (ObjectUtil.isNull(socialUser) || StrUtil.isBlankIfStr(socialUser.getOpenid())) { log.warn("[sendWxaSubscribeMessage][reqDTO({}) 发送订阅消息失败，原因：会员 openid 缺失]", reqDTO); return success(false); } From e455572adbfffb7bbfcf5a5853fdc12c8d926f82 Mon Sep 17 00:00:00 2001 From: wuKong Date: Mon, 15 Dec 2025 18:58:13 +0800 Subject: [PATCH 2/5] =?UTF-8?q?refactor(system):=20=E6=9B=BF=E6=8D=A2=20Ob?= =?UTF-8?q?jectUtil=20=E4=B8=BA=20ObjUtil?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将 SocialClientApiImpl 中的 ObjectUtil.isNull 替换为 ObjUtil.isNull - 移除未使用的 ObjectUtil 导入包 - 保持空值判断逻辑一致性 --- .../yudao/module/system/api/social/SocialClientApiImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/api/social/SocialClientApiImpl.java b/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/api/social/SocialClientApiImpl.java index aeb7865cb..07ad265cb 100644 --- a/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/api/social/SocialClientApiImpl.java +++ b/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/api/social/SocialClientApiImpl.java @@ -3,7 +3,6 @@ package cn.iocoder.yudao.module.system.api.social; import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjUtil; -import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; @@ -87,7 +86,7 @@ public class SocialClientApiImpl implements SocialClientApi { // 2. 获得社交用户 SocialUserRespDTO socialUser = socialUserService.getSocialUserByUserId(reqDTO.getUserType(), reqDTO.getUserId(), SocialTypeEnum.WECHAT_MINI_PROGRAM.getType()); - if (ObjectUtil.isNull(socialUser) || StrUtil.isBlankIfStr(socialUser.getOpenid())) { + if (ObjUtil.isNull(socialUser) || StrUtil.isBlankIfStr(socialUser.getOpenid())) { log.warn("[sendWxaSubscribeMessage][reqDTO({}) 发送订阅消息失败，原因：会员 openid 缺失]", reqDTO); return success(false); } From e63b79274118f5654154929f777aa0a86d5538cb Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sat, 20 Dec 2025 10:21:33 +0800 Subject: [PATCH 3/5] =?UTF-8?q?chore=EF=BC=9A=E5=8D=87=E7=BA=A7=20spring-a?= =?UTF-8?q?i=20=E8=87=B3=201.1.2=EF=BC=8Calibaba-ai=20=E8=87=B3=201.1.0.0-?= =?UTF-8?q?RC2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yudao-module-ai/yudao-module-ai-server/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yudao-module-ai/yudao-module-ai-server/pom.xml b/yudao-module-ai/yudao-module-ai-server/pom.xml index 574c1e9e4..25549c538 100644 --- a/yudao-module-ai/yudao-module-ai-server/pom.xml +++ b/yudao-module-ai/yudao-module-ai-server/pom.xml @@ -19,9 +19,9 @@ 国外：OpenAI、Ollama、Midjourney、StableDiffusion、Suno - 1.1.0 + 1.1.2 - 1.1.0.0-RC1 + 1.1.0.0-RC2 1.2.6 From 7015d221b1c3e3300046370a4d60c2040f9d95a1 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sat, 20 Dec 2025 15:08:09 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix=EF=BC=9A=E3=80=90bpm=E3=80=91CrmContrac?= =?UTF-8?q?tStatusListener=E3=80=81CrmReceivableStatusListener=20=E6=97=A0?= =?UTF-8?q?=E9=9C=80=20@FeignClient(name=20=3D=20ApiConstants.NAME)=20?= =?UTF-8?q?=E6=B3=A8=E8=A7=A3=EF=BC=8C=E5=AF=B9=E5=BA=94=20https://t.zsxq.?= =?UTF-8?q?com/8ETgM?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/contract/listener/CrmContractStatusListener.java | 2 -- .../receivable/listener/CrmReceivableStatusListener.java | 3 --- 2 files changed, 5 deletions(-) diff --git a/yudao-module-crm/yudao-module-crm-server/src/main/java/cn/iocoder/yudao/module/crm/service/contract/listener/CrmContractStatusListener.java b/yudao-module-crm/yudao-module-crm-server/src/main/java/cn/iocoder/yudao/module/crm/service/contract/listener/CrmContractStatusListener.java index 64caa3749..57acc4aa9 100644 --- a/yudao-module-crm/yudao-module-crm-server/src/main/java/cn/iocoder/yudao/module/crm/service/contract/listener/CrmContractStatusListener.java +++ b/yudao-module-crm/yudao-module-crm-server/src/main/java/cn/iocoder/yudao/module/crm/service/contract/listener/CrmContractStatusListener.java @@ -6,7 +6,6 @@ import cn.iocoder.yudao.module.crm.enums.ApiConstants; import cn.iocoder.yudao.module.crm.service.contract.CrmContractService; import cn.iocoder.yudao.module.crm.service.contract.CrmContractServiceImpl; import jakarta.annotation.Resource; -import org.springframework.cloud.openfeign.FeignClient; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -19,7 +18,6 @@ import org.springframework.web.bind.annotation.RestController; */ @RestController @Validated -@FeignClient(name = ApiConstants.NAME) // TODO 芋艿：fallbackFactory = public class CrmContractStatusListener extends BpmProcessInstanceStatusEventListener { private static final String PREFIX = ApiConstants.PREFIX + "/contract"; diff --git a/yudao-module-crm/yudao-module-crm-server/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/listener/CrmReceivableStatusListener.java b/yudao-module-crm/yudao-module-crm-server/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/listener/CrmReceivableStatusListener.java index dcb963bf0..cbbd0dba3 100644 --- a/yudao-module-crm/yudao-module-crm-server/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/listener/CrmReceivableStatusListener.java +++ b/yudao-module-crm/yudao-module-crm-server/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/listener/CrmReceivableStatusListener.java @@ -1,13 +1,11 @@ package cn.iocoder.yudao.module.crm.service.receivable.listener; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.module.bpm.api.event.BpmProcessInstanceStatusEvent; import cn.iocoder.yudao.module.bpm.api.event.BpmProcessInstanceStatusEventListener; import cn.iocoder.yudao.module.crm.enums.ApiConstants; import cn.iocoder.yudao.module.crm.service.receivable.CrmReceivableService; import cn.iocoder.yudao.module.crm.service.receivable.CrmReceivableServiceImpl; import jakarta.annotation.Resource; -import org.springframework.cloud.openfeign.FeignClient; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -20,7 +18,6 @@ import org.springframework.web.bind.annotation.RestController; */ @RestController @Validated -@FeignClient(name = ApiConstants.NAME) // TODO 芋艿：fallbackFactory = public class CrmReceivableStatusListener extends BpmProcessInstanceStatusEventListener { private static final String PREFIX = ApiConstants.PREFIX + "/receivable"; From 201711cec1b038847df1c5f2242a907d29e0ccf4 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Thu, 25 Dec 2025 22:28:13 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E3=80=90=E5=8D=87=E7=BA=A7=E3=80=91mybatis?= =?UTF-8?q?-plus=20from=203.5.14=20to=203.5.15=20=E3=80=90=E5=8D=87?= =?UTF-8?q?=E7=BA=A7=E3=80=91mybatis-plus-join=20from=201.5.4=20to=201.5.5?= =?UTF-8?q?=20=E3=80=90=E5=8D=87=E7=BA=A7=E3=80=91rocketmq-spring=20from?= =?UTF-8?q?=202.3.4=20to=202.3.5=20=E3=80=90=E5=8D=87=E7=BA=A7=E3=80=91net?= =?UTF-8?q?ty=20from=204.2.7=20to=204.2.9=20=E3=80=90=E5=8D=87=E7=BA=A7?= =?UTF-8?q?=E3=80=91awssdk=20from=202.39.2=20to=202.40.15?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yudao-dependencies/pom.xml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/yudao-dependencies/pom.xml b/yudao-dependencies/pom.xml index 067500882..a52b78b57 100644 --- a/yudao-dependencies/pom.xml +++ b/yudao-dependencies/pom.xml @@ -26,17 +26,17 @@ 1.2.27 3.5.19 - 3.5.14 - 1.5.4 + 3.5.15 + 1.5.5 4.3.1 3.0.6 3.52.0 8.1.3.140 8.6.0 5.1.0 - 3.7.8 + 3.7.9 - 2.3.4 + 2.3.5 @@ -58,7 +58,7 @@ 1.21.2 1.18.42 1.6.3 - 5.8.41 + 5.8.42 6.0.0-M22 1.3.0 2.4.1 @@ -67,21 +67,21 @@ 2.14.5 3.12.0 3.20.0 - 2.27.6 + 2.27.7 3.2.3 2.7.0 3.0.6 0.10.2 - 4.2.7.Final + 4.2.9.Final 1.2.5 4.5.22 - 2.39.2 + 2.40.15 1.16.7 1.4.0 2.1.3 2.2.0 - 4.7.8-20251117.120146 + 4.7.9-20251224.161447