YunaiV
							
						 
					 | 
					
						
						
							
						
						7731b4f503
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/dev-yunai
						
						
						
						
						
						
					 | 
					
						2023-02-01 21:09:29 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						987fcd366c
					 | 
					
						
						
							
							完善 LoginLogServiceImplTest 单元测试
						
						
						
						
						
						
					 | 
					
						2023-02-01 08:17:03 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						fed9feb05f
					 | 
					
						
						
							
							完善 DictTypeServiceImpl 单元测试
						
						
						
						
						
						
					 | 
					
						2023-02-01 07:45:57 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						08a4de37c2
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into feature/springdoc
						
						
						
						
						
						
						
						# Conflicts:
#	README.md 
						
						
					 | 
					
						2023-01-30 10:08:31 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						ca8bb72417
					 | 
					
						
						
							
							版本 1.7.0 发布:增加微信公众号、站内信、邮箱、数据脱敏!
						
						
						
						
						
						
					 | 
					
						2023-01-30 02:30:42 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						ffb0358ce2
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into feature/springdoc
						
						
						
						
						
						
					 | 
					
						2023-01-29 16:11:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						ae3ee95cdd
					 | 
					
						
						
							
							站内信模块:整体功能实现
						
						
						
						
						
						
					 | 
					
						2023-01-28 20:10:19 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						c0b029b244
					 | 
					
						
						
							
							邮箱模块:完善 template 的单元测试
						
						
						
						
						
						
					 | 
					
						2023-01-26 23:32:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						0895ee7d98
					 | 
					
						
						
							
							邮箱模块:完善 account 的单元测试
						
						
						
						
						
						
					 | 
					
						2023-01-26 23:04:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						179fdc8464
					 | 
					
						
						
							
							优化 xss 的代码实现,独立 xss 包
						
						
						
						
						
						
					 | 
					
						2023-01-25 11:17:52 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						c744e115e3
					 | 
					
						
						
							
							简化本地缓存的实现,萌新更容易看懂!
						
						
						
						
						
						
					 | 
					
						2023-01-25 10:11:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						0763c720d2
					 | 
					
						
						
							
							优化脱敏组件的注释
						
						
						
						
						
						
					 | 
					
						2023-01-21 13:17:08 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						e7f8e0c507
					 | 
					
						
						
							
							!372 支持 vo 返回脱敏
						
						
						
						
						
						
						
						Merge pull request !372 from 与或非/issues/I3QPZV 
						
						
					 | 
					
						2023-01-19 13:59:34 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								gaibu
							
						 
					 | 
					
						
						
							
						
						729ec31dab
					 | 
					
						
						
							
							feat: 修改脱敏注解名称
						
						
						
						
						
						
					 | 
					
						2023-01-19 20:16:03 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						6b1f3140b8
					 | 
					
						
						
							
							spring doc:移除多余字段~
						
						
						
						
						
						
					 | 
					
						2023-01-19 15:22:58 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						d193d2dd4a
					 | 
					
						
						
							
							spring doc:支持通过 springdoc.api-docs 禁用
						
						
						
						
						
						
					 | 
					
						2023-01-19 15:15:40 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						711a39b8e9
					 | 
					
						
						
							
							spring doc:增加模块分组
						
						
						
						
						
						
					 | 
					
						2023-01-19 15:03:46 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								gaibu
							
						 
					 | 
					
						
						
							
						
						2aa208f441
					 | 
					
						
						
							
							feat: 脱敏组件代码规范更新
						
						
						
						
						
						
					 | 
					
						2023-01-19 10:35:54 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						6593ec4214
					 | 
					
						
						
							
							code review 脱敏组件的代码
						
						
						
						
						
						
					 | 
					
						2023-01-19 10:25:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						2a332a95f9
					 | 
					
						
						
							
							!376 重构 滑块验证码实现 vue3 自动引入
						
						
						
						
						
						
						
						Merge pull request !376 from xingyu/dev 
						
						
					 | 
					
						2023-01-19 01:24:20 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						ba65a864fa
					 | 
					
						
						
							
							perf: 优化Springdoc配置
						
						
						
						
						
						
					 | 
					
						2023-01-18 17:40:49 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						f2adb441cd
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into feature/springdoc
						
						
						
						
						
						
						
						# Conflicts:
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserSimpleRespVO.java 
						
						
					 | 
					
						2023-01-18 15:39:58 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						5e9706007e
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/wechat-mp
						
						
						
						
						
						
						
						# Conflicts:
#	yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/DefaultDatabaseQueryTest.java 
						
						
					 | 
					
						2023-01-18 00:38:55 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						13afc3d57a
					 | 
					
						
						
							
							feat: springdoc
						
						
						
						
						
						
					 | 
					
						2023-01-17 21:25:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						0ef05fba7c
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/dev' into feature/springdoc
						
						
						
						
						
						
						
						# Conflicts:
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/captcha/CaptchaController.java 
						
						
					 | 
					
						2023-01-17 21:18:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						0ebba2eb81
					 | 
					
						
						
							
							移除springfox配置
						
						
						
						
						
						
					 | 
					
						2023-01-17 20:47:07 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						3d390d0d8f
					 | 
					
						
						
							
							feat: knife4j
						
						
						
						
						
						
					 | 
					
						2023-01-17 20:42:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						8c4bc638a4
					 | 
					
						
						
							
							chore: captcha-plus
						
						
						
						
						
						
					 | 
					
						2023-01-17 16:57:10 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								gaibu
							
						 
					 | 
					
						
						
							
						
						42bc0d1519
					 | 
					
						
						
							
							feat: 脱敏组件增加单元测试
						
						
						
						
						
						
					 | 
					
						2023-01-17 11:28:33 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								gaibu
							
						 
					 | 
					
						
						
							
						
						7b3fca2844
					 | 
					
						
						
							
							feat: 脱敏组件代码规范更新
						
						
						
						
						
						
					 | 
					
						2023-01-17 10:52:37 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						32d7d6ab29
					 | 
					
						
						
							
							code review 脱敏组件的代码
						
						
						
						
						
						
					 | 
					
						2023-01-17 08:11:57 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						4d35bcef65
					 | 
					
						
						
							
							feat: springdoc success
						
						
						
						
						
						
					 | 
					
						2023-01-16 22:58:56 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								gaibu
							
						 
					 | 
					
						
						
							
						
						e5ab9b71b6
					 | 
					
						
						
							
							feat: 完善注释
						
						
						
						
						
						
					 | 
					
						2023-01-16 21:50:09 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								gaibu
							
						 
					 | 
					
						
						
							
						
						c60f8d6da2
					 | 
					
						
						
							
							feat: 支持 vo 返回的脱敏
						
						
						
						
						
						
					 | 
					
						2023-01-16 21:45:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						cba69e94df
					 | 
					
						
						
							
							revert: file
						
						
						
						
						
						
					 | 
					
						2023-01-16 15:15:31 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						1c0d8fc1eb
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/dev' into feature/springdoc
						
						
						
						
						
						
						
						# Conflicts:
#	yudao-dependencies/pom.xml
#	yudao-framework/yudao-spring-boot-starter-web/pom.xml
#	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/swagger/config/YudaoSwaggerAutoConfiguration.java
#	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/swagger/core/SpringFoxHandlerProviderBeanPostProcessor.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/captcha/CaptchaController.java 
						
						
					 | 
					
						2023-01-16 14:25:03 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						b4b23596a5
					 | 
					
						
						
							
							feat: 升级 knife4j 4.0
						
						
						
						
						
						
					 | 
					
						2023-01-16 14:22:39 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						55db35e31b
					 | 
					
						
						
							
							chore: update deps
						
						
						
						
						
						
					 | 
					
						2023-01-16 13:43:05 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						fffe3008b5
					 | 
					
						
						
							
							refactor: captcha-plus
						
						
						
						
						
						
					 | 
					
						2023-01-16 10:47:39 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						aaf62982e2
					 | 
					
						
						
							
							feat: 优化 captcha 代码
						
						
						
						
						
						
					 | 
					
						2023-01-12 21:51:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						865f101070
					 | 
					
						
						
							
							feat: 将aj-captcha换为源码导入
						
						
						
						
						
						
					 | 
					
						2023-01-12 20:57:11 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								gaibu
							
						 
					 | 
					
						
						
							
						
						61a34ddac5
					 | 
					
						
						
							
							feat: 支持 vo 返回的脱敏
						
						
						
						
						
						
					 | 
					
						2023-01-12 19:57:11 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								gaibu
							
						 
					 | 
					
						
						
							
						
						70f15ab60d
					 | 
					
						
						
							
							feat: 增加注释
						
						
						
						
						
						
					 | 
					
						2023-01-12 15:43:31 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								gaibu
							
						 
					 | 
					
						
						
							
						
						cd9bcda935
					 | 
					
						
						
							
							feat: 支持 vo 返回的脱敏
						
						
						
						
						
						
					 | 
					
						2023-01-12 15:31:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								gaibu
							
						 
					 | 
					
						
						
							
						
						5c8e41b847
					 | 
					
						
						
							
							feat: 支持 vo 返回的脱敏
						
						
						
						
						
						
					 | 
					
						2023-01-12 14:54:33 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xingyu
							
						 
					 | 
					
						
						
							
						
						3df825034b
					 | 
					
						
						
							
							chore: update deps
						
						
						
						
						
						
					 | 
					
						2023-01-12 13:58:32 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								gaibu
							
						 
					 | 
					
						
						
							
						
						099754c26e
					 | 
					
						
						
							
							fix: xss 启用后编辑器上传图片错误
						
						
						
						
						
						
					 | 
					
						2023-01-10 19:27:24 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								gaibu
							
						 
					 | 
					
						
						
							
						
						e637bff8cd
					 | 
					
						
						
							
							feat: 支持 vo 返回的脱敏
						
						
						
						
						
						
					 | 
					
						2023-01-10 15:10:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								gaibu
							
						 
					 | 
					
						
						
							
						
						d7bec143fd
					 | 
					
						
						
							
							fix: xss 启用后编辑器上传图片错误
						
						
						
						
						
						
					 | 
					
						2023-01-09 13:23:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						b9246d1543
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/wechat-mp
						
						
						
						
						
						
						
						# Conflicts:
#	yudao-server/src/main/resources/application.yaml 
						
						
					 | 
					
						2023-01-07 18:57:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |