YunaiV
|
269c1fdabf
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/config/YudaoTenantAutoConfiguration.java
# yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/security/TenantSecurityWebFilter.java
|
2025-08-31 10:08:12 +08:00 |
|
YunaiV
|
040899d8c9
|
reactor：移除 @Accessors 和 @EqualsAndHashCode 注解
|
2025-08-30 17:48:16 +08:00 |
|
YunaiV
|
4bed44868c
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# README.md
# pom.xml
# yudao-dependencies/pom.xml
|
2025-08-29 09:24:09 +08:00 |
|
YunaiV
|
441fe18720
|
feat：【framework 框架】优化 jackson 的初始化
|
2025-08-24 16:03:39 +08:00 |
|
YunaiV
|
7a8f2f51e6
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2025-08-24 16:01:30 +08:00 |
|
wusongwen
|
16efe7b6aa
|
修复确认退款报错和取消订单定时任务报错
|
2025-08-20 19:44:30 +08:00 |
|
YunaiV
|
fbec7d030d
|
Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2025-08-17 15:02:24 +08:00 |
|
YunaiV
|
b5d5fa8ea4
|
fix：【mall 商城】门店自提时，缺少上传订单物流信息到微信小程序
|
2025-08-17 10:56:13 +08:00 |
|
YunaiV
|
e44d9fe136
|
fix：【mall 商城】优惠劵在“领取之后”场景下，计算不正确的问题
|
2025-08-17 10:37:06 +08:00 |
|
YunaiV
|
ef9fcc9aa4
|
reactor：@MockBean => @MockitoBean
|
2025-08-02 17:58:49 +08:00 |
|
YunaiV
|
863ec14f0b
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-infra/src/test/java/cn/iocoder/yudao/module/infra/service/db/DataSourceConfigServiceImplTest.java
# yudao-module-infra/src/test/java/cn/iocoder/yudao/module/infra/service/db/DatabaseTableServiceImplTest.java
# yudao-module-infra/src/test/java/cn/iocoder/yudao/module/infra/service/file/FileConfigServiceImplTest.java
# yudao-module-infra/src/test/java/cn/iocoder/yudao/module/infra/service/job/JobServiceImplTest.java
# yudao-module-mall/yudao-module-product/src/test/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceTest.java
# yudao-module-mall/yudao-module-trade/src/test/java/cn/iocoder/yudao/module/trade/service/aftersale/AfterSaleServiceTest.java
# yudao-module-mall/yudao-module-trade/src/test/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageRecordServiceImplTest.java
# yudao-module-member/src/test/java/cn/iocoder/yudao/module/member/service/auth/MemberAuthServiceTest.java
# yudao-module-member/src/test/java/cn/iocoder/yudao/module/member/service/group/MemberGroupServiceImplTest.java
# yudao-module-member/src/test/java/cn/iocoder/yudao/module/member/service/level/MemberLevelServiceImplTest.java
# yudao-module-member/src/test/java/cn/iocoder/yudao/module/member/service/tag/MemberTagServiceImplTest.java
# yudao-module-pay/src/test/java/cn/iocoder/yudao/module/pay/service/app/PayAppServiceTest.java
# yudao-module-pay/src/test/java/cn/iocoder/yudao/module/pay/service/channel/PayChannelServiceTest.java
# yudao-module-pay/src/test/java/cn/iocoder/yudao/module/pay/service/notify/PayNotifyServiceTest.java
# yudao-module-pay/src/test/java/cn/iocoder/yudao/module/pay/service/refund/PayRefundServiceTest.java
# yudao-module-report/src/test/java/cn/iocoder/yudao/module/report/service/goview/GoViewDataServiceImplTest.java
# yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/dict/DictDataServiceImplTest.java
# yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/dict/DictTypeServiceImplTest.java
# yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/mail/MailAccountServiceImplTest.java
# yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2ApproveServiceImplTest.java
# yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImplTest.java
# yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/permission/PermissionServiceTest.java
# yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/permission/RoleServiceImplTest.java
# yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/sms/SmsChannelServiceTest.java
# yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/sms/SmsTemplateServiceImplTest.java
# yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/tenant/TenantPackageServiceImplTest.java
# yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/tenant/TenantServiceImplTest.java
|
2025-08-02 17:34:02 +08:00 |
|
YunaiV
|
e79005a0a0
|
reactor：@MockBean => @MockitoBean
|
2025-08-02 17:32:12 +08:00 |
|
YunaiV
|
8939c04282
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/util/ExcelUtils.java
# yudao-module-pay/src/main/java/cn/iocoder/yudao/module/pay/api/order/dto/PayOrderCreateReqDTO.java
# yudao-module-pay/src/main/java/cn/iocoder/yudao/module/pay/api/refund/dto/PayRefundCreateReqDTO.java
# yudao-module-pay/src/main/java/cn/iocoder/yudao/module/pay/api/transfer/dto/PayTransferCreateReqDTO.java
|
2025-07-27 19:20:31 +08:00 |
|
YunaiV
|
8ffe9272e8
|
feat：【pay 支付】增加 userid、usertype，并额外支持权限校验
|
2025-07-27 19:18:04 +08:00 |
|
YunaiV
|
1b412546eb
|
fix：【Mall 商城】修复积分商品新增时校验商品是否参与其他活动校验失败
|
2025-07-26 19:49:50 +08:00 |
|
YunaiV
|
b208f100a6
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-dependencies/pom.xml
# yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/util/ExcelUtils.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserUpdateStatusReqVO.java
|
2025-07-26 17:25:10 +08:00 |
|
芋道源码
|
b8889a94c7
|
!1362 feat: 使用 fastExcel 替换 easyExcel (<a href="https://gitee.com/link?target=https%3A%2F%2Fgithub.com%2Ffast-excel%2Ffastexcel">https://github.com/fast-excel/fastexcel</a>)
Merge pull request !1362 from xingyu/master-jdk17-excel
|
2025-07-26 09:20:20 +00:00 |
|
YunaiV
|
a2dcbd7afe
|
【同步】jdk21 和 jdk8 的代码
|
2025-07-26 16:34:03 +08:00 |
|
YunaiV
|
d1c58b1c37
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2025-07-26 12:45:54 +08:00 |
|
YunaiV
|
529c570bbd
|
reactor：优化日志格式，解决 FILE 里存在 highlight、cyan高亮
reactor：弱化对 skywalking 依赖，可按需引入，更灵活
|
2025-07-26 12:45:41 +08:00 |
|
YunaiV
|
b535716084
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/api/websocket/WebSocketSenderApiImpl.java
# yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/websocket/DemoWebSocketMessageListener.java
|
2025-07-26 09:49:46 +08:00 |
|
YunaiV
|
942f51dd59
|
Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17
|
2025-07-25 21:18:11 +08:00 |
|
芋道源码
|
8c6dc8fcf9
|
!1381 refactor.trade: 优化 Kd100ExpressQueryRespDTO 中时间字段的处理
Merge pull request !1381 from binny1024/master-jdk17-fix-kd100-time
|
2025-07-25 12:42:03 +00:00 |
|
YunaiV
|
fb6771aad0
|
fix：【MALL 商城】秒杀时间段的校验
|
2025-07-21 19:45:30 +08:00 |
|
YunaiV
|
adece67532
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/vo/file/FileUploadReqVO.java
# yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/app/file/vo/AppFileUploadReqVO.java
|
2025-07-15 22:37:27 +08:00 |
|
YunaiV
|
a9c7b584cc
|
fix：【MALL 商城管理】优惠劵扣减时，增加 WHERE 乐观锁
|
2025-07-13 17:06:40 +08:00 |
|
YunaiV
|
4d5e501a41
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/framework/file/core/utils/FileTypeUtils.java
# yudao-module-mp/src/main/java/cn/iocoder/yudao/module/mp/service/handler/user/SubscribeHandler.java
|
2025-07-11 21:54:11 +08:00 |
|
YunaiV
|
d8e1610495
|
feat: enhance MyBatis utility for sorting and update SQL aliases in TradeOrderStatisticsMapper
|
2025-07-08 09:39:44 +08:00 |
|
YunaiV
|
eca9307344
|
fix：【MALL 商城】修复退款通知中 merchantRefundId 字符串转换 Long 类型的问题
|
2025-07-06 16:38:14 +08:00 |
|
ningjingzhiyuan1024
|
9241045365
|
refactor.trade: 移除 Kd100ExpressQueryRespDTO 中的冗余字段
- 删除了 Kd100ExpressQueryRespDTO 类中的 timeStr 字段
- 保留了已有的 time 字段，用于表示轨迹发生时间
|
2025-07-05 16:24:14 +08:00 |
|
xubinbin0303
|
c611f1ad15
|
refactor.trade: 优化 Kd100ExpressQueryRespDTO 中时间字段的处理
- 新增 timeStr 字段用于存储原始时间字符串
- 添加 parseTime 方法将时间字符串解析为 LocalDateTime 对象- 保留原有的 @JsonFormat 注解以确保序列化格式不变
|
2025-07-01 19:17:15 +08:00 |
|
芋道源码
|
ec5281f2e5
|
!1373 fix: 创建拼团活动时校验商品是否参与了其它活动
Merge pull request !1373 from puhui999/master-jdk17-2
|
2025-06-22 06:46:30 +00:00 |
|
puhui999
|
cac82a13a7
|
fix: 修复拼团还没成团，虚拟成团是否，这个时候核销也能核销成功
|
2025-06-18 17:23:59 +08:00 |
|
puhui999
|
9fc4a4061f
|
fix: 创建拼团活动时校验商品是否参与了其它活动
|
2025-06-18 15:40:51 +08:00 |
|
YunaiV
|
a000048196
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/FileConfigController.java
# yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/FileController.java
# yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileServiceImpl.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/MenuController.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/dept/PostServiceImpl.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/dict/DictTypeServiceImpl.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/permission/RoleService.java
|
2025-06-16 08:35:21 +08:00 |
|
YunaiV
|
0fbffdc1d3
|
reactor：统一导出的 url 都是 export-excel
|
2025-06-16 08:30:00 +08:00 |
|
xingyu4j
|
f38485ffd5
|
Merge branch 'refs/heads/master-jdk17' into master-jdk17-excel
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/handler/SelectSheetWriteHandler.java
|
2025-06-15 18:54:13 +08:00 |
|
YunaiV
|
39fcac4d5f
|
!1357 fix:修复"商品统计聚合函数的别名与排序字段不符"导致的SQL异常
|
2025-06-15 15:05:27 +08:00 |
|
芋道源码
|
69b896a688
|
!1357 fix:修复"商品统计聚合函数的别名与排序字段不符"导致的SQL异常
Merge pull request !1357 from SuchJack/master-jdk17-dev
|
2025-06-15 06:55:54 +00:00 |
|
YunaiV
|
7d867909d7
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# pom.xml
# sql/oracle/ruoyi-vue-pro.sql
# sql/sqlserver/ruoyi-vue-pro.sql
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailAccountController.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailTemplateController.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notice/NoticeController.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/NotifyTemplateController.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/OAuth2ClientController.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/OAuth2TokenController.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsChannelController.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsTemplateController.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/socail/SocialClientController.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/TenantPackageController.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailAccountService.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailAccountServiceImpl.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateService.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateServiceImpl.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/notice/NoticeServiceImpl.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyTemplateService.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyTemplateServiceImpl.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2ClientService.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2ClientServiceImpl.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsChannelService.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsTemplateService.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsTemplateServiceImpl.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantPackageService.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantPackageServiceImpl.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantService.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantServiceImpl.java
|
2025-06-15 10:21:55 +08:00 |
|
YunaiV
|
4aa9efc0dc
|
!1358 fix(mall)：拼团记录创建时，需要设置拼团商品的图片
|
2025-06-15 10:14:32 +08:00 |
|
芋道源码
|
f5f7061e00
|
!1358 fix(mall)：拼团记录创建时，需要设置拼团商品的图片
Merge pull request !1358 from SuchJack/master-jdk17-dev1
|
2025-06-15 02:12:18 +00:00 |
|
xingyu4j
|
9dec02d02e
|
feat: 使用 fastExcel 替换 easyExcel (https://github.com/fast-excel/fastexcel)
|
2025-06-10 14:51:41 +08:00 |
|
SuchJack
|
25106e2efd
|
fix(mall)：拼团记录创建时，需要设置拼团商品的图片
|
2025-06-01 18:22:43 +08:00 |
|
SuchJack
|
bed36f684f
|
fix(mall)：拼团记录创建时，需要设置拼团商品的图片
|
2025-06-01 18:15:24 +08:00 |
|
xingyu4j
|
1b37c47361
|
fix: deleteBatchIds 已过期
|
2025-05-26 14:09:31 +08:00 |
|
xingyu4j
|
5caf990920
|
fix: selectBatchIds 已过期
|
2025-05-26 14:06:02 +08:00 |
|
SuchJack
|
20241b8bcc
|
fix:修复"商品统计聚合函数的别名与排序字段不符"导致的SQL异常
|
2025-05-24 20:04:07 +08:00 |
|
YunaiV
|
e00bfd02a1
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# pom.xml
# yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
# yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/operatelog/CrmOperateLogController.java
# yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/statistics/CrmStatisticsPerformanceController.java
# yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/statistics/vo/performance/CrmStatisticsPerformanceReqVO.java
# yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/statistics/CrmStatisticsPerformanceServiceImpl.java
# yudao-module-mall/yudao-module-promotion/pom.xml
# yudao-module-mall/yudao-module-trade/pom.xml
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/api/social/SocialUserApi.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/AuthRegisterReqVO.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java
|
2025-05-17 14:14:23 +08:00 |
|
YunaiV
|
dfffc93584
|
reactor：移除 mall-trade 的 api 包
|
2025-05-17 11:31:10 +08:00 |
|