 YunaiV
|
231a1c2e2c
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# pom.xml
# yudao-module-crm/yudao-module-crm-server/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/contract/CrmContractSaveReqVO.java
# yudao-module-crm/yudao-module-crm-server/src/main/java/cn/iocoder/yudao/module/crm/service/product/CrmProductServiceImpl.java
# yudao-module-erp/yudao-module-erp-server/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/in/ErpPurchaseInSaveReqVO.java
# yudao-module-erp/yudao-module-erp-server/src/main/java/cn/iocoder/yudao/module/erp/service/product/ErpProductServiceImpl.java
# yudao-module-infra/yudao-module-infra-server/src/test/java/cn/iocoder/yudao/module/infra/service/file/FileServiceImplTest.java
# yudao-module-mall/yudao-module-product-server/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSkuSaveReqVO.java
# yudao-module-mall/yudao-module-trade-server/src/main/java/cn/iocoder/yudao/module/trade/service/order/handler/TradeBrokerageOrderHandler.java
# yudao-module-mes/yudao-module-mes-server/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptDetailServiceImpl.java
# yudao-module-system/yudao-module-system-server/src/test/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImplTest.java
|
2026-09-26 23:14:36 +08:00 |
|
|
YunaiV
|
088da8165b
|
【同步】BOOT 和 CLOUD 的功能（oa）
|
2026-09-26 23:07:52 +08:00 |
|
|
YunaiV
|
1a1b64beb6
|
feat：增强对 JDK8 的兼容性（OA）
Java CI with Maven / build (11) (push) Has been cancelled
Java CI with Maven / build (17) (push) Has been cancelled
Java CI with Maven / build (8) (push) Has been cancelled
|
2026-09-19 11:22:42 +08:00 |
|
|
YunaiV
|
65ee68a37f
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# pom.xml
# yudao-gateway/src/main/resources/application.yaml
|
2026-09-19 11:00:53 +08:00 |
|
|
YunaiV
|
15892e0a3e
|
【同步】BOOT 和 CLOUD 的功能（oa）
|
2026-09-19 09:54:09 +08:00 |
|
|
YunaiV
|
fc1ab33923
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-module-fms/yudao-module-fms-server/src/test/java/cn/iocoder/yudao/module/fms/service/config/FmsAccountUserServiceImplTest.java
# yudao-module-hrm/yudao-module-hrm-server/src/test/java/cn/iocoder/yudao/module/hrm/service/insurance/monthrecord/HrmInsuranceMonthEmployeeRecordServiceImplTest.java
# yudao-module-hrm/yudao-module-hrm-server/src/test/java/cn/iocoder/yudao/module/hrm/service/performance/assessment/HrmPerformanceAssessmentProcessServiceImplTest.java
# yudao-module-hrm/yudao-module-hrm-server/src/test/java/cn/iocoder/yudao/module/hrm/service/recruit/candidate/HrmRecruitInterviewServiceImplTest.java
# yudao-module-hrm/yudao-module-hrm-server/src/test/java/cn/iocoder/yudao/module/hrm/service/recruit/post/HrmRecruitPostServiceImplTest.java
# yudao-module-hrm/yudao-module-hrm-server/src/test/java/cn/iocoder/yudao/module/hrm/service/salary/config/HrmSalaryGroupServiceImplTest.java
# yudao-module-hrm/yudao-module-hrm-server/src/test/java/cn/iocoder/yudao/module/hrm/service/salary/slip/HrmSalarySlipServiceImplTest.java
|
2026-08-30 19:42:48 +08:00 |
|
|
YunaiV
|
df1f45530e
|
【同步】BOOT 和 CLOUD 的功能
|
2026-08-30 19:42:20 +08:00 |
|
|
YunaiV
|
c2cd1ccffa
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# pom.xml
# yudao-dependencies/pom.xml
# yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/servlet/ServletUtils.java
# yudao-gateway/src/main/resources/application.yaml
|
2026-08-14 23:31:39 +08:00 |
|
|
YunaiV
|
b98dbe3955
|
feat：初始化 hrm、fms
|
2026-08-14 18:34:54 +08:00 |
|
|
YunaiV
|
d1e5ee08d1
|
【同步】BOOT 和 CLOUD 的功能
|
2026-07-31 19:49:02 +08:00 |
|
|
YunaiV
|
83f1642fb4
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-module-bpm/yudao-module-bpm-server/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmModelController.java
# yudao-module-crm/yudao-module-crm-server/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/statistics/CrmStatisticsPerformanceController.java
# yudao-module-mall/yudao-module-promotion-server/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/coupon/AppCouponTemplateController.java
# yudao-module-mes/yudao-module-mes-server/src/main/java/cn/iocoder/yudao/module/mes/service/dv/repair/MesDvRepairLineServiceImpl.java
# yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserService.java
|
2026-07-31 19:30:16 +08:00 |
|
|
YunaiV
|
3051e8cdd0
|
【同步】BOOT 和 CLOUD 的功能
|
2026-07-31 19:29:50 +08:00 |
|
|
YunaiV
|
2974d8fea1
|
【同步】BOOT 和 CLOUD 的功能
|
2026-07-31 19:13:42 +08:00 |
|
|
YunaiV
|
47d3a792cc
|
【同步】BOOT 和 CLOUD 的功能
Java CI with Maven / build (11) (push) Has been cancelled
Java CI with Maven / build (17) (push) Has been cancelled
Java CI with Maven / build (8) (push) Has been cancelled
|
2026-07-05 00:29:02 +08:00 |
|
|
YunaiV
|
e6d8299606
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
|
2026-07-05 00:27:03 +08:00 |
|
|
YunaiV
|
46e9d3e89a
|
【同步】BOOT 和 CLOUD 的功能（bpm）
|
2026-07-05 00:26:39 +08:00 |
|
|
YunaiV
|
5fcfd853f3
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-module-bpm/yudao-module-bpm-server/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmTaskController.java
# yudao-module-im/yudao-module-im-server/src/main/java/cn/iocoder/yudao/module/im/controller/admin/friend/ImFriendController.java
# yudao-module-im/yudao-module-im-server/src/main/java/cn/iocoder/yudao/module/im/controller/admin/group/ImGroupRequestController.java
# yudao-module-im/yudao-module-im-server/src/main/java/cn/iocoder/yudao/module/im/dal/redis/message/ImChannelMessageReadRedisDAO.java
# yudao-module-im/yudao-module-im-server/src/main/java/cn/iocoder/yudao/module/im/dal/redis/message/ImGroupMessageReadRedisDAO.java
# yudao-module-im/yudao-module-im-server/src/main/java/cn/iocoder/yudao/module/im/service/friend/ImFriendRequestServiceImpl.java
# yudao-module-im/yudao-module-im-server/src/main/java/cn/iocoder/yudao/module/im/service/friend/ImFriendServiceImpl.java
# yudao-module-im/yudao-module-im-server/src/main/java/cn/iocoder/yudao/module/im/service/message/ImChannelMessageServiceImpl.java
# yudao-module-im/yudao-module-im-server/src/main/java/cn/iocoder/yudao/module/im/service/message/ImGroupMessageServiceImpl.java
# yudao-module-im/yudao-module-im-server/src/main/java/cn/iocoder/yudao/module/im/service/message/dto/ImGroupMessageSendDTO.java
# yudao-module-im/yudao-module-im-server/src/test/java/cn/iocoder/yudao/module/im/dal/mysql/message/ImGroupMessageMapperTest.java
# yudao-module-im/yudao-module-im-server/src/test/java/cn/iocoder/yudao/module/im/dal/mysql/statistics/ImStatisticsManagerMapperTest.java
# yudao-module-im/yudao-module-im-server/src/test/java/cn/iocoder/yudao/module/im/service/group/ImGroupServiceImplTest.java
# yudao-module-im/yudao-module-im-server/src/test/java/cn/iocoder/yudao/module/im/service/message/ImGroupMessageServiceImplTest.java
# yudao-module-im/yudao-module-im-server/src/test/java/cn/iocoder/yudao/module/im/service/rtc/ImRtcCallServiceImplTest.java
|
2026-07-05 00:19:56 +08:00 |
|
|
YunaiV
|
0e427886d1
|
【同步】BOOT 和 CLOUD 的功能（im、bpm）
|
2026-07-04 20:14:02 +08:00 |
|
|
YunaiV
|
e388f44819
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# pom.xml
# yudao-dependencies/pom.xml
|
2026-06-29 17:10:51 -07:00 |
|
|
YunaiV
|
1046d46789
|
【同步】BOOT 和 CLOUD 的功能
|
2026-06-29 17:02:39 -07:00 |
|
|
YunaiV
|
5a7e5e3ea7
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-module-mall/yudao-module-promotion-server/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/coupon/CouponController.java
|
2026-06-27 08:39:24 -07:00 |
|
|
YunaiV
|
edb292f622
|
【同步】BOOT 和 CLOUD 的功能
|
2026-06-27 08:38:59 -07:00 |
|
|
YunaiV
|
39f7e9de6a
|
【同步】BOOT 和 CLOUD 的功能
|
2026-06-19 19:07:42 -07:00 |
|
|
YunaiV
|
38f2341d34
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-module-bpm/yudao-module-bpm-server/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskRejectReqVO.java
# yudao-module-bpm/yudao-module-bpm-server/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskService.java
# yudao-module-im/yudao-module-im-server/src/main/java/cn/iocoder/yudao/module/im/service/friend/ImFriendRequestServiceImpl.java
# yudao-module-mall/yudao-module-trade-server/src/main/java/cn/iocoder/yudao/module/trade/controller/app/aftersale/AppAfterSaleController.java
# yudao-module-mes/yudao-module-mes-server/src/main/java/cn/iocoder/yudao/module/mes/service/wm/barcode/MesWmBarcodeServiceImpl.java
# yudao-module-mes/yudao-module-mes-server/src/main/java/cn/iocoder/yudao/module/mes/service/wm/sn/MesWmSnServiceImpl.java
|
2026-06-19 18:59:53 -07:00 |
|
|
YunaiV
|
eb7fa0d844
|
【同步】BOOT 和 CLOUD 的功能（im 为主）
|
2026-06-19 18:59:20 -07:00 |
|
|
YunaiV
|
ed87b45dff
|
fix(rpc): 统一 RPC API 返回 CommonResult
- 将 ConfigApi、DeptApi、AdminUserApi 的 RPC 方法返回值改为 CommonResult
- 调整对应 ApiImpl 使用 success 包装响应
- 更新调用方显式 getCheckedData/checkError 处理 RPC 返回
- 补充相关单测 mock 的 CommonResult 包装
|
2026-06-14 01:26:41 +08:00 |
|
|
YunaiV
|
ef63fa3737
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
|
2026-06-14 00:37:05 +08:00 |
|
|
YunaiV
|
af91987460
|
feat: 支持瀚高数据库 PostgreSQL 兼容模式
- 新增 highgo SQL 脚本与转换器类型
- 增加 HighGo Docker Compose 示例和工具文档
- 后端运行包引入 PostgreSQL JDBC 驱动
- 补充本地瀚高连接配置示例
|
2026-06-14 00:36:58 +08:00 |
|
|
YunaiV
|
f5a68ce6f3
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# sql/mysql/ruoyi-vue-pro.sql
# yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/config/YudaoTenantAutoConfiguration.java
# yudao-module-infra/yudao-module-infra-server/src/main/java/cn/iocoder/yudao/module/infra/api/config/ConfigApiImpl.java
# yudao-module-infra/yudao-module-infra-server/src/test/java/cn/iocoder/yudao/module/infra/framework/file/core/s3/S3FileClientTest.java
# yudao-module-iot/yudao-module-iot-core/src/main/java/cn/iocoder/yudao/module/iot/core/messagebus/config/IotMessageBusProperties.java
|
2026-06-07 23:36:09 +08:00 |
|
|
YunaiV
|
bccf7c79e5
|
【同步】BOOT 和 CLOUD 的功能
|
2026-06-07 23:35:29 +08:00 |
|
|
YunaiV
|
14add8edf0
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/service/thingmodel/IotThingModelServiceImpl.java
# yudao-module-member/yudao-module-member-server/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserBaseVO.java
|
2026-05-31 20:48:47 +08:00 |
|
|
YunaiV
|
6e492e1e6b
|
【同步】BOOT 和 CLOUD 的功能
|
2026-05-31 20:47:58 +08:00 |
|
|
YunaiV
|
116b6766b3
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/service/device/remote/IotDeviceApiImpl.java
|
2026-05-03 23:03:42 +08:00 |
|
|
YunaiV
|
8c7087ca2a
|
【同步】BOOT 和 CLOUD 的功能（bpm）
|
2026-05-03 22:46:59 +08:00 |
|
|
YunaiV
|
e1b3589bff
|
fix: 修正Lock4j配置中的超时时间注释
|
2026-05-03 20:46:37 +08:00 |
|
|
YunaiV
|
bb3f1954ee
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/TenantController.java
# yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/app/tenant/AppTenantController.java
|
2026-03-08 10:14:33 +08:00 |
|
|
YunaiV
|
34d74b378e
|
【同步】BOOT 和 CLOUD 的功能
|
2026-03-08 10:14:09 +08:00 |
|
|
YunaiV
|
456c96df16
|
【同步】BOOT 和 CLOUD 的功能
|
2026-01-29 22:38:05 +08:00 |
|
|
YunaiV
|
c57d3a65f9
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-dependencies/pom.xml
# yudao-module-iot/yudao-module-iot-core/src/main/java/cn/iocoder/yudao/module/iot/core/biz/dto/IotDeviceAuthReqDTO.java
# yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/protocol/mqttws/IotMqttWsDownstreamSubscriber.java
# yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/protocol/mqttws/IotMqttWsUpstreamProtocol.java
# yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/service/device/remote/IotDeviceApiImpl.java
# yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/api/device/IoTDeviceApiImpl.java
# yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/device/IotDeviceImportExcelVO.java
# yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/device/IotDeviceMapper.java
# yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/service/device/IotDeviceService.java
# yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/service/device/IotDeviceServiceImpl.java
# yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/service/device/message/IotDeviceMessageService.java
# yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/service/device/property/IotDevicePropertyServiceImpl.java
# yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/service/rule/data/action/IotWebSocketDataRuleAction.java
# yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/service/rule/data/action/websocket/IotWebSocketClient.java
# yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/IotSceneRuleServiceImpl.java
# yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/AuthLoginReqVO.java
|
2026-01-29 22:25:16 +08:00 |
|
|
YunaiV
|
fa72dc4e59
|
【同步】BOOT 和 CLOUD 的功能
|
2026-01-29 22:14:05 +08:00 |
|
|
YunaiV
|
e10be5160b
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/IotSceneRuleServiceImpl.java
# yudao-module-system/yudao-module-system-server/src/test/java/cn/iocoder/yudao/module/system/service/mail/MailSendServiceImplTest.java
|
2026-01-18 19:04:00 +08:00 |
|
|
YunaiV
|
304b2f102a
|
【同步】BOOT 和 CLOUD 的功能
|
2026-01-18 19:01:29 +08:00 |
|
|
YunaiV
|
7739c2a35d
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-module-mall/yudao-module-promotion-server/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponTemplateService.java
# yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateServiceImpl.java
|
2025-12-28 10:22:38 +08:00 |
|
|
YunaiV
|
0f27c0aa72
|
【同步】BOOT 和 CLOUD 的功能
|
2025-12-28 10:22:05 +08:00 |
|
|
YunaiV
|
e60f5496fa
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
|
2025-12-27 10:29:58 +08:00 |
|
|
YunaiV
|
be65f9cf97
|
feat：【infra】spring boot admin 默认需要登录
|
2025-12-27 10:29:42 +08:00 |
|
|
YunaiV
|
667cf9d1c9
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
|
2025-12-07 18:20:52 +08:00 |
|
|
YunaiV
|
b5a7350fe9
|
【同步】BOOT 和 CLOUD 的功能
|
2025-12-07 18:20:05 +08:00 |
|
|
YunaiV
|
d369c8210c
|
Merge branch 'develop' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-module-mp/yudao-module-mp-server/src/main/java/cn/iocoder/yudao/module/mp/controller/admin/user/vo/MpUserPageReqVO.java
|
2025-11-26 18:34:57 +08:00 |
|
|
YunaiV
|
6dcbb1829b
|
【同步】BOOT 和 CLOUD 的功能
|
2025-11-25 13:00:42 +08:00 |
|