YunaiV
|
52e883d5be
|
【同步】BOOT 和 CLOUD 的功能
|
2026-05-10 10:14:41 +08:00 |
|
YunaiV
|
32c353c53d
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
|
2026-05-10 10:11:37 +08:00 |
|
YunaiV
|
de4abc2f5f
|
【同步】BOOT 和 CLOUD 的功能（mall + mes）
|
2026-05-10 10:11:24 +08:00 |
|
YunaiV
|
9db40c8b80
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java
|
2026-05-10 09:41:19 +08:00 |
|
YunaiV
|
e657805544
|
【同步】BOOT 和 CLOUD 的功能（ai + trade）
|
2026-05-10 09:40:28 +08:00 |
|
YunaiV
|
116b6766b3
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/service/device/remote/IotDeviceApiImpl.java
|
2026-05-03 23:03:42 +08:00 |
|
YunaiV
|
3e5e60ce96
|
【同步】BOOT 和 CLOUD 的功能（system）
|
2026-05-03 22:45:50 +08:00 |
|
YunaiV
|
e1b3589bff
|
fix: 修正Lock4j配置中的超时时间注释
|
2026-05-03 20:46:37 +08:00 |
|
YunaiV
|
3f599a623a
|
【同步】BOOT 和 CLOUD 的功能
|
2026-03-08 10:18:09 +08:00 |
|
YunaiV
|
bb3f1954ee
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/TenantController.java
# yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/app/tenant/AppTenantController.java
|
2026-03-08 10:14:33 +08:00 |
|
YunaiV
|
34d74b378e
|
【同步】BOOT 和 CLOUD 的功能
|
2026-03-08 10:14:09 +08:00 |
|
YunaiV
|
71393eed21
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-module-iot/yudao-module-iot-core/src/main/java/cn/iocoder/yudao/module/iot/core/messagebus/config/IotMessageBusProperties.java
# yudao-module-iot/yudao-module-iot-core/src/main/java/cn/iocoder/yudao/module/iot/core/topic/auth/IotDeviceRegisterReqDTO.java
# yudao-module-iot/yudao-module-iot-core/src/main/java/cn/iocoder/yudao/module/iot/core/topic/auth/IotSubDeviceRegisterReqDTO.java
# yudao-module-iot/yudao-module-iot-core/src/main/java/cn/iocoder/yudao/module/iot/core/topic/topo/IotDeviceTopoAddReqDTO.java
# yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/config/IotGatewayProperties.java
# yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/protocol/AbstractIotProtocolDownstreamSubscriber.java
# yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/protocol/coap/IotCoapDownstreamSubscriber.java
# yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/protocol/coap/IotCoapUpstreamProtocol.java
# yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/protocol/emqx/IotEmqxAuthEventProtocol.java
# yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/protocol/emqx/IotEmqxUpstreamProtocol.java
# yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/protocol/http/IotHttpDownstreamSubscriber.java
# yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/protocol/http/IotHttpUpstreamProtocol.java
# yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/protocol/mqtt/IotMqttDownstreamSubscriber.java
# yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/protocol/mqtt/IotMqttUpstreamProtocol.java
# yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/protocol/tcp/IotTcpDownstreamSubscriber.java
# yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/protocol/tcp/IotTcpUpstreamProtocol.java
# yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/protocol/udp/IotUdpDownstreamSubscriber.java
# yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/protocol/udp/IotUdpUpstreamProtocol.java
# yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/protocol/websocket/IotWebSocketDownstreamSubscriber.java
# yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/protocol/websocket/IotWebSocketUpstreamProtocol.java
# yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/service/device/remote/IotDeviceApiImpl.java
# yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/api/device/IoTDeviceApiImpl.java
# yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/mq/consumer/rule/IotSceneRuleMessageSubscriber.java
# yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/service/product/IotProductServiceImpl.java
|
2026-02-14 16:36:52 +08:00 |
|
YunaiV
|
06586b85f6
|
【同步】BOOT 和 CLOUD 的功能
|
2026-02-14 16:07:21 +08:00 |
|
YunaiV
|
456c96df16
|
【同步】BOOT 和 CLOUD 的功能
|
2026-01-29 22:38:05 +08:00 |
|
YunaiV
|
c57d3a65f9
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-dependencies/pom.xml
# yudao-module-iot/yudao-module-iot-core/src/main/java/cn/iocoder/yudao/module/iot/core/biz/dto/IotDeviceAuthReqDTO.java
# yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/protocol/mqttws/IotMqttWsDownstreamSubscriber.java
# yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/protocol/mqttws/IotMqttWsUpstreamProtocol.java
# yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/service/device/remote/IotDeviceApiImpl.java
# yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/api/device/IoTDeviceApiImpl.java
# yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/device/IotDeviceImportExcelVO.java
# yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/device/IotDeviceMapper.java
# yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/service/device/IotDeviceService.java
# yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/service/device/IotDeviceServiceImpl.java
# yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/service/device/message/IotDeviceMessageService.java
# yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/service/device/property/IotDevicePropertyServiceImpl.java
# yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/service/rule/data/action/IotWebSocketDataRuleAction.java
# yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/service/rule/data/action/websocket/IotWebSocketClient.java
# yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/IotSceneRuleServiceImpl.java
# yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/AuthLoginReqVO.java
|
2026-01-29 22:25:16 +08:00 |
|
YunaiV
|
fa72dc4e59
|
【同步】BOOT 和 CLOUD 的功能
|
2026-01-29 22:14:05 +08:00 |
|
YunaiV
|
99ffe0fd41
|
【同步】BOOT 和 CLOUD 的功能
|
2026-01-18 19:19:42 +08:00 |
|
YunaiV
|
e10be5160b
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/IotSceneRuleServiceImpl.java
# yudao-module-system/yudao-module-system-server/src/test/java/cn/iocoder/yudao/module/system/service/mail/MailSendServiceImplTest.java
|
2026-01-18 19:04:00 +08:00 |
|
YunaiV
|
304b2f102a
|
【同步】BOOT 和 CLOUD 的功能
|
2026-01-18 19:01:29 +08:00 |
|
YunaiV
|
61b6b6c7bd
|
fix：【system】MailSendServiceImplTest 单测报错的问题，MockedStatic 存在差异
|
2026-01-18 17:56:44 +08:00 |
|
YunaiV
|
bcf00e3332
|
【同步】BOOT 和 CLOUD 的功能
|
2026-01-18 17:29:49 +08:00 |
|
YunaiV
|
c95268dfba
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
|
2026-01-18 17:22:52 +08:00 |
|
YunaiV
|
09d58706cc
|
【同步】BOOT 和 CLOUD 的功能
|
2026-01-18 17:22:44 +08:00 |
|
YunaiV
|
c6f8680da3
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-module-system/yudao-module-system-server/src/test/java/cn/iocoder/yudao/module/system/service/mail/MailSendServiceImplTest.java
|
2026-01-18 17:14:18 +08:00 |
|
YunaiV
|
f6eff05053
|
【同步】BOOT 和 CLOUD 的功能
|
2026-01-18 17:13:07 +08:00 |
|
YunaiV
|
d5ed2f4728
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-gateway/src/main/resources/application.yaml
# yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/mail/dto/MailSendSingleToUserReqDTO.java
# yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/api/mail/MailSendApiImpl.java
# yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/mq/message/mail/MailSendMessage.java
# yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/mq/producer/mail/MailProducer.java
# yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailSendServiceImpl.java
|
2026-01-18 16:58:19 +08:00 |
|
Danlin
|
b292bc2c19
|
!233 【system】发送邮件时，携带附件
* 发送邮件时，带上附件
|
2026-01-18 07:28:25 +00:00 |
|
YunaiV
|
6e9933cf0f
|
fix：【system】getUser 默认忽略数据权限，基础数据较为通用
|
2026-01-02 17:15:24 +08:00 |
|
YunaiV
|
51da2a2f36
|
(〃'▽'〃) v2025.12 发布：极大极大完善 vben5 的 antd、vben 版本的功能，新增 admin uniapp vue3 版本
|
2025-12-28 10:52:44 +08:00 |
|
YunaiV
|
7739c2a35d
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-module-mall/yudao-module-promotion-server/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponTemplateService.java
# yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateServiceImpl.java
|
2025-12-28 10:22:38 +08:00 |
|
YunaiV
|
0f27c0aa72
|
【同步】BOOT 和 CLOUD 的功能
|
2025-12-28 10:22:05 +08:00 |
|
YunaiV
|
e60f5496fa
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
|
2025-12-27 10:29:58 +08:00 |
|
YunaiV
|
be65f9cf97
|
feat：【infra】spring boot admin 默认需要登录
|
2025-12-27 10:29:42 +08:00 |
|
YunaiV
|
382e9e8cdd
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-dependencies/pom.xml
# yudao-module-crm/yudao-module-crm-server/src/main/java/cn/iocoder/yudao/module/crm/service/contract/listener/CrmContractStatusListener.java
# yudao-module-crm/yudao-module-crm-server/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/listener/CrmReceivableStatusListener.java
|
2025-12-25 22:30:00 +08:00 |
|
wuKong
|
e455572adb
|
refactor(system): 替换 ObjectUtil 为 ObjUtil
- 将 SocialClientApiImpl 中的 ObjectUtil.isNull 替换为 ObjUtil.isNull
- 移除未使用的 ObjectUtil 导入包
- 保持空值判断逻辑一致性
|
2025-12-15 18:58:13 +08:00 |
|
wuKong
|
13a1993dd2
|
fix(system): 当用户没有绑定微信小程序时获取到socialUser为null,会导致发货失败
- 在发送订阅消息前增加社交用户空值判断
- 避免因社交用户信息缺失导致的空指针异常
- 完善日志记录，提高问题排查效率
|
2025-12-15 18:55:08 +08:00 |
|
YunaiV
|
4017f71d10
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
|
2025-12-13 12:33:06 +08:00 |
|
YunaiV
|
ec8577bdd9
|
【同步】BOOT 和 CLOUD 的功能
|
2025-12-13 12:32:46 +08:00 |
|
YunaiV
|
667cf9d1c9
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
|
2025-12-07 18:20:52 +08:00 |
|
YunaiV
|
b5a7350fe9
|
【同步】BOOT 和 CLOUD 的功能
|
2025-12-07 18:20:05 +08:00 |
|
YunaiV
|
f4ba70ec5a
|
feat：【SocialClient】 支付宝小程序登录补充
|
2025-11-29 10:10:31 +08:00 |
|
YunaiV
|
4cfff2d05c
|
(〃'▽'〃) v2025.11 发布：极大完善 vben5 的 antd、vben 版本的功能，优化整体稳定性
|
2025-11-26 22:58:52 +08:00 |
|
YunaiV
|
d52e6cb7ea
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# pom.xml
# yudao-dependencies/pom.xml
|
2025-11-26 22:57:01 +08:00 |
|
YunaiV
|
454e68c162
|
fix：【system】AdminUserServiceImplTest 单测报错问题
|
2025-11-26 22:49:06 +08:00 |
|
YunaiV
|
12126a7530
|
【同步】BOOT 和 CLOUD 的功能
|
2025-11-26 22:45:16 +08:00 |
|
YunaiV
|
4f1de29748
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-dependencies/pom.xml
# yudao-module-bpm/yudao-module-bpm-server/src/main/java/cn/iocoder/yudao/module/bpm/api/event/CrmContractStatusListener.java
# yudao-module-bpm/yudao-module-bpm-server/src/main/java/cn/iocoder/yudao/module/bpm/api/event/CrmReceivableStatusListener.java
|
2025-11-24 11:26:03 +08:00 |
|
YunaiV
|
69e595d62e
|
【同步】BOOT 和 CLOUD 的功能
|
2025-11-23 09:07:03 +08:00 |
|
YunaiV
|
bf7bd49dd2
|
【同步】BOOT 和 CLOUD 的功能
|
2025-10-02 18:51:44 +08:00 |
|
YunaiV
|
dd30e9e111
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/config/YudaoWebAutoConfiguration.java
# yudao-module-bpm/yudao-module-bpm-server/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceCancelReqVO.java
# yudao-module-bpm/yudao-module-bpm-server/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceCreateReqVO.java
# yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/IotSceneRuleServiceImpl.java
# yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/action/IotDeviceControlSceneRuleAction.java
# yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/IotSceneRuleMatcherManager.java
# yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialClientServiceImpl.java
|
2025-10-02 17:56:24 +08:00 |
|
YunaiV
|
96c6f184fa
|
【同步】BOOT 和 CLOUD 的功能
|
2025-10-02 17:51:59 +08:00 |