paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							096ab34ae8
							
						
					 | 
					
						
						
							
							fix: 优化文件上传,删除冗余文件
						
						
						
						
						
						
					 | 
					
						2022-11-22 15:29:22 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								chc
							
						 
					 | 
					
						
						
						
						
							
						
						
							5a1c6b9e7f
							
						
					 | 
					
						
						
							
							v4.2.5
						
						
						
						
						
						
					 | 
					
						2022-10-21 11:26:55 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							27888f503a
							
						
					 | 
					
						
						
							
							去除无效的控制器,规范站点基础设置控制器的规范
						
						
						
						
						
						
					 | 
					
						2022-09-22 17:51:18 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								fengtianyangyang
							
						 
					 | 
					
						
						
						
						
							
						
						
							26dd8ed13a
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop into fengtianyangyang_clerk
						
						
						
						
						
						
						
						 Conflicts:
	DB/version4.2.3toMASTER.sql
	common-api/src/main/java/cn/lili/controller/common/SiteController.java
	common-api/src/main/java/cn/lili/controller/common/UploadController.java
	config/application.yml
	framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java
	framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java
	framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java
	framework/src/main/java/cn/lili/modules/page/serviceimpl/PageDataServiceImpl.java 
						
						
					 | 
					
						2022-08-09 18:54:19 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							7cbbc57514
							
						
					 | 
					
						
						
							
							更新部分es日志
						
						
						
						
						
						
					 | 
					
						2022-07-18 12:11:16 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							7b535434ae
							
						
					 | 
					
						
						
							
							代码优化,修复订单投诉问题
						
						
						
						
						
						
					 | 
					
						2022-07-04 18:31:36 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							a22ccbdda5
							
						
					 | 
					
						
						
							
							兼容MINIO
						
						
						
						
						
						
					 | 
					
						2022-06-07 09:35:58 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								caihongcheng
							
						 
					 | 
					
						
						
						
						
							
						
						
							a540e42460
							
						
					 | 
					
						
						
							
							siteController
						
						
						
						
						
						
					 | 
					
						2022-05-18 14:35:34 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								caihongcheng
							
						 
					 | 
					
						
						
						
						
							
						
						
							b91c8e34c2
							
						
					 | 
					
						
						
							
							电子面单
						
						
						
						
						
						
					 | 
					
						2022-05-09 09:27:30 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							66e6272571
							
						
					 | 
					
						
						
							
							优化默认生成的es商品索引结构。解决初次启动时,搜索商品报错
						
						
						
						
						
						
					 | 
					
						2022-04-27 18:15:11 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								fengtianyangyang
							
						 
					 | 
					
						
						
						
						
							
						
						
							4cdb461c22
							
						
					 | 
					
						
						
							
							配置文件修改及sql
						
						
						
						
						
						
					 | 
					
						2022-04-07 17:35:22 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							a988dedfbf
							
						
					 | 
					
						
						
							
							增加根据名称获取地址信息
						
						
						
						
						
						
					 | 
					
						2022-04-02 18:42:03 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								fengtianyangyang
							
						 
					 | 
					
						
						
						
						
							
						
						
							6bef12b91b
							
						
					 | 
					
						
						
							
							'合并'
						
						
						
						
						
						
					 | 
					
						2022-03-03 18:36:42 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								fengtianyangyang
							
						 
					 | 
					
						
						
						
						
							
						
						
							441cb6ddcb
							
						
					 | 
					
						
						
							
							'代码合并'
						
						
						
						
						
						
					 | 
					
						2022-03-03 17:22:13 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								itheinjury@163.com
							
						 
					 | 
					
						
						
						
						
							
						
						
							f14efa2612
							
						
					 | 
					
						
						
							
							BUG修改
						
						
						
						
						
						
					 | 
					
						2022-03-03 16:11:08 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								itheinjury@163.com
							
						 
					 | 
					
						
						
						
						
							
						
						
							a52b672e9b
							
						
					 | 
					
						
						
							
							更新,BUG修改
						
						
						
						
						
						
					 | 
					
						2022-03-02 15:17:06 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							b824ee625e
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop
						
						
						
						
						
						
					 | 
					
						2022-02-21 22:59:59 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							961ac20213
							
						
					 | 
					
						
						
							
							更新IM相关
						
						
						
						
						
						
					 | 
					
						2022-02-21 22:59:55 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							631600ab3f
							
						
					 | 
					
						
						
							
							优化rocketmq日志到logback
						
						
						
						
						
						
					 | 
					
						2022-02-21 12:03:07 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								itheinjury@163.com
							
						 
					 | 
					
						
						
						
						
							
						
						
							1600f7cdab
							
						
					 | 
					
						
						
							
							更新
						
						
						
						
						
						
					 | 
					
						2022-02-18 10:52:03 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								itheinjury@163.com
							
						 
					 | 
					
						
						
						
						
							
						
						
							b0858429fb
							
						
					 | 
					
						
						
							
							更新
						
						
						
						
						
						
					 | 
					
						2022-02-17 13:58:46 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								itheinjury@163.com
							
						 
					 | 
					
						
						
						
						
							
						
						
							2f3e2a5ae8
							
						
					 | 
					
						
						
							
							更新
						
						
						
						
						
						
					 | 
					
						2022-02-17 13:58:16 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								itheinjury@163.com
							
						 
					 | 
					
						
						
						
						
							
						
						
							5b1b75cbbe
							
						
					 | 
					
						
						
							
							更新
						
						
						
						
						
						
					 | 
					
						2022-02-15 15:30:33 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							1f1b534b13
							
						
					 | 
					
						
						
							
							适配优化的api地址
						
						
						
						
						
						
					 | 
					
						2022-02-12 15:05:42 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								itheinjury@163.com
							
						 
					 | 
					
						
						
						
						
							
						
						
							bf8f8d9382
							
						
					 | 
					
						
						
							
							初始化代码 2022-02-11前 最新版本
						
						
						
						
						
						
					 | 
					
						2022-02-11 19:30:50 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							5c78711d8e
							
						
					 | 
					
						
						
							
							merge conflict origin/master
						
						
						
						
						
						
					 | 
					
						2022-02-11 15:33:28 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							acb88a6b2a
							
						
					 | 
					
						
						
							
							优化redisson配置
						
						
						
						
						
						
					 | 
					
						2022-02-11 14:54:56 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							6639ec8971
							
						
					 | 
					
						
						
							
							优化代码,增加redisson配置
						
						
						
						
						
						
					 | 
					
						2022-02-10 11:27:20 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							9aa7a6dcf3
							
						
					 | 
					
						
						
							
							优化代码,增加redisson配置
						
						
						
						
						
						
					 | 
					
						2022-02-10 11:26:10 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							3972e0231c
							
						
					 | 
					
						
						
							
							api端防重复提交
						
						
						
						
						
						
					 | 
					
						2022-01-25 10:22:45 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							cf0d1378c8
							
						
					 | 
					
						
						
							
							压测相关还原
						
						
						
						
						
						
					 | 
					
						2022-01-18 11:03:15 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								fengtianyangyang
							
						 
					 | 
					
						
						
						
						
							
						
						
							6409d0dc2d
							
						
					 | 
					
						
						
							
							'更新'
						
						
						
						
						
						
					 | 
					
						2022-01-14 11:47:56 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							65e7f9750a
							
						
					 | 
					
						
						
							
							增加获取uuid的方法,为压测环境的同一token购物车重复问题处理
						
						
						
						
						
						
					 | 
					
						2022-01-12 11:20:27 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								fengtianyangyang
							
						 
					 | 
					
						
						
						
						
							
						
						
							87f637099c
							
						
					 | 
					
						
						
							
							'合并master'
						
						
						
						
						
						
					 | 
					
						2022-01-11 14:50:06 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							9bed8e57df
							
						
					 | 
					
						
						
							
							代码处理
						
						
						
						
						
						
					 | 
					
						2022-01-10 18:34:23 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							366d1b8846
							
						
					 | 
					
						
						
							
							对限流暂时关闭
						
						
						
						
						
						
					 | 
					
						2022-01-10 17:10:19 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							f720e00132
							
						
					 | 
					
						
						
							
							验证码验证默认通过
						
						
						
						
						
						
					 | 
					
						2022-01-10 15:42:32 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								fengtianyangyang
							
						 
					 | 
					
						
						
						
						
							
						
						
							efc4b37782
							
						
					 | 
					
						
						
							
							'RequestMapping请求路径统一处理'
						
						
						
						
						
						
					 | 
					
						2021-12-15 18:32:59 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							c3fbad7dbf
							
						
					 | 
					
						
						
							
							移除mongo,将系统日志存储在es。修复拼团商品的正常购买价格为拼团价格问题
						
						
						
						
						
						
					 | 
					
						2021-12-13 18:15:37 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							90e550934d
							
						
					 | 
					
						
						
							
							merge branch "master"
						
						
						
						
						
						
					 | 
					
						2021-12-11 17:45:25 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							8616854e00
							
						
					 | 
					
						
						
							
							消息模块,会员模块,微信模块独立
						
						
						
						
						
						
					 | 
					
						2021-12-07 05:47:17 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							7b98d1d9d0
							
						
					 | 
					
						
						
							
							几个代码编译问题处理
						
						
						
						
						
						
					 | 
					
						2021-12-07 04:33:51 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							00ffd246a9
							
						
					 | 
					
						
						
							
							业务代码模块trade统一更名为order
						
						
						
						
						
						
					 | 
					
						2021-12-06 17:45:16 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							58648c3ece
							
						
					 | 
					
						
						
							
							模块隔离优化
						
						
						
						
						
						
					 | 
					
						2021-11-24 10:30:21 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							6f13218564
							
						
					 | 
					
						
						
							
							修复安全漏洞。优化代码
						
						
						
						
						
						
					 | 
					
						2021-11-11 18:15:21 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							b98e01b261
							
						
					 | 
					
						
						
							
							增加参数
						
						
						
						
						
						
					 | 
					
						2021-11-05 11:05:43 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							c5f5128b1b
							
						
					 | 
					
						
						
							
							优化LOGBACK文件,logstash参数读取spring配置文件
						
						
						
						
						
						
					 | 
					
						2021-11-04 14:39:59 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							10c3e90f54
							
						
					 | 
					
						
						
							
							更改mongo连接配置参数为可集群
						
						
						
						
						
						
					 | 
					
						2021-11-04 14:38:26 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							c85caab197
							
						
					 | 
					
						
						
							
							merge origin master
						
						
						
						
						
						
					 | 
					
						2021-11-03 15:29:48 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							956a6e465a
							
						
					 | 
					
						
						
							
							优化验证码模块相关代码,解决一个可能由于并发导致多发短信,或者多生成验证结果的情景。
						
						
						
						
						
						
					 | 
					
						2021-11-03 09:14:05 +08:00 | 
					
					
						
						
							
							
							
						
					 |