疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						d2c6e27d07
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
						
						
						
						
						
						
						
						 Conflicts:
	ruoyi-ui/src/views/system/user/index.vue 
						
						
					 | 
					
						2021-12-16 14:21:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						8041ced02d
					 | 
					
						
						
							
							update 数据权限增加全局缓存 提高处理性能 减少重复处理
						
						
						
						
						
						
					 | 
					
						2021-12-16 13:58:52 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						d81056cbe7
					 | 
					
						
						
							
							update 修改 缓存懒加载 为 false 默认启动预加载数据
						
						
						
						
						
						
					 | 
					
						2021-12-16 13:55:14 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						44e8a012e2
					 | 
					
						
						
							
							update 去除 jdk17 标签 由于很多组件还未适配 导致一些问题
						
						
						
						
						
						
					 | 
					
						2021-12-16 12:10:42 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						30483dacfb
					 | 
					
						
						
							
							update 回滚错误修改
						
						
						
						
						
						
					 | 
					
						2021-12-16 11:52:55 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						9d81d95700
					 | 
					
						
						
							
							update 代码生成 数据库功能使用 mapper 操作 规范用法避免滥用
						
						
						
						
						
						
					 | 
					
						2021-12-16 11:45:58 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						e6b45d4cdb
					 | 
					
						
						
							
							update 数据权限注解支持类标注
						
						
						
						
						
						
					 | 
					
						2021-12-16 10:54:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						c2e28b5d94
					 | 
					
						
						
							
							update 修改 基础方法返回空判断 优化返回值
						
						
						
						
						
						
					 | 
					
						2021-12-16 10:54:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						fef7ead0d5
					 | 
					
						
						
							
							新增Vue3前端代码生成模板
						
						
						
						
						
						
					 | 
					
						2021-12-16 09:51:11 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						06aef0587a
					 | 
					
						
						
							
							用户导入提示溢出则显示滚动条
						
						
						
						
						
						
					 | 
					
						2021-12-16 09:50:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								若依
							
						 
					 | 
					
						
						
							
						
						bf7c259cdd
					 | 
					
						
						
							
							!390 fix: cron组件中周回显bug
						
						
						
						
						
						
						
						Merge pull request !390 from fuzui/fix_week_echo_in_cron_component 
						
						
					 | 
					
						2021-12-16 01:45:14 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								fuzui
							
						 
					 | 
					
						
						
							
						
						43d76e5990
					 | 
					
						
						
							
							fix: cron组件中周回显bug
						
						
						
						
						
						
					 | 
					
						2021-12-16 02:18:48 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子Li
							
						 
					 | 
					
						
						
							
						
						ffde310d30
					 | 
					
						
						
							
							update qiniu 7.8.0 => 7.9.0
						
						
						
						
						
						
						
						update minio 8.3.3 => 8.3.4 
						
						
					 | 
					
						2021-12-16 00:13:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子Li
							
						 
					 | 
					
						
						
							
						
						44bc7dd9a5
					 | 
					
						
						
							
							update 修改已过期方法 调整编译警告
						
						
						
						
						
						
					 | 
					
						2021-12-16 00:11:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子Li
							
						 
					 | 
					
						
						
							
						
						9e5b64e1b7
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/dev' into dev
						
						
						
						
						
						
					 | 
					
						2021-12-15 23:33:57 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子Li
							
						 
					 | 
					
						
						
							
						
						2599073f56
					 | 
					
						
						
							
							fix 修复数据权限 兜底sql处理逻辑问题
						
						
						
						
						
						
					 | 
					
						2021-12-15 23:33:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						a2d49f9981
					 | 
					
						
						
							
							update 更改演示案例多数据源注解
						
						
						
						
						
						
					 | 
					
						2021-12-15 17:28:41 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						877a9d510b
					 | 
					
						
						
							
							update tlog 1.3.5 => 1.3.6 修复 jdk17 不兼容问题
						
						
						
						
						
						
					 | 
					
						2021-12-15 15:33:31 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						2455d0b859
					 | 
					
						
						
							
							add 增加 自定义 Xss 校验注解 用户导入增加 Bean 校验
						
						
						
						
						
						
					 | 
					
						2021-12-15 15:03:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						b3c3afc2b4
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
						
						
						
						
						
						
						
						 Conflicts:
	pom.xml
	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
	ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java 
						
						
					 | 
					
						2021-12-15 14:12:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						3f97d19381
					 | 
					
						
						
							
							update [重磅更新] 重构分页 简化使用
						
						
						
						
						
						
					 | 
					
						2021-12-15 13:29:54 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						3ab3d49055
					 | 
					
						
						
							
							update 清除警告
						
						
						
						
						
						
					 | 
					
						2021-12-15 13:23:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						bd89cc0287
					 | 
					
						
						
							
							update ServicePlusImpl 功能 下沉到 BaseMapperPlus
						
						
						
						
						
						
					 | 
					
						2021-12-15 12:17:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						d365a52cd6
					 | 
					
						
						
							
							自定义xss校验注解实现
						
						
						
						
						
						
					 | 
					
						2021-12-15 10:50:10 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						5e38e054a7
					 | 
					
						
						
							
							update hutool 工具 改为单包引入 减少无用依赖
						
						
						
						
						
						
					 | 
					
						2021-12-15 10:44:50 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子Li
							
						 
					 | 
					
						
						
							
						
						317f6d5c87
					 | 
					
						
						
							
							fix 修复代码生成 sql异常 屏蔽代码生成数据权限过滤
						
						
						
						
						
						
					 | 
					
						2021-12-14 23:47:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						c876776a25
					 | 
					
						
						
							
							update 更正包名书写错误
						
						
						
						
						
						
					 | 
					
						2021-12-14 18:00:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						e1c7115d8c
					 | 
					
						
						
							
							升级log4j2到安全版本,防止漏洞风险
						
						
						
						
						
						
					 | 
					
						2021-12-14 12:09:57 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						bb4d75aff0
					 | 
					
						
						
							
							升级log4j2到安全版本,防止漏洞风险
						
						
						
						
						
						
					 | 
					
						2021-12-14 10:33:25 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						c5dbd04c9c
					 | 
					
						
						
							
							fix 修复数据权限 仅自己 相关问题
						
						
						
						
						
						
					 | 
					
						2021-12-14 10:11:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						2a8a72a085
					 | 
					
						
						
							
							add 新增 Vue3 分支(由于组件还未完善 仅供学习)
						
						
						
						
						
						
					 | 
					
						2021-12-13 20:33:31 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						29c46a15f9
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
						
						
						
						
						
						
						
						 Conflicts:
	README.md
	pom.xml
	ruoyi-admin/pom.xml
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
	ruoyi-admin/src/main/resources/application.yml
	ruoyi-common/pom.xml
	ruoyi-framework/pom.xml
	ruoyi-generator/pom.xml
	ruoyi-job/pom.xml
	ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java
	ruoyi-system/pom.xml
	ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java
	ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java
	ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.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/SysMenuMapper.xml
	ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml
	ruoyi-ui/package.json
	ruoyi-ui/src/directive/index.js
	ruoyi-ui/src/plugins/download.js
	ruoyi-ui/src/views/index.vue
	ruoyi-ui/src/views/monitor/online/index.vue
	ruoyi-ui/src/views/system/user/authRole.vue
	ruoyi-ui/src/views/system/user/index.vue
	ruoyi-ui/src/views/tool/gen/basicInfoForm.vue
	ruoyi-ui/src/views/tool/gen/genInfoForm.vue 
						
						
					 | 
					
						2021-12-13 12:37:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子Li
							
						 
					 | 
					
						
						
							
						
						aae3fe5305
					 | 
					
						
						
							
							update [重大更新] 重写数据权限实现
						
						
						
						
						
						
					 | 
					
						2021-12-13 03:49:05 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						2743785aaf
					 | 
					
						
						
							
							修复多参数逗号分隔的问题
						
						
						
						
						
						
					 | 
					
						2021-12-13 10:11:34 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						79fc16eeb7
					 | 
					
						
						
							
							fix 修复代码生成 导出注解错误
						
						
						
						
						
						
					 | 
					
						2021-12-13 10:02:32 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						2a235917dc
					 | 
					
						
						
							
							优化下载解析blob异常提示
						
						
						
						
						
						
					 | 
					
						2021-12-10 10:03:25 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						8a5c8d0db5
					 | 
					
						
						
							
							update 补全缺失导包
						
						
						
						
						
						
					 | 
					
						2021-12-09 11:52:27 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						bcd5b713f8
					 | 
					
						
						
							
							fix 修复 SysOssConfig 主键类型错误
						
						
						
						
						
						
					 | 
					
						2021-12-09 11:50:34 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						a9488ba3c9
					 | 
					
						
						
							
							update 多数据源切换标注过期 3.6.0 移除 推荐使用原生注解
						
						
						
						
						
						
					 | 
					
						2021-12-09 11:50:25 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						be13e3494a
					 | 
					
						
						
							
							update redisson 3.16.4 => 3.16.6
						
						
						
						
						
						
						
						update dynamic-ds 3.4.1 => 3.5.0 
						
						
					 | 
					
						2021-12-09 11:49:00 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						a62d65a9b8
					 | 
					
						
						
							
							fix 修复 TreeBuildUtils 顶节点不为 0 问题
						
						
						
						
						
						
					 | 
					
						2021-12-09 11:48:55 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						44ce6774dc
					 | 
					
						
						
							
							代码生成预览支持复制内容
						
						
						
						
						
						
					 | 
					
						2021-12-09 09:57:02 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						b911d7f78f
					 | 
					
						
						
							
							自定义文字复制剪贴指令
						
						
						
						
						
						
					 | 
					
						2021-12-09 09:56:11 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						4644176e26
					 | 
					
						
						
							
							升级clipboard到最新版本2.0.8
						
						
						
						
						
						
					 | 
					
						2021-12-09 09:52:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						df6759b033
					 | 
					
						
						
							
							remove 删除无用注入
						
						
						
						
						
						
					 | 
					
						2021-12-07 17:41:50 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						bf8bac2bcc
					 | 
					
						
						
							
							fix 关于 Undertow 的错误说明
						
						
						
						
						
						
					 | 
					
						2021-12-07 17:06:11 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						37def02ee1
					 | 
					
						
						
							
							fix 修复sql关键字处理 防止解析器报错
						
						
						
						
						
						
					 | 
					
						2021-12-07 15:16:37 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						09dfb25d73
					 | 
					
						
						
							
							update 修改 健康检查权限 改为用户放行 提高安全性
						
						
						
						
						
						
					 | 
					
						2021-12-07 12:20:21 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						850b98337b
					 | 
					
						
						
							
							修正用户分配角色属性错误
						
						
						
						
						
						
					 | 
					
						2021-12-06 20:58:10 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								若依
							
						 
					 | 
					
						
						
							
						
						7f2921f26b
					 | 
					
						
						
							
							!382 update 优化查询用户的角色组、岗位组代码
						
						
						
						
						
						
						
						Merge pull request !382 from 疯狂的狮子Li/update 
						
						
					 | 
					
						2021-12-06 12:35:59 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |