YunaiV
|
dc4412114b
|
【升级】hutool from 5.8.32 to 5.8.35
|
2024-12-28 13:19:40 +08:00 |
|
YunaiV
|
f6986fdd97
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-dependencies/pom.xml
|
2024-12-28 13:18:32 +08:00 |
|
YunaiV
|
9a3e9cdd4f
|
【升级】hutool from 5.8.32 to 5.8.35
|
2024-12-28 13:17:52 +08:00 |
|
YunaiV
|
0b11e22887
|
【升级】mapstruct from 1.6.2 to 1.6.3
|
2024-12-28 13:12:03 +08:00 |
|
YunaiV
|
ae73c5beee
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# README.md
# pom.xml
# yudao-dependencies/pom.xml
|
2024-12-28 13:10:00 +08:00 |
|
YunaiV
|
c2e92cc9a9
|
【升级】mapstruct from 1.6.2 to 1.6.3
|
2024-12-28 13:08:50 +08:00 |
|
YunaiV
|
acdafccfac
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-dependencies/pom.xml
# yudao-framework/yudao-spring-boot-starter-web/pom.xml
|
2024-12-28 12:44:24 +08:00 |
|
YunaiV
|
4d5983bf11
|
【升级】knife4j from 4.5.0 to 4.6.0（社区版）
|
2024-12-28 12:44:09 +08:00 |
|
YunaiV
|
9ad43363e1
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
|
2024-12-28 11:53:01 +08:00 |
|
YunaiV
|
547ec2c7c5
|
【升级】redisson from 3.36.0 to 3.41.0
|
2024-12-28 11:52:52 +08:00 |
|
YunaiV
|
9076bb84e8
|
【升级】spring boot from 3.3.4 to 3.4.1
|
2024-12-28 11:44:54 +08:00 |
|
YunaiV
|
e918223c9e
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# README.md
# pom.xml
# yudao-dependencies/pom.xml
|
2024-12-28 11:37:52 +08:00 |
|
YunaiV
|
11939ee7b1
|
【升级】spring boot from 3.3.4 to 3.4.1
|
2024-12-28 11:37:38 +08:00 |
|
YunaiV
|
fcb6eac4e2
|
【同步】BOOT 和 CLOUD 的功能
|
2024-12-27 22:22:11 +08:00 |
|
YunaiV
|
7c3dacc875
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# 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
# 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/service/point/MemberPointRecordServiceImpl.java
|
2024-12-27 22:19:54 +08:00 |
|
YunaiV
|
e5c036a60d
|
【同步】BOOT 和 CLOUD 的功能（所有）
|
2024-12-27 22:19:09 +08:00 |
|
YunaiV
|
527a635155
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
|
2024-12-01 17:41:34 +08:00 |
|
YunaiV
|
c322c53b45
|
【功能修复】商城：trade 服务，启动失败
|
2024-12-01 17:41:00 +08:00 |
|
YunaiV
|
ab5c790b3d
|
【功能修复】Job 组件：修复多租户下，XXL-Job 无法传参的问题
|
2024-12-01 16:37:21 +08:00 |
|
YunaiV
|
4c978ab78f
|
【同步】BOOT 和 CLOUD 的功能（支付相关）
|
2024-11-25 20:31:24 +08:00 |
|
YunaiV
|
2b8334018a
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/kefu/KeFuMessageController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/kefu/AppKeFuMessageController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/kefu/KeFuMessageServiceImpl.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/vo/record/BrokerageRecordBaseVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/vo/user/BrokerageUserBaseVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/vo/user/BrokerageUserClearBrokerageUserReqVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/vo/user/BrokerageUserUpdateBrokerageEnabledReqVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/vo/user/BrokerageUserUpdateBrokerageUserReqVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/vo/withdraw/BrokerageWithdrawBaseVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/vo/withdraw/BrokerageWithdrawRejectReqVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/DeliveryPickUpStoreController.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/vo/pickup/DeliveryPickUpStoreBaseVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/vo/pickup/DeliveryPickUpStoreCreateReqVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/vo/pickup/DeliveryPickUpStoreUpdateReqVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/TradeOrderController.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageWithdrawServiceImpl.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/delivery/DeliveryPickUpStoreService.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/delivery/DeliveryPickUpStoreServiceImpl.java
# yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/api/transfer/PayTransferApi.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/app/vo/PayAppBaseVO.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/notify/PayNotifyController.java
# yudao-module-pay/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/PayClientConfig.java
# yudao-module-pay/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/dto/order/PayOrderUnifiedReqDTO.java
# yudao-module-pay/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/dto/refund/PayRefundUnifiedReqDTO.java
# yudao-module-pay/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/dto/transfer/PayTransferUnifiedReqDTO.java
# yudao-module-pay/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/NonePayClientConfig.java
|
2024-11-25 20:26:19 +08:00 |
|
YunaiV
|
50e47434bb
|
【同步】BOOT 和 CLOUD 的功能（支付相关）
|
2024-11-25 20:26:00 +08:00 |
|
YunaiV
|
18b63f4e05
|
【同步】BOOT 和 CLOUD 的功能
|
2024-11-23 11:19:17 +08:00 |
|
YunaiV
|
2031f42396
|
【同步】BOOT 和 CLOUD 的功能
|
2024-11-23 11:17:15 +08:00 |
|
YunaiV
|
14c49629b7
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmModelController.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmActivityController.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmTaskController.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmApprovalDetailReqVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmFormFieldsPermissionReqVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskApproveReqVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskReturnReqVO.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/dept/BpmTaskCandidateStartUserDeptLeaderMultiStrategy.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/dept/BpmTaskCandidateStartUserDeptLeaderStrategy.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/dept/BpmTaskCandidateStartUserSelectStrategy.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/other/BpmTaskCandidateAssignEmptyStrategy.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/user/BpmTaskCandidateRoleStrategy.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/user/BpmTaskCandidateStartUserStrategy.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/util/SimpleModelUtils.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmModelService.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmProcessDefinitionServiceImpl.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmActivityServiceImpl.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/discount/vo/DiscountActivityBaseVO.java
|
2024-11-23 11:13:01 +08:00 |
|
YunaiV
|
90d006b4c9
|
【同步】BOOT 和 CLOUD 的功能（所有）
|
2024-11-23 11:12:04 +08:00 |
|
YunaiV
|
10b2d10fcc
|
【功能新增】bpm：仿钉钉、飞书的设计器
|
2024-11-23 11:03:12 +08:00 |
|
YunaiV
|
91180bc65b
|
【缺陷修复】gateway：文档的 ai-server 错误写成 crm-server
|
2024-11-22 19:45:37 +08:00 |
|
YunaiV
|
2cda46df2a
|
Merge branch 'master' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/job/notify/PayNotifyJob.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/job/order/PayOrderExpireJob.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/job/order/PayOrderSyncJob.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/job/refund/PayRefundSyncJob.java
|
2024-11-22 19:16:36 +08:00 |
|
芋道源码
|
1b6f99deb9
|
!157 fix: @Resource注解依赖错误
Merge pull request !157 from Roan123/master
|
2024-11-22 11:16:20 +00:00 |
|
YunaiV
|
b0dbd40666
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/logger/dto/LoginLogCreateReqDTO.java
|
2024-11-22 19:12:53 +08:00 |
|
YunaiV
|
64cdc5f456
|
【功能修复】全局：jakarta => javax
|
2024-11-22 19:12:38 +08:00 |
|
YunaiV
|
fdd0b28d2b
|
【缺陷修复】gateway：文档的 ai-server 错误写成 crm-server
|
2024-11-22 19:10:34 +08:00 |
|
Roan
|
860b099ec4
|
fix: @Resource注解依赖错误
|
2024-11-22 16:43:35 +08:00 |
|
芋道源码
|
cf4cbe2f57
|
!156 fix: 修复 system-api 模块的验证注解导入
Merge pull request !156 from huangshuai/master
|
2024-11-11 05:01:16 +00:00 |
|
黄帅
|
2cd7b0d188
|
fix: 修复 system-api 模块的验证依赖问题
将 jakarta.validation 包名改为 javax.validation，以匹配 Spring Boot 2.7.x 版本要求
影响文件：yudao-module-system-api 模块下的 LoginLogCreateReqDTO 类"
|
2024-11-11 12:54:28 +08:00 |
|
芋道源码
|
9d4927029b
|
!155 修复 因 https://gitee.com/zhijiantianya/ruoyi-vue-pro/pulls/1053 PR 变更模板变量占用名称导致 订单日志发货快递公司显示异常问题
Merge pull request !155 from 筱龙缘/N/A
|
2024-11-09 10:58:25 +00:00 |
|
YunaiV
|
5912d91abe
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-dependencies/pom.xml
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/job/notify/PayNotifyJob.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/job/order/PayOrderExpireJob.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/job/order/PayOrderSyncJob.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/job/refund/PayRefundSyncJob.java
# yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/logger/dto/LoginLogCreateReqDTO.java
|
2024-11-09 18:45:01 +08:00 |
|
YunaiV
|
dfe018b8ce
|
【代码优化】infra：s3 minio sdk 替换为 aws sdk
|
2024-11-09 18:34:50 +08:00 |
|
YunaiV
|
d8ae5846cb
|
【缺陷修复】修复由于多租户定时任务方法返回 void 导致的执行 xxlJob 执行失败的问题。
ConcurrentHashMap value 不支持 null 值
|
2024-11-09 15:13:19 +08:00 |
|
筱龙缘
|
3a1a818c49
|
修复 因 https://gitee.com/zhijiantianya/ruoyi-vue-pro/pulls/1053 PR 变更模板变量占用名称导致 订单日志发货快递公司显示异常问题
修复 因 https://gitee.com/zhijiantianya/ruoyi-vue-pro/pulls/1053 PR 变更模板变量占用名称导致 订单日志发货快递公司显示异常问题
Signed-off-by: 筱龙缘 <794334212@qq.com>
|
2024-11-04 03:32:51 +00:00 |
|
YunaiV
|
246c095468
|
Merge remote-tracking branch 'origin/master'
|
2024-11-02 20:16:53 +08:00 |
|
YunaiV
|
11fd5c3ff2
|
【功能修复】报表：修复 JmReportTokenServiceImpl 在 jdk17 和 jdk8 存在差异的问题
|
2024-11-02 20:16:46 +08:00 |
|
YunaiV
|
f9fdca0d6d
|
【缺陷修复】商城：优惠劵在不限制时，无法发送的问题
|
2024-10-27 20:33:56 +08:00 |
|
YunaiV
|
a887c364f9
|
146 【功能修复】会员：微信登录注册时，因为 username 为空导致失败的问题
|
2024-10-27 16:22:58 +08:00 |
|
YunaiV
|
5208f2878e
|
146 【功能修复】PAY：修复定时任务没有返回值导致的异常
|
2024-10-27 15:57:05 +08:00 |
|
芋道源码
|
243ad6634a
|
!146 【功能修复】PAY：修复定时任务没有返回值导致的异常
Merge pull request !146 from Lcp/master-jdk17
|
2024-10-27 07:55:17 +00:00 |
|
Lcp
|
6e8329ef75
|
【功能修复】PAY：修复定时任务没有返回值导致的异常
|
2024-10-14 12:15:47 +08:00 |
|
YunaiV
|
bcc713f4ae
|
【依赖降级】weixin-java from 4.6.5B to 4.6.0，避免 privateCertPath 报错
|
2024-10-13 17:06:07 +08:00 |
|
YunaiV
|
707ea5c48f
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-dependencies/pom.xml
|
2024-10-13 17:04:28 +08:00 |