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 |
|
芋道源码
|
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 |
|
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 |
|
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 |
|
puhui999
|
cf40cce552
|
【代码优化】S3FileClient
|
2025-02-07 18:10:03 +08:00 |
|
puhui999
|
f141d64eb2
|
【依赖升级】AWS SDK for Java 1.x to 2.x
|
2025-02-06 16:05:56 +08:00 |
mcwindy
|
4e43958fe3
|
fix typo: adminTenentId -> adminTenantId, appTenentId -> appTenantId
|
2025-02-05 11:42:59 +08:00 |
|
YunaiV
|
7168e60fdd
|
【功能新增】IoT：实现 IotRuleSceneDataBridgeAction 的 http 部分的逻辑
|
2025-02-03 18:33:43 +08:00 |
山野羡民
|
69efe91bde
|
雪花ID溢出了 update apierrorlog/ApiErrorLogRespVO.java.
Signed-off-by: 山野羡民 <liyujiang_tk@yeah.net>
|
2025-01-25 02:47:03 +00:00 |
|
YunaiV
|
e46163cba7
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-dependencies/pom.xml
|
2024-11-09 18:38:24 +08:00 |
|
YunaiV
|
0bbc682ba4
|
【代码优化】infra：s3 minio sdk 替换为 aws sdk
|
2024-11-09 18:33:52 +08:00 |
segerts
|
ad00fbc566
|
S3 minio sdk 替换为 aws sdk
|
2024-11-03 19:28:23 +08:00 |
|
YunaiV
|
eae97e1b33
|
【功能优化】spring security：antMatchers 替换成 requestMatchers
|
2024-10-01 15:13:01 +08:00 |
|
YunaiV
|
2ca4f1fb9b
|
【功能调整】全局：默认 /app-api/* 需要登录，和 /admin-api/* 保持一致，降低大家理解成本
|
2024-10-01 11:45:00 +08:00 |
|
YunaiV
|
3d3b2cd6d5
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoWebSecurityConfigurerAdapter.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/app/file/AppFileController.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/category/AppCategoryController.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/comment/AppProductCommentController.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/favorite/AppFavoriteController.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/AppProductSpuController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/AppBargainRecordController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/combination/AppCombinationActivityController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/combination/AppCombinationRecordController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/coupon/AppCouponTemplateController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/diy/AppDiyPageController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/diy/AppDiyTemplateController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/reward/AppRewardActivityController.java
# yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/seckill/AppSeckillActivityController.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/brokerage/AppBrokerageRecordController.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/controller/app/cart/AppCartController.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/address/AppAddressController.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/point/AppMemberPointRecordController.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/signin/AppMemberSignInRecordController.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/social/AppSocialUserController.java
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/AppMemberUserController.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/app/channel/AppPayChannelController.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/app/order/AppPayOrderController.java
|
2024-10-01 11:33:41 +08:00 |
|
YunaiV
|
8fd0f72925
|
【功能调整】全局：默认 /app-api/* 需要登录，和 /admin-api/* 保持一致，降低大家理解成本
|
2024-10-01 11:33:18 +08:00 |
|
YunaiV
|
2cbc6aeef5
|
【代码优化】增强 JDK17、JDK8 之间的兼容性
|
2024-09-29 13:01:23 +08:00 |
|
YunaiV
|
9f676fecfa
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# README.md
# pom.xml
# yudao-dependencies/pom.xml
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/app/file/AppFileController.java
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/CodegenServiceImpl.java
# yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/CodegenServiceImplTest.java
# yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageServiceImplTest.java
# yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/sms/SmsCodeServiceImplTest.java
|
2024-09-29 12:58:49 +08:00 |
|
YunaiV
|
42b7946685
|
【功能修复】代码生成：代同步数据库结构之后字段顺序混乱的问题
|
2024-09-29 07:41:35 +08:00 |
卢越
|
a0aa627315
|
【功能新增】前端文件直传
|
2024-09-24 17:25:55 +08:00 |
|
YunaiV
|
805f80c36a
|
【功能优化】INFRA：代码生成时，默认禁用单元测试的生成，更符合大家的习惯
|
2024-09-19 13:10:23 +08:00 |
|
YunaiV
|
af5520db46
|
【缺陷修复】全局：完善对 SQLServer 2015 的兼容性
|
2024-09-17 20:39:34 +08:00 |
|
YunaiV
|
d100093be1
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderQueryServiceImpl.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java
|
2024-09-17 17:26:01 +08:00 |
|
YunaiV
|
c71182dda9
|
【功能优化】定时任务的 Bean 不存在时，进行报错提示
|
2024-09-12 13:44:13 +08:00 |
|
YunaiV
|
a6338b8635
|
【代码优化】增强 JDK17、JDK8 之间的兼容性
|
2024-09-07 20:52:28 +08:00 |