dxyx
							
						 
					 | 
					
						
						
							
						
						bec7167524
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:zhijiantianya/ruoyi-vue-pro into master
						
						
						
						
						
						
					 | 
					
						2021-03-17 21:17:08 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								asas6559
							
						 
					 | 
					
						
						
							
						
						49f25a8870
					 | 
					
						
						
							
							解决由于mybatis-plus无法过滤软删除导致角色去掉菜单缓存未刷新的问题
						
						
						
						
						
						
					 | 
					
						2021-03-17 21:13:13 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						517842c20c
					 | 
					
						
						
							
							!21 job 单元测试增加校验调用
						
						
						
						
						
						
						
						Merge pull request !21 from neilz/feature/ut-job 
						
						
					 | 
					
						2021-03-16 00:58:20 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						7d45cfa33a
					 | 
					
						
						
							
							!22 个人信息 修改信息、修改密码
						
						
						
						
						
						
						
						Merge pull request !22 from niu_dehua/feat_userprofile 
						
						
					 | 
					
						2021-03-16 00:57:28 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								niudehua
							
						 
					 | 
					
						
						
							
						
						b621f15b0b
					 | 
					
						
						
							
							个人信息 修改信息、修改密码
						
						
						
						
						
						
					 | 
					
						2021-03-15 23:58:37 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dylan
							
						 
					 | 
					
						
						
							
						
						54378aeed3
					 | 
					
						
						
							
							完成错误码
						
						
						
						
						
						
					 | 
					
						2021-03-15 21:51:00 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								neilz
							
						 
					 | 
					
						
						
							
						
						15391dd394
					 | 
					
						
						
							
							job 单元测试增加校验调用
						
						
						
						
						
						
					 | 
					
						2021-03-15 07:53:29 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						d5fb438f59
					 | 
					
						
						
							
							!20 Job 模块单元测试
						
						
						
						
						
						
						
						Merge pull request !20 from neilz/feature/ut-job 
						
						
					 | 
					
						2021-03-14 23:54:25 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						97e842a59f
					 | 
					
						
						
							
							完善 role、user、menu 删除时,对权限的影响
						
						
						
						
						
						
					 | 
					
						2021-03-14 23:51:14 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						f4818d26d6
					 | 
					
						
						
							
							整理 permission、user 模块的 url
						
						
						
						
						
						
					 | 
					
						2021-03-14 22:46:39 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						378f5834cc
					 | 
					
						
						
							
							整理 logger、notice 的 url
						
						
						
						
						
						
					 | 
					
						2021-03-14 21:54:23 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						9f9c63a221
					 | 
					
						
						
							
							整理 dict data 模块的 url
						
						
						
						
						
						
					 | 
					
						2021-03-14 21:28:17 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								neilz
							
						 
					 | 
					
						
						
							
						
						a7a2725a87
					 | 
					
						
						
							
							回退多余代码
						
						
						
						
						
						
					 | 
					
						2021-03-14 21:06:55 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								neilz
							
						 
					 | 
					
						
						
							
						
						ca9458088c
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:zhijiantianya/ruoyi-vue-pro into feature/ut-job
						
						
						
						
						
						
					 | 
					
						2021-03-14 20:59:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								neilz
							
						 
					 | 
					
						
						
							
						
						ca1132f2df
					 | 
					
						
						
							
							job 单元测试
						
						
						
						
						
						
					 | 
					
						2021-03-14 20:59:40 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						78e847a81a
					 | 
					
						
						
							
							整理 dept、post 模块的 url 地址
						
						
						
						
						
						
					 | 
					
						2021-03-14 20:46:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						472ff81dd9
					 | 
					
						
						
							
							!17 新增序列化Long类型,自动转为字符串类型,避免前端丢失精度
						
						
						
						
						
						
						
						Merge pull request !17 from 贺小五/feature/serialized 
						
						
					 | 
					
						2021-03-14 19:31:55 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						0fedc8fece
					 | 
					
						
						
							
							合并 master 分支的代码
						
						
						
						
						
						
					 | 
					
						2021-03-14 19:21:14 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								hexiaowu
							
						 
					 | 
					
						
						
							
						
						4067087da6
					 | 
					
						
						
							
							移除自定义的Long序列化字符串类型规则
						
						
						
						
						
						
						
						新增LocalDateTime的序列化、反序列化规则 
						
						
					 | 
					
						2021-03-14 18:56:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						2e58e8585e
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into sms_temp_zzf_0127
						
						
						
						
						
						
						
						 Conflicts:
	pom.xml
	src/main/java/cn/iocoder/dashboard/framework/redis/core/RedisKeyDefine.java
	src/main/java/cn/iocoder/dashboard/framework/redis/core/RedisKeyRegistry.java
	src/main/java/cn/iocoder/dashboard/framework/security/config/SecurityConfiguration.java
	src/main/java/cn/iocoder/dashboard/modules/infra/controller/redis/RedisController.java
	src/main/java/cn/iocoder/dashboard/modules/system/dal/redis/RedisKeyConstants.java
	src/main/java/cn/iocoder/dashboard/modules/system/service/dict/impl/SysDictDataServiceImpl.java
	src/main/java/cn/iocoder/dashboard/modules/system/service/permission/impl/SysPermissionServiceImpl.java 
						
						
					 | 
					
						2021-03-14 18:42:52 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						11b8afc4c7
					 | 
					
						
						
							
							补下 sql 脚本
						
						
						
						
						
						
					 | 
					
						2021-03-14 18:04:35 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								neilz
							
						 
					 | 
					
						
						
							
						
						0775e85aac
					 | 
					
						
						
							
							Quartz 相关表新增初始化任务sql sysUserSessionTimeoutJob
						
						
						
						
						
						
					 | 
					
						2021-03-14 15:35:42 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						ef6dd91f2d
					 | 
					
						
						
							
							智障的我,补下 sql 脚本
						
						
						
						
						
						
					 | 
					
						2021-03-14 13:13:56 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								neilz
							
						 
					 | 
					
						
						
							
						
						08bc389ba5
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:zhijiantianya/ruoyi-vue-pro into feature/ut-job
						
						
						
						
						
						
					 | 
					
						2021-03-14 12:36:52 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						2fcb54b576
					 | 
					
						
						
							
							增加数据库文档的 html、word、markdown 的导出
						
						
						
						
						
						
					 | 
					
						2021-03-14 00:58:39 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						84ca9222c8
					 | 
					
						
						
							
							!19 infra logger junit
						
						
						
						
						
						
						
						Merge pull request !19 from kevinwang0224/ut_infra_logger 
						
						
					 | 
					
						2021-03-14 00:05:46 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						570f9f0a69
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
						
						
						
						
						
						
					 | 
					
						2021-03-14 00:02:46 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						6e7f8f570d
					 | 
					
						
						
							
							增加全局 lombok 配置
						
						
						
						
						
						
					 | 
					
						2021-03-14 00:02:23 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangkai
							
						 
					 | 
					
						
						
							
						
						914626b850
					 | 
					
						
						
							
							Merge branch 'master' into ut_infra_logger
						
						
						
						
						
						
					 | 
					
						2021-03-13 23:21:17 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangkai
							
						 
					 | 
					
						
						
							
						
						32620fb3a7
					 | 
					
						
						
							
							infra logger 单元测试 (issues I3A9GW)
						
						
						
						
						
						
					 | 
					
						2021-03-13 23:20:29 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						6cf1e920d7
					 | 
					
						
						
							
							!15 增加 个人信息设置 功能
						
						
						
						
						
						
						
						Merge pull request !15 from niu_dehua/feat_userprofile 
						
						
					 | 
					
						2021-03-13 23:17:40 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								niudehua
							
						 
					 | 
					
						
						
							
						
						aac051a615
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/feat_userprofile' into feat_userprofile
						
						
						
						
						
						
						
						# Conflicts:
#	src/main/java/cn/iocoder/dashboard/modules/system/controller/user/SysUserProfileController.java
#	src/main/java/cn/iocoder/dashboard/modules/system/service/user/SysUserService.java
#	src/main/java/cn/iocoder/dashboard/modules/system/service/user/SysUserServiceImpl.java 
						
						
					 | 
					
						2021-03-13 23:10:14 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								niudehua
							
						 
					 | 
					
						
						
							
						
						61c24c0aa7
					 | 
					
						
						
							
							设置 事务 rollback 属性
						
						
						
						
						
						
						
						增加 个人信息设置 功能
增加 个人信息设置 功能 
						
						
					 | 
					
						2021-03-13 23:06:47 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						4048e59805
					 | 
					
						
						
							
							!14 完成导出数据库文档
						
						
						
						
						
						
						
						Merge pull request !14 from timfruit/feature/screw-export-dbdoc 
						
						
					 | 
					
						2021-03-13 23:05:41 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								timfruit
							
						 
					 | 
					
						
						
							
						
						562f4cb953
					 | 
					
						
						
							
							根据艿艿的提示修改
						
						
						
						
						
						
					 | 
					
						2021-03-13 22:40:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								niudehua
							
						 
					 | 
					
						
						
							
						
						74669817d8
					 | 
					
						
						
							
							增加 个人信息设置 功能
						
						
						
						
						
						
					 | 
					
						2021-03-13 22:25:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								niudehua
							
						 
					 | 
					
						
						
							
						
						8297d94b51
					 | 
					
						
						
							
							增加 个人信息设置 功能
						
						
						
						
						
						
					 | 
					
						2021-03-13 22:24:02 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								niudehua
							
						 
					 | 
					
						
						
							
						
						2dd87e0414
					 | 
					
						
						
							
							设置 事务 rollback 属性
						
						
						
						
						
						
					 | 
					
						2021-03-13 22:16:40 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								niudehua
							
						 
					 | 
					
						
						
							
						
						cd854d0ee1
					 | 
					
						
						
							
							增加 个人信息设置 功能
						
						
						
						
						
						
					 | 
					
						2021-03-13 21:07:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								niudehua
							
						 
					 | 
					
						
						
							
						
						e4bda22b73
					 | 
					
						
						
							
							Merge branch 'master' into feat_userprofile
						
						
						
						
						
						
						
						# Conflicts:
#	src/main/resources/application-dev.yaml
#	src/main/resources/application-local.yaml 
						
						
					 | 
					
						2021-03-13 21:02:01 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						dd8b6cc94a
					 | 
					
						
						
							
							1. 增加事务管理器的自动配置
						
						
						
						
						
						
					 | 
					
						2021-03-13 19:58:11 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						4dc484f51d
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
						
						
						
						
						
						
					 | 
					
						2021-03-13 19:43:47 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						82b73994cb
					 | 
					
						
						
							
							!18 解决页面操作按钮繁多时的用户体验问题
						
						
						
						
						
						
						
						Merge pull request !18 from 幕羽/feature/muyu 
						
						
					 | 
					
						2021-03-13 19:41:23 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						8af60fdaa6
					 | 
					
						
						
							
							1. 验证码的单元测试
						
						
						
						
						
						
						
						2. 修复 h2 脚本的问题 
						
						
					 | 
					
						2021-03-13 19:34:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								NiuXing
							
						 
					 | 
					
						
						
							
						
						9c71274994
					 | 
					
						
						
							
							I3B7FG任务提交;解决页面操作按钮繁多时用户体验问题
						
						
						
						
						
						
					 | 
					
						2021-03-13 19:13:01 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								neilz
							
						 
					 | 
					
						
						
							
						
						3b6359caa0
					 | 
					
						
						
							
							job 单元测试 Demo
						
						
						
						
						
						
					 | 
					
						2021-03-13 16:38:07 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						cee1aa3e60
					 | 
					
						
						
							
							增加文件服务的展示
						
						
						
						
						
						
					 | 
					
						2021-03-13 13:37:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						daa38661d2
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
						
						
						
						
						
						
						
						 Conflicts:
	pom.xml 
						
						
					 | 
					
						2021-03-13 13:28:23 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								timfruit
							
						 
					 | 
					
						
						
							
						
						7089ef7651
					 | 
					
						
						
							
							根据艿艿的说明修改
						
						
						
						
						
						
					 | 
					
						2021-03-13 13:21:33 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hccake
							
						 
					 | 
					
						
						
							
						
						7861c3ec3f
					 | 
					
						
						
							
							🐛 修复 Lombok 建造模式,导致构造函数非 public, mapstruct 无法构造实例的问题
						
						
						
						
						
						
					 | 
					
						2021-03-13 12:38:52 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |