yudao
/
spring-cloud
mirror of https://gitee.com/zhijiantianya/yudao-cloud.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud 

# Conflicts:
#	pom.xml
#	yudao-dependencies/pom.xml
#	yudao-module-iot/yudao-module-iot-core/src/main/java/cn/iocoder/yudao/module/iot/core/messagebus/core/rabbitmq/IotRabbitMQMessageBus.java
master
YunaiV 2026-05-31 21:31:31 +08:00
parent 3020c6cdb0 1bc987805a
commit 0ca9eda251
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/service/alert/IotAlertConfigServiceImpl.java
View File

@ -47,7 +47,7 @@ public class IotAlertConfigServiceImpl implements IotAlertConfigService {
public Long createAlertConfig(IotAlertConfigSaveReqVO createReqVO) { public Long createAlertConfig(IotAlertConfigSaveReqVO createReqVO) {
// 校验关联数据是否存在 // 校验关联数据是否存在
sceneRuleService.validateSceneRuleList(createReqVO.getSceneRuleIds()); sceneRuleService.validateSceneRuleList(createReqVO.getSceneRuleIds());
adminUserApi.validateUserList(createReqVO.getReceiveUserIds()); adminUserApi.validateUserList(createReqVO.getReceiveUserIds()).checkError();
validateReceiveTemplates(createReqVO); validateReceiveTemplates(createReqVO);
// 插入 // 插入
@ -62,7 +62,7 @@ public class IotAlertConfigServiceImpl implements IotAlertConfigService {
validateAlertConfigExists(updateReqVO.getId()); validateAlertConfigExists(updateReqVO.getId());
// 校验关联数据是否存在 // 校验关联数据是否存在
sceneRuleService.validateSceneRuleList(updateReqVO.getSceneRuleIds()); sceneRuleService.validateSceneRuleList(updateReqVO.getSceneRuleIds());
adminUserApi.validateUserList(updateReqVO.getReceiveUserIds()); adminUserApi.validateUserList(updateReqVO.getReceiveUserIds()).checkError();
validateReceiveTemplates(updateReqVO); validateReceiveTemplates(updateReqVO);
// 更新 // 更新

6
yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/action/IotAlertTriggerSceneRuleAction.java
View File

@ -103,15 +103,15 @@ public class IotAlertTriggerSceneRuleAction implements IotSceneRuleAction {
switch (typeEnum) { switch (typeEnum) {
case SMS: case SMS:
smsSendApi.sendSingleSmsToAdmin(new SmsSendSingleToUserReqDTO().setUserId(userId) smsSendApi.sendSingleSmsToAdmin(new SmsSendSingleToUserReqDTO().setUserId(userId)
.setTemplateCode(templateCode).setTemplateParams(templateParams)); .setTemplateCode(templateCode).setTemplateParams(templateParams)).checkError();
break; break;
case MAIL: case MAIL:
mailSendApi.sendSingleMailToAdmin(new MailSendSingleToUserReqDTO().setUserId(userId) mailSendApi.sendSingleMailToAdmin(new MailSendSingleToUserReqDTO().setUserId(userId)
.setTemplateCode(templateCode).setTemplateParams(templateParams)); .setTemplateCode(templateCode).setTemplateParams(templateParams)).checkError();
break; break;
case NOTIFY: case NOTIFY:
notifyMessageSendApi.sendSingleMessageToAdmin(new NotifySendSingleToUserReqDTO().setUserId(userId) notifyMessageSendApi.sendSingleMessageToAdmin(new NotifySendSingleToUserReqDTO().setUserId(userId)
.setTemplateCode(templateCode).setTemplateParams(templateParams)); .setTemplateCode(templateCode).setTemplateParams(templateParams)).checkError();
break; break;
} }
} catch (Exception ex) { } catch (Exception ex) {

4
yudao-module-mall/yudao-module-promotion-server/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationRecordServiceImpl.java
View File

@ -238,7 +238,7 @@ public class CombinationRecordServiceImpl implements CombinationRecordService {
.setTemplateTitle(COMBINATION_SUCCESS) .setTemplateTitle(COMBINATION_SUCCESS)
.setPage("pages/order/detail?id=" + record.getOrderId()) // 订单详情页 .setPage("pages/order/detail?id=" + record.getOrderId()) // 订单详情页
.addMessage("thing1", "商品拼团活动") // 活动标题 .addMessage("thing1", "商品拼团活动") // 活动标题
.addMessage("thing2", "恭喜您拼团成功！我们将尽快为您发货。")); // 温馨提示 .addMessage("thing2", "恭喜您拼团成功！我们将尽快为您发货。")).checkError(); // 温馨提示
} }
@Override @Override
@ -345,7 +345,7 @@ public class CombinationRecordServiceImpl implements CombinationRecordService {
CombinationRecordStatusEnum.FAILED); CombinationRecordStatusEnum.FAILED);
// 2. 订单取消 // 2. 订单取消
headAndRecords.forEach(item -> tradeOrderApi.cancelPaidOrder(item.getUserId(), item.getOrderId(), headAndRecords.forEach(item -> tradeOrderApi.cancelPaidOrder(item.getUserId(), item.getOrderId(),
TradeOrderCancelTypeEnum.COMBINATION_CLOSE.getType())); TradeOrderCancelTypeEnum.COMBINATION_CLOSE.getType()).checkError());
} }
/** /**

4
yudao-module-mall/yudao-module-promotion-server/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponTemplateServiceImpl.java
View File

@ -122,9 +122,9 @@ public class CouponTemplateServiceImpl implements CouponTemplateService {
private void validateProductScope(Integer productScope, List<Long> productScopeValues) { private void validateProductScope(Integer productScope, List<Long> productScopeValues) {
if (Objects.equals(PromotionProductScopeEnum.SPU.getScope(), productScope)) { if (Objects.equals(PromotionProductScopeEnum.SPU.getScope(), productScope)) {
productSpuApi.validateSpuList(productScopeValues); productSpuApi.validateSpuList(productScopeValues).checkError();
} else if (Objects.equals(PromotionProductScopeEnum.CATEGORY.getScope(), productScope)) { } else if (Objects.equals(PromotionProductScopeEnum.CATEGORY.getScope(), productScope)) {
productCategoryApi.validateCategoryList(productScopeValues); productCategoryApi.validateCategoryList(productScopeValues).checkError();
} }
} }

8
yudao-module-member/yudao-module-member-server/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java
View File

@ -164,11 +164,11 @@ public class MemberUserServiceImpl implements MemberUserService {
// 补充说明：从安全性来说，老手机也校验 oldCode 验证码会更安全。但是由于 uni-app 商城界面暂时没做，所以这里不强制校验 // 补充说明：从安全性来说，老手机也校验 oldCode 验证码会更安全。但是由于 uni-app 商城界面暂时没做，所以这里不强制校验
if (StrUtil.isNotEmpty(reqVO.getOldCode())) { if (StrUtil.isNotEmpty(reqVO.getOldCode())) {
smsCodeApi.useSmsCode(new SmsCodeUseReqDTO().setMobile(user.getMobile()).setCode(reqVO.getOldCode()) smsCodeApi.useSmsCode(new SmsCodeUseReqDTO().setMobile(user.getMobile()).setCode(reqVO.getOldCode())
.setScene(SmsSceneEnum.MEMBER_UPDATE_MOBILE.getScene()).setUsedIp(getClientIP())); .setScene(SmsSceneEnum.MEMBER_UPDATE_MOBILE.getScene()).setUsedIp(getClientIP())).checkError();
} }
// 2.2 使用新验证码 // 2.2 使用新验证码
smsCodeApi.useSmsCode(new SmsCodeUseReqDTO().setMobile(reqVO.getMobile()).setCode(reqVO.getCode()) smsCodeApi.useSmsCode(new SmsCodeUseReqDTO().setMobile(reqVO.getMobile()).setCode(reqVO.getCode())
.setScene(SmsSceneEnum.MEMBER_UPDATE_MOBILE.getScene()).setUsedIp(getClientIP())); .setScene(SmsSceneEnum.MEMBER_UPDATE_MOBILE.getScene()).setUsedIp(getClientIP())).checkError();
// 3. 更新用户手机 // 3. 更新用户手机
memberUserMapper.updateById(MemberUserDO.builder().id(userId).mobile(reqVO.getMobile()).build()); memberUserMapper.updateById(MemberUserDO.builder().id(userId).mobile(reqVO.getMobile()).build());
@ -193,7 +193,7 @@ public class MemberUserServiceImpl implements MemberUserService {
MemberUserDO user = validateUserExists(userId); MemberUserDO user = validateUserExists(userId);
// 校验验证码 // 校验验证码
smsCodeApi.useSmsCode(new SmsCodeUseReqDTO().setMobile(user.getMobile()).setCode(reqVO.getCode()) smsCodeApi.useSmsCode(new SmsCodeUseReqDTO().setMobile(user.getMobile()).setCode(reqVO.getCode())
.setScene(SmsSceneEnum.MEMBER_UPDATE_PASSWORD.getScene()).setUsedIp(getClientIP())); .setScene(SmsSceneEnum.MEMBER_UPDATE_PASSWORD.getScene()).setUsedIp(getClientIP())).checkError();
// 更新用户密码 // 更新用户密码
memberUserMapper.updateById(MemberUserDO.builder().id(userId) memberUserMapper.updateById(MemberUserDO.builder().id(userId)
@ -207,7 +207,7 @@ public class MemberUserServiceImpl implements MemberUserService {
// 使用验证码 // 使用验证码
smsCodeApi.useSmsCode(AuthConvert.INSTANCE.convert(reqVO, SmsSceneEnum.MEMBER_RESET_PASSWORD, smsCodeApi.useSmsCode(AuthConvert.INSTANCE.convert(reqVO, SmsSceneEnum.MEMBER_RESET_PASSWORD,
getClientIP())); getClientIP())).checkError();
// 更新密码 // 更新密码
memberUserMapper.updateById(MemberUserDO.builder().id(user.getId()) memberUserMapper.updateById(MemberUserDO.builder().id(user.getId())