疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						6801490e3b
					 | 
					
						
						
							
							update 分页合理化
						
						
						
						
						
						
					 | 
					
						2021-09-02 11:29:50 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						1a695159e3
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
						
						
						
						
						
						
						
						 Conflicts:
	ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
	ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java
	ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableSupport.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java
	ruoyi-ui/src/api/login.js
	ruoyi-ui/src/views/system/dict/data.vue
	ruoyi-ui/src/views/system/dict/index.vue
	ruoyi-ui/src/views/system/role/index.vue
	ruoyi-ui/src/views/system/user/index.vue
	ruoyi-ui/src/views/tool/gen/index.vue 
						
						
					 | 
					
						2021-09-02 10:49:56 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						ee823b8326
					 | 
					
						
						
							
							防止表格最后页最后项删除变成暂无数据
						
						
						
						
						
						
					 | 
					
						2021-09-02 10:19:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						b461c8cc99
					 | 
					
						
						
							
							update spring-boot-admin 2.5.0 => 2.5.1
						
						
						
						
						
						
						
						update aliyun.oss 3.13.0 => 3.13.1
update qcloud.cos 5.6.47 => 5.6.51
update hutool 5.7.9 => 5.7.11
update maven-jar-plugin 3.1.1 => 3.2.0 
						
						
					 | 
					
						2021-09-01 15:38:08 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						adb31b71f8
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
						
						
						
						
						
						
						
						 Conflicts:
	ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
	ruoyi-ui/src/views/monitor/job/index.vue
	ruoyi-ui/src/views/monitor/logininfor/index.vue
	ruoyi-ui/src/views/monitor/operlog/index.vue
	ruoyi-ui/src/views/system/config/index.vue
	ruoyi-ui/src/views/system/dept/index.vue
	ruoyi-ui/src/views/system/menu/index.vue
	ruoyi-ui/src/views/system/notice/index.vue
	ruoyi-ui/src/views/system/post/index.vue 
						
						
					 | 
					
						2021-09-01 09:40:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								若依
							
						 
					 | 
					
						
						
							
						
						57178e72a4
					 | 
					
						
						
							
							!304 修改数据字典样式回显
						
						
						
						
						
						
						
						Merge pull request !304 from 马小法/master 
						
						
					 | 
					
						2021-09-01 01:20:59 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						52ca1e7d06
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
						
						
						
						
						
						
						
						 Conflicts:
	ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml 
						
						
					 | 
					
						2021-08-31 09:42:55 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								若依
							
						 
					 | 
					
						
						
							
						
						b8317a562c
					 | 
					
						
						
							
							!303 修改非管理员登录时,获取菜单报错sql
						
						
						
						
						
						
						
						Merge pull request !303 from Gold_Fish/master 
						
						
					 | 
					
						2021-08-30 08:59:55 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								马小法
							
						 
					 | 
					
						
						
							
						
						8040ad8c03
					 | 
					
						
						
							
							修改数据字典回显
						
						
						
						
						
						
					 | 
					
						2021-08-30 16:53:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								马小法
							
						 
					 | 
					
						
						
							
						
						c628aa5be8
					 | 
					
						
						
							
							修改代码生成字典回显样式
						
						
						
						
						
						
					 | 
					
						2021-08-30 16:49:30 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						1370d4a43c
					 | 
					
						
						
							
							add 优化 增加 redis 配置文件
						
						
						
						
						
						
					 | 
					
						2021-08-30 14:18:22 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						f22aa6d94a
					 | 
					
						
						
							
							update 更新容器名
						
						
						
						
						
						
					 | 
					
						2021-08-30 13:46:49 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						bdfd2f0787
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
						
						
						
						
						
						
						
						 Conflicts:
	ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java
	ruoyi-ui/src/api/login.js 
						
						
					 | 
					
						2021-08-30 12:49:19 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						673d10c6c4
					 | 
					
						
						
							
							update 优化 saveAll 空列表校验
						
						
						
						
						
						
					 | 
					
						2021-08-30 12:36:01 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						e54033f4e4
					 | 
					
						
						
							
							update 优化 saveOrUpdateAll 空列表校验
						
						
						
						
						
						
					 | 
					
						2021-08-30 12:24:24 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子Li
							
						 
					 | 
					
						
						
							
						
						bfeca2cd7c
					 | 
					
						
						
							
							!84 全量保存或更新之前判断addList长度和updateList长度
						
						
						
						
						
						
						
						Merge pull request !84 from 抓蛙师/dev 
						
						
					 | 
					
						2021-08-30 04:20:46 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								抓蛙师
							
						 
					 | 
					
						
						
							
						
						41de169dd2
					 | 
					
						
						
							
							全量保存或更新时判断数组长度再继续
						
						
						
						
						
						
					 | 
					
						2021-08-30 11:29:33 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gold_Fish
							
						 
					 | 
					
						
						
							
						
						b036e78d85
					 | 
					
						
						
							
							修改根据userId获取菜单sql
						
						
						
						
						
						
					 | 
					
						2021-08-30 02:42:49 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						4e8c6fb7c0
					 | 
					
						
						
							
							修复字典组件值为整形不显示问题
						
						
						
						
						
						
					 | 
					
						2021-08-29 15:57:01 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						134835c870
					 | 
					
						
						
							
							验证码默认20s超时
						
						
						
						
						
						
					 | 
					
						2021-08-29 15:56:46 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								若依
							
						 
					 | 
					
						
						
							
						
						5ade90debf
					 | 
					
						
						
							
							!299 XssHttpServletRequestWrapper中增加available方法
						
						
						
						
						
						
						
						Merge pull request !299 from Ming/master 
						
						
					 | 
					
						2021-08-29 07:36:57 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								若依
							
						 
					 | 
					
						
						
							
						
						bb0aeb39e3
					 | 
					
						
						
							
							!298 修复带utc日期格式 yyyy-MM-dd'T'HH:mm:ss.SSS 在safari浏览器中无法正确格式化的问题
						
						
						
						
						
						
						
						Merge pull request !298 from wjtc8/N/A 
						
						
					 | 
					
						2021-08-29 07:35:06 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						dc0f655781
					 | 
					
						
						
							
							remove 移除docker镜像无用路径配置
						
						
						
						
						
						
					 | 
					
						2021-08-27 12:07:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						a5acc3b27e
					 | 
					
						
						
							
							update java 代码格式统一使用4个空格
						
						
						
						
						
						
					 | 
					
						2021-08-26 13:06:27 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子Li
							
						 
					 | 
					
						
						
							
						
						ee927ad6dc
					 | 
					
						
						
							
							!83 update 优化生成的业务名
						
						
						
						
						
						
						
						Merge pull request !83 from 友杰/auto-8071125-dev-1629950351765 
						
						
					 | 
					
						2021-08-26 04:33:02 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								youjie
							
						 
					 | 
					
						
						
							
						
						b71e8970fe
					 | 
					
						
						
							
							update 优化生成的业务名
						
						
						
						
						
						
					 | 
					
						2021-08-26 11:59:05 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						0c438ad8e9
					 | 
					
						
						
							
							update 修改时检查用户数据权限范围
						
						
						
						
						
						
					 | 
					
						2021-08-26 11:15:07 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						31c2cfa53c
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
						
						
						
						
						
						
						
						 Conflicts:
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
	ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
	ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
	ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
	ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml 
						
						
					 | 
					
						2021-08-26 11:10:42 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						23ce0af2e8
					 | 
					
						
						
							
							update 优化 ServicePlusImpl 的 vo 泛型 由K改成V 增加可读性 增加注释
						
						
						
						
						
						
					 | 
					
						2021-08-26 10:56:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						0014be5242
					 | 
					
						
						
							
							update 优化代码生成 导入与同步 批处理效率
						
						
						
						
						
						
					 | 
					
						2021-08-26 10:23:01 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						7c6fe5f244
					 | 
					
						
						
							
							add 新增 saveOrUpdateAll 方法 可完美替代 saveOrUpdateBatch 高性能
						
						
						
						
						
						
					 | 
					
						2021-08-26 09:58:57 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子Li
							
						 
					 | 
					
						
						
							
						
						3e5ae811bf
					 | 
					
						
						
							
							!82 saveAll支持有id更新,无id插入
						
						
						
						
						
						
						
						Merge pull request !82 from 抓蛙师/dev 
						
						
					 | 
					
						2021-08-26 01:24:20 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						5df5e63afe
					 | 
					
						
						
							
							update 解决 logout 写死 无法扩展路径问题
						
						
						
						
						
						
					 | 
					
						2021-08-25 21:50:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								抓蛙师
							
						 
					 | 
					
						
						
							
						
						545f0bd4b0
					 | 
					
						
						
							
							saveAll支持有id则更新和无id则插入
						
						
						
						
						
						
					 | 
					
						2021-08-25 20:24:35 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						8ffe111086
					 | 
					
						
						
							
							update 重写 InsertAll 方法实现 可完美替代 saveBatch 秒级插入上万数据
						
						
						
						
						
						
					 | 
					
						2021-08-25 18:01:52 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						1cd64a1c4e
					 | 
					
						
						
							
							fix minio Prefix 空问题
						
						
						
						
						
						
					 | 
					
						2021-08-25 10:03:39 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ming
							
						 
					 | 
					
						
						
							
						
						098c650655
					 | 
					
						
						
							
							update ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java.
						
						
						
						
						
						
						
						增加available方法于XssHttpServletRequestWrapper 
						
						
					 | 
					
						2021-08-24 08:42:56 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						e52092c6d4
					 | 
					
						
						
							
							修改时检查用户数据权限范围
						
						
						
						
						
						
					 | 
					
						2021-08-24 16:00:39 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						fc98a260d6
					 | 
					
						
						
							
							update 优化spy配置文件为 UTF8编码 解决中文注释乱码问题
						
						
						
						
						
						
					 | 
					
						2021-08-24 16:00:33 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						613fe5d35a
					 | 
					
						
						
							
							update 更改OSS上传通用路径生成 按照年月日分三级目录
						
						
						
						
						
						
					 | 
					
						2021-08-24 15:51:23 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						f5b90af6d0
					 | 
					
						
						
							
							add 增加 导出雪花id excel失真问题
						
						
						
						
						
						
					 | 
					
						2021-08-24 14:28:39 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						bf86e5979b
					 | 
					
						
						
							
							update 重构 将下载excel工具提取到全局
						
						
						
						
						
						
					 | 
					
						2021-08-24 14:28:20 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						dae8ee4afc
					 | 
					
						
						
							
							update 增加验证码开关注释
						
						
						
						
						
						
					 | 
					
						2021-08-24 14:27:14 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wjtc8
							
						 
					 | 
					
						
						
							
						
						89911e7caf
					 | 
					
						
						
							
							修复带utc日期格式 yyyy-MM-dd'T'HH:mm:ss.SSS 在safari浏览器中无法正确格式化的问题
						
						
						
						
						
						
					 | 
					
						2021-08-24 05:51:00 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						72f3971ca2
					 | 
					
						
						
							
							update 重构 将下载excel工具提取到全局
						
						
						
						
						
						
					 | 
					
						2021-08-24 13:38:15 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						0fc266fe80
					 | 
					
						
						
							
							定时任务对检查异常进行事务回滚
						
						
						
						
						
						
					 | 
					
						2021-08-24 11:12:11 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						f91ebd93d2
					 | 
					
						
						
							
							update 重构 将下载excel工具提取到全局
						
						
						
						
						
						
					 | 
					
						2021-08-23 18:28:33 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						dea627f02c
					 | 
					
						
						
							
							update 更改用户注册页面标题名
						
						
						
						
						
						
					 | 
					
						2021-08-23 18:21:05 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						3c0f992e76
					 | 
					
						
						
							
							fix 解决搜索校验不通过问题
						
						
						
						
						
						
					 | 
					
						2021-08-23 18:20:07 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						5f2f4bb7ef
					 | 
					
						
						
							
							add 增加查询校验组
						
						
						
						
						
						
					 | 
					
						2021-08-23 18:17:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |