szz
/
ShiShiYiBan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,455 Commits 13 Branches 41 Tags 242 MiB
Commit Graph

9455 Commits

Author SHA1 Message Date
puhui999 b0f4a252c7 【功能完善】INFRA：代码生成 vben5 antd 树表模版 2025-05-03 15:06:09 +08:00
puhui999 28c818e9bc Merge remote-tracking branch 'yudao/master-jdk17' into master-jdk17 
# Conflicts:
#	yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngine.java
 2025-05-03 13:34:23 +08:00
puhui999 ed920f3fd3 【代码优化】INFRA：代码生成 vben5 antd 模版 2025-05-03 13:32:53 +08:00
YunaiV 8176278086 feat：集成积木仪表盘 2025-05-03 10:28:41 +08:00
YunaiV 09b872a882 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2025-05-03 10:26:44 +08:00
YunaiV 4fb4af2c5c feat：集成积木仪表盘 2025-05-03 10:26:14 +08:00
YunaiV 0038aa0cdf chore：guice version 移除 2025-05-03 09:15:35 +08:00
YunaiV b0a53a26cd Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-dependencies/pom.xml
 2025-05-03 09:07:55 +08:00
YunaiV 0b98ef4ecf chore：jimureport 1.8.1 to 1.9.4 2025-05-03 09:06:36 +08:00
YunaiV 28c20fa323 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2025-05-03 08:45:47 +08:00
YunaiV bd057ce14d chore：mybatis 相关依赖升级 2025-05-03 08:45:36 +08:00
YunaiV 071fafd687 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	README.md
#	pom.xml
#	yudao-dependencies/pom.xml
 2025-05-03 08:36:08 +08:00
YunaiV 585a124d34 chore：spring 相关依赖升级 2025-05-03 08:35:31 +08:00
YunaiV cd263022d4 fix：【全局】sqlserver 在分页的兼容性 2025-05-02 22:47:25 +08:00
YunaiV 387c5cd6ff Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17 2025-05-02 22:21:41 +08:00
YunaiV c8a14f11ec Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17 2025-05-02 21:09:43 +08:00
YunaiV 00ed548ef5 【同步】jdk21 和 jdk8 的代码 2025-05-02 21:09:14 +08:00
YunaiV a557f0733f Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/api/file/FileApiImpl.java
#	yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileServiceImpl.java
#	yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/file/FileServiceImplTest.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/coupon/vo/template/AppCouponTemplateRespVO.java
#	yudao-module-member/yudao-module-member-biz/src/test/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImplTest.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserService.java
#	yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImplTest.java
 2025-05-02 21:01:58 +08:00
芋道源码 c2db16cc15
!1335 reactor：【INFRA】文件上传 api，增加 directory 参数，去除 path 参数，并支持按照日期分目录、文件名不再使用 … 
Merge pull request !1335 from 芋道源码/develop
 2025-05-02 13:00:17 +00:00
YunaiV cce09044c1 reactor：【INFRA】文件上传 api，增加 directory 参数，去除 path 参数，并支持按照日期分目录、文件名不再使用 sha256 而是时间戳 2025-05-02 18:22:00 +08:00
xingyu4j bf05e2d277 fix: vben5 Codegen Front Type 2025-05-02 13:46:36 +08:00
YunaiV d778184213 feat：【MALL】增加优惠模版的领取信息的返回 2025-05-01 09:01:57 +08:00
YunaiV 95b8cf00fd fix：【商城】已删除的商品，无法评论，导致 TradeOrderAutoCommentJob 重复持续运行 2025-04-30 21:29:50 +08:00
YunaiV 361e50e5de feat：Redis Stream 增加清理 Job，避免占用内存过多 2025-04-30 19:41:24 +08:00
YunaiV 74490ed03b reactor：使用 aj-captcha 官方 1.4.0 2025-04-30 15:09:06 +08:00
YunaiV e7ad73c278 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-dependencies/pom.xml
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/captcha/CaptchaController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImpl.java
#	yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImplTest.java
 2025-04-30 15:02:49 +08:00
YunaiV d7656535a2 reactor：使用 aj-captcha 官方 1.4.0 2025-04-30 15:01:19 +08:00
YunaiV b047274306 【同步】jdk21 和 jdk8 的代码 2025-04-30 13:47:25 +08:00
YunaiV 622e71cd55 【同步】jdk21 和 jdk8 的代码 2025-04-30 13:47:00 +08:00
YunaiV 4d925f69db 【同步】jdk21 和 jdk8 的代码 2025-04-30 09:45:18 +08:00
YunaiV 3c361527fc reactor：使用 justauth 官方 1.16.7（jdk8 特殊适配，等 1.4.1） 2025-04-30 09:42:33 +08:00
dhb52 8dbbad9e2d
fix: ai-writer 获取聊天模型错误 
Signed-off-by: dhb52 <dhb52@126.com>
 2025-04-29 16:20:37 +00:00
YunaiV 54941f1361 Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-dependencies/pom.xml
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/ota/vo/firmware/IotOtaFirmwareCreateReqVO.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/ota/vo/firmware/IotOtaFirmwareUpdateReqVO.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/ota/vo/upgrade/record/IotOtaUpgradeRecordPageReqVO.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/ota/vo/upgrade/task/IotOtaUpgradeTaskPageReqVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/aftersale/AfterSaleServiceImpl.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/auth/MemberAuthServiceImpl.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialClientService.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialClientServiceImpl.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialUserServiceImpl.java
#	yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/social/SocialClientServiceImplTest.java
#	yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/social/SocialUserServiceImplTest.java
 2025-04-30 00:11:24 +08:00
YunaiV 4cebe4af14 reactor：使用 justauth 官方 1.16.7 2025-04-30 00:05:54 +08:00
xingyu4j d591e9a01e feat: 使用 modalApi.unlock() 替换 modalApi.lock(false) 2025-04-29 22:53:30 +08:00
YunaiV dad0cc4cb1 Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17 2025-04-29 22:12:35 +08:00
YunaiV cb701d7d7f fix：【INFRA】阿里云 S3 上传时，会 aws-chunked encoding is not supported 报错的问题 2025-04-29 19:11:50 +08:00
xingyu4j 5a906a7b20 fix: requiredMode 调成为 Schema.RequiredMode.REQUIRED 的方式，解决提示 REQUIRED 找不到的问题 2025-04-29 14:26:37 +08:00
Lesan bce63cd04f feat: 完善AI工作流运行测试(通义千问) 2025-04-29 13:59:33 +08:00
YunaiV 4dde700f35 feat：【MALL】App 售后筛选时，增加 status 过滤 2025-04-28 23:16:54 +08:00
xingyu4j aa48a6f533 fix: vben 代码生成默认vbenForm 样式 2025-04-28 15:10:30 +08:00
xingyu4j 1080972e36 fix: VxeTableGridOptions 从 #/adapter/vxe-table 导入 2025-04-28 15:06:48 +08:00
YunaiV 00a08d6cb6 reactor：【MALL】修改购物车查询接口，返回库存、状态等状态，默认不自动取消 selected 状态 2025-04-28 00:24:59 +08:00
YunaiV ec76c1ae6e fix：【MALL】修复 addBrokerage 创建分销记录时，每个订单项，生成分销记录 2025-04-27 09:44:27 +08:00
YunaiV 3395a3d86b feat：【MALL】商城订单取消时，额外校验支付单的状态，进一步兜底回调情况 2025-04-27 08:58:54 +08:00
YunaiV 03e510adfd fix：【MALL】修复了一些问题 https://gitee.com/zhijiantianya/ruoyi-vue-pro/pulls/1315 2025-04-26 17:34:17 +08:00
芋道源码 f6acc9dea5
!1315 修复了一些问题 
Merge pull request !1315 from puhui999/develop-tmp
 2025-04-26 09:26:25 +00:00
YunaiV abfbe1ea83 feat：【SYSTEM】通过系统配置管理来设置系统是否可注册用户 2025-04-26 17:22:42 +08:00
YunaiV 4a9e9961b0 fix：【SYSTEM】AdminUserServiceImplTest 的 testUpdateUserProfile_success 单测报错 2025-04-26 17:04:20 +08:00
YunaiV cca592a15b fix：【SYSTEM】修复创建租户管理员时，select/update 自动拼接user_id 问题 2025-04-26 16:51:41 +08:00