gitee/ruoyi-vue-pro
1
0
Fork 0
mirror of https://gitee.com/zhijiantianya/ruoyi-vue-pro.git synced 2026-03-22 05:07:17 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
10,546 Commits 16 Branches 55 Tags
master
Commit Graph

10546 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
YunaiV
b29c5f0e40 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Details
Java CI with Maven / build (17) (push) Has been cancelled
Details
Java CI with Maven / build (8) (push) Has been cancelled
Details
yudao-ui-admin CI / build (14.x) (push) Has been cancelled
Details
yudao-ui-admin CI / build (16.x) (push) Has been cancelled
Details
2026-01-25 21:06:53 +08:00
YunaiV
fa1e527db3 239 AuthLoginReqVO同步AuthRegisterReqVO、TenantSaveReqVO、UserSaveReqVO的username验证 2026-01-25 20:59:29 +08:00
YunaiV
1233921b86 fix：【system】refreshAccessToken 时，抛出 UNAUTHORIZED 导致回滚，对应 https://gitee.com/zhijiantianya/yudao-cloud/issues/IDL4OW 2026-01-25 20:56:55 +08:00
YunaiV
0c0a6ae40a feat：【bpm】删除AsyncListenableTaskExecutor配置 2026-01-25 20:51:26 +08:00
芋道源码
7ce2a19ea5 Merge pull request #1062 from xuyunan/master-jdk17 
fix: 屏蔽解析器覆写, 避免解析 ${coll_userList} 变量报错 (#1061)
 2026-01-25 20:30:41 +08:00
YunaiV
4b67fc2d65 feat(iot)：tcp 协议完善 IotDirectDeviceUdpProtocolIntegrationTest 单测，并支持动态注册 2026-01-25 20:28:42 +08:00
芋道源码
eb5fa9fd91 !1500 feat：【iot】udp 协议 100%：完善注释、完善单测 
Merge pull request !1500 from 芋道源码/feature/iot-udp
 2026-01-25 10:53:21 +00:00
芋道源码
8a2c38a026 !1504 feat(iot):【网关设备】 
Merge pull request !1504 from 芋道源码/feature/iot-sub
 2026-01-25 10:52:16 +00:00
puhui999
7ec541e5bb perf(iot):【场景联动】WebSocket 重连锁从 Redisson 分布式锁改为 ReentrantLock 单机锁 2026-01-25 18:24:43 +08:00
puhui999
6c971631b0 Merge remote-tracking branch 'origin/feature/iot' into feature/iot 2026-01-25 17:45:56 +08:00
puhui999
4901912ece feat(iot):【场景联动】定时触发，增加条件组 2026-01-25 17:30:16 +08:00
YunaiV
e013b1add4 feat(iot):【网关设备：80%】动态注册的初步实现（已测试） 2026-01-25 16:58:00 +08:00
YunaiV
b4ce72ea7d feat(iot):【网关设备：72%】动态注册的初步实现（未测试、额外优化代码），基于 stateful-sauteeing-pillow.md 规划 2026-01-25 12:58:17 +08:00
YunaiV
38a21ad59c feat(iot):【网关设备：70%】动态注册的初步实现（未测试），基于 stateful-sauteeing-pillow.md 规划 2026-01-25 11:16:07 +08:00
YunaiV
1309be39c3 feat(iot):【网关设备：80%】整体流程跑通，并增加 IotGatewayDeviceHttpProtocolIntegrationTest、IotGatewaySubDeviceHttpProtocolIntegrationTest 单测 2026-01-24 23:00:05 +08:00
YunaiV
679b696abe feat（iot）：HTTP 协议增加 IotDirectDeviceHttpProtocolIntegrationTest 测试类 2026-01-24 21:06:03 +08:00
YunaiV
268a2ad4cf feat(iot):【网关设备：68%】整体初步实现（修复少量 review agent 发现的缺陷） 2026-01-24 19:31:47 +08:00
YunaiV
05eb745f2a feat(iot):【网关设备：67%】整体初步实现（优化部分代码） 2026-01-24 19:14:34 +08:00
YunaiV
bfbc352a1c feat(iot):【网关设备：65%】整体初步实现（优化部分代码） 2026-01-24 13:12:37 +08:00
YunaiV
18ed7b50be feat(iot):【网关设备：60%】整体初步实现（优化部分代码） 2026-01-24 09:15:01 +08:00
YunaiV
a2750693eb feat(iot):【网关设备：50%】整体初步实现（未测试），基于 gateway-device-topic-design.md 规划 2026-01-23 22:18:34 +08:00
YunaiV
e765099a33 refactor(iot): 删除 3 个不再使用的枚举 2026-01-23 01:07:45 +08:00
YunaiV
b4013e9a6c feat(iot):【网关设备：30%】增加网关设备绑定能力（优化代码），基于 optimized-pondering-dragon.md 规划 2026-01-22 09:52:52 +08:00
YunaiV
4b1dfad063 feat(iot):【网关设备：20%】增加网关设备绑定能力（未完成），基于 breezy-doodling-starlight.md 规划 2026-01-22 00:52:09 +08:00
puhui999
4ad4fcf6cf perf：【iot】增强 IotDeviceServiceInvokeTriggerMatcher 参数校验 2026-01-21 22:06:02 +08:00
puhui999
5bc8a4e487 perf：【iot】添加 IotDeviceMessageUtils.notContainsIdentifier 方法 2026-01-21 21:37:39 +08:00
puhui999
f320569f2c perf：【iot】优化 IotTcpClient 代码 2026-01-21 21:21:07 +08:00
puhui999
44838510c9 feat：【iot】WebSocket 连接线程安全与 JDK 8 兼容 2026-01-21 18:12:28 +08:00
YunaiV
45638b35f4 feat(iot):【设备定位：100%】首页接入地图，基于 sequential-crafting-thacker.md 规划 2026-01-21 13:41:35 +08:00
YunaiV
6892571a33 feat(iot):【设备定位：70%】优化设备坐标的解析逻辑代码，基于 hashed-juggling-tome.md 2026-01-21 09:12:49 +08:00
xuyunan
52f067cdfb fix: 屏蔽解析器覆写, 避免解析 ${coll_userList} 变量报错 2026-01-20 23:58:06 +08:00
YunaiV
3a832d9fb4 feat(iot):【设备订单：50%】简化设备定位功能，支持 GeoLocation 自动更新，基于 calm-roaming-pillow.md 2026-01-20 21:41:43 +08:00
YunaiV
7646884008 【同步】jdk21 和 jdk8 的代码
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Details
Java CI with Maven / build (17) (push) Has been cancelled
Details
Java CI with Maven / build (8) (push) Has been cancelled
Details
yudao-ui-admin CI / build (14.x) (push) Has been cancelled
Details
yudao-ui-admin CI / build (16.x) (push) Has been cancelled
Details
2026-01-18 18:35:15 +08:00
YunaiV
a39647efc0 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/IotSceneRuleServiceImpl.java
 2026-01-18 18:27:48 +08:00
芋道源码
853afd2184 !1501 IOT：同步最新代码 
Merge pull request !1501 from 芋道源码/feature/iot
 2026-01-18 10:26:57 +00:00
YunaiV
28a30d4b79 feat：【iot】默认关闭 mqttws 协议，= = 要合并 master 一下，避免不一定大家都用 2026-01-18 18:26:31 +08:00
YunaiV
f3ef0e72e2 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/api/mail/dto/MailSendSingleToUserReqDTO.java
#	yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/mq/message/mail/MailSendMessage.java
#	yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/mq/producer/mail/MailProducer.java
#	yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailSendServiceImpl.java
#	yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/mail/MailSendServiceImplTest.java
 2026-01-18 18:15:27 +08:00
YunaiV
17ec78f68a fix：【pay】修复钱包流水生成逻辑，区分充值退款与消费支付情况，对应 https://t.zsxq.com/OJk9m 2026-01-18 17:58:34 +08:00
YunaiV
9fa9183f2e feat：【system】优化 MailSendServiceImplTest 的单测 2026-01-18 17:21:07 +08:00
YunaiV
90f0ea13e0 fix：【system】增加 node 的 parentId 为空下的兼容性，对应 https://t.zsxq.com/ktTUO 2026-01-18 16:54:04 +08:00
YunaiV
258b4c3d60 fix：【system】解决支付回调与订单信息上传之间的时间差导致 uploadWxaOrderShippingInfo 报错 2026-01-18 16:35:02 +08:00
YunaiV
76477bbb18 feat：【report】增强对报表的安全集成，对应 https://t.zsxq.com/yzlkA 反馈的问题 2026-01-18 16:01:38 +08:00
YunaiV
f743ffd195 feat：【system】发送邮件时，携带附件，对应 https://gitee.com/zhijiantianya/yudao-cloud/pulls/233 2026-01-18 15:43:52 +08:00
YunaiV
3db0c41bf3 feat：【mall】优化订单日志切面中的用户信息获取逻辑，同步 https://gitee.com/zhijiantianya/yudao-cloud/pulls/231/files 2026-01-18 15:27:58 +08:00
YunaiV
cfcf0dc107 fix：【framework】数据权限的单测报错问题 2026-01-18 15:21:14 +08:00
YunaiV
6520514426 fix：【system】增加 node 的 parentId 为空下的兼容性，对应 https://t.zsxq.com/ktTUO 2026-01-18 15:16:31 +08:00
YunaiV
5bb29a3fa0 feat：【erp】优化对 pgsql 的兼容性，对应 https://t.zsxq.com/rM8Y1 2026-01-18 14:57:04 +08:00
YunaiV
fdfca8588f fix：【mall】分销用户创建时，缺少对 bindUserId 的校验 2026-01-18 12:14:58 +08:00
YunaiV
52b8e66466 feat：【iot】modbus-tcp 协议接入 100%：完善注释、完善单测 2026-01-18 11:47:56 +08:00
YunaiV
6991a2dea4 fix：【iot】coap 协议接入：testEventPost 单测的数据格式不正确 2026-01-18 11:23:23 +08:00