1021 Commits

Author	SHA1	Message	Date
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
芋道源码	3f1d80364f	!1484 fix: 修复新增菜单时被允许相同组件名称问题 ... Merge pull request !1484 from 半栈幼儿员/hotfix/menu	2025-12-25 13:43:24 +00:00
YunaiV	315a024ccc	feat(mail): 增强邮件模板参数解析和内容格式化功能	2025-12-25 09:59:34 +08:00
preschooler	fdbd7dcdef	🐞 fix: 修复新增菜单时被允许相同组件名称问题	2025-12-22 23:56:38 +08:00
C77	abed96ecc9	feat(mail): 增强邮件模板参数解析和HTML内容格式化功能 ... - 修改邮件模板创建和更新逻辑，同时解析标题和内容中的参数 - 增强邮件内容格式化方法，支持HTML特殊字符反转义 - 实现代码块格式化，为<pre><code>标签添加样式 - 替换最外层pre标签为div标签以改善显示效果 - 添加完整的HTML邮件模板处理测试用例 - 扩展参数解析方法以合并标题和内容中的参数并去重	2025-12-22 10:40:21 +08:00
YunaiV	ac018539d7	feat：【infra】【system】新增文件与短信日志详情查询接口	2025-12-21 18:11:36 +08:00
YunaiV	9d4b2bf8b1	224 fix(system): 当用户没有绑定微信小程序时获取到socialUser为null,会导致发货失败，对应 https://gitee.com/zhijiantianya/yudao-cloud/pulls/224/files	2025-12-20 17:47:24 +08:00
YunaiV	2eddc3ecfa	feat：【system】登录日志，增加 get 接口，满足 admin uniapp 查询诉求	2025-12-20 10:10:57 +08:00
YunaiV	1979084ca9	feat：【system】操作日志增加 userType 的展示	2025-12-17 13:13:48 +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	4576801e75	1476 fix: 修复system模块岗位批量删除接口	2025-12-13 09:48:09 +08:00
YunaiV	8b616c3153	feat：【system/infra】访问日志、操作日志、错误日志，增加 get 接口，满足 admin uniapp 查询诉求	2025-12-07 18:39:05 +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	e45e2ae29f	fix：【system】"system_social_client" 的单测缺少 public_key 字段	2025-12-07 18:19:33 +08:00
YunaiV	5d49baa69c	同步 https://gitee.com/zhijiantianya/ruoyi-vue-pro/pulls/1464/files	2025-11-29 10:00:22 +08:00
YunaiV	ffd822c703	Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro ... # Conflicts: # yudao-server/src/main/resources/application-dev.yaml # yudao-server/src/main/resources/application-local.yaml	2025-11-29 09:59:28 +08:00
YunaiV	f7042897ff	同步：https://gitee.com/zhijiantianya/ruoyi-vue-pro/pulls/1464/files	2025-11-29 09:58:32 +08:00
YunaiV	e1bac0818f	Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro ... # Conflicts: # yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/socail/vo/client/SocialClientRespVO.java	2025-11-29 09:56:44 +08:00
YunaiV	86de468413	同步：https://gitee.com/zhijiantianya/ruoyi-vue-pro/pulls/1464/files	2025-11-29 09:56:32 +08:00
yunlongn	a2a2b4a059	Merge remote-tracking branch 'origin/master' into master-alipaymini ... # Conflicts: # sql/mysql/ruoyi-vue-pro.sql	2025-11-27 18:01:52 +08:00
yunlongn	f83ca8ea4d	feat：【SocialClient】 支付宝小程序登录补充	2025-11-27 12:01:55 +08:00
YunaiV	1b2acd3a55	(〃'▽'〃) v2025.11 发布：极大完善 vben5 的 antd、vben 版本的功能，优化整体稳定性	2025-11-26 22:56:38 +08:00
YunaiV	c89758ad86	Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro ... # Conflicts: # pom.xml # yudao-dependencies/pom.xml	2025-11-26 22:54:49 +08:00
YunaiV	8536a8368a	fix：【system】AdminUserServiceImplTest 单测报错问题	2025-11-26 22:49:00 +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	62e4af4016	feat：【system】用户被禁用时，删除其相关 token，关联 issue：https://gitee.com/yudaocode/yudao-ui-admin-vue3/issues/IB2EK6	2025-11-25 19:50:43 +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	d886f8196a	fix: 【member】清理 socialUser 对象以确保 updateTime 正确更新	2025-11-22 10:10:28 +08:00
manumiter	31f6d03d67	fix(user):修复用户角色过滤逻辑，确保当用户不包含当前选中角色时返回空结果而非全部用户	2025-10-23 09:33:22 +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	79df9fe8e2	fix：【system 系统管理】justauth 三方登录允许禁用	2025-09-21 10:40:51 +08:00
YunaiV	269c1fdabf	Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro ... # Conflicts: # yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/config/YudaoTenantAutoConfiguration.java # yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/security/TenantSecurityWebFilter.java	2025-08-31 10:08:12 +08:00
YunaiV	040899d8c9	reactor：移除 @Accessors 和 @EqualsAndHashCode 注解	2025-08-30 17:48:16 +08:00
YunaiV	e86be20a8e	Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro ... # Conflicts: # yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/api/device/IotDeviceUpstreamApi.java # yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/api/device/dto/control/downstream/IotDeviceConfigSetReqDTO.java # yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/api/device/dto/control/downstream/IotDeviceDownstreamAbstractReqDTO.java # yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/api/device/dto/control/downstream/IotDevicePropertyGetReqDTO.java # yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/api/device/dto/control/downstream/IotDevicePropertySetReqDTO.java # yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/api/device/dto/control/downstream/IotDeviceServiceInvokeReqDTO.java # yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/api/device/dto/control/upstream/IotDeviceEventReportReqDTO.java # yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/api/device/dto/control/upstream/IotDevicePropertyReportReqDTO.java # yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/api/device/dto/control/upstream/IotDeviceRegisterSubReqDTO.java # yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/api/device/dto/control/upstream/IotDeviceStateUpdateReqDTO.java # yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/api/device/dto/control/upstream/IotDeviceTopologyAddReqDTO.java # yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/api/device/dto/control/upstream/IotDeviceUpstreamAbstractReqDTO.java # yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/api/device/dto/control/upstream/IotPluginInstanceHeartbeatReqDTO.java # yudao-module-iot/yudao-module-iot-biz/pom.xml # yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/api/device/IoTDeviceUpstreamApiImpl.java # yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/IotDeviceLogController.java # yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/control/IotDeviceDownstreamReqVO.java # yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/control/IotDeviceUpstreamReqVO.java # yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/data/IotDeviceLogPageReqVO.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/controller/admin/device/vo/device/IotDeviceSaveReqVO.java # yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/ota/IotOtaUpgradeRecordController.java # yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/ota/IotOtaUpgradeTaskController.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-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/plugin/PluginConfigController.java # yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/plugin/vo/config/PluginConfigImportReqVO.java # yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/rule/IotDataBridgeController.java # yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/rule/IotRuleSceneController.java # yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/rule/vo/databridge/IotDataBridgeSaveReqVO.java # yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/statistics/vo/IotStatisticsReqVO.java # yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/redis/plugin/DevicePluginProcessIdRedisDAO.java # yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/job/device/IotDeviceOfflineCheckJob.java # yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/job/plugin/IotPluginInstancesJob.java # yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/job/rule/IotRuleSceneJob.java # yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/mq/consumer/device/IotDeviceLogMessageConsumer.java # yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/mq/consumer/device/IotDeviceOnlineMessageConsumer.java # yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/mq/consumer/device/IotDevicePropertyMessageConsumer.java # yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/mq/consumer/rule/IotRuleSceneMessageHandler.java # yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/mq/producer/device/IotDeviceProducer.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/control/IotDeviceDownstreamService.java # yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/control/IotDeviceDownstreamServiceImpl.java # yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/control/IotDeviceUpstreamService.java # yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/control/IotDeviceUpstreamServiceImpl.java # yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/data/IotDeviceLogServiceImpl.java # yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/data/IotDevicePropertyService.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/ota/IotOtaFirmwareServiceImpl.java # yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/ota/IotOtaUpgradeRecordService.java # yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/ota/IotOtaUpgradeRecordServiceImpl.java # yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/ota/IotOtaUpgradeTaskService.java # yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/ota/IotOtaUpgradeTaskServiceImpl.java # yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/plugin/IotPluginConfigService.java # yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/plugin/IotPluginConfigServiceImpl.java # yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/plugin/IotPluginInstanceServiceImpl.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/rule/IotDataBridgeService.java # yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/IotDataBridgeServiceImpl.java # yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/IotRuleSceneServiceImpl.java # yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/action/IotRuleSceneDataBridgeAction.java # yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/action/IotRuleSceneDeviceControlAction.java # yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/data/action/IotHttpDataSinkAction.java # yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/thingmodel/IotThingModelService.java # yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/thingmodel/IotThingModelServiceImpl.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-plugins/yudao-module-iot-plugin-common/src/main/java/cn/iocoder/yudao/module/iot/plugin/common/config/IotPluginCommonAutoConfiguration.java # yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-common/src/main/java/cn/iocoder/yudao/module/iot/plugin/common/config/IotPluginCommonProperties.java # yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-emqx/src/main/java/cn/iocoder/yudao/module/iot/plugin/emqx/upstream/IotDeviceUpstreamServer.java # yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-emqx/src/main/java/cn/iocoder/yudao/module/iot/plugin/emqx/upstream/router/IotDeviceMqttMessageHandler.java # yudao-server/src/main/resources/application-local.yaml	2025-08-30 11:02:21 +08:00
YunaiV	32a4a99e2f	fix：【pay 支付】单测报错的问题	2025-08-29 22:59:39 +08:00
YunaiV	6a71622a80	【同步】jdk21 和 jdk8 的代码	2025-08-29 13:46:18 +08:00
YunaiV	b4df73b3a9	Merge branch 'feature/ai' of https://gitee.com/zhijiantianya/ruoyi-vue-pro	2025-08-29 13:34:36 +08:00
YunaiV	a1b07adbf6	【代码优化】增强 JDK17、JDK8 之间的兼容性	2025-08-29 13:33:21 +08:00
YunaiV	c86cf9286c	Merge branch 'feature/ai' of https://gitee.com/zhijiantianya/ruoyi-vue-pro	2025-08-29 13:26:35 +08:00
YunaiV	22d2de9dd2	【代码优化】增强 JDK17、JDK8 之间的兼容性	2025-08-29 13:21:21 +08:00
YunaiV	4bed44868c	Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro ... # Conflicts: # README.md # pom.xml # yudao-dependencies/pom.xml	2025-08-29 09:24:09 +08:00
xingyu4j	87b6a258ee	feat: 使用 switch 新特性	2025-08-28 15:34:13 +08:00
xingyu4j	224980aa1a	feat: 使用 jdk instanceof 新特性	2025-08-28 15:10:52 +08:00
xingyu4j	495ef72a39	fix: equalsIgnoreCase	2025-08-28 15:03:35 +08:00
xingyu4j	94a1bfc7cb	fix: StringUtils.equalsIgnoreCase is deprecated	2025-08-28 15:03:07 +08:00
YunaiV	7a8f2f51e6	Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro	2025-08-24 16:01:30 +08:00
YunaiV	d943b5e491	Merge branch 'master-jdk17' of https://github.com/YunaiV/ruoyi-vue-pro into master-jdk17	2025-08-24 15:50:23 +08:00
YunaiV	c647a4fb9d	Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro	2025-08-24 10:39:00 +08:00
YunaiV	51d9611c62	chore：redisson 从 3.4.1 to 3.50.0	2025-08-24 10:36:26 +08:00