2668 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
芋道源码	53d3146ad9	!243 fix(trade): 修复订单项价格计算逻辑 ... Merge pull request !243 from irongroup/master-jdk17-sync	2026-03-08 01:51:21 +00: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	1fca0acc92	【同步】BOOT 和 CLOUD 的功能（IoT）	2026-02-14 16:52:20 +08:00
YunaiV	6ca2c97849	【同步】BOOT 和 CLOUD 的功能（IoT）	2026-02-14 16:41:18 +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	92eda45afd	【同步】BOOT 和 CLOUD 的功能（IoT）	2026-02-14 16:35:48 +08:00
YunaiV	2d4251eda7	Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud into master-jdk17	2026-02-14 16:07:31 +08:00
YunaiV	06586b85f6	【同步】BOOT 和 CLOUD 的功能	2026-02-14 16:07:21 +08:00
芋道源码	7dc6b24e66	!241 feat(trade): 添加快递轨迹时间字段反序列化配置 ... Merge pull request !241 from wuKong/feat/feat(trade)-添加快递轨迹时间字段反序列化配置 v2026.01(jdk17/21)	2026-01-30 10:14:22 +00:00
wuKong	4052c5c4d0	feat(trade): 添加快递轨迹时间字段反序列化配置 ... - 引入 LocalDateTimeDeserializer 处理轨迹时间字段 - 配置 time 字段使用自定义反序列化器 - 确保快递轨迹时间格式正确解析	2026-01-30 14:55:46 +08:00
YunaiV	a3db49babf	(〃'▽'〃) v2026.01 发布：大大大大完善 vben5 的 antd、vben 版本的功能，新增 IoT 各种接入协议 v2026.01(jdk8/11)	2026-01-29 23:32:29 +08:00
YunaiV	33ff11edcf	Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud ... # Conflicts: # pom.xml # yudao-dependencies/pom.xml	2026-01-29 23:31:28 +08:00
YunaiV	b8a213849c	(〃'▽'〃) v2026.01 发布：大大大大完善 vben5 的 antd、vben 版本的功能，新增 IoT 各种接入协议	2026-01-29 23:29:40 +08:00
YunaiV	5a0d95e493	Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud	2026-01-29 22:39:15 +08:00
YunaiV	622db6dc73	Merge remote-tracking branch 'origin/master' ... # Conflicts: # yudao-module-bpm/yudao-module-bpm-server/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/config/BpmFlowableConfiguration.java # yudao-module-bpm/yudao-module-bpm-server/src/main/resources/application-local.yaml	2026-01-29 22:38:27 +08:00
YunaiV	456c96df16	【同步】BOOT 和 CLOUD 的功能	2026-01-29 22:38:05 +08:00
YunaiV	560636ed50	【同步】BOOT 和 CLOUD 的功能	2026-01-29 22:36:17 +08:00
YunaiV	8fd3173670	【同步】BOOT 和 CLOUD 的功能	2026-01-29 22:29:41 +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	2a48bcbee9	Merge remote-tracking branch 'origin/master-jdk17' into master-jdk17 ... # Conflicts: # yudao-module-bpm/yudao-module-bpm-server/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/config/BpmFlowableConfiguration.java	2026-01-29 22:14:16 +08:00
YunaiV	fa72dc4e59	【同步】BOOT 和 CLOUD 的功能	2026-01-29 22:14:05 +08:00
芋道源码	ad68973d19	!237 删除AsyncListenableTaskExecutor配置 ... Merge pull request !237 from alexz10248080/master	2026-01-25 12:55:07 +00:00
芋道源码	eee662adaf	!238 删除AsyncListenableTaskExecutor配置 ... Merge pull request !238 from alexz10248080/master-jdk17	2026-01-25 12:55:01 +00:00
芋道源码	35ccc5eaa4	!240 AuthLoginReqVO同步AuthRegisterReqVO、TenantSaveReqVO、UserSaveReqVO的username验证 ... Merge pull request !240 from kangxinghua/master	2026-01-25 12:43:56 +00:00
芋道源码	44bfa54d32	!239 AuthLoginReqVO同步AuthRegisterReqVO、TenantSaveReqVO、UserSaveReqVO的username验证 ... Merge pull request !239 from kangxinghua/master-jdk17	2026-01-25 12:43:10 +00:00
KangXinghua	4bd1ac8424	AuthLoginReqVO同步AuthRegisterReqVO、TenantSaveReqVO、UserSaveReqVO的username验证	2026-01-21 22:27:45 +08:00
KangXinghua	13b37b4d2f	AuthLoginReqVO同步AuthRegisterReqVO、TenantSaveReqVO、UserSaveReqVO的username验证	2026-01-21 22:21:21 +08:00
zhengpingzhong	d1fa308961	删除AsyncListenableTaskExecutor配置，官方commit(38727db7926ea470ae81eee6c95123123a3035cc)已经“Replace the use of the deprecated AsyncListenableTaskExecutor with AsyncTaskExecutor”，且ProcessEngineAutoConfiguration会注入	2026-01-20 16:03:34 +08:00
zhengpingzhong	9ef140f07f	删除AsyncListenableTaskExecutor配置，官方commit(38727db7926ea470ae81eee6c95123123a3035cc)已经“Replace the use of the deprecated AsyncListenableTaskExecutor with AsyncTaskExecutor”，且ProcessEngineAutoConfiguration会注入	2026-01-19 17:35:30 +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	17a1af1069	【同步】BOOT 和 CLOUD 的功能	2026-01-18 19:03:30 +08:00
YunaiV	304b2f102a	【同步】BOOT 和 CLOUD 的功能	2026-01-18 19:01:29 +08:00
YunaiV	2e317b165b	fix：【crm】CrmProductRespVO 的 easy-trans 翻译错误，对应 https://t.zsxq.com/o6w8b	2026-01-18 18:01:28 +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
芋道源码	efae658cc5	!229 采用 https://github.com/spring-cloud/spring-cloud-gateway/pull/866 解决响应头重复问题 ... Merge pull request !229 from alexz10248080/master	2026-01-18 08:58:50 +00: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
芋道源码	9defcf736c	!228 采用spring-cloud-gateway pull/866 解决响应头重复问题 ... Merge pull request !228 from alexz10248080/master-jdk17	2026-01-18 08:57:09 +00:00
Danlin	b292bc2c19	!233 【system】发送邮件时，携带附件 ... * 发送邮件时，带上附件	2026-01-18 07:28:25 +00:00
芋道源码	72c0c013a0	!231 feat(trade): 优化订单日志切面中的用户信息获取逻辑 ... Merge pull request !231 from wuKong/feat(trade)-优化订单日志切面中的用户信息获取逻辑	2026-01-18 07:26:38 +00:00
YunaiV	6b519a7654	https://gitee.com/zhijiantianya/ruoyi-vue-pro/pulls/1485/files	2026-01-09 19:16:16 +08:00