Commit Graph

1524 Commits

Author SHA1 Message Date
YunaiV
9392da82b2 Merge branch 'master-jdk17' 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/api/device/IoTDeviceApiImpl.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/device/IotDeviceImportExcelVO.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/device/IotDeviceMapper.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/device/IotDeviceServiceImpl.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/message/IotDeviceMessageService.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/property/IotDevicePropertyServiceImpl.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/data/action/IotWebSocketDataRuleAction.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/data/action/websocket/IotWebSocketClient.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/IotSceneRuleServiceImpl.java
#	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
2026-01-29 22:17:13 +08:00
芋道源码
8957e94159 !1512 feat(mybatis): 扩展 MPJLambdaWrapperX 查询功能- 重写 orderByAsc 方法支持升序排序功能
Merge pull request !1512 from Manumiter/master-jdk17
2026-01-29 11:40:32 +00:00
芋道源码
e46c0f3421 !1506 iot:最新的 tcp、udp、coap、mqtt、emqx 等同步
Merge pull request !1506 from 芋道源码/feature/iot
2026-01-29 11:27:36 +00:00
manumiter
3819ed1cf9 feat(mybatis): 扩展 MPJLambdaWrapperX 查询功能- 重写 orderByAsc 方法支持升序排序功能 2026-01-28 09:33:44 +08:00
YunaiV
05eb745f2a feat(iot):【网关设备:67%】整体初步实现(优化部分代码) 2026-01-24 19:14:34 +08:00
YunaiV
bfbc352a1c feat(iot):【网关设备:65%】整体初步实现(优化部分代码) 2026-01-24 13:12:37 +08:00
YunaiV
6892571a33 feat(iot):【设备定位:70%】优化设备坐标的解析逻辑代码,基于 hashed-juggling-tome.md 2026-01-21 09:12:49 +08:00
YunaiV
f3ef0e72e2 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/api/mail/dto/MailSendSingleToUserReqDTO.java
#	yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/mq/message/mail/MailSendMessage.java
#	yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/mq/producer/mail/MailProducer.java
#	yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailSendServiceImpl.java
#	yudao-module-system/src/test/java/cn/iocoder/yudao/module/system/service/mail/MailSendServiceImplTest.java
2026-01-18 18:15:27 +08:00
YunaiV
cfcf0dc107 fix:【framework】数据权限的单测报错问题 2026-01-18 15:21:14 +08:00
preschooler
b84db7c168 🎈 perf: 优化数据库兼容性 2025-12-29 00:48:24 +08:00
YunaiV
7c150f080c Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateServiceImpl.java
2025-12-25 22:28:27 +08:00
YunaiV
018be292d9 feat:【框架】TimestampLocalDateTimeSerializer 优化下代码格式 2025-12-20 15:45:11 +08:00
preschooler
8af29bf6fd 🐞 fix: LocalDateTime 序列化器不支持 JsonProperty 问题 2025-12-19 17:11:47 +08:00
YunaiV
e761721b2e Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2025-12-13 12:30:16 +08:00
YunaiV
e1f64eaad2 fix:【框架】支持自定义过期时间的缓存 key,不能忽略租户问题,对应 https://gitee.com/zhijiantianya/ruoyi-vue-pro/pulls/1474 2025-12-13 09:43:48 +08:00
YunaiV
3031f7c1ce Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2025-12-07 18:19:51 +08:00
YunaiV
32304b74df fix:最大分页从 100-> 200,更好的适应 vben,对应 issue:https://github.com/yudaocode/yudao-ui-admin-vben/issues/176 2025-12-07 18:13:55 +08:00
YunaiV
289d847eff 【同步】jdk21 和 jdk8 的代码 2025-12-07 10:40:21 +08:00
YunaiV
91870831d2 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2025-12-07 10:38:30 +08:00
YunaiV
0531651efc fix:最大分页从 100-> 200,更好的适应 vben,对应 issue:https://github.com/yudaocode/yudao-ui-admin-vben/issues/176 2025-12-07 10:21:00 +08:00
芋道源码
ba2307f0dd !1469 feat:【infra】s3 生成 presignGetUrl 时需要对 path 进行解码,解决文件名是中文时访问不到文件
Merge pull request !1469 from puhui999/master-jdk17
2025-12-07 02:16:14 +00:00
YunaiV
0df951079b fix:【框架】TimestampLocalDateTimeSerializer 的 fieldName 为空的情况,对应 https://github.com/YunaiV/ruoyi-vue-pro/issues/1032 2025-12-06 09:28:00 +08:00
puhui999
8aaead39bc feat:【infra】s3 生成 presignGetUrl 时需要对 path 进行解码,解决文件名是中文时访问不到文件 2025-12-02 17:42:28 +08:00
YunaiV
755d5e48cc Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2025-11-26 18:49:11 +08:00
YunaiV
351ae4494c fix:【framework】MyBatisUtils join 分页总数有问题,关联 issue:https://gitee.com/zhijiantianya/yudao-cloud/issues/ID2QLL 2025-11-25 19:29:26 +08:00
YunaiV
ec0c4eebdb Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	pom.xml
#	yudao-dependencies/pom.xml
2025-11-24 17:03:53 +08:00
YunaiV
6d057b8d4d !208 使用外部中间件时,如:金蝶、东方通 在不重启整个中间件的情况下,二次部署或多个服务同时部署在一个虚拟机下(JVM) IdTypeEnvir… 2025-11-24 11:24:06 +08:00
YunaiV
95355cb522 fix: 【framework】TimestampLocalDateTimeSerializer 中,使用 ReflectUtil 替代 2025-11-24 11:18:47 +08:00
YunaiV
e87f4bc6cb fix: 增加 try 处理以兼容 Windows 场景的 Excel 文件读取 2025-11-22 09:08:03 +08:00
YunaiV
65e1d34e85 1454 <code>selectJoinPage</code> 方法,支持带有排序参数的分页查询 2025-11-21 20:18:17 +08:00
芋道源码
c8ce4cae3f !1454 <code>selectJoinPage</code> 方法,支持带有排序参数的分页查询
Merge pull request !1454 from 光辉/master-jdk17-sortable-join
2025-11-21 12:16:59 +00:00
YunaiV
073ad8798c 1446 fix: 修复API响应加密时添加加密 header 标识不生效的问题 2025-11-21 20:11:24 +08:00
芋道源码
1e76214362 !1446 fix: 修复API响应加密时添加加密 header 标识不生效的问题
Merge pull request !1446 from sunguowei/master-jdk17
2025-11-21 12:09:53 +00:00
YunaiV
485a70de6d Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/config/YudaoWebAutoConfiguration.java
2025-11-21 20:04:46 +08:00
YunaiV
24a88059fc fix:【framework】修复 easy-trans 因为数据权限,导致无法读取的问题 2025-11-21 16:56:52 +08:00
YunaiV
ed3edaf755 fix:【framework】修复 CorsFilter 因执行顺序影响到跨域配置不生效问题 2025-11-21 16:47:10 +08:00
YunaiV
019d5fb473 feat:【framework】增加对 LocalDateTime 类型格式化不生效问题 #1019 2025-11-21 15:52:41 +08:00
guanghui
43372dc511 selectJoinPage 方法,支持带有排序参数的分页查询
更新了 BaseMapperX 接口的文档说明,使其更加清晰。新增了一个 `selectJoinPage` 方法,支持带有排序参数的分页查询,并兼容不分页的情况。
2025-11-07 11:00:58 +08:00
sungw
6310624c42 fix: 修复API响应加密时添加加密 header 标识不生效的问题 2025-10-21 11:06:48 +08:00
YunaiV
283c1009a4 【同步】jdk21 和 jdk8 的代码 2025-10-02 19:06:00 +08:00
YunaiV
c80ffe437f Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/config/YudaoWebAutoConfiguration.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/IotSceneRuleServiceImpl.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/action/IotDeviceControlSceneRuleAction.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/IotSceneRuleMatcherManager.java
#	yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialClientServiceImpl.java
2025-10-02 18:52:15 +08:00
YunaiV
b167b419f4 fix:【iot 物联网】增强 jdk8 的兼容性 2025-10-02 18:51:19 +08:00
YunaiV
a4e230828f Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop
# Conflicts:
#	yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/schema/api/api.ts.vm
2025-10-01 09:50:48 +08:00
YunaiV
a9fdc6b42d fix:【framework 框架】确保在 Bean 创建前映射应用请求前缀 2025-09-20 21:49:56 +08:00
YunaiV
455a012644 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	yudao-dependencies/pom.xml
#	yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/FileController.java
#	yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/framework/file/core/client/ftp/FtpFileClientConfig.java
#	yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/framework/file/core/client/sftp/SftpFileClientConfig.java
2025-09-20 21:32:03 +08:00
YunaiV
5ca386bfac fix:【framework 框架】knife4j 在改包下,Knife4jOpenApiCustomizer 无法生效 2025-09-20 16:01:56 +08:00
YunaiV
d9e729e1a8 fix:【framework 框架】
app-api 前缀不生效,都是使用 admin-api
2025-09-20 15:19:02 +08:00
YunaiV
a6d9da31e8 fix:【framework 框架】JacksonTypeHandler 导致 String 处理问题 2025-09-20 11:54:01 +08:00
YunaiV
976a38fea0 feat:【framework 框架】DbTypeEnum 支持 OCEAN_BASE 2025-09-07 16:56:58 +08:00
YunaiV
a303e09ae9 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2025-09-01 13:14:02 +08:00