Commit Graph

1880 Commits

Author SHA1 Message Date
YunaiV
9d8f924fec Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
#	pom.xml
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/statistics/vo/portrait/CrmStatisticsPortraitReqVO.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/statistics/CrmStatisticsPerformanceServiceImpl.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/dept/DeptSaveReqVO.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/post/PostSaveReqVO.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/data/DictDataPageReqVO.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/data/DictDataSaveReqVO.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/menu/MenuRespVO.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/menu/MenuSaveVO.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/role/RoleRespVO.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/role/RoleSaveReqVO.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImpl.java
2024-05-01 09:32:36 +08:00
YunaiV
6d40550bbf 【同步】对齐 boot 和 cloud 的逻辑 2024-05-01 09:30:22 +08:00
YunaiV
78e151d4ee 【优化】降低 JDK 21 最低到 17 版本 2024-05-01 01:44:07 +08:00
YunaiV
ef63cb37b7 【优化】README,将版本说明提前 2024-05-01 01:37:25 +08:00
YunaiV
a015b1e539 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/yudao-cloud 2024-05-01 00:38:22 +08:00
YunaiV
f7b0618216 【修复】短信模板中关于 type 字段的描述 2024-04-29 20:51:46 +08:00
YunaiV
fe11de8e3c 【增强】一键改包:支持 site、org 等包 2024-04-29 12:51:23 +08:00
YunaiV
b1c11f8dd8 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/security/TenantSecurityWebFilter.java
#	yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoWebSecurityConfigurerAdapter.java
2024-04-29 12:50:00 +08:00
YunaiV
b500bb7da1 【增强】一键改包:支持 site、org 等包 2024-04-29 12:48:46 +08:00
YunaiV
ed04f0ce5a 【修复】RPC 调用时,不再进行 tenant-id 校验,内部使用,无需校验 2024-04-29 09:46:30 +08:00
YunaiV
0f802a6b52 【修复】部分菜单,确实 menu.sql 配置的权限标识 2024-04-24 20:59:27 +08:00
YunaiV
59dd0a3f5c Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/followup/CrmFollowUpRecordController.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/permission/CrmPermissionController.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/seckill/SeckillConfigController.java
2024-04-24 20:55:04 +08:00
YunaiV
e618f833fd 【修复】部分菜单,确实 menu.sql 配置的权限标识 2024-04-24 20:11:19 +08:00
YunaiV
59178eca49 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/permission/RoleMapper.java
2024-04-24 09:45:10 +08:00
YunaiV
44055ba53f 【优化】新增 sslEnable 字段,支持 outlook 邮箱 2024-04-24 09:44:38 +08:00
YunaiV
5e3e68f7f5 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/account/MailAccountSaveReqVO.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailSendServiceImpl.java
2024-04-24 09:40:05 +08:00
YunaiV
b150605da9 【修复】角色管理页面-查询未按照排序字段排序的问题 2024-04-24 09:38:14 +08:00
芋道源码
961e3210c7
!112 bugfix:修复角色管理页面-查询未按照排序字段排序的问题
Merge pull request !112 from limz/bugfix-pull
2024-04-24 01:36:21 +00:00
YunaiV
ddafd44114 【完善】代码生成对 DM 达梦数据的兼容性
【优化】新增 sslEnable 字段,支持 outlook 邮箱
2024-04-24 09:35:51 +08:00
芋道源码
ca93a858fd
!108 Infra模块>代码生成器>适配达梦数据库
Merge pull request !108 from 再见七月/infraBug-by-dm
2024-04-24 01:20:45 +00:00
YunaiV
96e2548240 【修复】解决视频地址在移动端播放的兼容性问题 2024-04-23 22:45:20 +08:00
YunaiV
8e17192ad1 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
#	yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/servlet/ServletUtils.java
#	yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/CodegenController.java
2024-04-23 22:42:53 +08:00
YunaiV
819ad49b08 【修复】解决视频地址在移动端播放的兼容性问题 2024-04-23 09:44:57 +08:00
YunaiV
9164fa0ffb bugfix:非 json 请求(文件上传)时,token 过期时,错误读取 request body 问题 2024-04-22 23:31:57 +08:00
YunaiV
ea4db88dab Merge remote-tracking branch 'origin/master' 2024-04-22 21:10:49 +08:00
YunaiV
ce74fbca98 【同步】与 yudao-boot 版本保持一致! 2024-04-22 21:10:22 +08:00
YunaiV
38df9d3911 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
#	yudao-dependencies/pom.xml
#	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/errorcode/config/ErrorCodeProperties.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/business/CrmBusinessTransferReqVO.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contact/vo/CrmContactTransferReqVO.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/contract/CrmContractTransferReqVO.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/permission/vo/CrmPermissionSaveReqVO.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/permission/CrmPermissionServiceImpl.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivablePlanServiceImpl.java
#	yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/db/DatabaseDocController.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppCartAddReqVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java
#	yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/errorcode/ErrorCodeApi.java
#	yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/errorcode/dto/ErrorCodeAutoGenerateReqDTO.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/errorcode/ErrorCodeApiImpl.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/sensitiveword/SensitiveWordApiImpl.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/errorcode/ErrorCodeController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/errorcode/vo/ErrorCodeSaveReqVO.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sensitiveword/SensitiveWordController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sensitiveword/vo/SensitiveWordSaveVO.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailAccountConvert.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/errorcode/ErrorCodeService.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/errorcode/ErrorCodeServiceImpl.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailSendServiceImpl.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/sensitiveword/SensitiveWordService.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/sensitiveword/SensitiveWordServiceImpl.java
#	yudao-module-system/yudao-module-system-biz/src/test-integration/java/cn/iocoder/yudao/module/system/job/SchedulerManagerTest.java
#	yudao-module-system/yudao-module-system-biz/src/test-integration/java/cn/iocoder/yudao/module/system/mq/RedisStreamTest.java
#	yudao-module-system/yudao-module-system-biz/src/test-integration/java/cn/iocoder/yudao/module/system/service/sms/SmsServiceIntegrationTest.java
#	yudao-module-system/yudao-module-system-biz/src/test-integration/resources/application-integration-test.yaml
#	yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/errorcode/ErrorCodeServiceTest.java
#	yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/sensitiveword/SensitiveWordServiceImplTest.java
2024-04-22 21:02:10 +08:00
YunaiV
feb742e084 【同步】与 yudao-boot 版本保持一致! 2024-04-22 21:01:30 +08:00
limingz
4d069460cd bugfix:修复角色管理页面-查询未按照排序字段排序的问题 2024-04-18 15:22:32 +08:00
芋道源码
36a314779a
!110 bugfix:修复获取登录用户的权限信息接口在没有授权角色时,没有菜单列表导致报错的问题
Merge pull request !110 from a472159403/bug_getMenuList
2024-04-14 14:07:13 +00:00
lihaiyang
0703c8d154 bugfix:修复获取登录用户的权限信息接口在没有授权角色时,没有菜单列表导致报错的问题 2024-04-13 23:36:01 +08:00
YunaiV
1fcc167070 bugfix:解决 web、security 组件的依赖重复问题 2024-04-12 00:12:23 +08:00
YunaiV
3af7097f17 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/yudao-cloud 2024-04-11 23:42:45 +08:00
YunaiV
a5aeca4d49 【优化】将项目的 annotations 统一修改成 annotation 包 2024-04-11 23:42:22 +08:00
YunaiV
b90ea83d2c Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
#	yudao-dependencies/pom.xml
#	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/handler/GlobalExceptionHandler.java
2024-04-11 22:55:58 +08:00
YunaiV
bb5966f1b6 【新增】RateLimiter 限流器,支持全局、用户、IP 等级别的限流 2024-04-11 22:53:36 +08:00
YunaiV
7766c82f6c Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/yudao-cloud 2024-04-10 20:49:59 +08:00
YunaiV
9c1c946edc 【新增】新增 UserIdempotentKeyResolver 解析器,支持用户级别的幂等 2024-04-10 20:46:38 +08:00
byeJuly
f89d9f6d99 漏掉一个mysql,提交一下 2024-04-10 19:08:33 +08:00
byeJuly
4e10a0c2ef 修复 Infra 模块:
修复项目迁移达梦8数据库后,代码生成器导入功能报错的原因:
调整策略:删除-> autoIncrement <-字段
2024-04-10 17:51:16 +08:00
YunaiV
3aa8d41fcd 【优化】支持登陆用户,直接读取昵称、部门等信息,也支持自定义字段 2024-04-07 20:02:22 +08:00
YunaiV
be6aaec818 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/core/filter/TokenAuthenticationFilter.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2TokenServiceImpl.java
#	yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2TokenServiceImplTest.java
2024-04-07 19:53:25 +08:00
YunaiV
e2c1c7d380 【优化】支持登陆用户,直接读取昵称、部门等信息,也支持自定义字段 2024-04-07 19:51:24 +08:00
YunaiV
60d56f0834 bugfix:easy-trans 在 FeignClient 无法启动的情况 2024-04-04 18:59:35 +08:00
YunaiV
c41a155cfe Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
#	yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApi.java
2024-04-04 18:58:46 +08:00
YunaiV
9de92e730b bugfix:easy-trans 在 FeignClient 无法启动的情况 2024-04-04 18:58:13 +08:00
YunaiV
9d6eca05dd 【新增】system user 和 role 接入新操作日志 2024-04-04 10:00:06 +08:00
YunaiV
0c2736399f Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/yudao-cloud 2024-04-04 09:59:18 +08:00
YunaiV
a6db89c9e3 【新增】system user 和 role 接入新操作日志 2024-04-04 09:58:41 +08:00
YunaiV
06bfe3335e Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/role/RoleUpdateStatusReqVO.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserSaveReqVO.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/RoleServiceImpl.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java
2024-04-04 09:50:11 +08:00