yudao
/
spring-cloud
mirror of https://gitee.com/zhijiantianya/yudao-cloud.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,793 Commits
3 Branches
47 Tags
61 MiB
Commit Graph

302 Commits (39f7e9de6ab178f61860675ff6a5710053ff8f78)

Author SHA1 Message Date
YunaiV 39f7e9de6a 【同步】BOOT 和 CLOUD 的功能 2026-06-19 19:07:42 -07:00
YunaiV 38f2341d34 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud 
# Conflicts:
#	yudao-module-bpm/yudao-module-bpm-server/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskRejectReqVO.java
#	yudao-module-bpm/yudao-module-bpm-server/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskService.java
#	yudao-module-im/yudao-module-im-server/src/main/java/cn/iocoder/yudao/module/im/service/friend/ImFriendRequestServiceImpl.java
#	yudao-module-mall/yudao-module-trade-server/src/main/java/cn/iocoder/yudao/module/trade/controller/app/aftersale/AppAfterSaleController.java
#	yudao-module-mes/yudao-module-mes-server/src/main/java/cn/iocoder/yudao/module/mes/service/wm/barcode/MesWmBarcodeServiceImpl.java
#	yudao-module-mes/yudao-module-mes-server/src/main/java/cn/iocoder/yudao/module/mes/service/wm/sn/MesWmSnServiceImpl.java
 2026-06-19 18:59:53 -07:00
YunaiV eb7fa0d844 【同步】BOOT 和 CLOUD 的功能（im 为主） 2026-06-19 18:59:20 -07:00
YunaiV ed87b45dff fix(rpc): 统一 RPC API 返回 CommonResult 
- 将 ConfigApi、DeptApi、AdminUserApi 的 RPC 方法返回值改为 CommonResult
- 调整对应 ApiImpl 使用 success 包装响应
- 更新调用方显式 getCheckedData/checkError 处理 RPC 返回
- 补充相关单测 mock 的 CommonResult 包装
 2026-06-14 01:26:41 +08:00
YunaiV ef63fa3737 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud 2026-06-14 00:37:05 +08:00
YunaiV af91987460 feat: 支持瀚高数据库 PostgreSQL 兼容模式 
- 新增 highgo SQL 脚本与转换器类型
- 增加 HighGo Docker Compose 示例和工具文档
- 后端运行包引入 PostgreSQL JDBC 驱动
- 补充本地瀚高连接配置示例
 2026-06-14 00:36:58 +08:00
YunaiV f5a68ce6f3 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud 
# Conflicts:
#	sql/mysql/ruoyi-vue-pro.sql
#	yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/config/YudaoTenantAutoConfiguration.java
#	yudao-module-infra/yudao-module-infra-server/src/main/java/cn/iocoder/yudao/module/infra/api/config/ConfigApiImpl.java
#	yudao-module-infra/yudao-module-infra-server/src/test/java/cn/iocoder/yudao/module/infra/framework/file/core/s3/S3FileClientTest.java
#	yudao-module-iot/yudao-module-iot-core/src/main/java/cn/iocoder/yudao/module/iot/core/messagebus/config/IotMessageBusProperties.java
 2026-06-07 23:36:09 +08:00
YunaiV bccf7c79e5 【同步】BOOT 和 CLOUD 的功能 2026-06-07 23:35:29 +08:00
YunaiV 0ca9eda251 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
 2026-05-31 21:31:31 +08:00
YunaiV 3020c6cdb0 【同步】BOOT 和 CLOUD 的功能 2026-05-31 21:22:56 +08:00
YunaiV ff4ed31c1b 【同步】BOOT 和 CLOUD 的功能 2026-05-31 20:59:11 +08:00
YunaiV 14add8edf0 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/thingmodel/IotThingModelServiceImpl.java
#	yudao-module-member/yudao-module-member-server/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserBaseVO.java
 2026-05-31 20:48:47 +08:00
YunaiV 6e492e1e6b 【同步】BOOT 和 CLOUD 的功能 2026-05-31 20:47:58 +08:00
YunaiV 8ad9167ddd Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud 2026-05-24 11:12:57 +08:00
YunaiV 4363135bf8 【同步】BOOT 和 CLOUD 的功能 2026-05-23 23:17:59 +08:00
YunaiV e7ac652a9c Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud 2026-05-23 16:20:59 +08:00
YunaiV 17943589a4 【同步】BOOT 和 CLOUD 的功能（框架） 2026-05-23 16:20:19 +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 e1b3589bff fix: 修正Lock4j配置中的超时时间注释 2026-05-03 20:46:37 +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
tqliang a61ecaa019 fix(trade): 修复售后日志记录中的错误引用和排序问题 
- 修正了AfterSaleLogAspect中对operateType的错误引用
- 将AfterSaleLogMapper中的排序字段从createTime改为id以确保正确顺序
- 确保售后操作日志能够正确显示和按预期排序
 2026-03-05 11:19:37 +08:00
tqliang f969670fd3 fix(trade): 修复订单项价格计算逻辑 
- 将价格计算从使用原始价格改为使用支付价格
- 确保价格分配计算的准确性
- 解决因价格比例分配可能导致的计算误差问题
 2026-02-27 08:51:45 +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
芋道源码 7dc6b24e66
!241 feat(trade): 添加快递轨迹时间字段反序列化配置 
Merge pull request !241 from wuKong/feat/feat(trade)-添加快递轨迹时间字段反序列化配置
 2026-01-30 10:14:22 +00:00
wuKong 4052c5c4d0 feat(trade): 添加快递轨迹时间字段反序列化配置 
- 引入 LocalDateTimeDeserializer 处理轨迹时间字段
- 配置 time 字段使用自定义反序列化器
- 确保快递轨迹时间格式正确解析
 2026-01-30 14:55:46 +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 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 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
wuKong 29e4976da3 feat(trade): 优化订单日志切面中的用户信息获取逻辑 
- 使用 ThreadLocal 获取用户类型和用户ID，提高性能
- 添加空值检查确保在 ThreadLocal 未设置时回退到原方法
- 将订单ID检查从 == null 改为 ObjectUtil.isNull 提高一致性
 2026-01-05 10:15:13 +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 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 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
芋道源码 f63b837300
回退 'Pull Request !216 : feat(pay,mall-trade): 小程序商品订单详情path配置支持' 2025-11-21 13:21:34 +00:00
wuKong 45603c7132 fix(trade):优化订单详情接口参数处理 
- 将同步支付状态参数改为字符串类型以避免空指针异常
- 添加参数非空判断逻辑
- 保留原有 Long 类型订单 ID 查询方式
- 增强接口对不同输入参数的兼容性处理
- 使用 Hutool 工具类进行参数转换与校验
- 维持原接口功能不变的基础上提升健壮性
 2025-11-10 17:30:56 +08:00
wuKong d952cdec59 docs(order): 更新订单详情接口参数说明 2025-11-10 16:34:33 +08:00
wuKong 2d7bad4e98 🎨 feat(trade): 调整订单详情接口支持多种查询方式 
- 修改 getOrderDetail 接口参数 id 类型为 String
- 根据 sync 参数决定调用不同的订单查询方法
- 删除冗余的 getOrderDetailByOutTradeNo 接口
- 优化订单支付状态同步逻辑
- 保持原有订单详情返回结构不变
 2025-11-10 16:25:39 +08:00