疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						a42c1e4711
					 | 
					
						
						
							
							remove 删除提交错误文件
						
						
						
						
						
						
					 | 
					
						2021-05-25 14:32:41 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						3131b7ea9d
					 | 
					
						
						
							
							fix redis反序列化异常问题
						
						
						
						
						
						
					 | 
					
						2021-05-25 13:40:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						5795958a18
					 | 
					
						
						
							
							update 同步升级 ruoyi-vue 3.5.0
						
						
						
						
						
						
					 | 
					
						2021-05-25 10:14:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						6c195af2a3
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
						
						
						
						
						
						
						
						 Conflicts:
	pom.xml
	ruoyi-admin/pom.xml
	ruoyi-admin/src/main/resources/application.yml
	ruoyi-common/pom.xml
	ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/IdUtils.java
	ruoyi-framework/pom.xml
	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
	ruoyi-generator/pom.xml
	ruoyi-generator/src/main/resources/vm/java/mapper.java.vm
	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
	ruoyi-quartz/pom.xml
	ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java
	ruoyi-system/pom.xml
	ruoyi-ui/package.json
	ruoyi-ui/public/index.html
	ruoyi-ui/src/views/index.vue
	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/dict/data.vue
	ruoyi-ui/src/views/system/dict/index.vue
	ruoyi-ui/src/views/system/notice/index.vue
	ruoyi-ui/src/views/system/post/index.vue
	ruoyi-ui/src/views/system/role/index.vue
	ruoyi-ui/src/views/system/user/index.vue 
						
						
					 | 
					
						2021-05-25 10:00:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						5e64a93d11
					 | 
					
						
						
							
							若依 3.5.0
						
						
						
						
						
						
					 | 
					
						2021-05-25 09:37:55 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						7e79c4f249
					 | 
					
						
						
							
							生成vue模板导出按钮点击后添加遮罩
						
						
						
						
						
						
					 | 
					
						2021-05-24 11:34:03 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								若依
							
						 
					 | 
					
						
						
							
						
						504638eb41
					 | 
					
						
						
							
							!234 【轻量级 PR】:删去两处冗余代码
						
						
						
						
						
						
						
						Merge pull request !234 from xivLi/master 
						
						
					 | 
					
						2021-05-24 11:30:21 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						7b94ae3a9a
					 | 
					
						
						
							
							xss校验json条件优化
						
						
						
						
						
						
					 | 
					
						2021-05-23 19:20:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xivLi
							
						 
					 | 
					
						
						
							
						
						9651a7d7fc
					 | 
					
						
						
							
							删去utils.uuid下 IdUtils类中 多余的import(同包下的UUID类)
						
						
						
						
						
						
					 | 
					
						2021-05-22 15:52:19 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lyqwer
							
						 
					 | 
					
						
						
							
						
						b2914cbcb1
					 | 
					
						
						
							
							修正方法名单词拼写错误
						
						
						
						
						
						
					 | 
					
						2021-05-21 17:24:48 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						97a237bbdc
					 | 
					
						
						
							
							update springboot 升级 2.3.11
						
						
						
						
						
						
						
						update mybatis-plus 升级 3.4.3 分页Plus对象适配更新 
						
						
					 | 
					
						2021-05-21 11:50:47 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						7076deb2b6
					 | 
					
						
						
							
							update 请求响应对象 与 分页对象 结构修改 适配接口文档配置
						
						
						
						
						
						
					 | 
					
						2021-05-20 13:23:12 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						2ebcffb22e
					 | 
					
						
						
							
							update 配置统一提取为 properties 配置类
						
						
						
						
						
						
					 | 
					
						2021-05-17 13:39:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						5bc6057050
					 | 
					
						
						
							
							fix maven install 异常
						
						
						
						
						
						
					 | 
					
						2021-05-16 10:29:13 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						87164d574e
					 | 
					
						
						
							
							update 删除过期方法
						
						
						
						
						
						
					 | 
					
						2021-05-16 09:25:19 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						69b9a4db2b
					 | 
					
						
						
							
							update 通用Service接口 增加自定义vo转换函数
						
						
						
						
						
						
					 | 
					
						2021-05-15 14:27:29 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						ee064fa84c
					 | 
					
						
						
							
							update swagger升级3.0.2
						
						
						
						
						
						
					 | 
					
						2021-05-15 14:25:48 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						31db658929
					 | 
					
						
						
							
							update 增强分页工具兼容性
						
						
						
						
						
						
					 | 
					
						2021-05-15 11:32:05 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						6067cb1797
					 | 
					
						
						
							
							add 增加增强Mapper 重写业务适配
						
						
						
						
						
						
					 | 
					
						2021-05-14 13:01:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						b0417338cc
					 | 
					
						
						
							
							add 增加升级版通用Service IServicePlus
						
						
						
						
						
						
					 | 
					
						2021-05-13 21:24:47 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						20e82d708b
					 | 
					
						
						
							
							remove 移除 pagehelper 分页工具
						
						
						
						
						
						
					 | 
					
						2021-05-13 21:23:50 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						9f5a03edcd
					 | 
					
						
						
							
							add 增加分页工具
						
						
						
						
						
						
					 | 
					
						2021-05-13 21:22:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						c33c3de43a
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
						
						
						
						
						
						
						
						 Conflicts:
	README.md
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java
	ruoyi-common/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/Arith.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
	ruoyi-ui/src/assets/styles/element-ui.scss
	ruoyi-ui/src/views/index.vue 
						
						
					 | 
					
						2021-05-11 17:14:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						dd384e4a31
					 | 
					
						
						
							
							上传媒体类型添加视频格式
						
						
						
						
						
						
					 | 
					
						2021-05-11 14:25:08 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						98624e66e5
					 | 
					
						
						
							
							正式发布 1.0.0
						
						
						
						
						
						
					 | 
					
						2021-05-10 15:34:17 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								libin
							
						 
					 | 
					
						
						
							
						
						14ea071306
					 | 
					
						
						
							
							修复文件上传时java.nio.file.FileAlreadyExistsException
						
						
						
						
						
						
					 | 
					
						2021-05-08 15:31:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								phper08
							
						 
					 | 
					
						
						
							
						
						7d0f5e94ef
					 | 
					
						
						
							
							update ruoyi-common/src/main/java/com/ruoyi/common/utils/Arith.java.
						
						
						
						
						
						
					 | 
					
						2021-05-03 13:18:33 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						c0e5e9cb24
					 | 
					
						
						
							
							update 同步ruoyi
						
						
						
						
						
						
					 | 
					
						2021-04-25 09:45:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						4e723f4936
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
						
						
						
						
						
						
						
						 Conflicts:
	ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java 
						
						
					 | 
					
						2021-04-25 09:27:07 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						734073019f
					 | 
					
						
						
							
							update 屏蔽用户密码返回
						
						
						
						
						
						
					 | 
					
						2021-04-23 15:59:46 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						1bef814c51
					 | 
					
						
						
							
							update 补全实体类 注入注解
						
						
						
						
						
						
					 | 
					
						2021-04-22 21:07:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						5fcef39a2e
					 | 
					
						
						
							
							add 集成 spring-boot-admin 全方位监控
						
						
						
						
						
						
					 | 
					
						2021-04-22 15:04:35 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								再见亦是路人
							
						 
					 | 
					
						
						
							
						
						a4b71278c0
					 | 
					
						
						
							
							修改用户密码获取失败
						
						
						
						
						
						
					 | 
					
						2021-04-21 15:56:00 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ricky
							
						 
					 | 
					
						
						
							
						
						2c94587263
					 | 
					
						
						
							
							优化ExcelUtil空值处理
						
						
						
						
						
						
					 | 
					
						2021-04-21 09:53:14 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						48d61a3cdf
					 | 
					
						
						
							
							update mp化
						
						
						
						
						
						
					 | 
					
						2021-04-14 11:19:46 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						876a06a9cd
					 | 
					
						
						
							
							update mp化
						
						
						
						
						
						
					 | 
					
						2021-04-13 17:14:50 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						20d40ea691
					 | 
					
						
						
							
							update mp化
						
						
						
						
						
						
					 | 
					
						2021-04-13 15:29:05 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						d69d1fbfe8
					 | 
					
						
						
							
							update 更新任务调度模块 与 代码生成模块 MP lombok 化
						
						
						
						
						
						
					 | 
					
						2021-04-12 17:49:56 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						323fe960bd
					 | 
					
						
						
							
							update 更新基础包与核心包 lombok 化
						
						
						
						
						
						
					 | 
					
						2021-04-12 17:26:47 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						938ca5c451
					 | 
					
						
						
							
							fix 补全缺包
						
						
						
						
						
						
					 | 
					
						2021-04-12 17:09:05 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						4500db395f
					 | 
					
						
						
							
							update ruoyi原生改为 MP lombok 格式
						
						
						
						
						
						
						
						update SysConfig 模块代码 
						
						
					 | 
					
						2021-04-12 17:02:55 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						fdacc04582
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
						
						
						
						
						
						
						
						 Conflicts:
	ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java 
						
						
					 | 
					
						2021-03-30 17:21:22 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						6ca7870393
					 | 
					
						
						
							
							修正注释
						
						
						
						
						
						
					 | 
					
						2021-03-30 15:30:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								若依
							
						 
					 | 
					
						
						
							
						
						2a7342ec43
					 | 
					
						
						
							
							!195 读取excel增加非空判断
						
						
						
						
						
						
						
						Merge pull request !195 from 叫我宏锅锅/yuhong 
						
						
					 | 
					
						2021-03-30 15:23:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						96d10126b2
					 | 
					
						
						
							
							修复request.getInputStream() 重复读取错误问题
						
						
						
						
						
						
					 | 
					
						2021-03-30 11:41:24 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						a29ebef202
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
						
						
						
						
						
						
						
						 Conflicts:
	ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatableFilter.java 
						
						
					 | 
					
						2021-03-30 11:38:56 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wangyuanyang
							
						 
					 | 
					
						
						
							
						
						347f36ceff
					 | 
					
						
						
							
							fix:RepeatedlyRequestWrapper.ServletInputStream 实现available方法
						
						
						
						
						
						
					 | 
					
						2021-03-29 10:17:31 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								yuhong0206@sina.cn
							
						 
					 | 
					
						
						
							
						
						9b9c1b999f
					 | 
					
						
						
							
							读取excel增加
						
						
						
						
						
						
						
						if(row == null)
{
    continue;
}
判断。防止有时候Excel表中有空数据行,导致读取时出现空指针异常。
						
						
					 | 
					
						2021-03-29 09:00:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								yuhong0206@sina.cn
							
						 
					 | 
					
						
						
							
						
						ec627704b2
					 | 
					
						
						
							
							取消
						
						
						
						
						
						
					 | 
					
						2021-03-29 08:58:46 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								yuhong0206@sina.cn
							
						 
					 | 
					
						
						
							
						
						9e6b2a1265
					 | 
					
						
						
							
							读取excel增加
						
						
						
						
						
						
						
						if(row == null)
{
    continue;
}
判断。防止有时候Excel表中有空数据行,导致读取时出现空指针异常。
						
						
					 | 
					
						2021-03-29 08:56:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |