YunaiV
							
						 
					 | 
					
						
						
							
						
						22686bafa2
					 | 
					
						
						
							
							【代码优化】SYSTEM:增加新阿里云 SmsClient 的单测
						
						
						
						
						
						
					 | 
					
						2024-08-09 20:41:35 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						0c8ee55a17
					 | 
					
						
						
							
							【代码优化】SYSTEM:去除阿里云短信的 maven 依赖
						
						
						
						
						
						
					 | 
					
						2024-08-09 00:28:20 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						dc267ea568
					 | 
					
						
						
							
							Merge branch 'develop' of https://gitee.com/scholarli/ruoyi-vue-pro_1 into develop
						
						
						
						
						
						
						
						# Conflicts:
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/sms/core/client/impl/AliyunSmsClient.java 
						
						
					 | 
					
						2024-08-09 00:16:41 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								scholar
							
						 
					 | 
					
						
						
							
						
						2f38261de8
					 | 
					
						
						
							
							阿里云短信fix urlencode问题
						
						
						
						
						
						
					 | 
					
						2024-08-08 22:16:23 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						8775472af7
					 | 
					
						
						
							
							【代码评审】门店自提:相关代码的优化、以及 todo 评审
						
						
						
						
						
						
					 | 
					
						2024-08-07 22:09:31 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						5b59ce5261
					 | 
					
						
						
							
							!1031 【代码优化】MALL-TRADE:订单结算信息返回积分相关信息
						
						
						
						
						
						
						
						Merge pull request !1031 from puhui999/develop 
						
						
					 | 
					
						2024-08-07 13:24:51 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						8eb82f0b59
					 | 
					
						
						
							
							【代码优化】SYSTEM:去除腾讯云短信的 maven 依赖
						
						
						
						
						
						
					 | 
					
						2024-08-07 21:20:29 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						44014c7772
					 | 
					
						
						
							
							!1030 阿里云短信修改为基于API方式,减少SDK依赖
						
						
						
						
						
						
						
						Merge pull request !1030 from scholarli/develop 
						
						
					 | 
					
						2024-08-07 13:12:20 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						4322e2f8e1
					 | 
					
						
						
							
							【代码优化】腾讯云短信功能还需要 tencentcloud-sdk
						
						
						
						
						
						
					 | 
					
						2024-08-07 17:31:46 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						cd03ddddb3
					 | 
					
						
						
							
							Merge remote-tracking branch 'refs/remotes/yudao/develop' into develop
						
						
						
						
						
						
					 | 
					
						2024-08-07 17:09:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						24b1594976
					 | 
					
						
						
							
							【代码优化】MALL-TRADE:订单结算信息返回积分相关信息
						
						
						
						
						
						
					 | 
					
						2024-08-07 17:09:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						30c6f1eb77
					 | 
					
						
						
							
							【代码优化】SYSTEM:去除阿里云短信的 maven 依赖
						
						
						
						
						
						
					 | 
					
						2024-08-07 13:03:42 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								scholar
							
						 
					 | 
					
						
						
							
						
						2192129220
					 | 
					
						
						
							
							完成todo部分的修改
						
						
						
						
						
						
					 | 
					
						2024-08-07 10:52:07 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						2dd66847cf
					 | 
					
						
						
							
							Merge branch 'develop' of https://gitee.com/scholarli/ruoyi-vue-pro_1 into develop
						
						
						
						
						
						
						
						# Conflicts:
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/sms/core/client/impl/HuaweiSmsClient.java 
						
						
					 | 
					
						2024-08-03 19:54:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						7ba3b12313
					 | 
					
						
						
							
							【优化】数据脱敏支持 Spring el 表达式,支持根据权限控制脱敏
						
						
						
						
						
						
					 | 
					
						2024-08-03 18:48:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						8c2b8ed894
					 | 
					
						
						
							
							Merge branch 'develop' of https://github.com/YunaiV/ruoyi-vue-pro into develop
						
						
						
						
						
						
					 | 
					
						2024-08-03 18:47:37 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						55fec9e8ef
					 | 
					
						
						
							
							Merge pull request #605 from craftsman4j/dev-0712-sensitive
						
						
						
						
						
						
						
						【优化】数据脱敏支持 Spring el 表达式,支持根据权限控制脱敏 
						
						
					 | 
					
						2024-08-03 18:47:23 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						760b4c147d
					 | 
					
						
						
							
							Merge branch 'dev-0712-sensitive' of https://github.com/craftsman4j/ruoyi-vue-pro into develop
						
						
						
						
						
						
					 | 
					
						2024-08-03 16:54:17 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						1eb07b8389
					 | 
					
						
						
							
							V2.2.0 版本发布
						
						
						
						
						
						
					 | 
					
						2024-08-02 23:11:13 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						7de546385a
					 | 
					
						
						
							
							【代码优化】SYSTEM:微信小程序的订阅
						
						
						
						
						
						
					 | 
					
						2024-08-01 23:21:14 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						abe2f8580b
					 | 
					
						
						
							
							【代码优化】SYSTEM:微信小程序的订阅
						
						
						
						
						
						
					 | 
					
						2024-07-31 23:47:02 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zhougang
							
						 
					 | 
					
						
						
							
						
						08e1c69d10
					 | 
					
						
						
							
							【优化】数据脱敏支持 Spring el 表达式,支持根据权限控制脱敏
						
						
						
						
						
						
					 | 
					
						2024-07-31 22:43:48 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						ba18788517
					 | 
					
						
						
							
							【代码优化】SYSTEM:微信小程序的订阅
						
						
						
						
						
						
					 | 
					
						2024-07-31 19:48:02 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						1f65dd2ec9
					 | 
					
						
						
							
							!1027 【新增】MALL:拼团结果通知订阅消息
						
						
						
						
						
						
						
						Merge pull request !1027 from puhui999/develop 
						
						
					 | 
					
						2024-07-31 11:38:44 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						b678da810e
					 | 
					
						
						
							
							【新增】MALL:拼团结果通知订阅消息
						
						
						
						
						
						
					 | 
					
						2024-07-31 16:26:08 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						e860314b20
					 | 
					
						
						
							
							!1025 【代码优化】SYSTEM:订阅消息跳转小程序类型
						
						
						
						
						
						
						
						Merge pull request !1025 from puhui999/develop 
						
						
					 | 
					
						2024-07-31 05:45:14 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						2bc96fe521
					 | 
					
						
						
							
							【代码优化】SYSTEM:订阅消息跳转小程序类型
						
						
						
						
						
						
					 | 
					
						2024-07-31 12:58:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						0e24994c92
					 | 
					
						
						
							
							Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop
						
						
						
						
						
						
					 | 
					
						2024-07-30 23:12:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						7782b36f90
					 | 
					
						
						
							
							【代码优化】SYSTEM:微信小程序的订阅
						
						
						
						
						
						
					 | 
					
						2024-07-30 23:12:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						9058c152d8
					 | 
					
						
						
							
							!1024 【新增】MALL: 订单发货订阅消息、钱包退款订阅消息
						
						
						
						
						
						
						
						Merge pull request !1024 from puhui999/develop 
						
						
					 | 
					
						2024-07-30 14:30:49 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						0cca6be63a
					 | 
					
						
						
							
							【新增】MALL: 订单发货订阅消息
						
						
						
						
						
						
					 | 
					
						2024-07-30 16:55:58 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						5307852fb2
					 | 
					
						
						
							
							【优化】SYSTEM: 小程序订阅模版获取增加缓存
						
						
						
						
						
						
					 | 
					
						2024-07-30 16:05:25 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						4c846ef4ce
					 | 
					
						
						
							
							【新增】MALL: 新增退款订阅消息发送
						
						
						
						
						
						
					 | 
					
						2024-07-30 15:40:21 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						a9862b798d
					 | 
					
						
						
							
							【代码评审】SYSTEM:微信小程序的订阅
						
						
						
						
						
						
					 | 
					
						2024-07-30 12:57:32 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						3be6ee271b
					 | 
					
						
						
							
							!1023 【优化】SYSTEM: 根据代码评审优化订阅消息
						
						
						
						
						
						
						
						Merge pull request !1023 from puhui999/develop 
						
						
					 | 
					
						2024-07-30 04:44:00 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						ab4e10ccf8
					 | 
					
						
						
							
							【优化】SYSTEM: 根据代码评审优化订阅消息
						
						
						
						
						
						
					 | 
					
						2024-07-30 12:22:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						f10840afb8
					 | 
					
						
						
							
							【优化】SYSTEM: 根据代码评审优化订阅消息
						
						
						
						
						
						
					 | 
					
						2024-07-30 12:19:31 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						29ade63f87
					 | 
					
						
						
							
							【代码优化】AI:image 作品中心的代码
						
						
						
						
						
						
					 | 
					
						2024-07-30 00:01:08 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						d0cec28bfd
					 | 
					
						
						
							
							【代码优化】SYSTEM:优化用户导入的实现
						
						
						
						
						
						
					 | 
					
						2024-07-29 19:43:08 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						36765d53a1
					 | 
					
						
						
							
							!1017 bugfix-导入系统用户时,增加注解校验过程,与界面添加和修改用户保持一致
						
						
						
						
						
						
						
						Merge pull request !1017 from 尹先生/master-jdk17 
						
						
					 | 
					
						2024-07-29 11:36:45 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						c69d502fde
					 | 
					
						
						
							
							!1022 【优化】idea在debug时toString方法报错StackOverflowError、指定jackson默认序列化时双向引用的前向、后向出口避免死循环报错
						
						
						
						
						
						
						
						Merge pull request !1022 from 常柯柯/master-jdk17 
						
						
					 | 
					
						2024-07-29 11:32:48 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						345f41b153
					 | 
					
						
						
							
							【代码评审】SYSTEM:订阅消息
						
						
						
						
						
						
					 | 
					
						2024-07-29 19:18:23 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						f46d47a966
					 | 
					
						
						
							
							Merge branch 'develop' of https://gitee.com/puhui999/ruoyi-vue-pro into develop
						
						
						
						
						
						
						
						# Conflicts:
#	yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/MessageTemplateConstants.java
#	yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/enums/MessageTemplateConstants.java 
						
						
					 | 
					
						2024-07-29 19:09:08 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						512d68f793
					 | 
					
						
						
							
							【代码评审】SYSTEM:订阅消息
						
						
						
						
						
						
					 | 
					
						2024-07-29 19:03:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								常柯柯
							
						 
					 | 
					
						
						
							
						
						ac39a80552
					 | 
					
						
						
							
							!1 【代码优化】全局:Area 在 IDEA debug 时 toString 方法报错StackOverflowError、指定 jackson 默认序列化时双向引用的前向、后向出口避免死循环报错
						
						
						
						
						
						
						
						Merge pull request !1 from 常柯柯/N/A 
						
						
					 | 
					
						2024-07-29 09:42:26 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								常柯柯
							
						 
					 | 
					
						
						
							
						
						18cf9e55e1
					 | 
					
						
						
							
							【代码优化】全局:Area 在 IDEA debug 时 toString 方法报错StackOverflowError、指定 jackson 默认序列化时双向引用的前向、后向出口避免死循环报错
						
						
						
						
						
						
						
						Signed-off-by: 常柯柯 <88455621@qq.com> 
						
						
					 | 
					
						2024-07-29 09:40:13 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						e782077e23
					 | 
					
						
						
							
							Merge remote-tracking branch 'refs/remotes/yudao/develop' into develop
						
						
						
						
						
						
					 | 
					
						2024-07-29 17:15:05 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								puhui999
							
						 
					 | 
					
						
						
							
						
						9a926e251b
					 | 
					
						
						
							
							【新增】mall: 钱包充值成功发送订阅消息
						
						
						
						
						
						
					 | 
					
						2024-07-29 17:14:41 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						008b544f03
					 | 
					
						
						
							
							!1019 【优化】SYSTEM: 根据代码评审优化小程序的订阅消息
						
						
						
						
						
						
						
						Merge pull request !1019 from puhui999/develop 
						
						
					 | 
					
						2024-07-29 01:39:01 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						934b0ef69c
					 | 
					
						
						
							
							V2.2.0 版本的 SQL
						
						
						
						
						
						
					 | 
					
						2024-07-28 23:20:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |