puhui999
|
908f95875d
|
fix：【iot】saveDeviceProperty 中，类型要转换
|
2026-01-13 15:49:19 +08:00 |
|
puhui999
|
9fbced1192
|
perf：【iot】IotDataSinkWebSocketConfig 常量枚举
|
2026-01-13 15:42:06 +08:00 |
|
puhui999
|
60817a6a5b
|
perf：【iot】IotDataSinkTcpConfig 常量枚举
|
2026-01-13 15:38:33 +08:00 |
|
puhui999
|
158576740d
|
feat：【iot】新增 WebSocket 的 {@link IotDataRuleAction} 实现类
|
2026-01-13 15:29:29 +08:00 |
|
YunaiV
|
dfd1f90ae0
|
fix：【bpm】getTaskTodoPage 未基于租户过滤的问题
|
2026-01-09 19:38:32 +08:00 |
|
芋道源码
|
26ee50de88
|
!1485 perf: 优化 swagger-annotation 版本冲突
Merge pull request !1485 from 半栈幼儿员/hotfix/swagger
|
2026-01-09 11:17:06 +00:00 |
|
芋道源码
|
11e19414b1
|
!1494 refactor(bpm): 优化并行和串行多实例行为实现
Merge pull request !1494 from ssw/master-jdk17
|
2026-01-09 11:15:24 +00:00 |
|
sisw
|
6816821e13
|
refactor(bpm): 优化并行和串行多实例行为实现
- 移除多余的集合变量设置逻辑，简化任务处理人获取流程
- 添加对集合表达式、集合变量和元素变量的解析器覆写屏蔽
- 修复串行多实例中使用 getVariableLocal 替代 getVariable 避免变量清理问题
- 统一代码注释和实现逻辑，提高代码可读性
|
2026-01-06 17:35:05 +08:00 |
|
YunaiV
|
7f038eb320
|
fix：【iot】tdengine 的 url 增加 varcharAsString=true 参数，解决 https://github.com/YunaiV/yudao-cloud/issues/282 问题
|
2026-01-05 21:08:44 +08:00 |
|
YunaiV
|
a8ed2111f8
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/iot
# Conflicts:
# yudao-dependencies/pom.xml
|
2026-01-05 20:30:11 +08:00 |
|
YunaiV
|
50a88a9ce7
|
review：【iot】mqtt websocket 协议
|
2026-01-05 20:26:16 +08:00 |
|
芋道源码
|
696463d95b
|
!1492 fix(mall): 修复创建商品时，未设置sku销量，导致只能统计spu销量，不能统计sku销量问题
Merge pull request !1492 from Jarrett/fix-sku-sales-count
|
2026-01-05 12:10:15 +00:00 |
|
芋道源码
|
c26c53d042
|
!1491 fix(mall): 修复商品SPU库存计算溢出问题
Merge pull request !1491 from Jarrett/master-jdk17
|
2026-01-05 12:07:58 +00:00 |
|
lijian
|
605b401610
|
fix(mall): 修复创建商品时，未设置sku销量，导致只能统计spu销量，不能统计sku销量问题
|
2026-01-05 10:19:35 +08:00 |
|
lijian
|
d1f85163da
|
fix(mall): 修复商品SPU库存计算溢出问题
|
2026-01-04 16:59:22 +08:00 |
|
haohao
|
6fdd91d01e
|
feat: 【IoT 物联网】新增网关设备 ID 字段到 IotDevicePageReqVO，支持网关子设备的功能
|
2026-01-04 12:21:54 +08:00 |
|
YunaiV
|
7835363c88
|
fix：【infra】代码生成：移动端的模版，id= 的拼接不对（linter 报错）
|
2026-01-02 18:36:42 +08:00 |
|
YunaiV
|
d797bbd169
|
fix：【infra】代码生成：移动端的模版，id= 的拼接不对（linter 报错）
|
2026-01-02 18:36:38 +08:00 |
|
芋道源码
|
a18328ac43
|
!1490 update 移除多余的DictTypeConstants包路径
Merge pull request !1490 from 哦是吗/N/A
|
2026-01-02 10:18:13 +00:00 |
|
YunaiV
|
77a187b941
|
fix：【system】getUser 默认忽略数据权限，基础数据较为通用
|
2026-01-02 17:15:13 +08:00 |
|
哦是吗
|
1e3efaa406
|
update 移除多余的DictTypeConstants包路径
Signed-off-by: 哦是吗 <1733179386@qq.com>
|
2025-12-31 06:54:13 +00:00 |
|
YunaiV
|
586a7f6a4a
|
feat：【infra】代码生成：优化 admin uniapp 模版，增加 const formRef = ref<FormInstance>() 的类型
|
2025-12-29 23:24:07 +08:00 |
|
preschooler
|
f8d9c4170c
|
🎈 perf: 优化 swagger-annotation 版本冲突
|
2025-12-29 11:31:06 +08:00 |
|
芋道源码
|
a110ec2de3
|
!1486 perf: 优化数据库兼容性
Merge pull request !1486 from 半栈幼儿员/hotfix/db
|
2025-12-28 22:33:26 +00:00 |
|
YunaiV
|
fc9fe221d7
|
1487 fix: 修复导入用户的 username 为空时会异常问题
|
2025-12-29 06:31:21 +08:00 |
|
芋道源码
|
08445f52b3
|
!1487 fix: 修复导入用户的 username 为空时会异常问题
Merge pull request !1487 from 半栈幼儿员/hotfix/user
|
2025-12-28 22:29:25 +00:00 |
|
preschooler
|
b84db7c168
|
🎈 perf: 优化数据库兼容性
|
2025-12-29 00:48:24 +08:00 |
|
preschooler
|
69da706f55
|
🐞 fix: 修复导入用户的 username 为空时会异常问题
|
2025-12-29 00:45:45 +08:00 |
|
YunaiV
|
711821f530
|
【同步】最新精简版本！(〃'▽'〃) v2025.12 发布：极大极大完善 vben5 的 antd、vben 版本的功能，新增 admin uniapp vue3 版本
Java CI with Maven / build (11) (push) Has been cancelled
Java CI with Maven / build (17) (push) Has been cancelled
Java CI with Maven / build (8) (push) Has been cancelled
yudao-ui-admin CI / build (14.x) (push) Has been cancelled
yudao-ui-admin CI / build (16.x) (push) Has been cancelled
v2025.12(jdk8/11)
|
2025-12-28 10:46:06 +08:00 |
|
YunaiV
|
7bb0950094
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-ai/pom.xml
# yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/knowledge/vo/segment/AiKnowledgeSegmentPageReqVO.java
# yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/service/chat/AiChatMessageServiceImpl.java
# yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/service/knowledge/AiKnowledgeSegmentServiceImpl.java
# yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmTaskController.java
# yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/behavior/BpmParallelMultiInstanceBehavior.java
# yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/behavior/BpmSequentialMultiInstanceBehavior.java
# yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/BpmTaskCandidateInvoker.java
# yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/listener/BpmCopyTaskDelegate.java
# yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskServiceImpl.java
# yudao-module-infra/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/CodegenServiceImplTest.java
# yudao-module-infra/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineVue2Test.java
# yudao-module-infra/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineVue3Test.java
# yudao-module-mall/yudao-module-product/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/sku/ProductSkuMapper.java
# yudao-module-mall/yudao-module-product/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/spu/ProductSpuMapper.java
# yudao-module-mall/yudao-module-promotion/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/kefu/vo/message/KeFuMessageListReqVO.java
# yudao-module-mall/yudao-module-promotion/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/kefu/vo/message/AppKeFuMessagePageReqVO.java
# yudao-module-mall/yudao-module-promotion/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/coupon/CouponTemplateMapper.java
# yudao-module-mall/yudao-module-promotion/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponServiceImpl.java
# yudao-module-mall/yudao-module-promotion/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponTemplateService.java
# yudao-module-mall/yudao-module-promotion/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponTemplateServiceImpl.java
# yudao-module-mall/yudao-module-trade/src/main/java/cn/iocoder/yudao/module/trade/framework/aftersale/core/aop/AfterSaleLogAspect.java
# yudao-module-mall/yudao-module-trade/src/main/java/cn/iocoder/yudao/module/trade/framework/order/core/aop/TradeOrderLogAspect.java
# yudao-module-member/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/MemberUserController.java
# yudao-module-pay/pom.xml
# yudao-module-pay/src/main/java/cn/iocoder/yudao/module/pay/api/transfer/dto/PayTransferCreateReqDTO.java
# yudao-module-pay/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/wallet/PayWalletRechargeController.java
# yudao-module-pay/src/main/java/cn/iocoder/yudao/module/pay/framework/pay/core/client/impl/alipay/AbstractAlipayPayClient.java
# yudao-module-pay/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/PayWalletRechargeService.java
# yudao-module-pay/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/PayWalletRechargeServiceImpl.java
# yudao-module-pay/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/PayWalletServiceImpl.java
# yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateServiceImplTest.java
# yudao-module-system/src/test/resources/sql/create_tables.sql
|
2025-12-28 10:44:59 +08:00 |
|
YunaiV
|
342b1ab7bf
|
(〃'▽'〃) v2025.12 发布：极大极大完善 vben5 的 antd、vben 版本的功能，新增 admin uniapp vue3 版本
|
2025-12-28 10:41:38 +08:00 |
|
YunaiV
|
96bfc15d38
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# pom.xml
# yudao-dependencies/pom.xml
|
2025-12-28 10:40:06 +08:00 |
|
YunaiV
|
eb246a2df4
|
(〃'▽'〃) v2025.12 发布：极大极大完善 vben5 的 antd、vben 版本的功能，新增 admin uniapp vue3 版本
|
2025-12-28 10:39:40 +08:00 |
|
YunaiV
|
b41f25bc20
|
【同步】jdk21 和 jdk8 的代码
|
2025-12-28 10:31:30 +08:00 |
|
YunaiV
|
d0293ea2fa
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-dependencies/pom.xml
|
2025-12-27 21:38:07 +08:00 |
|
YunaiV
|
0eed2fa74c
|
没问题
|
2025-12-27 21:35:44 +08:00 |
|
YunaiV
|
3accf80700
|
fix：【mall】优惠劵：相关的判断不对，关联 https://t.zsxq.com/fYaKv
|
2025-12-27 21:35:19 +08:00 |
|
YunaiV
|
9fe59e8543
|
feat：【pay】转账：支持支付宝的 transferSceneName 参数
|
2025-12-27 21:16:23 +08:00 |
|
YunaiV
|
9519ca969c
|
feat：【infra】代码生成：menu 生成时，支持多种
|
2025-12-27 20:22:24 +08:00 |
|
YunaiV
|
36708447ff
|
fix：【system】操作日志导出时，缺少 userName 字段，对应 https://gitee.com/yudaocode/yudao-boot-mini/issues/IDFZ4X
|
2025-12-27 20:07:20 +08:00 |
|
YunaiV
|
0cbced1cef
|
fix：pgsql 有点问题
|
2025-12-27 19:20:04 +08:00 |
|
YunaiV
|
ab8e68d3a2
|
fix：【system】优化 createOAuth2AccessToken 的 tenantId 逻辑，优先使用 OAuth2RefreshTokenDO
|
2025-12-27 17:25:36 +08:00 |
|
YunaiV
|
d2dd2f10f5
|
feat：【system】简化 AuthConvert 逻辑，避免 login 接口在 mapstruct 生成失败，导致开发登录失败
|
2025-12-27 12:35:57 +08:00 |
|
YunaiV
|
9a3bfe89e5
|
feat：【ai】226 修改知识库和联网搜索仅初始化一次
|
2025-12-27 11:09:15 +08:00 |
|
YunaiV
|
be56c83408
|
feat：【system】阿里云短信客户端的 GetSmsTemplate 接口升级适配
|
2025-12-27 11:03:17 +08:00 |
|
YunaiV
|
136be0affb
|
feat：【infra】spring boot admin 默认需要登录
|
2025-12-27 10:28:09 +08:00 |
|
YunaiV
|
752ed579c0
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2025-12-27 10:21:42 +08:00 |
|
YunaiV
|
88f322311e
|
feat：【infra】spring boot admin 默认需要登录
|
2025-12-27 10:21:33 +08:00 |
|
YunaiV
|
d860ca2c8c
|
fix：【bpm】“refactor(bpm): 优化多实例行为初始化逻辑”导致的问题，对应 https://gitee.com/zhijiantianya/ruoyi-vue-pro/pulls/1483/files
|
2025-12-26 21:23:47 +08:00 |
|
YunaiV
|
0fdd561af6
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2025-12-25 22:51:40 +08:00 |
|