YunaiV
							
						 
					 | 
					
						
						
							
						
						213a6aa0fc
					 | 
					
						
						
							
							Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/db
						
						
						
						
						
						
						
						# Conflicts:
#	yudao-server/src/main/resources/application-local.yaml 
						
						
					 | 
					
						2024-05-04 09:15:58 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dhb52
							
						 
					 | 
					
						
						
							
						
						774082509b
					 | 
					
						
						
							
							feat: 达梦DM8
						
						
						
						
						
						
					 | 
					
						2024-05-03 23:22:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						29746d1459
					 | 
					
						
						
							
							【修复】MySQL jdbc 连接 5.7 示例不正确
						
						
						
						
						
						
					 | 
					
						2024-05-03 09:04:47 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						6ba73e60f0
					 | 
					
						
						
							
							Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/db
						
						
						
						
						
						
					 | 
					
						2024-05-02 18:16:11 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dhb52
							
						 
					 | 
					
						
						
							
						
						fd8889e76a
					 | 
					
						
						
							
							wip: SQLServer数据库更新, 代码生成注释乱码
						
						
						
						
						
						
					 | 
					
						2024-05-02 15:30:33 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						ab00986a1d
					 | 
					
						
						
							
							Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17
						
						
						
						
						
						
					 | 
					
						2024-05-01 08:37:56 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						c0722b3a19
					 | 
					
						
						
							
							Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/db
						
						
						
						
						
						
						
						# Conflicts:
#	sql/mysql/ruoyi-vue-pro.sql 
						
						
					 | 
					
						2024-05-01 08:05:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dhb52
							
						 
					 | 
					
						
						
							
						
						06dacb747b
					 | 
					
						
						
							
							feat: Oracle数据 DDL 适配
						
						
						
						
						
						
					 | 
					
						2024-04-30 23:41:25 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dhb52
							
						 
					 | 
					
						
						
							
						
						4f3aaa124c
					 | 
					
						
						
							
							feat: 测试数据库docker-compose, postgres DDL初稿
						
						
						
						
						
						
					 | 
					
						2024-04-29 23:41:33 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						cd5e6319d9
					 | 
					
						
						
							
							【增强】一键改包:支持 site、org 等包
						
						
						
						
						
						
					 | 
					
						2024-04-29 00:13:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						da5425da2f
					 | 
					
						
						
							
							【修复】pay:PayWalletServiceImpl 可能存在的循环依赖问题
						
						
						
						
						
						
						
						【修复】system:dev 配置文件,缺少 WECHAT_MINI_APP 配置项~ 
						
						
					 | 
					
						2024-04-24 12:53:30 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						fd832e23fd
					 | 
					
						
						
							
							bugfix:非 json 请求(文件上传)时,token 过期时,错误读取 request body 问题
						
						
						
						
						
						
					 | 
					
						2024-04-22 23:31:50 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						9a31613e5b
					 | 
					
						
						
							
							【移除】敏感词的管理,简化项目的复杂度
						
						
						
						
						
						
					 | 
					
						2024-04-22 19:53:01 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						8093ef3b96
					 | 
					
						
						
							
							【移除】错误码的管理,简化项目的复杂度
						
						
						
						
						
						
					 | 
					
						2024-04-22 19:42:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						2e03dcba69
					 | 
					
						
						
							
							移除 resilience4j 组件
						
						
						
						
						
						
					 | 
					
						2024-04-10 20:57:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						beea186507
					 | 
					
						
						
							
							全局:增加 VO 数据翻译的支持
						
						
						
						
						
						
					 | 
					
						2024-04-01 12:42:27 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						dcf6cc293e
					 | 
					
						
						
							
							BPM:【移除】Ureport 的实现,因为和 Spring Boot 兼容性较差
						
						
						
						
						
						
					 | 
					
						2024-03-30 20:44:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						e5444c5d47
					 | 
					
						
						
							
							BPM:优化 convert 的逻辑
						
						
						
						
						
						
					 | 
					
						2024-03-20 21:32:01 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						31e8777a7b
					 | 
					
						
						
							
							✨ CRM:更新最新代码,支持线索、客户、联系人、商机、合同等功能
						
						
						
						
						
						
					 | 
					
						2024-02-26 13:09:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						94153cb59e
					 | 
					
						
						
							
							✨ 增加 ERP 系统的介绍
						
						
						
						
						
						
					 | 
					
						2024-02-17 10:10:09 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						bfe3dc95fe
					 | 
					
						
						
							
							✨ ERP:增加供应商的实现
						
						
						
						
						
						
					 | 
					
						2024-02-06 17:59:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						6a6e95fcb6
					 | 
					
						
						
							
							✨ 对齐 BOOT 与 CLOUD 的代码
						
						
						
						
						
						
					 | 
					
						2024-01-19 22:13:55 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						290f45dd6e
					 | 
					
						
						
							
							Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop
						
						
						
						
						
						
						
						# Conflicts:
#	yudao-server/src/main/resources/application-local.yaml 
						
						
					 | 
					
						2023-12-30 20:11:07 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						078ead536b
					 | 
					
						
						
							
							🐛 REPORT:支持 SaaS 租户模式
						
						
						
						
						
						
					 | 
					
						2023-12-30 10:30:47 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						5de6a8bd23
					 | 
					
						
						
							
							📖 code review:操作日志的实现
						
						
						
						
						
						
					 | 
					
						2023-12-25 21:40:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						82a25474f6
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/develop' into develop
						
						
						
						
						
						
					 | 
					
						2023-12-25 08:43:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						7542b6a78d
					 | 
					
						
						
							
							✨ Member:完善微信相关配置
						
						
						
						
						
						
					 | 
					
						2023-12-25 08:43:32 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						3e91ac73c4
					 | 
					
						
						
							
							CRM:完善数据分页查询条件构造 CrmQueryWrapperUtils
						
						
						
						
						
						
					 | 
					
						2023-12-19 10:29:41 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						98697ee075
					 | 
					
						
						
							
							⬆️
						
						
						
						
						
						
					 | 
					
						2023-12-07 20:48:11 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								liuhongfeng
							
						 
					 | 
					
						
						
							
						
						0d3efe4f80
					 | 
					
						
						
							
							【优化】ureport2菜单,初始化数据,按照规范重新进行命名处理
						
						
						
						
						
						
					 | 
					
						2023-12-06 21:02:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						5e9cbb9cad
					 | 
					
						
						
							
							report:code review ureport 的集成
						
						
						
						
						
						
					 | 
					
						2023-12-06 21:02:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								liuhongfeng
							
						 
					 | 
					
						
						
							
						
						5894d2be01
					 | 
					
						
						
							
							【修改】ureport2 集成的SQL语句,并适配数据库存储方式
						
						
						
						
						
						
					 | 
					
						2023-12-06 21:02:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								liuhongfeng
							
						 
					 | 
					
						
						
							
						
						8507fa9172
					 | 
					
						
						
							
							【新增】ureport2 集成
						
						
						
						
						
						
					 | 
					
						2023-12-06 21:02:25 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						7724d6e830
					 | 
					
						
						
							
							!765 Vue2 + Element UI 代码生成器
						
						
						
						
						
						
						
						Merge pull request !765 from 芋道源码/feature/sub-table 
						
						
					 | 
					
						2023-11-28 12:28:30 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						6d228828f4
					 | 
					
						
						
							
							application-local.yaml 恢复
						
						
						
						
						
						
					 | 
					
						2023-11-27 16:34:55 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						0233b092b8
					 | 
					
						
						
							
							websocket:重新封装 websocket 组件,支持 sender 广播
						
						
						
						
						
						
					 | 
					
						2023-11-24 00:32:52 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						1941a7b3e6
					 | 
					
						
						
							
							websocket:重新封装 websocket 组件,支持 token 认证,并增加 WebSocketMessageListener 方便处理消息
						
						
						
						
						
						
					 | 
					
						2023-11-22 23:17:50 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						df69fecbb4
					 | 
					
						
						
							
							代码生成:重构 vue2 模版,适配树表和主子表(80%)
						
						
						
						
						
						
					 | 
					
						2023-11-17 17:03:35 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						feba904fd8
					 | 
					
						
						
							
							多租户:登录界面,根据 host 域名获取对应的租户编号
						
						
						
						
						
						
					 | 
					
						2023-11-06 19:47:21 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						c162b39e1e
					 | 
					
						
						
							
							多租户:调整 tenant 表的 domain 字段为 website,避免 dm 数据库的关键字冲突
						
						
						
						
						
						
					 | 
					
						2023-11-06 19:04:01 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						456b0c8ddd
					 | 
					
						
						
							
							mq:增加 kafka 配置项
						
						
						
						
						
						
					 | 
					
						2023-11-02 12:25:50 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						20725e3dfd
					 | 
					
						
						
							
							mq:增加 rabbitmq 配置项
						
						
						
						
						
						
					 | 
					
						2023-11-02 08:22:05 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						b8d5a665be
					 | 
					
						
						
							
							mq:增加 rocketmq 配置项
						
						
						
						
						
						
					 | 
					
						2023-11-02 00:07:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						c066ea46f9
					 | 
					
						
						
							
							mq 重构:默认的 redis 实现:
						
						
						
						
						
						
						
						1)默认 channel 和 stream key
2)移除 enabled 开关,通过 listener 是否存在来实现
3)调整包名,为接入 rocketmq 作为 mq 实现做准备 
						
						
					 | 
					
						2023-10-30 21:15:22 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						fc2d30cfaf
					 | 
					
						
						
							
							pay:修复单元测试报错
						
						
						
						
						
						
					 | 
					
						2023-10-24 08:09:47 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						b009f0b058
					 | 
					
						
						
							
							application-local.yaml 恢复
						
						
						
						
						
						
					 | 
					
						2023-10-15 16:43:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						55eed1377a
					 | 
					
						
						
							
							营销活动: 新增文章管理
						
						
						
						
						
						
					 | 
					
						2023-10-15 16:16:41 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								owen
							
						 
					 | 
					
						
						
							
						
						df16278a03
					 | 
					
						
						
							
							统计:会员统计
						
						
						
						
						
						
					 | 
					
						2023-10-09 23:27:10 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						ac55a9657c
					 | 
					
						
						
							
							promotion:完善秒杀模块
						
						
						
						
						
						
					 | 
					
						2023-10-03 18:41:41 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						c66b4e7bc0
					 | 
					
						
						
							
							code review:日志清理 Job
						
						
						
						
						
						
					 | 
					
						2023-10-03 11:02:33 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |