lwf
							
						 
					 | 
					
						
						
							
						
						414c1be128
					 | 
					
						
						
							
							feature(使用redis缓存): 功能合并
						
						
						
						
						
						
						
						1、缓存改为Redis缓存,不在启动时缓存,使用时候根据数据源缓存
2、前端登录接口调整 
						
						
					 | 
					
						2023-07-26 17:20:54 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						654b70c514
					 | 
					
						
						
							
							mall + pay:
						
						
						
						
						
						
						
						1. 增加通知管理 
						
						
					 | 
					
						2023-07-20 22:48:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						b84da30234
					 | 
					
						
						
							
							mall + pay:
						
						
						
						
						
						
						
						1. 优化订单管理的接口实现
2. 支付状态增加 refund 类型,将 refund status 合并进去 
						
						
					 | 
					
						2023-07-19 21:09:02 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						518e89dc4b
					 | 
					
						
						
							
							mall + pay:
						
						
						
						
						
						
						
						1. 重构支付回调的逻辑,将回调解析改成 PayOrderRespDTO,为后续轮询做铺垫
2. 调整退款单的表结构
3. 调整退款调用的实现 
						
						
					 | 
					
						2023-07-15 10:35:41 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zhijiantianya@gmail.com
							
						 
					 | 
					
						
						
							
						
						47ba5b7b44
					 | 
					
						
						
							
							by gateway: 支付渠道的代码优化
						
						
						
						
						
						
					 | 
					
						2023-07-12 20:34:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						5d2d52020e
					 | 
					
						
						
							
							mall + pay:简化 pay 的复杂度
						
						
						
						
						
						
						
						1. 移除 merchant 表设计
2. 移除 app 和 channel 的导出 
						
						
					 | 
					
						2023-07-09 12:40:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								VT1996
							
						 
					 | 
					
						
						
							
						
						22c70df111
					 | 
					
						
						
							
							bugfix:解决公众号粉丝同步api配置错误
						
						
						
						
						
						
					 | 
					
						2023-05-28 14:56:41 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						04c3cdf372
					 | 
					
						
						
							
							增加 swagger、druid、skywalking、admin 的自定义路径
						
						
						
						
						
						
					 | 
					
						2023-04-07 23:25:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						eb660ca619
					 | 
					
						
						
							
							pay:示例订单,增加发起退款的操作
						
						
						
						
						
						
					 | 
					
						2023-02-15 22:40:56 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						4d2ebcd898
					 | 
					
						
						
							
							pay:前端收银台接入支付宝扫码
						
						
						
						
						
						
					 | 
					
						2023-02-15 00:11:34 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						84e9c0bba0
					 | 
					
						
						
							
							pay:前端收银台的信息接入
						
						
						
						
						
						
					 | 
					
						2023-02-13 23:59:03 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						7fbdfec396
					 | 
					
						
						
							
							增加接入示例的查询
						
						
						
						
						
						
					 | 
					
						2023-02-11 23:04:35 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						2ea9027031
					 | 
					
						
						
							
							mp user => mp mpuser
						
						
						
						
						
						
					 | 
					
						2023-01-31 13:22:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						91dd4a32b1
					 | 
					
						
						
							
							站内信模块:vue3 站内信弹板
						
						
						
						
						
						
					 | 
					
						2023-01-29 09:26:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						ae3ee95cdd
					 | 
					
						
						
							
							站内信模块:整体功能实现
						
						
						
						
						
						
					 | 
					
						2023-01-28 20:10:19 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						143035d798
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/notify
						
						
						
						
						
						
						
						# Conflicts:
#	sql/mysql/ruoyi-vue-pro.sql
#	yudao-ui-admin/src/utils/dict.js 
						
						
					 | 
					
						2023-01-27 23:25:08 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						c0b029b244
					 | 
					
						
						
							
							邮箱模块:完善 template 的单元测试
						
						
						
						
						
						
					 | 
					
						2023-01-26 23:32:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						525078abd3
					 | 
					
						
						
							
							邮箱模块:完善 log 相关的逻辑
						
						
						
						
						
						
					 | 
					
						2023-01-26 20:39:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						ea39dcc5c8
					 | 
					
						
						
							
							邮箱模块:完善 template 模版的增删改查功能
						
						
						
						
						
						
					 | 
					
						2023-01-25 20:44:48 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						0262fa5c15
					 | 
					
						
						
							
							邮箱模块:完善 account 账号的增删改查功能
						
						
						
						
						
						
					 | 
					
						2023-01-25 17:48:09 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						68ef11ee87
					 | 
					
						
						
							
							mp:完善微信公众号的消息
						
						
						
						
						
						
					 | 
					
						2023-01-17 23:20:56 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						1e402d8063
					 | 
					
						
						
							
							mp:增加【自动回复】的前端实现
						
						
						
						
						
						
					 | 
					
						2023-01-17 00:01:07 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						2173cf0364
					 | 
					
						
						
							
							mp:menu 前端接入菜单的保存、清空操作
						
						
						
						
						
						
					 | 
					
						2023-01-15 00:54:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						02ec5d455c
					 | 
					
						
						
							
							mp:1)引入 less-loader,解决 menu 的 less 样式;2)接入菜单列表接口
						
						
						
						
						
						
					 | 
					
						2023-01-14 21:24:14 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						5a1d02dffd
					 | 
					
						
						
							
							mp:素材管理,增加【图片】
						
						
						
						
						
						
					 | 
					
						2023-01-14 15:46:35 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						d1cbe0c3fd
					 | 
					
						
						
							
							mp:增加图文草稿箱的删除、发布功能
						
						
						
						
						
						
					 | 
					
						2023-01-14 10:21:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						90ffe5adb7
					 | 
					
						
						
							
							mp:增加图文草稿箱的修改;优化前端代码
						
						
						
						
						
						
					 | 
					
						2023-01-14 09:17:01 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						4080d2de9b
					 | 
					
						
						
							
							mp:初步实现【草稿】的前端新增
						
						
						
						
						
						
					 | 
					
						2023-01-14 00:17:35 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						1e63198f4a
					 | 
					
						
						
							
							mp:完善【发布功能】的相关代码
						
						
						
						
						
						
					 | 
					
						2023-01-13 07:33:25 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						9f7b646f6c
					 | 
					
						
						
							
							mp:增加发送【图文】消息
						
						
						
						
						
						
					 | 
					
						2023-01-13 00:07:13 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						02ccf52d6c
					 | 
					
						
						
							
							mp:增加发送【图文】消息
						
						
						
						
						
						
					 | 
					
						2023-01-12 23:57:17 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						5901ab6664
					 | 
					
						
						
							
							mp:增加 server 草稿箱的分页、添加;已发布的分页、提交
						
						
						
						
						
						
					 | 
					
						2023-01-12 22:49:55 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						188d880239
					 | 
					
						
						
							
							mp:增加【图片】素材的选择
						
						
						
						
						
						
					 | 
					
						2023-01-12 13:51:46 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						541ee81300
					 | 
					
						
						
							
							mp:前端接入发送消息
						
						
						
						
						
						
					 | 
					
						2023-01-10 23:24:08 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						9ec2f8b60f
					 | 
					
						
						
							
							mp:梳理 message 的前端和后端代码
						
						
						
						
						
						
					 | 
					
						2023-01-08 18:57:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						2ac2af64d4
					 | 
					
						
						
							
							mp:实现 user 的 ui 界面
						
						
						
						
						
						
					 | 
					
						2023-01-08 17:33:11 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						a341c44c4d
					 | 
					
						
						
							
							mp:实现 tag 模块的前端界面
						
						
						
						
						
						
					 | 
					
						2023-01-08 12:12:31 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						d6de233a47
					 | 
					
						
						
							
							mp:完成公众号的数据统计前端界面
						
						
						
						
						
						
					 | 
					
						2023-01-08 00:36:25 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						d0934510af
					 | 
					
						
						
							
							mp:完成公众号统计的用户累计数据、消息概况数据
						
						
						
						
						
						
					 | 
					
						2023-01-07 23:49:50 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						09e200c364
					 | 
					
						
						
							
							mp:完成公众号统计的用户增减数据
						
						
						
						
						
						
					 | 
					
						2023-01-07 22:35:30 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						39b2afd506
					 | 
					
						
						
							
							mp:完成的公众号的管理界面
						
						
						
						
						
						
					 | 
					
						2023-01-07 18:31:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						627cb39517
					 | 
					
						
						
							
							mp:完善公众号的账号管理
						
						
						
						
						
						
					 | 
					
						2023-01-01 20:39:47 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						48520a456b
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/wechat-mp
						
						
						
						
						
						
						
						# Conflicts:
#	pom.xml
#	sql/mysql/ruoyi-vue-pro.sql
#	yudao-dependencies/pom.xml
#	yudao-framework/yudao-spring-boot-starter-biz-weixin/pom.xml
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsCallbackController.java
#	yudao-server/pom.xml
#	yudao-server/src/main/resources/admin-ui/static/js/4.js
#	yudao-server/src/main/resources/admin-ui/static/js/chunk-vendors.js
#	yudao-server/src/main/resources/application-local.yaml
#	yudao-ui-admin/yarn.lock 
						
						
					 | 
					
						2023-01-01 18:11:23 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						92632c046c
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
						
						
						
						
						
						
						
						# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/config/YudaoJacksonAutoConfiguration.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/notify/PayNotifyServiceImpl.java
#	yudao-ui-admin/src/views/mall/trade/order/index.vue 
						
						
					 | 
					
						2022-12-23 19:12:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						7a4a6a3046
					 | 
					
						
						
							
							product:优化管理后台相关的接口
						
						
						
						
						
						
						
						area:增加地区列表界面 
						
						
					 | 
					
						2022-12-23 18:47:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								luowenfeng
							
						 
					 | 
					
						
						
							
						
						826a564abd
					 | 
					
						
						
							
							站内信开发
						
						
						
						
						
						
					 | 
					
						2022-12-17 16:41:14 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						4a2cb33cd7
					 | 
					
						
						
							
							product:优化商品属性值的代码
						
						
						
						
						
						
					 | 
					
						2022-12-12 23:40:23 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						98ca807d4b
					 | 
					
						
						
							
							product:优化商品属性项的代码
						
						
						
						
						
						
					 | 
					
						2022-12-12 22:25:31 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						c5408965eb
					 | 
					
						
						
							
							trade:增加管理后台的订单详情接口
						
						
						
						
						
						
					 | 
					
						2022-12-10 17:53:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						fac3e7c726
					 | 
					
						
						
							
							product:商品规格,调整成商品属性,避免和 sku 概念冲突
						
						
						
						
						
						
					 | 
					
						2022-12-08 21:12:35 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |