疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						65eb873f9a
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/dev'
						
						
						
						
						
						
					 | 
					
						2021-11-29 13:59:15 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						52673152cc
					 | 
					
						
						
							
							发布 v3.4.0
						
						
						
						
						
						
					 | 
					
						2021-11-29 13:58:42 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						36fd16562e
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/dev'
						
						
						
						
						
						
					 | 
					
						2021-11-29 13:31:37 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						a8a4f2101d
					 | 
					
						
						
							
							add 增加 mapper 目录下 package-info 防止建错目录
						
						
						
						
						
						
					 | 
					
						2021-11-29 09:59:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子Li
							
						 
					 | 
					
						
						
							
						
						f46bd8b6ba
					 | 
					
						
						
							
							update 更新 Validation 框架国际化说明
						
						
						
						
						
						
					 | 
					
						2021-11-28 21:47:08 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子Li
							
						 
					 | 
					
						
						
							
						
						a627de02c7
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/dev' into dev
						
						
						
						
						
						
					 | 
					
						2021-11-28 21:04:13 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子Li
							
						 
					 | 
					
						
						
							
						
						a94a0589dd
					 | 
					
						
						
							
							update [重磅更新] Validator 校验框架支持国际化
						
						
						
						
						
						
					 | 
					
						2021-11-28 21:03:48 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						81755a280d
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
						
						
						
						
						
						
						
						 Conflicts:
	ruoyi-ui/src/utils/index.js
	ruoyi-ui/src/views/register.vue 
						
						
					 | 
					
						2021-11-28 15:10:05 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子Li
							
						 
					 | 
					
						
						
							
						
						89d776acb5
					 | 
					
						
						
							
							fix 修复 OSS 工厂 未实例化服务更新加载问题
						
						
						
						
						
						
					 | 
					
						2021-11-27 16:36:11 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子Li
							
						 
					 | 
					
						
						
							
						
						daf660e66d
					 | 
					
						
						
							
							update 更改 excel 方法注释 更清晰明显用法
						
						
						
						
						
						
					 | 
					
						2021-11-27 13:20:50 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子Li
							
						 
					 | 
					
						
						
							
						
						e4020faff3
					 | 
					
						
						
							
							update 使用导入新写法 重构系统用户导入
						
						
						
						
						
						
					 | 
					
						2021-11-27 12:57:21 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子Li
							
						 
					 | 
					
						
						
							
						
						e11b727584
					 | 
					
						
						
							
							update 修改移除无用回执信息
						
						
						
						
						
						
					 | 
					
						2021-11-27 12:43:34 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子Li
							
						 
					 | 
					
						
						
							
						
						0a36a94b73
					 | 
					
						
						
							
							update 报错增加 excel 表头信息
						
						
						
						
						
						
					 | 
					
						2021-11-27 11:18:41 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						89e7cb19b9
					 | 
					
						
						
							
							注册成功提示类型success
						
						
						
						
						
						
					 | 
					
						2021-11-26 18:11:57 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						fa2bdcd5ac
					 | 
					
						
						
							
							update 抽象 Excel 导入支持自定义监听器
						
						
						
						
						
						
					 | 
					
						2021-11-26 18:11:41 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								若依
							
						 
					 | 
					
						
						
							
						
						ea71c9b214
					 | 
					
						
						
							
							!376 camelCase中应该转换下划线,而不是横杠
						
						
						
						
						
						
						
						Merge pull request !376 from khejing/master 
						
						
					 | 
					
						2021-11-26 10:07:58 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						c00e397405
					 | 
					
						
						
							
							update 抽象 Excel 导入支持自定义监听器
						
						
						
						
						
						
					 | 
					
						2021-11-26 18:06:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						a2a2640d29
					 | 
					
						
						
							
							update 调整校验异常 返回完整信息
						
						
						
						
						
						
					 | 
					
						2021-11-26 18:05:47 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子Li
							
						 
					 | 
					
						
						
							
						
						7c4a104823
					 | 
					
						
						
							
							!113 add 新增 excel 导入支持开启 Validator 数据验证
						
						
						
						
						
						
						
						Merge pull request !113 from Yjoioooo/auto-5403234-dev-1637903026810 
						
						
					 | 
					
						2021-11-26 08:40:42 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						7892ec5a59
					 | 
					
						
						
							
							fix 修复重复提交不生效问题 由于概念不同 使用 RedisUtils 重构
						
						
						
						
						
						
					 | 
					
						2021-11-26 16:32:56 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								khejing
							
						 
					 | 
					
						
						
							
						
						e5fd1f76db
					 | 
					
						
						
							
							camelCase中应该是下划线,而不是横杠
						
						
						
						
						
						
					 | 
					
						2021-11-26 08:26:45 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子Li
							
						 
					 | 
					
						
						
							
						
						6502f21072
					 | 
					
						
						
							
							update 修改不规范命名
						
						
						
						
						
						
					 | 
					
						2021-11-26 05:57:28 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						48fd65d7f8
					 | 
					
						
						
							
							update satoken 标注为公测
						
						
						
						
						
						
					 | 
					
						2021-11-26 13:45:12 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						1010ccca4d
					 | 
					
						
						
							
							update 更新 RedisUtils set保留ttl 兼容 5.X redis版本
						
						
						
						
						
						
					 | 
					
						2021-11-26 13:34:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zhujie
							
						 
					 | 
					
						
						
							
						
						c21ff85b57
					 | 
					
						
						
							
							update 增加excel导入样例
						
						
						
						
						
						
					 | 
					
						2021-11-26 13:02:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zhujie
							
						 
					 | 
					
						
						
							
						
						c3bb4d2a61
					 | 
					
						
						
							
							add 新增导入支持开启Validator数据验证,支持开启导入异常行继续读取,支持返回导入回执
						
						
						
						
						
						
					 | 
					
						2021-11-26 13:01:00 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						d2b7f8ef0f
					 | 
					
						
						
							
							remove 删除无用 js 文件
						
						
						
						
						
						
					 | 
					
						2021-11-25 19:47:34 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						af25588b88
					 | 
					
						
						
							
							Merge remote-tracking branch 'ruoyi-vue/master' into dev
						
						
						
						
						
						
						
						# Conflicts:
#	pom.xml
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java
#	ruoyi-generator/pom.xml
#	ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java
#	ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
#	ruoyi-generator/src/main/resources/vm/js/api.js.vm
#	ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
#	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
#	ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
#	ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java
#	ruoyi-ui/package.json
#	ruoyi-ui/src/api/monitor/server.js
#	ruoyi-ui/src/components/RuoYi/Doc/index.vue
#	ruoyi-ui/src/components/RuoYi/Git/index.vue
#	ruoyi-ui/src/components/SizeSelect/index.vue
#	ruoyi-ui/src/layout/components/Sidebar/Logo.vue
#	ruoyi-ui/src/layout/components/TagsView/index.vue
#	ruoyi-ui/src/layout/index.vue
#	ruoyi-ui/src/main.js
#	ruoyi-ui/src/plugins/download.js
#	ruoyi-ui/src/router/index.js
#	ruoyi-ui/src/store/modules/permission.js
#	ruoyi-ui/src/store/modules/settings.js
#	ruoyi-ui/src/store/modules/tagsView.js
#	ruoyi-ui/src/store/modules/user.js
#	ruoyi-ui/src/views/login.vue
#	ruoyi-ui/src/views/monitor/job/log.vue
#	ruoyi-ui/src/views/system/dict/data.vue
#	ruoyi-ui/src/views/system/role/index.vue
#	ruoyi-ui/src/views/system/user/authRole.vue
#	ruoyi-ui/src/views/system/user/index.vue
#	ruoyi-ui/src/views/system/user/profile/resetPwd.vue
#	ruoyi-ui/src/views/system/user/profile/userAvatar.vue
#	ruoyi-ui/src/views/system/user/profile/userInfo.vue 
						
						
					 | 
					
						2021-11-25 19:39:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						7546ef649c
					 | 
					
						
						
							
							update springboot 2.5.6 => 2.5.7
						
						
						
						
						
						
					 | 
					
						2021-11-25 19:14:52 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						2a3bf1d994
					 | 
					
						
						
							
							remove 删除无用 redis 依赖配置
						
						
						
						
						
						
					 | 
					
						2021-11-25 19:14:30 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ricky
							
						 
					 | 
					
						
						
							
						
						664192da0b
					 | 
					
						
						
							
							升级velocity到最新版本2.3(语法升级)
						
						
						
						
						
						
					 | 
					
						2021-11-25 15:18:02 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ricky
							
						 
					 | 
					
						
						
							
						
						9fc3e220a7
					 | 
					
						
						
							
							防止修改用户个人信息接口修改用户名
						
						
						
						
						
						
					 | 
					
						2021-11-25 14:00:27 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ricky
							
						 
					 | 
					
						
						
							
						
						64f6a69d9a
					 | 
					
						
						
							
							修复代码生成复选框字典遗漏问题
						
						
						
						
						
						
					 | 
					
						2021-11-25 13:54:49 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						16734b1d88
					 | 
					
						
						
							
							升级velocity到最新版本2.3
						
						
						
						
						
						
					 | 
					
						2021-11-24 15:03:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						31106c91fb
					 | 
					
						
						
							
							修复使用 this.$options.data 报错问题
						
						
						
						
						
						
					 | 
					
						2021-11-24 15:00:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						026a427103
					 | 
					
						
						
							
							优化前端代码
						
						
						
						
						
						
					 | 
					
						2021-11-24 14:47:24 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						7a4f36c00e
					 | 
					
						
						
							
							update 优化时间查询语句
						
						
						
						
						
						
					 | 
					
						2021-11-24 11:24:15 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						1f3ef4ffe1
					 | 
					
						
						
							
							update 初始化数据转移到 ApplicationRunner 统一处理
						
						
						
						
						
						
					 | 
					
						2021-11-24 10:59:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						c364836a9d
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/dev' into dev
						
						
						
						
						
						
					 | 
					
						2021-11-24 10:58:17 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						97a12075b1
					 | 
					
						
						
							
							update 初始化数据转移到 ApplicationRunner 统一处理
						
						
						
						
						
						
					 | 
					
						2021-11-24 10:58:10 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								若依
							
						 
					 | 
					
						
						
							
						
						bafb1372a7
					 | 
					
						
						
							
							!375 删除代码生成中冗余的导出方法
						
						
						
						
						
						
						
						Merge pull request !375 from fuzui/delete_redundancy_gen_export_function 
						
						
					 | 
					
						2021-11-24 00:39:07 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								fuzui
							
						 
					 | 
					
						
						
							
						
						b4f032fab4
					 | 
					
						
						
							
							删除代码生成中冗余的导出方法
						
						
						
						
						
						
					 | 
					
						2021-11-24 02:48:35 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子Li
							
						 
					 | 
					
						
						
							
						
						d36d944b3a
					 | 
					
						
						
							
							remove 删除 quartz 相关 sql 数据
						
						
						
						
						
						
					 | 
					
						2021-11-23 21:53:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						7af22453ba
					 | 
					
						
						
							
							update 更新 redis.conf 存储策略 aof 与 rdb 配置参数
						
						
						
						
						
						
					 | 
					
						2021-11-23 20:19:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						d0c4b5bc76
					 | 
					
						
						
							
							add 增加 RedisUtils set 保留 TTL 有效期方法
						
						
						
						
						
						
					 | 
					
						2021-11-23 10:20:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						4f194aa101
					 | 
					
						
						
							
							升级js-cookie到最新版本3.0.1
						
						
						
						
						
						
					 | 
					
						2021-11-22 18:07:33 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						ef4bfde4a8
					 | 
					
						
						
							
							优化提示信息
						
						
						
						
						
						
					 | 
					
						2021-11-22 18:06:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						65a1245a03
					 | 
					
						
						
							
							update OSS 模块 整体重命名 消除歧义
						
						
						
						
						
						
					 | 
					
						2021-11-22 09:48:22 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						486e4f8dd3
					 | 
					
						
						
							
							update 删除无用字段
						
						
						
						
						
						
					 | 
					
						2021-11-22 09:46:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						4cfbd8a9d2
					 | 
					
						
						
							
							update OSS 模块 整体重命名 消除歧义
						
						
						
						
						
						
					 | 
					
						2021-11-22 09:45:46 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |