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

596 Commits

Author SHA1 Message Date
YunaiV e4e162a47b Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/biz/infra/logger/ApiAccessLogCommonApi.java
#	yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/biz/infra/logger/ApiErrorLogCommonApi.java
#	yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/biz/infra/logger/dto/ApiAccessLogCreateReqDTO.java
#	yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoSecurityAutoConfiguration.java
#	yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/core/filter/TokenAuthenticationFilter.java
#	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/config/YudaoApiLogAutoConfiguration.java
#	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/config/YudaoWebAutoConfiguration.java
#	yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/api/logger/ApiAccessLogApiImpl.java
#	yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/logger/ApiAccessLogServiceImplTest.java
#	yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/logger/OperateLogApi.java
 2025-05-14 21:04:37 +08:00
YunaiV 6c6babb4c3 reactor：yudao-common 增加 biz 包，将 framework 依赖的 api 统一迁移，方便后续 yudao-framework 独立仓库 2025-05-14 19:23:40 +08:00
安浩浩 abf5fae91a fix：将API导入路径中的simpleClassName_strikeCase替换为businessName，以确保正确引用API 2025-05-13 22:55:31 +08:00
YunaiV f3b897ea5d Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2025-05-13 19:30:11 +08:00
YunaiV efc535c051 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-dependencies/pom.xml
#	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/app/brokerage/AppBrokerageWithdrawController.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/framework/aftersale/core/aop/AfterSaleLogAspect.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageWithdrawServiceImpl.java
#	yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/api/notify/dto/PayTransferNotifyReqDTO.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-api/src/main/java/cn/iocoder/yudao/module/pay/api/transfer/dto/PayTransferCreateReqDTO.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/api/refund/PayRefundApiImpl.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/demo/PayDemoOrderController.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/demo/PayDemoTransferController.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/demo/vo/transfer/PayDemoTransferCreateReqVO.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/transfer/PayTransferController.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/transfer/vo/PayTransferCreateReqVO.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/app/order/AppPayOrderController.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/demo/PayDemoTransferService.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/demo/PayDemoTransferServiceImpl.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/transfer/PayTransferService.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/transfer/PayTransferServiceImpl.java
#	yudao-module-pay/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/dto/transfer/PayTransferUnifiedReqDTO.java
 2025-05-12 09:19:22 +08:00
puhui999 74712db1a8 perf: vben5 代码生成 2025-05-09 16:38:47 +08:00
xingyu4j 5327d3a494 perf: vben5 代码生成 2025-05-06 23:26:44 +08:00
xingyu4j 6ba0484f33 perf: vben5 代码生成 2025-05-06 22:14:10 +08:00
YunaiV e6fcb60332 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2025-05-05 11:19:27 +08:00
YunaiV 70cbb82c84 reactor：@TenantIgnore 添加在 DO 实体类上，该表自动忽略租户 2025-05-05 11:18:19 +08:00
YunaiV 8e0398bce6 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/service/message/MpMessageServiceImpl.java
 2025-05-05 09:33:51 +08:00
YunaiV be86cdfd51 reactor：@TenantIgnore 添加在 Controller 时，自动添加到 TenantProperties 中 2025-05-05 09:33:34 +08:00
puhui999 c6582b2a61 【功能完善】INFRA：代码生成 vben5 antd 主子表 erp 模版 2025-05-03 18:24:12 +08:00
puhui999 515cbbb285 【功能完善】INFRA：代码生成 vben5 antd 主子表 inner 模版 2025-05-03 17:31:09 +08:00
puhui999 57138d7995 【功能完善】INFRA：代码生成 vben5 antd 主子表 normal 模版 2025-05-03 16:39:55 +08:00
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 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 cd263022d4 fix：【全局】sqlserver 在分页的兼容性 2025-05-02 22:47:25 +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 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
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 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 dd068eb94f refactor：【INFRA】优化 vben5.0 标准代码生成的模版 2025-04-26 16:48:55 +08:00
YunaiV 3d45f92852 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop 2025-04-26 16:44:38 +08:00
YunaiV 2da16930ae Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-dependencies/pom.xml
 2025-04-26 09:44:14 +08:00
YunaiV 46676a439d feat：【INFRA】文件存储，增加 enablePathStyleAccess 选项 2025-04-25 21:48:37 +08:00
puhui999 03d3239463 【功能完善】INFRA：代码生成 vben5 antd 单表表单模版 2025-04-25 18:08:24 +08:00
puhui999 ff39a2b57b 【功能完善】INFRA：代码生成 vben5 antd 单表表单模版 2025-04-25 11:15:57 +08:00
芋道源码 0885eb7c70
!1219 【依赖升级】AWS SDK for Java 1.x to 2.x 
Merge pull request !1219 from puhui999/develop
 2025-04-24 14:20:39 +00:00
puhui999 ef2d0b354a 【功能新增】INFRA：代码生成 vben5 antd 模版 50% 2025-04-24 18:25:04 +08:00
puhui999 c26a46da66 【功能新增】INFRA：代码生成 vben5 antd 模版 50% 2025-04-24 11:37:56 +08:00
YunaiV ab8cad2352 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/socail/SocialUserController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserProfileController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/profile/UserProfileUpdateReqVO.java
 2025-04-23 23:08:41 +08:00
puhui999 32bdc20a4b 【代码优化】INFRA：代码生成 vben5 schema data.ts 模版优化 2025-04-22 16:12:12 +08:00
YunaiV 10397aa480 【代码优化】SYSTEM：profile 接口，不在加载 socialuser，而是提供独立接口 2025-04-21 20:15:00 +08:00
puhui999 2d0f989968 【功能新增】代码生成: vue3_vben5_antd schema 主子表 erp 模板 2025-04-21 19:10:33 +08:00
puhui999 b3a40af214 【代码优化】代码生成: vue3_vben5_antd schema 主子表模板优化 2025-04-21 16:03:36 +08:00
YunaiV 436eb29d30 【功能新增】SYSTEM：返回人信息时，增加 username、email，用于 vben 界面的展示 2025-04-19 19:45:07 +08:00
puhui999 e1fa4e1a70 【代码优化】代码生成: vue3_vben5_antd schema 主子表标准模式和内嵌模式模板完成 2025-04-17 18:42:05 +08:00
puhui999 dfcbcf09d4 【代码优化】代码生成: vue3_vben5_antd schema 主子表标准模式和内嵌模式模板完成 2025-04-17 16:25:13 +08:00
puhui999 f3aa501e94 【代码优化】代码生成: vue3_vben5_antd schema 主子表模版优化 2025-04-17 11:19:30 +08:00