|  YunaiV | b160d409f3 | Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud # Conflicts:
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/coupon/vo/template/CouponTemplateBaseVO.java
#	yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/service/member/MemberStatisticsServiceImpl.java
#	yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2ApproveServiceImplTest.java
#	yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2ClientServiceImplTest.java
#	yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2CodeServiceImplTest.java | 2024-08-31 09:51:54 +08:00 | 
				
					
						|  YunaiV | daef8d3b03 | 【同步】BOOT 和 CLOUD 的功能 | 2024-08-31 09:51:21 +08:00 | 
				
					
						|  YunaiV | edefc6cedb | Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud | 2024-07-27 15:41:44 +08:00 | 
				
					
						|  YunaiV | c9a64030da | 【同步】BOOT 和 CLOUD 的功能 | 2024-07-27 15:41:35 +08:00 | 
				
					
						|  YunaiV | 0536fa3957 | Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud # Conflicts:
#	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/core/interceptor/ApiAccessLogInterceptor.java
#	yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/jmreport/core/service/JmReportTokenServiceImpl.java | 2024-07-24 19:05:47 +08:00 | 
				
					
						|  YunaiV | c0df6eab4e | 【同步】BOOT 和 CLOUD 的功能 | 2024-07-24 19:05:11 +08:00 | 
				
					
						|  YunaiV | 35ccb222a8 | 【功能新增】INFRA:增加 ConfigApi,支持参数配置的读取 | 2024-07-20 17:59:37 +08:00 | 
				
					
						|  YunaiV | 5bf8c47587 | Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud | 2024-07-20 17:58:19 +08:00 | 
				
					
						|  YunaiV | b728e66282 | 【功能新增】INFRA:增加 ConfigApi,支持参数配置的读取 | 2024-07-20 17:57:31 +08:00 | 
				
					
						|  YunaiV | 3ae388d886 | Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud # Conflicts:
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/resources/application-local.yaml | 2024-07-20 16:13:17 +08:00 | 
				
					
						|  YunaiV | a034b3d218 | 【代码优化】全局:去除 application.yaml 相关配置文件的冗余 | 2024-07-20 16:12:55 +08:00 | 
				
					
						|  YunaiV | 84379445dd | Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud | 2024-07-19 23:02:49 +08:00 | 
				
					
						|  YunaiV | 24eaa68269 | 【功能修复】全局:请求租户不存在时,记录访问日志、操作日志异常的问题 | 2024-07-19 22:54:25 +08:00 | 
				
					
						|  YunaiV | 8da3a97122 | 【依赖】knife4j from 4.3.0 to 4.5.0 | 2024-07-16 09:41:04 +08:00 | 
				
					
						|  YunaiV | 503a6eecc5 | Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud # Conflicts:
#	yudao-dependencies/pom.xml
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/security/config/SecurityConfiguration.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/framework/security/config/SecurityConfiguration.java
#	yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/framework/security/config/SecurityConfiguration.java
#	yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/framework/security/config/SecurityConfiguration.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/framework/security/config/SecurityConfiguration.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/framework/security/config/SecurityConfiguration.java
#	yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/framework/security/config/SecurityConfiguration.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/framework/security/config/SecurityConfiguration.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/framework/security/config/SecurityConfiguration.java
#	yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/framework/security/config/SecurityConfiguration.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/framework/security/config/SecurityConfiguration.java
#	yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/security/config/SecurityConfiguration.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/security/config/SecurityConfiguration.java | 2024-07-16 00:44:24 +08:00 | 
				
					
						|  YunaiV | 684c249d4b | 【依赖】knife4j from 4.3.0 to 4.5.0 | 2024-07-16 00:44:02 +08:00 | 
				
					
						|  YunaiV | d8941bc990 | Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud | 2024-07-15 13:01:45 +08:00 | 
				
					
						|  YunaiV | e263468389 | 【依赖】easy-trans from 2.2.11 to 3.0.5 | 2024-07-15 13:01:35 +08:00 | 
				
					
						|  YunaiV | 3a1fbcd448 | Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud | 2024-07-14 18:10:33 +08:00 | 
				
					
						|  YunaiV | df4bde2e67 | 【代码优化】INFRA:移除 bootstrap.yaml,和 boot 保持一致 | 2024-07-14 18:10:23 +08:00 | 
				
					
						|  YunaiV | 1d6c72d001 | 【依赖】mybatis-plus from 3.5.5 to 3.5.7 【代码优化】全局:复用 MyBatis Plus 数据权限插件,简化项目的数据权限实现 | 2024-07-14 00:07:33 +08:00 | 
				
					
						|  YunaiV | 6a20f3cb89 | Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud # Conflicts:
#	yudao-dependencies/pom.xml
#	yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/file/FileConfigDO.java
#	yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/dal/dataobject/message/MpMessageDO.java | 2024-07-14 00:02:35 +08:00 | 
				
					
						|  YunaiV | 76e4586e20 | 【依赖】mybatis-plus from 3.5.5 to 3.5.7 【代码优化】全局:复用 MyBatis Plus 数据权限插件,简化项目的数据权限实现 | 2024-07-14 00:01:39 +08:00 | 
				
					
						|  YunaiV | 58cc529c12 | Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud # Conflicts:
#	yudao-dependencies/pom.xml | 2024-07-13 16:50:22 +08:00 | 
				
					
						|  YunaiV | 7e3c290a2d | 【依赖】spring boot from 3.2.2 to 3.3.1 | 2024-07-13 16:50:05 +08:00 | 
				
					
						|  YunaiV | c0b196bd07 | Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud # Conflicts:
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/auth/MemberAuthServiceImpl.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImpl.java | 2024-07-13 12:04:48 +08:00 | 
				
					
						|  YunaiV | 3b8675dc6a | 【同步】Boot 和 Cloud 的功能同步 | 2024-07-13 12:03:51 +08:00 | 
				
					
						|  YunaiV | 5c610b2df5 | 同步 HTTP 请求签名 | 2024-06-04 21:43:56 +08:00 | 
				
					
						|  YunaiV | 0ee01346d0 | Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud # Conflicts:
#	yudao-framework/yudao-spring-boot-starter-security/pom.xml
#	yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoWebSecurityConfigurerAdapter.java
#	yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/logger/ApiAccessLogServiceImpl.java
#	yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/logger/ApiErrorLogServiceImpl.java | 2024-06-04 21:34:48 +08:00 | 
				
					
						|  YunaiV | 025857c9f2 | 【同步】对齐 boot 和 cloud 的逻辑 | 2024-06-04 19:23:20 +08:00 | 
				
					
						|  YunaiV | 4ca583cbe8 | 【发版】全局:2.1.0 发版 | 2024-05-04 09:52:40 +08:00 | 
				
					
						|  YunaiV | 2bd9fd97bb | Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud # Conflicts:
#	pom.xml
#	yudao-dependencies/pom.xml
#	yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/db/DatabaseTableServiceImpl.java | 2024-05-04 09:48:50 +08:00 | 
				
					
						|  YunaiV | 1e106844e8 | 【同步】boot 和 cloud 版本 | 2024-05-04 09:45:51 +08:00 | 
				
					
						|  YunaiV | 1e23316fb1 | 【修复】MySQL jdbc 连接 5.7 示例不正确 | 2024-05-03 09:11:22 +08:00 | 
				
					
						|  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 | 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 | 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 | 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 | 
				
					
						|  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 | 
				
					
						|  byeJuly | 4e10a0c2ef | 修复 Infra 模块: 修复项目迁移达梦8数据库后,代码生成器导入功能报错的原因:
调整策略:删除-> autoIncrement <-字段 | 2024-04-10 17:51:16 +08:00 |