疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						bb793d71e7
					 | 
					
						
						
							
							fix 修复 minio 适配 https 导致的问题
						
						
						
						
						
						
					 | 
					
						2022-02-18 14:05:32 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						587fb27484
					 | 
					
						
						
							
							add 增加页面更新说明
						
						
						
						
						
						
					 | 
					
						2022-02-18 10:38:03 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						7f305962f2
					 | 
					
						
						
							
							发布 4.0.0
						
						
						
						
						
						
					 | 
					
						2022-02-18 10:31:13 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						f6edb48df9
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
						
						
						
						
						
						
						
						 Conflicts:
	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
	ruoyi-ui/src/components/Pagination/index.vue 
						
						
					 | 
					
						2022-02-18 09:57:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						5c2992ef16
					 | 
					
						
						
							
							update 去除编译器警告 规范写法
						
						
						
						
						
						
					 | 
					
						2022-02-17 14:02:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						d734bfc34f
					 | 
					
						
						
							
							修复分页组件请求两次问题(I4SQOR)
						
						
						
						
						
						
					 | 
					
						2022-02-17 11:56:11 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						86d5a1d190
					 | 
					
						
						
							
							update 更新 所有 oss 均支持 https 配置
						
						
						
						
						
						
					 | 
					
						2022-02-17 10:31:52 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						cb713e32d3
					 | 
					
						
						
							
							fix 修复 insertOrUpdateBatch 获取模板错误
						
						
						
						
						
						
					 | 
					
						2022-02-16 16:54:19 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子Li
							
						 
					 | 
					
						
						
							
						
						84fe0737de
					 | 
					
						
						
							
							update 更新uuid去除默认值 漏改
						
						
						
						
						
						
					 | 
					
						2022-02-16 08:53:11 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						4ea636366d
					 | 
					
						
						
							
							update 优化代码生成 使用新 JsonUtils.parseMap 方法
						
						
						
						
						
						
					 | 
					
						2022-02-15 17:32:33 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						54f5b59c8c
					 | 
					
						
						
							
							update 优化代码生成 使用新 JsonUtils.parseMap 方法
						
						
						
						
						
						
					 | 
					
						2022-02-15 12:07:56 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						657b6a9fae
					 | 
					
						
						
							
							update 使用 hutool Dict 优化 JsonUtils 防止类型解析异常
						
						
						
						
						
						
					 | 
					
						2022-02-15 12:07:20 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						6c01241b96
					 | 
					
						
						
							
							fix 回滚代码生成部分优化 修复优化导致的问题
						
						
						
						
						
						
					 | 
					
						2022-02-15 11:07:50 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						961073ec96
					 | 
					
						
						
							
							update 优化 TreeBuildUtils 工具 使用反射自动获取顶级父id
						
						
						
						
						
						
					 | 
					
						2022-02-15 10:45:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						e2b786d97b
					 | 
					
						
						
							
							update 更新 swagger 配置类错误注释
						
						
						
						
						
						
					 | 
					
						2022-02-14 18:30:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						2fbf9ab7be
					 | 
					
						
						
							
							fix 修复因升级 sa-token 导致 doLogin 无法获取 token 问题
						
						
						
						
						
						
					 | 
					
						2022-02-14 17:29:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						68a23c4918
					 | 
					
						
						
							
							update 优化代码生成
						
						
						
						
						
						
					 | 
					
						2022-02-14 16:02:22 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						b49dbcdbbe
					 | 
					
						
						
							
							update 修改验证码校验 增加 uuid 空判断
						
						
						
						
						
						
					 | 
					
						2022-02-14 14:31:57 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						ee2f74dc5e
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
						
						
						
						
						
						
						
						 Conflicts:
	.gitignore
	ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/file/ImageUtils.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpHelper.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java
	ruoyi-common/src/main/java/com/ruoyi/common/xss/XssValidator.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
	ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.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/SysRoleServiceImpl.java
	ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
	ruoyi-ui/src/components/FileUpload/index.vue
	ruoyi-ui/src/views/tool/build/index.vue 
						
						
					 | 
					
						2022-02-14 14:27:13 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						81630a096f
					 | 
					
						
						
							
							代码生成同步保留必填/类型选项
						
						
						
						
						
						
					 | 
					
						2022-02-13 21:06:28 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						21780d8106
					 | 
					
						
						
							
							优化代码
						
						
						
						
						
						
					 | 
					
						2022-02-13 21:06:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						b7b4364db2
					 | 
					
						
						
							
							代码生成编辑修改打开新页签
						
						
						
						
						
						
					 | 
					
						2022-02-12 13:14:09 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						d9859de756
					 | 
					
						
						
							
							代码优化
						
						
						
						
						
						
					 | 
					
						2022-02-12 13:13:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								若依
							
						 
					 | 
					
						
						
							
						
						5e6fd0d1e1
					 | 
					
						
						
							
							!429 修复自定义组件file-upload无法显示第一个文件,列表显示的文件比实际文件少一个的问题
						
						
						
						
						
						
						
						Merge pull request !429 from hjk2008/master 
						
						
					 | 
					
						2022-02-12 03:56:02 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								若依
							
						 
					 | 
					
						
						
							
						
						a91d7cdd72
					 | 
					
						
						
							
							!428 删除方法无返回值时,方法注释上的@return,StringBuilder append() 改为链式调用
						
						
						
						
						
						
						
						Merge pull request !428 from 我的世界有我/master 
						
						
					 | 
					
						2022-02-12 03:55:12 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								若依
							
						 
					 | 
					
						
						
							
						
						d00dc3b03a
					 | 
					
						
						
							
							!426 修正单词拼写错误
						
						
						
						
						
						
						
						Merge pull request !426 from 稚屿/master 
						
						
					 | 
					
						2022-02-12 03:54:13 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								若依
							
						 
					 | 
					
						
						
							
						
						f5c69bae30
					 | 
					
						
						
							
							!425 优化默认值的问题,Model中不建议有默认值的逻辑
						
						
						
						
						
						
						
						Merge pull request !425 from Yancey/default_value_optimization 
						
						
					 | 
					
						2022-02-12 03:53:29 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								若依
							
						 
					 | 
					
						
						
							
						
						89fe17f419
					 | 
					
						
						
							
							!424 update .gitignore.
						
						
						
						
						
						
						
						Merge pull request !424 from oo0oo/N/A 
						
						
					 | 
					
						2022-02-12 03:53:06 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								sam
							
						 
					 | 
					
						
						
							
						
						c491257359
					 | 
					
						
						
							
							修复自定义组件file-upload无法显示第一个文件,列表显示的文件比实际文件少一个的问题
						
						
						
						
						
						
					 | 
					
						2022-02-12 08:46:12 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						8a2f988be6
					 | 
					
						
						
							
							update 返回体 统一
						
						
						
						
						
						
					 | 
					
						2022-02-11 17:46:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						83c0b70a2d
					 | 
					
						
						
							
							fix 修复 验证码 强制校验问题
						
						
						
						
						
						
					 | 
					
						2022-02-11 17:30:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						b7082c0eb4
					 | 
					
						
						
							
							fix 修复 R 参数位置错误
						
						
						
						
						
						
					 | 
					
						2022-02-11 16:49:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						61e2a07ee2
					 | 
					
						
						
							
							update 使用 satoken 自带的 BCrypt 工具 替换 Security 加密工具 减少依赖
						
						
						
						
						
						
					 | 
					
						2022-02-11 15:03:09 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								caohong
							
						 
					 | 
					
						
						
							
						
						dd5e514d92
					 | 
					
						
						
							
							StringBuilder append方法改为链式调用
						
						
						
						
						
						
					 | 
					
						2022-02-11 10:06:07 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								caohong
							
						 
					 | 
					
						
						
							
						
						2532e40f9c
					 | 
					
						
						
							
							删除方法无返回值时,方法注释上的@return
						
						
						
						
						
						
					 | 
					
						2022-02-11 10:05:01 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						50236ae4e5
					 | 
					
						
						
							
							修复Xss注解字段值为空时的异常问题
						
						
						
						
						
						
					 | 
					
						2022-02-10 17:17:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						04c36018d6
					 | 
					
						
						
							
							update sa-token 1.28.0 => 1.29.0
						
						
						
						
						
						
					 | 
					
						2022-02-10 11:14:10 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						1273421498
					 | 
					
						
						
							
							add 增加 issue 与 pr 模板
						
						
						
						
						
						
					 | 
					
						2022-02-10 09:32:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						7bd34cb1da
					 | 
					
						
						
							
							update 更新 swagger 注解用法
						
						
						
						
						
						
					 | 
					
						2022-02-09 19:44:48 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						d99dd4b875
					 | 
					
						
						
							
							update 调整oss预览开关 使用前端直接调用更改配置参数
						
						
						
						
						
						
					 | 
					
						2022-02-09 14:52:33 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								稚屿
							
						 
					 | 
					
						
						
							
						
						c99eb98001
					 | 
					
						
						
							
							代码优化
						
						
						
						
						
						
					 | 
					
						2022-02-09 09:10:50 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								稚屿
							
						 
					 | 
					
						
						
							
						
						a29201a248
					 | 
					
						
						
							
							修正单词拼写错误
						
						
						
						
						
						
					 | 
					
						2022-02-09 08:46:54 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yancey
							
						 
					 | 
					
						
						
							
						
						6f0c59d7be
					 | 
					
						
						
							
							优化默认值的问题,Model中不建议有默认值的逻辑。
						
						
						
						
						
						
					 | 
					
						2022-02-09 00:27:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子Li
							
						 
					 | 
					
						
						
							
						
						844e8b2f77
					 | 
					
						
						
							
							fix 修复 insertOrUpdateBatch 获取错误 class 类
						
						
						
						
						
						
					 | 
					
						2022-02-07 23:37:47 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子Li
							
						 
					 | 
					
						
						
							
						
						5a0a9e3a1c
					 | 
					
						
						
							
							update 更新文档说明
						
						
						
						
						
						
					 | 
					
						2022-02-07 23:08:00 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								oo0oo
							
						 
					 | 
					
						
						
							
						
						a6ed5667ab
					 | 
					
						
						
							
							update .gitignore.
						
						
						
						
						
						
						
						添加JRebel工具rebel.xml文件规则至gitignore 
						
						
					 | 
					
						2022-02-01 02:24:49 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						53da7140c2
					 | 
					
						
						
							
							update 调整返回类型为 R
						
						
						
						
						
						
					 | 
					
						2022-01-29 11:48:41 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						eb87229ee9
					 | 
					
						
						
							
							update 修正脚本错误
						
						
						
						
						
						
					 | 
					
						2022-01-29 09:23:27 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						0b852faf00
					 | 
					
						
						
							
							Merge remote-tracking branch 'ruoyi-vue/master' into dev
						
						
						
						
						
						
						
						# Conflicts:
#	pom.xml
#	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-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.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-ui/src/assets/styles/ruoyi.scss
#	ry.bat 
						
						
					 | 
					
						2022-01-29 09:23:11 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						ce9e033551
					 | 
					
						
						
							
							update 更新全局异常响应
						
						
						
						
						
						
					 | 
					
						2022-01-28 19:57:19 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |