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 |
|
puhui999
|
da248cd126
|
【代码优化】代码生成: vue3_vben5_antd schema 主子表模板优化（标准和内嵌模式）
|
2025-04-16 23:53:33 +08:00 |
|
puhui999
|
1f7f06549f
|
【代码优化】代码生成: vue3_vben5_antd schema 主子表 api 和 data.ts 模板优化
|
2025-04-16 22:29:32 +08:00 |
|
puhui999
|
3923189887
|
【功能新增】代码生成: vue3_vben5_antd schema 主子表
|
2025-04-16 18:47:47 +08:00 |
|
puhui999
|
e704f4c755
|
【代码优化】代码生成: vue3_vben5_antd 模版目录调整
|
2025-04-16 15:52:20 +08:00 |
|
puhui999
|
24aea3e30a
|
【代码优化】INFRA: vue3_vben5_antd schema 单表和树表代码生成模版优化
|
2025-04-16 15:26:01 +08:00 |
|
YunaiV
|
d8451b004e
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/kefu/KeFuMessageServiceImpl.java
|
2025-04-12 11:56:35 +08:00 |
|
YunaiV
|
42dbd4e21a
|
【代码评审】INFRA：代码生成在 vben5 的模版
|
2025-04-12 09:48:15 +08:00 |
|
puhui999
|
37e5152a35
|
【代码优化】INFRA: vben next 树表代码生成
|
2025-04-11 21:38:39 +08:00 |
|
puhui999
|
015565cc9a
|
【功能新增】INFRA: vben next 树表代码生成
|
2025-04-11 18:21:42 +08:00 |
|
puhui999
|
69486939d5
|
【功能新增】INFRA: vben next 单表代码生成
|
2025-04-11 16:47:11 +08:00 |
|
YunaiV
|
77e64c217e
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# pom.xml
# yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/http/HttpUtils.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/IotDeviceController.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/IotDeviceStatusUpdateReqVO.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/product/IotProductController.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/thingmodel/vo/IotThingModelSaveReqVO.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/thinkmodelfunction/IotThinkModelFunctionController.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/thinkmodelfunction/vo/IotThinkModelFunctionPageReqVO.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/emq/callback/EmqxCallback.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/emq/client/EmqxClient.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/emq/start/EmqxStart.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/DeviceServiceImpl.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/IotDeviceService.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/product/IotProductService.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/product/IotProductServiceImpl.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/thinkmodelfunction/IotThinkModelFunctionService.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/thinkmodelfunction/IotThinkModelFunctionServiceImpl.java
# yudao-server/src/main/resources/application-local.yaml
|
2025-03-17 13:16:59 +08:00 |
|
YunaiV
|
eb7269083a
|
Merge branch 'feature/iot' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17
|
2025-03-17 08:54:10 +08:00 |
|
YunaiV
|
7da7c10b47
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/api/task/BpmProcessInstanceApi.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/api/task/BpmProcessInstanceApiImpl.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/framework/flowable/core/candidate/strategy/dept/BpmTaskCandidateStartUserSelectStrategy.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmModelServiceImpl.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceService.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/listener/BpmUserTaskListener.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/trigger/BpmHttpRequestTrigger.java
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/trigger/BpmUpdateNormalFormTrigger.java
|
2025-03-15 13:43:34 +08:00 |
|
芋道源码
|
367e3b9880
|
!1286 2.4.2：工作流的更新
Merge pull request !1286 from 芋道源码/feature/bpm
|
2025-03-15 05:22:46 +00:00 |
|
YunaiV
|
197c4ad9bf
|
【功能修复】INFRA：错误日志、访问日志，params 过长的问题
|
2025-02-25 13:17:27 +08:00 |
|
YunaiV
|
a44a45a2cb
|
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
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/trigger/BpmHttpRequestTrigger.java
|
2025-02-09 11:36:21 +08:00 |
|
YunaiV
|
bb11fdd3fa
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/iot
# Conflicts:
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/thinkmodelfunction/IotThinkModelFunctionController.http
|
2025-02-09 07:23:17 +08:00 |
|
YunaiV
|
19b5582a78
|
Merge branch 'master-jdk17' of https://github.com/YunaiV/ruoyi-vue-pro into master-jdk17
|
2025-02-09 07:14:42 +08:00 |