Commit Graph

1040 Commits

Author SHA1 Message Date
YunaiV
b29c5f0e40 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2026-01-25 21:06:53 +08:00
YunaiV
fa1e527db3 239 AuthLoginReqVO同步AuthRegisterReqVO、TenantSaveReqVO、UserSaveReqVO的username验证 2026-01-25 20:59:29 +08:00
YunaiV
1233921b86 fix:【system】refreshAccessToken 时,抛出 UNAUTHORIZED 导致回滚,对应 https://gitee.com/zhijiantianya/yudao-cloud/issues/IDL4OW 2026-01-25 20:56:55 +08:00
YunaiV
7646884008 【同步】jdk21 和 jdk8 的代码 2026-01-18 18:35:15 +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
9fa9183f2e feat:【system】优化 MailSendServiceImplTest 的单测 2026-01-18 17:21:07 +08:00
YunaiV
90f0ea13e0 fix:【system】增加 node 的 parentId 为空下的兼容性,对应 https://t.zsxq.com/ktTUO 2026-01-18 16:54:04 +08:00
YunaiV
258b4c3d60 fix:【system】解决支付回调与订单信息上传之间的时间差导致 uploadWxaOrderShippingInfo 报错 2026-01-18 16:35:02 +08:00
YunaiV
f743ffd195 feat:【system】发送邮件时,携带附件,对应 https://gitee.com/zhijiantianya/yudao-cloud/pulls/233 2026-01-18 15:43:52 +08:00
YunaiV
6520514426 fix:【system】增加 node 的 parentId 为空下的兼容性,对应 https://t.zsxq.com/ktTUO 2026-01-18 15:16:31 +08:00
YunaiV
77a187b941 fix:【system】getUser 默认忽略数据权限,基础数据较为通用 2026-01-02 17:15:13 +08:00
YunaiV
fc9fe221d7 1487 fix: 修复导入用户的 username 为空时会异常问题 2025-12-29 06:31:21 +08:00
preschooler
69da706f55 🐞 fix: 修复导入用户的 username 为空时会异常问题 2025-12-29 00:45:45 +08:00
YunaiV
d0293ea2fa Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	yudao-dependencies/pom.xml
2025-12-27 21:38:07 +08:00
YunaiV
36708447ff fix:【system】操作日志导出时,缺少 userName 字段,对应 https://gitee.com/yudaocode/yudao-boot-mini/issues/IDFZ4X 2025-12-27 20:07:20 +08:00
YunaiV
ab8e68d3a2 fix:【system】优化 createOAuth2AccessToken 的 tenantId 逻辑,优先使用 OAuth2RefreshTokenDO 2025-12-27 17:25:36 +08:00
YunaiV
d2dd2f10f5 feat:【system】简化 AuthConvert 逻辑,避免 login 接口在 mapstruct 生成失败,导致开发登录失败 2025-12-27 12:35:57 +08:00
YunaiV
be56c83408 feat:【system】阿里云短信客户端的 GetSmsTemplate 接口升级适配 2025-12-27 11:03:17 +08:00
YunaiV
d56cda82d2 【同步】jdk21 和 jdk8 的代码 2025-12-25 22:35:06 +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
芋道源码
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