chenlei65368
							
						 
					 | 
					
						
						
							
						
						bb8204b5a7
					 | 
					
						
						
							
							fix WXLitePayClient.java 中copy应忽略的字段
						
						
						
						
						
						
						
						小程序支付,copy应忽略 "privateKeyContent","privateCertContent",而不是“KeyContent”
Signed-off-by: chenlei65368 <chenlei65368@sohu.com> 
						
						
					 | 
					
						2022-10-24 10:43:04 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						2bd2cb56a1
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
						
						
						
						
						
						
						
						 Conflicts:
	yudao-module-mall/yudao-module-trade-biz/pom.xml 
						
						
					 | 
					
						2022-10-23 22:16:54 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								huangyemin
							
						 
					 | 
					
						
						
							
						
						93135363c6
					 | 
					
						
						
							
							阿里云OSS解析region时兼容带https的配置
						
						
						
						
						
						
					 | 
					
						2022-10-12 11:33:29 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						72ee1206e6
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into dev
						
						
						
						
						
						
					 | 
					
						2022-09-29 14:13:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						1aca24b636
					 | 
					
						
						
							
							feat: 升级依赖
						
						
						
						
						
						
					 | 
					
						2022-09-28 21:04:13 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						034de50999
					 | 
					
						
						
							
							完善多租户的注释与代码
						
						
						
						
						
						
					 | 
					
						2022-09-24 21:54:03 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						b73cdd15b5
					 | 
					
						
						
							
							同步 Master 最新代码
						
						
						
						
						
						
					 | 
					
						2022-09-24 18:25:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						25e7c8dceb
					 | 
					
						
						
							
							同步 Master 最新代码
						
						
						
						
						
						
					 | 
					
						2022-09-24 18:16:27 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						1be09d092b
					 | 
					
						
						
							
							♻️优化“通过注解增加多租户缓存”的代码
						
						
						
						
						
						
					 | 
					
						2022-09-24 12:26:01 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						597a923828
					 | 
					
						
						
							
							!257 通过注解增加多租户缓存
						
						
						
						
						
						
						
						Merge pull request !257 from CrazyAirhead/master 
						
						
					 | 
					
						2022-09-24 04:11:50 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						9054a772b0
					 | 
					
						
						
							
							feat: 升级依赖
						
						
						
						
						
						
					 | 
					
						2022-09-20 18:00:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						38e88b02f5
					 | 
					
						
						
							
							🐛修复数据权限,不支持隐式内连接的问题
						
						
						
						
						
						
					 | 
					
						2022-09-10 21:37:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								airhead
							
						 
					 | 
					
						
						
							
						
						6b429584bf
					 | 
					
						
						
							
							fix(tenant): 租户缓存增加注释
						
						
						
						
						
						
					 | 
					
						2022-09-09 22:56:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								airhead
							
						 
					 | 
					
						
						
							
						
						0e1babd7f4
					 | 
					
						
						
							
							feat(redis): 注解支持多租户缓存
						
						
						
						
						
						
						
						1.增加多租户Cache
2.修复Mac M1启动报错 
						
						
					 | 
					
						2022-09-09 22:56:25 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						61b0624a59
					 | 
					
						
						
							
							!262 接口实现-交易订单创建(未完全实现)
						
						
						
						
						
						
						
						Merge pull request !262 from LeeYan9/ly_uniapp 
						
						
					 | 
					
						2022-09-05 13:16:11 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						833fd33844
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
						
						
						
						
						
						
						
						 Conflicts:
	sql/optional/mall/mall.sql 
						
						
					 | 
					
						2022-09-04 21:06:28 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						9715087b54
					 | 
					
						
						
							
							管理后台的 uniapp 验证码,增加开关
						
						
						
						
						
						
					 | 
					
						2022-09-04 17:44:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						a484cd5193
					 | 
					
						
						
							
							优化图片验证码的后端实现
						
						
						
						
						
						
					 | 
					
						2022-09-04 12:44:02 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						926c75d29a
					 | 
					
						
						
							
							优化图片验证码的后端实现
						
						
						
						
						
						
					 | 
					
						2022-09-04 11:26:37 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ex_yang.li@ca-nio.com
							
						 
					 | 
					
						
						
							
						
						19a703b8c9
					 | 
					
						
						
							
							创建订单接口定义
						
						
						
						
						
						
					 | 
					
						2022-08-26 17:47:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								luowenfeng
							
						 
					 | 
					
						
						
							
						
						0bc2ef1d39
					 | 
					
						
						
							
							feature(uniapp商品): 商品业务代码调整
						
						
						
						
						
						
					 | 
					
						2022-08-24 14:08:32 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						e5bd517829
					 | 
					
						
						
							
							perf: final方法改为大写命名
						
						
						
						
						
						
					 | 
					
						2022-08-11 11:45:34 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						e1b8ae09c9
					 | 
					
						
						
							
							增加手机号正则验证
						
						
						
						
						
						
					 | 
					
						2022-08-11 11:32:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu4j
							
						 
					 | 
					
						
						
							
						
						40f730033f
					 | 
					
						
						
							
							压缩图片尺寸
						
						
						
						
						
						
					 | 
					
						2022-08-07 23:26:17 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						cfde3dcacb
					 | 
					
						
						
							
							mall:优化订单表的设计
						
						
						
						
						
						
					 | 
					
						2022-08-05 00:28:40 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						2bf09cbfc2
					 | 
					
						
						
							
							升级部分依赖,存在高危漏洞报错问题
						
						
						
						
						
						
					 | 
					
						2022-08-03 13:38:02 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						a8ea50a059
					 | 
					
						
						
							
							update hutool 5.8.5
						
						
						
						
						
						
					 | 
					
						2022-08-03 13:38:02 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						4a92081937
					 | 
					
						
						
							
							vue2 新增行为验证码
						
						
						
						
						
						
					 | 
					
						2022-08-03 13:38:01 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						2866b58741
					 | 
					
						
						
							
							1. 默认不开启 bpm 工作流模块,按需启动,提升启动速度
						
						
						
						
						
						
						
						2. 完整移除 activiti 遗留的东东 
						
						
					 | 
					
						2022-07-29 22:51:52 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						39ac59efee
					 | 
					
						
						
							
							默认禁用报表模块,
						
						
						
						
						
						
					 | 
					
						2022-07-29 20:57:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xgd
							
						 
					 | 
					
						
						
							
						
						8c5681f4f9
					 | 
					
						
						
							
							[新增]接入支付宝【PC网站支付】
						
						
						
						
						
						
					 | 
					
						2022-07-29 17:31:35 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						35413b52c9
					 | 
					
						
						
							
							!237 集成积木报表
						
						
						
						
						
						
						
						Merge pull request !237 from 芋道源码/feature/visual 
						
						
					 | 
					
						2022-07-29 04:51:54 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						e5a7b8474f
					 | 
					
						
						
							
							fix:短信验证码的每日发送条数不正确
						
						
						
						
						
						
					 | 
					
						2022-07-29 00:56:17 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						88fc7ed39b
					 | 
					
						
						
							
							删除未引用
						
						
						
						
						
						
					 | 
					
						2022-07-28 12:18:14 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						d872676748
					 | 
					
						
						
							
							完善积木报表的集成
						
						
						
						
						
						
					 | 
					
						2022-07-28 09:29:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						62dc600c51
					 | 
					
						
						
							
							reactor:完善多租户的配置类
						
						
						
						
						
						
					 | 
					
						2022-07-27 09:08:56 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						26a094a710
					 | 
					
						
						
							
							refactor:优化时间范围查询
						
						
						
						
						
						
					 | 
					
						2022-07-27 00:15:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						611e11ae23
					 | 
					
						
						
							
							增加区间查询字段判断
						
						
						
						
						
						
					 | 
					
						2022-07-25 19:14:33 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						b4ee434289
					 | 
					
						
						
							
							fix: #I5II34 hutool error
						
						
						
						
						
						
					 | 
					
						2022-07-25 11:52:15 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						9bdae339cc
					 | 
					
						
						
							
							update: hutool 5.6.1 ==> 5.7.22
						
						
						
						
						
						
					 | 
					
						2022-07-22 12:08:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						14594e492e
					 | 
					
						
						
							
							update: springboot 2.6.8 ==> 2.6.9
						
						
						
						
						
						
					 | 
					
						2022-07-22 11:07:54 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						c7a64fc8b4
					 | 
					
						
						
							
							时间区间查询 betweenIfPresent 支持传入数组
						
						
						
						
						
						
					 | 
					
						2022-07-21 23:16:48 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						bc233df980
					 | 
					
						
						
							
							feat: 添加 vue3 时间区间查询
						
						
						
						
						
						
					 | 
					
						2022-07-21 15:07:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						b0cdfd7afc
					 | 
					
						
						
							
							完善工作流的注释
						
						
						
						
						
						
					 | 
					
						2022-07-20 00:34:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						0ed44f29c8
					 | 
					
						
						
							
							fix: flowable basic ==》 process
						
						
						
						
						
						
					 | 
					
						2022-07-19 18:16:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						c92cc26171
					 | 
					
						
						
							
							增加文档、视频教程的地址
						
						
						
						
						
						
					 | 
					
						2022-07-13 22:05:01 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						33a31cfb0f
					 | 
					
						
						
							
							优化文件的 type 识别与存储
						
						
						
						
						
						
					 | 
					
						2022-07-10 00:02:21 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jiangqiang
							
						 
					 | 
					
						
						
							
						
						2621f2195d
					 | 
					
						
						
							
							优化代码
						
						
						
						
						
						
					 | 
					
						2022-07-09 17:46:29 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jiangqiang
							
						 
					 | 
					
						
						
							
						
						a5d16c11e8
					 | 
					
						
						
							
							优化获取mimetype方式,优化生成path方式
						
						
						
						
						
						
					 | 
					
						2022-07-09 11:27:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						ed097e5ead
					 | 
					
						
						
							
							基于 tika 识别文件类型
						
						
						
						
						
						
					 | 
					
						2022-07-08 21:26:34 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |