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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						1bc1be14fb
					 | 
					
						
						
							
							Merge branch 'feature/mall_product' of https://gitee.com/lanxindx/ruoyi-vue-pro into feature/mall_product
						
						
						
						
						
						
						
						# Conflicts:
#	yudao-server/src/main/resources/application-local.yaml 
						
						
					 | 
					
						2023-10-03 10:33:22 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						1f910992d6
					 | 
					
						
						
							
							trade:新增是否自提的配置项
						
						
						
						
						
						
					 | 
					
						2023-10-02 21:18:52 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								j-sentinel
							
						 
					 | 
					
						
						
							
						
						2f0483ce9f
					 | 
					
						
						
							
							[新增][定时任务]重新申请 ApiAccessLog、ApiErrorLog、JobLog 3个日志的定时清理
						
						
						
						
						
						
					 | 
					
						2023-10-02 19:18:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								j-sentinel
							
						 
					 | 
					
						
						
							
						
						11921fab5a
					 | 
					
						
						
							
							[新增][定时任务]ApiAccessLog、ApiErrorLog、JobLog 3个日志的定时清理
						
						
						
						
						
						
					 | 
					
						2023-10-01 16:53:17 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						666ba351a2
					 | 
					
						
						
							
							trade:退款理由的维护
						
						
						
						
						
						
					 | 
					
						2023-09-29 13:35:40 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						f9bf41d773
					 | 
					
						
						
							
							code review:分佣剩余部分的 review
						
						
						
						
						
						
					 | 
					
						2023-09-28 22:22:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						5913ee0706
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
						
						
						
						
						
						
						
						# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/config/YudaoJacksonAutoConfiguration.java
#	yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/ErrorCodeConstants.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/vo/activity/AppBargainActivityDetailRespVO.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/vo/activity/AppBargainActivityRespVO.java
#	yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/ErrorCodeConstants.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderSettlementReqVO.java
#	yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java
#	yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/enums/ErrorCodeConstants.java
#	yudao-server/src/main/resources/application-local.yaml 
						
						
					 | 
					
						2023-09-28 15:18:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						26dfbfb2ac
					 | 
					
						
						
							
							trade:发货逻辑,增加订单日志
						
						
						
						
						
						
					 | 
					
						2023-09-27 09:55:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						53bd1b9ec1
					 | 
					
						
						
							
							trade:订单评论超时时,自动评论
						
						
						
						
						
						
					 | 
					
						2023-09-26 23:50:54 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						a8c78f3097
					 | 
					
						
						
							
							trade:增加自动收货的 job
						
						
						
						
						
						
					 | 
					
						2023-09-26 19:27:37 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						1b154699c6
					 | 
					
						
						
							
							code review:处理错误的 mysql 连接
						
						
						
						
						
						
					 | 
					
						2023-09-20 00:10:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						ab800aa891
					 | 
					
						
						
							
							1. 简化 JsonUtils 初始化方式,去掉 BeanPostProcessor
						
						
						
						
						
						
						
						2. 减少日志打印
目的:优化启动速度 
						
						
					 | 
					
						2023-09-16 18:05:50 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						50371b3676
					 | 
					
						
						
							
							1. 禁用 member 模块
						
						
						
						
						
						
						
						2. 减少 mybatis 日志打印
3. 降低 local 环境的初始连接
目的:提升项目的启动速度 
						
						
					 | 
					
						2023-09-16 17:04:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						62c4838ba7
					 | 
					
						
						
							
							默认禁用 spring boot admin 的启动
						
						
						
						
						
						
					 | 
					
						2023-09-16 15:30:02 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						6a371f06b0
					 | 
					
						
						
							
							默认禁用 spring data redis repositories,一方面没用到,一方面提高启动速度
						
						
						
						
						
						
					 | 
					
						2023-09-16 13:29:47 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						f0f5b52150
					 | 
					
						
						
							
							默认禁用 quartz 依赖,保证启动速度
						
						
						
						
						
						
					 | 
					
						2023-09-16 12:50:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xiaqing
							
						 
					 | 
					
						
						
							
						
						e893cfd757
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
						
						
						
						
						
						
						
						# Conflicts:
#	yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/signin/MemberSignInRecordConvert.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/signin/MemberSignInRecordMapper.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/signin/MemberSignInRecordService.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/signin/MemberSignInRecordServiceImpl.java 
						
						
					 | 
					
						2023-09-15 15:27:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xiaqing
							
						 
					 | 
					
						
						
							
						
						9d262e8e7f
					 | 
					
						
						
							
							新增两个APP端接口
						
						
						
						
						
						
						
						1.获取用户个人签到信息
2.用户签到接接口 
						
						
					 | 
					
						2023-09-15 15:20:39 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						8b50cd9661
					 | 
					
						
						
							
							Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
						
						
						
						
						
						
						
						 Conflicts:
	yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/ErrorCodeConstants.java
	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/combination/AppCombinationRecordController.java
	yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/ErrorCodeConstants.java
	yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java
	yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/enums/ErrorCodeConstants.java 
						
						
					 | 
					
						2023-09-11 16:19:55 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						314dee430e
					 | 
					
						
						
							
							bugfix:微信公众号登录报 access token 的问题
						
						
						
						
						
						
					 | 
					
						2023-09-11 11:06:42 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						40e1a879e3
					 | 
					
						
						
							
							登录:社交登录时,额外返回 openid
						
						
						
						
						
						
					 | 
					
						2023-09-10 18:01:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						5a940b1d2c
					 | 
					
						
						
							
							修复 knife4j get 参数无法正确展示的问题
						
						
						
						
						
						
					 | 
					
						2023-09-09 15:04:22 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xiaqing
							
						 
					 | 
					
						
						
							
						
						db1f44305d
					 | 
					
						
						
							
							会员积分和会员签到模块todo修改
						
						
						
						
						
						
					 | 
					
						2023-08-19 14:09:47 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xiaqing
							
						 
					 | 
					
						
						
							
						
						2e9dfac9ab
					 | 
					
						
						
							
							会员积分和会员签到模块todo修改
						
						
						
						
						
						
					 | 
					
						2023-08-19 14:09:22 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						e4a2c738b2
					 | 
					
						
						
							
							订单:
						
						
						
						
						
						
						
						1. 增加查询物流接口 
						
						
					 | 
					
						2023-08-15 20:18:22 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						be2ee905df
					 | 
					
						
						
							
							code review:积分模块的实现
						
						
						
						
						
						
					 | 
					
						2023-08-11 23:49:20 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xiaqing
							
						 
					 | 
					
						
						
							
						
						d397758dd1
					 | 
					
						
						
							
							还原配置文件
						
						
						
						
						
						
					 | 
					
						2023-08-09 22:39:12 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xiaqing
							
						 
					 | 
					
						
						
							
						
						33323c1483
					 | 
					
						
						
							
							会员签到针对代码格式、功能优化
						
						
						
						
						
						
						
						1.优化todo建议
2.删除无用代码 
						
						
					 | 
					
						2023-08-09 16:13:35 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						68049b85b9
					 | 
					
						
						
							
							基于 Redis 实现的 pubsub、stream 消息队列,支持开启或关闭。默认为关闭状态,项目启动更快
						
						
						
						
						
						
					 | 
					
						2023-07-29 12:04:50 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						7f657ee931
					 | 
					
						
						
							
							优化 mp-java 库的依赖管理
						
						
						
						
						
						
					 | 
					
						2023-07-27 23:15:49 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |