diff --git a/yudao-dependencies/pom.xml b/yudao-dependencies/pom.xml index e4f606ee0..d8f7022ec 100644 --- a/yudao-dependencies/pom.xml +++ b/yudao-dependencies/pom.xml @@ -29,17 +29,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 @@ -61,7 +61,7 @@ 1.21.2 1.18.42 1.6.3 - 5.8.41 + 5.8.42 1.3.0 2.4 1.2.83 @@ -69,21 +69,21 @@ 2.14.5 3.12.0 3.20.0 - 2.27.6 + 2.27.7 2.9.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 1.2.13 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 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 3a19e85f8..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 @@ -5,14 +5,12 @@ import cn.iocoder.yudao.module.bpm.api.event.BpmProcessInstanceStatusEventListen 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 org.springframework.cloud.openfeign.FeignClient; +import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; -import javax.annotation.Resource; - /** * 合同审批的结果的监听器实现类 * @@ -20,7 +18,6 @@ import javax.annotation.Resource; */ @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 84b69fca7..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 @@ -5,14 +5,12 @@ import cn.iocoder.yudao.module.bpm.api.event.BpmProcessInstanceStatusEventListen 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 org.springframework.cloud.openfeign.FeignClient; +import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; -import javax.annotation.Resource; - /** * 回款审批的结果的监听器实现类 * @@ -20,7 +18,6 @@ import javax.annotation.Resource; */ @RestController @Validated -@FeignClient(name = ApiConstants.NAME) // TODO 芋艿:fallbackFactory = public class CrmReceivableStatusListener extends BpmProcessInstanceStatusEventListener { private static final String PREFIX = ApiConstants.PREFIX + "/receivable"; 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 6a0560417..0916a039b 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 @@ -86,7 +86,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 (ObjUtil.isNull(socialUser) || StrUtil.isBlankIfStr(socialUser.getOpenid())) { log.warn("[sendWxaSubscribeMessage][reqDTO({}) 发送订阅消息失败,原因:会员 openid 缺失]", reqDTO); return success(false); }