qs
							
						 
					 | 
					
						
						
							
						
						24ed7be5c5
					 | 
					
						
						
							
							修改支付模块>解析订单通知V3>属性设置错误
						
						
						
						
						
						
					 | 
					
						2022-12-13 15:21:55 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								gaibu
							
						 
					 | 
					
						
						
							
						
						453603b6ad
					 | 
					
						
						
							
							fix: SQL 条件表达式缺少括号问题
						
						
						
						
						
						
					 | 
					
						2022-12-13 10:37:41 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						f9b4874ee9
					 | 
					
						
						
							
							!320 秒杀活动相关
						
						
						
						
						
						
						
						Merge pull request !320 from halfninety/feature/1.8.0-uniapp 
						
						
					 | 
					
						2022-12-13 02:04:54 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dark
							
						 
					 | 
					
						
						
							
						
						0b5aa560b3
					 | 
					
						
						
							
							ip库引入,查询工具类
						
						
						
						
						
						
					 | 
					
						2022-12-11 22:20:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						fc48ab4928
					 | 
					
						
						
							
							trade:前端订单管理,联调接口
						
						
						
						
						
						
					 | 
					
						2022-12-10 17:06:34 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						fc49f000ce
					 | 
					
						
						
							
							trade:前端订单管理,联调接口
						
						
						
						
						
						
					 | 
					
						2022-12-10 11:52:11 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						bddbedd781
					 | 
					
						
						
							
							增加城市库
						
						
						
						
						
						
					 | 
					
						2022-12-10 00:17:08 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						3937004d5b
					 | 
					
						
						
							
							fix: mysql warn
						
						
						
						
						
						
					 | 
					
						2022-12-09 18:34:34 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu4j
							
						 
					 | 
					
						
						
							
						
						88ce5e540e
					 | 
					
						
						
							
							refactor: springdoc 替换 springfox
						
						
						
						
						
						
					 | 
					
						2022-12-09 14:24:09 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu4j
							
						 
					 | 
					
						
						
							
						
						9fc6e0f00b
					 | 
					
						
						
							
							refactor: springdoc 替换 springfox
						
						
						
						
						
						
					 | 
					
						2022-12-09 13:43:15 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu4j
							
						 
					 | 
					
						
						
							
						
						262ff34160
					 | 
					
						
						
							
							保证统一的版本号
						
						
						
						
						
						
					 | 
					
						2022-12-08 13:58:48 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu4j
							
						 
					 | 
					
						
						
							
						
						232c325608
					 | 
					
						
						
							
							升级版本,保证统一的版本号
						
						
						
						
						
						
					 | 
					
						2022-12-08 13:52:01 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						7fc9689f07
					 | 
					
						
						
							
							trade:定义管理后台的订单分页接口
						
						
						
						
						
						
					 | 
					
						2022-12-08 00:07:14 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						2513bbf02d
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into dev
						
						
						
						
						
						
					 | 
					
						2022-12-06 20:53:09 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						ffab0b1d6a
					 | 
					
						
						
							
							1. 优化 menu 本地缓存的刷新策略,在修改或删除菜单时,强制刷新缓存
						
						
						
						
						
						
						
						2. 修复 pub/sub 未初始化的问题
3. 优化 Job 定时的 mybatis 日志输出,避免一直打印 
						
						
					 | 
					
						2022-12-06 20:38:05 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu4j
							
						 
					 | 
					
						
						
							
						
						4397d47da1
					 | 
					
						
						
							
							升级版本,保证统一的版本号
						
						
						
						
						
						
					 | 
					
						2022-12-06 17:04:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								halfninety
							
						 
					 | 
					
						
						
							
						
						abbb076859
					 | 
					
						
						
							
							完成秒杀时段,秒杀活动相关todo
						
						
						
						
						
						
					 | 
					
						2022-12-02 22:33:07 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu4j
							
						 
					 | 
					
						
						
							
						
						fea1ad8f8d
					 | 
					
						
						
							
							升级最新依赖
						
						
						
						
						
						
					 | 
					
						2022-12-02 11:37:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu4j
							
						 
					 | 
					
						
						
							
						
						9d3bbdd8c4
					 | 
					
						
						
							
							v 1.6.5
						
						
						
						
						
						
					 | 
					
						2022-12-01 09:39:20 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						650133dda4
					 | 
					
						
						
							
							增加 NumberSerializer 注释
						
						
						
						
						
						
					 | 
					
						2022-11-30 20:17:05 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu4j
							
						 
					 | 
					
						
						
							
						
						1b3ff0e7d1
					 | 
					
						
						
							
							fix: WebSecurityConfigurerAdapter 过期
						
						
						
						
						
						
					 | 
					
						2022-11-30 14:04:47 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu4j
							
						 
					 | 
					
						
						
							
						
						2c8e2209e8
					 | 
					
						
						
							
							feat: 增加全局超长number序列化
						
						
						
						
						
						
					 | 
					
						2022-11-30 12:32:56 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu4j
							
						 
					 | 
					
						
						
							
						
						a43b884c73
					 | 
					
						
						
							
							fix: warn
						
						
						
						
						
						
					 | 
					
						2022-11-30 10:30:58 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						0a8a41dea1
					 | 
					
						
						
							
							chore: update tencentcloud version
						
						
						
						
						
						
					 | 
					
						2022-11-30 01:29:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						283aae1da2
					 | 
					
						
						
							
							feat: 适配springboot 2.7 configuration ==> AutoConfiguration
						
						
						
						
						
						
					 | 
					
						2022-11-30 01:20:20 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						1aa05e0198
					 | 
					
						
						
							
							feat: 适配 springboot 2.7
						
						
						
						
						
						
					 | 
					
						2022-11-30 01:03:56 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						b079513dc8
					 | 
					
						
						
							
							chore: 升级springboot 2.7.6
						
						
						
						
						
						
					 | 
					
						2022-11-30 00:41:24 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								halfninety
							
						 
					 | 
					
						
						
							
						
						d6b426970b
					 | 
					
						
						
							
							序列化配置修改名称
						
						
						
						
						
						
					 | 
					
						2022-11-29 23:25:01 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								halfninety
							
						 
					 | 
					
						
						
							
						
						cd62c4d220
					 | 
					
						
						
							
							秒杀时段相关
						
						
						
						
						
						
					 | 
					
						2022-11-29 23:25:00 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						44249e43dd
					 | 
					
						
						
							
							!313 修复上传七牛云无mime type问题
						
						
						
						
						
						
						
						Merge pull request !313 from 石溪/master 
						
						
					 | 
					
						2022-11-29 13:12:54 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						66abe4a84b
					 | 
					
						
						
							
							trade:完成交易订单的发货逻辑
						
						
						
						
						
						
					 | 
					
						2022-11-27 19:42:49 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								石溪
							
						 
					 | 
					
						
						
							
						
						7f9fc41555
					 | 
					
						
						
							
							修复上传七牛云无mime type问题
						
						
						
						
						
						
					 | 
					
						2022-11-26 19:26:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						07f1681b50
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
						
						
						
						
						
						
					 | 
					
						2022-11-26 18:41:02 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						693288d33d
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into feature/vue3
						
						
						
						
						
						
						
						# Conflicts:
#	yudao-dependencies/pom.xml 
						
						
					 | 
					
						2022-11-26 13:07:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						2d78b02086
					 | 
					
						
						
							
							移除云片短信渠道,解决云片的安全风险
						
						
						
						
						
						
					 | 
					
						2022-11-25 21:04:40 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						ea95115ffd
					 | 
					
						
						
							
							移除云片短信渠道,解决云片的安全风险
						
						
						
						
						
						
					 | 
					
						2022-11-25 20:22:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						1cd9085c59
					 | 
					
						
						
							
							pay: PayNotifyJob 增加多租户的支持
						
						
						
						
						
						
					 | 
					
						2022-11-24 23:56:13 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						0d0f64e30a
					 | 
					
						
						
							
							feat: 删除过期方法
						
						
						
						
						
						
					 | 
					
						2022-11-23 22:54:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						8798944069
					 | 
					
						
						
							
							优化 pay 支付成功后的回调逻辑
						
						
						
						
						
						
					 | 
					
						2022-11-23 21:09:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						73d847ae2e
					 | 
					
						
						
							
							调整支付模块的回调地址
						
						
						
						
						
						
					 | 
					
						2022-11-22 19:54:52 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						35528e8267
					 | 
					
						
						
							
							trade:【交易售后】查询分页列表
						
						
						
						
						
						
					 | 
					
						2022-11-19 20:43:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zy
							
						 
					 | 
					
						
						
							
						
						9b667448ea
					 | 
					
						
						
							
							fix: 加入异步注解配置后redis消费者不能正常消费
						
						
						
						
						
						
					 | 
					
						2022-11-18 09:51:19 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						969b9c3458
					 | 
					
						
						
							
							修复 swagger 404 的问题
						
						
						
						
						
						
					 | 
					
						2022-11-16 21:52:33 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						38f67d4130
					 | 
					
						
						
							
							将 mall 使用到 Date 的部分,迁移到 LocalDateTime 中
						
						
						
						
						
						
					 | 
					
						2022-11-13 21:23:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						12d045ea58
					 | 
					
						
						
							
							修复部分单元测试报错的问题
						
						
						
						
						
						
					 | 
					
						2022-11-13 21:08:15 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						89580e7903
					 | 
					
						
						
							
							合并 master 代码
						
						
						
						
						
						
					 | 
					
						2022-11-13 12:21:17 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						afc76973ce
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
						
						
						
						
						
						
						
						# Conflicts:
#	yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/date/DateUtils.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponBaseVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponExcelVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponExportReqVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponPageReqVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponRespVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteBaseVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteExcelVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteExportReqVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempletePageReqVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteRespVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/dal/dataobject/CouponTemplete/CouponTempleteDO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/dal/dataobject/coupon/CouponDO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuPageReqVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuRespVO.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/discount/DiscountProductDO.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/reward/RewardActivityDO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/cart/TradeCartItemDO.java
#	yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/user/dto/UserInfoDTO.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java
#	yudao-server/pom.xml
#	yudao-server/src/main/resources/application-local.yaml
#	yudao-server/src/main/resources/application.yaml
#	yudao-ui-admin/src/views/mall/CouponTemplete/index.vue
#	yudao-ui-admin/src/views/mall/product/property/index.vue
#	yudao-ui-admin/src/views/mall/product/spu/index.vue
#	yudao-ui-admin/src/views/mall/product/spu/save.vue
#	yudao-ui-admin/src/views/system/role/index.vue 
						
						
					 | 
					
						2022-11-13 12:07:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						0e903df380
					 | 
					
						
						
							
							调整 YudaoDataPermissionAutoConfiguration 的自动配置
						
						
						
						
						
						
					 | 
					
						2022-11-13 10:06:33 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						1819e0e1d6
					 | 
					
						
						
							
							异步化 Redis MQ 的初始化,提升启动速度
						
						
						
						
						
						
					 | 
					
						2022-11-12 20:57:28 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						c5b547e0f3
					 | 
					
						
						
							
							优化,使用 @Configuration(proxyBeanMethods = false) 提升启动速度
						
						
						
						
						
						
					 | 
					
						2022-11-12 20:22:09 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |