YunaiV
|
0435a45df7
|
【同步】最新精简版本！(〃'▽'〃) v2025.11 发布：极大完善 vben5 的 antd、vben 版本的功能，优化整体稳定性
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.11(jdk8/11)
|
2025-11-26 23:03:37 +08:00 |
|
YunaiV
|
e2cbfed077
|
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/enums/model/AiPlatformEnum.java
# yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/framework/ai/config/AiAutoConfiguration.java
# yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/framework/ai/config/YudaoAiProperties.java
# yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/AiModelFactoryImpl.java
# yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/framework/security/config/SecurityConfiguration.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-ai/src/main/java/cn/iocoder/yudao/module/ai/util/AiUtils.java
# yudao-module-ai/src/test/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/chat/AnthropicChatModelTest.java
# yudao-module-ai/src/test/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/chat/LlamaChatModelTests.java
# yudao-module-ai/src/test/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/chat/OllamaChatModelTests.java
# yudao-module-ai/src/test/java/cn/iocoder/yudao/module/ai/framework/ai/core/model/chat/ZhiPuAiChatModelTests.java
# yudao-module-ai/src/test/java/cn/iocoder/yudao/module/ai/framework/ai/core/websearch/AiBoChaWebSearchClientTest.java
# yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/enums/BpmnVariableConstants.java
# yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/util/BpmnModelUtils.java
# yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceCopyServiceImpl.java
# yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
# yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskServiceImpl.java
# yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/task/listener/BpmCallActivityListener.java
# yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/task/listener/BpmUserTaskListener.java
# yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/vo/plan/CrmReceivablePlanRespVO.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/product/IotProductController.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/alert/IotAlertConfigMapper.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/mq/consumer/rule/IotSceneRuleMessageHandler.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/IotSceneRuleServiceImpl.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/IotDeviceEventPostTriggerMatcher.java
# yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/data/action/IotTcpDataRuleActionTest.java
# yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/IotSceneRuleServiceSimpleTest.java
# yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/condition/IotCurrentTimeConditionMatcherTest.java
# yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/condition/IotDevicePropertyConditionMatcherTest.java
# yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/condition/IotDeviceStateConditionMatcherTest.java
# yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/IotDeviceEventPostTriggerMatcherTest.java
# yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/IotDevicePropertyPostTriggerMatcherTest.java
# yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/IotDeviceServiceInvokeTriggerMatcherTest.java
# yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/IotDeviceStateUpdateTriggerMatcherTest.java
# yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/IotTimerTriggerMatcherTest.java
# yudao-module-iot/yudao-module-iot-core/src/test/java/cn/iocoder/yudao/module/iot/core/messagebus/core/rocketmq/RocketMQIotMessageBusTest.java
# yudao-module-iot/yudao-module-iot-gateway/pom.xml
# yudao-module-iot/yudao-module-iot-gateway/src/main/resources/application.yaml
# yudao-module-mall/yudao-module-promotion/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponServiceImpl.java
# yudao-module-mall/yudao-module-trade/src/main/java/cn/iocoder/yudao/module/trade/convert/delivery/DeliveryExpressTemplateConvert.java
# yudao-module-mall/yudao-module-trade/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java
# yudao-module-mall/yudao-module-trade/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/brokerage/BrokerageRecordDO.java
# yudao-module-mall/yudao-module-trade/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/brokerage/BrokerageRecordMapper.java
# yudao-module-mall/yudao-module-trade/src/main/java/cn/iocoder/yudao/module/trade/service/aftersale/AfterSaleServiceImpl.java
# yudao-module-mall/yudao-module-trade/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageWithdrawServiceImpl.java
# yudao-module-mp/src/main/java/cn/iocoder/yudao/module/mp/enums/ErrorCodeConstants.java
# yudao-module-pay/src/main/java/cn/iocoder/yudao/module/pay/controller/app/order/AppPayOrderController.java
# yudao-module-pay/src/main/java/cn/iocoder/yudao/module/pay/dal/mysql/order/PayOrderMapper.java
# yudao-module-pay/src/main/java/cn/iocoder/yudao/module/pay/framework/pay/core/client/impl/weixin/AbstractWxPayClient.java
# yudao-module-pay/src/main/java/cn/iocoder/yudao/module/pay/service/order/PayOrderService.java
# yudao-module-pay/src/main/java/cn/iocoder/yudao/module/pay/service/order/PayOrderServiceImpl.java
# yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImplTest.java
|
2025-11-26 23:02:51 +08:00 |
|
YunaiV
|
1b2acd3a55
|
(〃'▽'〃) v2025.11 发布：极大完善 vben5 的 antd、vben 版本的功能，优化整体稳定性
|
2025-11-26 22:56:38 +08:00 |
|
YunaiV
|
c89758ad86
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# pom.xml
# yudao-dependencies/pom.xml
|
2025-11-26 22:54:49 +08:00 |
|
YunaiV
|
ee8a5bf822
|
(〃'▽'〃) v2025.11 发布：极大完善 vben5 的 antd、vben 版本的功能，优化整体稳定性
|
2025-11-26 22:53:20 +08:00 |
|
YunaiV
|
8536a8368a
|
fix：【system】AdminUserServiceImplTest 单测报错问题
|
2025-11-26 22:49:00 +08:00 |
|
YunaiV
|
7880d09d77
|
feat：同步最新表结构
|
2025-11-26 22:43:26 +08:00 |
|
YunaiV
|
9e8a7de7d1
|
【同步】jdk21 和 jdk8 的代码
|
2025-11-26 18:54:12 +08:00 |
|
YunaiV
|
eee85fd39d
|
【同步】jdk21 和 jdk8 的代码
|
2025-11-26 18:51:35 +08:00 |
|
YunaiV
|
755d5e48cc
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2025-11-26 18:49:11 +08:00 |
|
YunaiV
|
1f98c1f5a6
|
!222 feat：【mp】完善“模版消息”的功能
|
2025-11-26 18:47:11 +08:00 |
|
YunaiV
|
69c5591baf
|
chore：spring ai alibaba from 1.0.1 to 1.1.0
|
2025-11-26 09:55:35 +08:00 |
|
YunaiV
|
62e4af4016
|
feat：【system】用户被禁用时，删除其相关 token，关联 issue：https://gitee.com/yudaocode/yudao-ui-admin-vue3/issues/IB2EK6
|
2025-11-25 19:50:43 +08:00 |
|
YunaiV
|
351ae4494c
|
fix：【framework】MyBatisUtils join 分页总数有问题，关联 issue：https://gitee.com/zhijiantianya/yudao-cloud/issues/ID2QLL
|
2025-11-25 19:29:26 +08:00 |
|
YunaiV
|
6ac6cddbc7
|
feat：【infra】vben5 + antd 的代码生成器模版的优化
|
2025-11-25 10:58:22 +08:00 |
|
YunaiV
|
bdb4e3fadc
|
fix：【bpm】flowable 7.2.0 驳回可使用 moveActivityIdsToSingleActivityId 方法
|
2025-11-25 08:55:59 +08:00 |
|
YunaiV
|
a1a695a033
|
fix：【framework】附件返回时，iOS 手机可播放
|
2025-11-24 20:53:51 +08:00 |
|
YunaiV
|
d1b8e03b5b
|
!221 feat(pay): 支持通过支付订单号查询支付订单
|
2025-11-24 20:19:58 +08:00 |
|
YunaiV
|
490e91d0ca
|
fix：【iot】产品精简列表，未返回设备状态
|
2025-11-24 19:51:20 +08:00 |
|
YunaiV
|
94780ebcf3
|
fix：【iot】IotDeviceEventPostTriggerMatcher 应该使用 params 判断，而不是 data
|
2025-11-24 19:44:02 +08:00 |
|
YunaiV
|
27a0aca516
|
fix：【iot】IotSceneRuleServiceImpl 缓存处理不正确，导致 getSelf NPE 问题
|
2025-11-24 19:36:16 +08:00 |
|
YunaiV
|
d5e2f1d142
|
fix：【iot】spring redis 配置多了 data 层，修复 https://t.zsxq.com/51v5n
|
2025-11-24 19:25:20 +08:00 |
|
YunaiV
|
8f2c65a45d
|
feat：【iot】tdengine 调整成 WS 以支持 decimal 字段
|
2025-11-24 19:21:54 +08:00 |
|
YunaiV
|
8d4fba8aa7
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2025-11-24 18:24:47 +08:00 |
|
YunaiV
|
e336f36cce
|
fix：【iot】单测报错的问题
|
2025-11-24 18:24:02 +08:00 |
|
YunaiV
|
9ea8d9e4aa
|
fix：iot-gateway-server 的 spring-boot-maven-plugin 缺少版本号，对应 https://gitee.com/zhijiantianya/yudao-cloud/issues/ID5LU4
|
2025-11-24 18:04:16 +08:00 |
|
YunaiV
|
7f4e15c6a2
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2025-11-24 17:44:14 +08:00 |
|
YunaiV
|
2660b6b7d9
|
chore：依赖升级最新版本
|
2025-11-24 17:43:52 +08:00 |
|
YunaiV
|
a70d989ddf
|
chore：依赖升级最新版本
|
2025-11-24 17:43:00 +08:00 |
|
YunaiV
|
6943f2e25e
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-dependencies/pom.xml
|
2025-11-24 17:14:57 +08:00 |
|
YunaiV
|
1fd2b59d09
|
chore：依赖升级最新版本
|
2025-11-24 17:13:07 +08:00 |
|
YunaiV
|
ec0c4eebdb
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# pom.xml
# yudao-dependencies/pom.xml
|
2025-11-24 17:03:53 +08:00 |
|
YunaiV
|
0a1aa15fe7
|
chore：依赖升级最新版本
|
2025-11-24 17:01:11 +08:00 |
|
YunaiV
|
bd2301eb07
|
fix：【ai】单测在 spring-ai 1.1.0 版本下的报错
|
2025-11-24 16:56:17 +08:00 |
|
YunaiV
|
30c4be14f6
|
fix：【framework】convertor.py 兼容 mall 的转换
|
2025-11-24 15:41:32 +08:00 |
|
YunaiV
|
2e236a7cb7
|
fix: 更新 AI 平台名称从 '月之暗灭' 修改为 '月之暗面'（= = dota 打多了）
|
2025-11-24 15:18:33 +08:00 |
|
YunaiV
|
6d057b8d4d
|
!208 使用外部中间件时，如：金蝶、东方通 在不重启整个中间件的情况下，二次部署或多个服务同时部署在一个虚拟机下（JVM） IdTypeEnvir…
|
2025-11-24 11:24:06 +08:00 |
|
YunaiV
|
95355cb522
|
fix: 【framework】TimestampLocalDateTimeSerializer 中，使用 ReflectUtil 替代
|
2025-11-24 11:18:47 +08:00 |
|
芋道源码
|
2c0d4073b6
|
!1458 spring ai from 1.0.1 to 1.1.0
Merge pull request !1458 from 芋道源码/feature/ai
|
2025-11-24 02:54:35 +00:00 |
|
YunaiV
|
721449501f
|
fix：【ai】glm 因为缺少 ObservationRegistry Bean 导致报错问题
|
2025-11-24 10:31:25 +08:00 |
|
YunaiV
|
9f9366f158
|
feat：【ai】增加 Grok 接入
|
2025-11-24 10:17:15 +08:00 |
|
YunaiV
|
ea8f532f5a
|
Merge branch 'master-jdk17' of https://github.com/YunaiV/ruoyi-vue-pro into feature/ai
|
2025-11-24 10:14:25 +08:00 |
|
芋道源码
|
6d10f136a0
|
Merge pull request #981 from gezipppp-ux/master-jdk17
支持 GROK
|
2025-11-24 10:13:55 +08:00 |
|
YunaiV
|
cc35749d0b
|
chore：spring ai from 1.0.1 to 1.1.0
|
2025-11-24 09:59:25 +08:00 |
|
YunaiV
|
9fe1ce8e1a
|
chore：flowable from 7.0.1 to 7.2.0
|
2025-11-23 17:36:28 +08:00 |
|
YunaiV
|
c34c218bb5
|
fix：【bpm】只能退回到已经处理过的节点（排除审批未经过的节点）。相关 issue：https://github.com/YunaiV/ruoyi-vue-pro/issues/982
|
2025-11-23 12:04:42 +08:00 |
|
YunaiV
|
fe186da113
|
fix：【bpm】流程操作时，增加数据权限的忽略
|
2025-11-23 10:11:38 +08:00 |
|
YunaiV
|
d34dd35eab
|
fix：【bpm】流程操作时，增加数据权限的忽略
|
2025-11-23 10:11:34 +08:00 |
|
YunaiV
|
073ffb5c71
|
fix: 【coupon】更新发放数量校验逻辑，确保用户领取时剩余数量充足
|
2025-11-22 18:09:50 +08:00 |
|
YunaiV
|
887594ec2e
|
fix: 【mall】兼容纯积分订单的退款逻辑
|
2025-11-22 17:49:20 +08:00 |
|