YunaiV
|
3871a1f83f
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# pom.xml
# yudao-dependencies/pom.xml
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
|
2024-12-31 09:22:59 +08:00 |
|
YunaiV
|
46c825cb6f
|
V2.4.0 发布~
|
2024-12-31 09:22:04 +08:00 |
|
YunaiV
|
82b03d7f7d
|
【功能新增】工作流：API 创建流程时，设置 userId（解决 Job 下，无法设置 userId 的问题）
|
2024-12-28 20:44:08 +08:00 |
|
YunaiV
|
cdb31679da
|
【功能修复】商城：限时折扣在 activityIds、skuIds 为空时，报 SQL 不正确的问题
|
2024-12-28 19:30:57 +08:00 |
|
YunaiV
|
d49c11fbec
|
【拼写修正】KafkaWebSocketMessageConsumer 的 kafkaWebSocketMessageSender 拼错
|
2024-12-28 19:17:55 +08:00 |
|
YunaiV
|
266e892a9e
|
【升级】lombok from 1.18.34 to 1.18.36
|
2024-12-28 17:59:38 +08:00 |
|
YunaiV
|
a1b93f7ae1
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# pom.xml
|
2024-12-28 17:58:36 +08:00 |
|
YunaiV
|
df5f481e38
|
【升级】lombok from 1.18.34 to 1.18.36
|
2024-12-28 17:58:20 +08:00 |
|
YunaiV
|
b75264daca
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-dependencies/pom.xml
|
2024-12-28 17:52:42 +08:00 |
|
YunaiV
|
cbb208dc47
|
【升级】spring boot admin from 3.3.3 to 3.4.1
|
2024-12-28 17:52:25 +08:00 |
|
YunaiV
|
c072e87f28
|
【升级】jedis-mock from 1.1.4 to 1.1.8
|
2024-12-28 17:43:49 +08:00 |
|
YunaiV
|
57b33e0d86
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-dependencies/pom.xml
|
2024-12-28 17:42:31 +08:00 |
|
YunaiV
|
6b1572f13f
|
【升级】jedis-mock from 1.1.4 to 1.1.8
|
2024-12-28 17:42:03 +08:00 |
|
YunaiV
|
f202613987
|
【升级】mybatis-plus from 3.5.8 to 3.5.9
|
2024-12-28 17:29:03 +08:00 |
|
YunaiV
|
839bddf83f
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-dependencies/pom.xml
# yudao-framework/yudao-spring-boot-starter-mybatis/pom.xml
|
2024-12-28 17:23:24 +08:00 |
|
YunaiV
|
5831534ed3
|
【升级】mybatis-plus from 3.5.8 to 3.5.9
|
2024-12-28 17:22:52 +08:00 |
|
YunaiV
|
37767f5997
|
【升级】netty from 4.1.113 to 4.1.116
【升级】velocity from 2.4 to 2.4.1
【升级】guava from 33.3.1 to 33.4.0
|
2024-12-28 13:27:43 +08:00 |
|
YunaiV
|
0df743fc24
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-dependencies/pom.xml
|
2024-12-28 13:24:35 +08:00 |
|
YunaiV
|
4a7515ce3a
|
【升级】netty from 4.1.113 to 4.1.116
【升级】velocity from 2.4 to 2.4.1
【升级】guava from 33.3.1 to 33.4.0
|
2024-12-28 13:24:11 +08:00 |
|
YunaiV
|
9d73afbd54
|
【升级】hutool from 5.8.32 to 5.8.35
|
2024-12-28 13:19:33 +08:00 |
|
YunaiV
|
e71c7c3e06
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-dependencies/pom.xml
|
2024-12-28 13:18:08 +08:00 |
|
YunaiV
|
a7a5563111
|
【升级】hutool from 5.8.32 to 5.8.35
|
2024-12-28 13:17:02 +08:00 |
|
YunaiV
|
2e2005bdd0
|
【升级】mapstruct from 1.6.2 to 1.6.3
|
2024-12-28 13:08:11 +08:00 |
|
YunaiV
|
d02e65b7dd
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# README.md
# pom.xml
# yudao-dependencies/pom.xml
|
2024-12-28 13:07:26 +08:00 |
|
YunaiV
|
b6b4847476
|
【升级】mapstruct from 1.6.2 to 1.6.3
|
2024-12-28 13:06:56 +08:00 |
|
YunaiV
|
45151dd23e
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-dependencies/pom.xml
# yudao-framework/yudao-spring-boot-starter-web/pom.xml
|
2024-12-28 12:10:58 +08:00 |
|
YunaiV
|
9733c48f4c
|
【升级】knife4j from 4.5.0 to 4.6.0（社区版）
|
2024-12-28 12:10:30 +08:00 |
|
YunaiV
|
b8ac8c8ccc
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2024-12-28 11:51:18 +08:00 |
|
YunaiV
|
d25625fcc8
|
【升级】redisson from 3.36.0 to 3.41.0
|
2024-12-28 11:50:58 +08:00 |
|
YunaiV
|
a18ee8c002
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# README.md
# pom.xml
# yudao-dependencies/pom.xml
|
2024-12-28 11:23:55 +08:00 |
|
YunaiV
|
54a5854908
|
【升级】spring boot from 3.3.4 to 3.4.1
|
2024-12-28 11:23:13 +08:00 |
|
YunaiV
|
158b7114a5
|
【同步】jdk21 和 jdk8 的代码
|
2024-12-27 21:50:06 +08:00 |
|
YunaiV
|
d676dcc525
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelSaveReqVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
|
2024-12-27 21:46:30 +08:00 |
|
YunaiV
|
427cc63764
|
Merge branch 'feature/bpm' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17
|
2024-12-27 21:46:10 +08:00 |
|
YunaiV
|
b1b74cf14a
|
【漏洞修复】由于自增id可猜测，需避免别有用心之人删除别人的购物车 update /yudao/module/trade/service/cart/CartServiceImpl
|
2024-12-27 21:46:01 +08:00 |
|
芋道源码
|
8c4f906da4
|
!1168 【漏洞修复】由于自增id可猜测，需避免别有用心之人删除别人的购物车 update /yudao/module/trade/service/cart/CartServiceImpl.java.
Merge pull request !1168 from 山野羡民/N/A
|
2024-12-27 13:45:35 +00:00 |
|
YunaiV
|
5998df0119
|
【同步】jdk21 和 jdk8 的代码
|
2024-12-27 21:41:39 +08:00 |
|
YunaiV
|
9039af46d4
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageRecordServiceImpl.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageUserService.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/handler/TradeCouponOrderHandler.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/api/level/MemberLevelApiImpl.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/api/point/MemberPointApiImpl.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/point/MemberPointRecordServiceImpl.java
|
2024-12-27 21:30:31 +08:00 |
|
YunaiV
|
fa526a98c0
|
Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17
|
2024-12-27 21:29:41 +08:00 |
山野羡民
|
fb436ac189
|
【漏洞修复】由于自增id可猜测，需避免别有用心之人删除别人的购物车 update /yudao/module/trade/service/cart/CartServiceImpl.java.
Signed-off-by: 山野羡民 <liyujiang_tk@yeah.net>
|
2024-12-21 06:55:11 +00:00 |
|
YunaiV
|
6a746a4d89
|
【同步】jdk21 和 jdk8 的代码
|
2024-12-19 21:31:11 +08:00 |
|
YunaiV
|
50536f1af0
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
|
2024-12-19 21:27:52 +08:00 |
jason
|
fe99c95f8c
|
【缺陷修复】 修复从我的流程进入审批详情页面，表单权限问题
|
2024-12-18 23:15:46 +08:00 |
|
YunaiV
|
14fad915a6
|
【功能新增】Bpm：新增和修改 model 时，增加 bpmnxml 和 simplemodel
|
2024-12-16 10:03:32 +08:00 |
|
芋道源码
|
9faee918f9
|
!1159 接口文档标签错误 update /trade/controller/app/aftersale/AppAfterSaleLogController.java.
Merge pull request !1159 from 山野羡民/N/A
|
2024-12-15 09:19:57 +00:00 |
|
芋道源码
|
2f4889bb99
|
!1160 错误码支持格式化输出
Merge pull request !1160 from 杨宇庆/N/A
|
2024-12-15 09:19:22 +00:00 |
|
芋道源码
|
987bf3ebe9
|
!1161 同步最新的 bpm 改动
Merge pull request !1161 from 芋道源码/feature/bpm
|
2024-12-15 08:42:36 +00:00 |
杨宇庆
|
9b1e01fa93
|
错误码支持格式化输出
Signed-off-by: 杨宇庆 <hiyyq@qq.com>
|
2024-12-15 08:34:25 +00:00 |
|
YunaiV
|
b67c2d5ef5
|
【代码评审】Bpm：完善相关注释
|
2024-12-15 12:03:01 +08:00 |
|
山野羡民
|
797d8f32dc
|
接口文档标签错误 update /trade/controller/app/aftersale/AppAfterSaleLogController.java.
Signed-off-by: 山野羡民 <liyujiang_tk@yeah.net>
|
2024-12-15 03:32:52 +00:00 |