疯狂的狮子Li
							
						 
					 | 
					
						
						
							
						
						0f75f789d8
					 | 
					
						
						
							
							!133 修复单词拼写错误
						
						
						
						
						
						
						
						Merge pull request !133 from JackyTang/dev 
						
						
					 | 
					
						2022-01-22 03:47:15 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								JackyTang
							
						 
					 | 
					
						
						
							
						
						bc9098bc22
					 | 
					
						
						
							
							fix 修复单词拼写错误
						
						
						
						
						
						
					 | 
					
						2022-01-22 10:19:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						76f1650109
					 | 
					
						
						
							
							fix vue3下点击编辑,取消修改报错问题
						
						
						
						
						
						
					 | 
					
						2022-01-21 18:34:41 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						c636e6909b
					 | 
					
						
						
							
							Merge remote-tracking branch 'ruoyi-vue/master' into dev
						
						
						
						
						
						
						
						# Conflicts:
#	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java
#	ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java 
						
						
					 | 
					
						2022-01-21 18:29:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						b5b1b94a9d
					 | 
					
						
						
							
							update springboot 2.6.2 => 2.6.3
						
						
						
						
						
						
					 | 
					
						2022-01-21 14:55:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						b87aeb9b95
					 | 
					
						
						
							
							update 移除掉 StringUtils 语义不明确的api方法 使用特定工具替换
						
						
						
						
						
						
					 | 
					
						2022-01-21 10:30:39 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子Li
							
						 
					 | 
					
						
						
							
						
						5f0e4e81f0
					 | 
					
						
						
							
							!131 fix 修改用户信息校验方法
						
						
						
						
						
						
						
						Merge pull request !131 from KonBAI/fix_cheakUserInfo 
						
						
					 | 
					
						2022-01-20 09:13:54 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								hewenqiang
							
						 
					 | 
					
						
						
							
						
						7306feb6ef
					 | 
					
						
						
							
							fix 修改用户信息校验方法。
						
						
						
						
						
						
						
						1. 校验用户名称是否唯一采用baseMapper.exists()方法判断是否存在。
2. 校验手机号码和校验email是否唯一,当存在userId时,sql查询条件才加上不等于当前userId。 
						
						
					 | 
					
						2022-01-20 15:24:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						dccb3ac6c6
					 | 
					
						
						
							
							修复选项卡点击右键刷新丢失参数问题
						
						
						
						
						
						
					 | 
					
						2022-01-18 11:29:31 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								若依
							
						 
					 | 
					
						
						
							
						
						89cd2106ed
					 | 
					
						
						
							
							!416 update ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java.
						
						
						
						
						
						
						
						Merge pull request !416 from SG/N/A 
						
						
					 | 
					
						2022-01-18 03:25:31 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								若依
							
						 
					 | 
					
						
						
							
						
						74f991b8c5
					 | 
					
						
						
							
							!414 优化任务队列满时任务拒绝策略
						
						
						
						
						
						
						
						Merge pull request !414 from root/master 
						
						
					 | 
					
						2022-01-18 03:20:23 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						dcf79d9119
					 | 
					
						
						
							
							add 增加 3.X update 4.0 更新sql
						
						
						
						
						
						
					 | 
					
						2022-01-17 18:32:02 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						911867d5a5
					 | 
					
						
						
							
							update 数据库更改 对接多用户体系
						
						
						
						
						
						
					 | 
					
						2022-01-17 17:09:27 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						3600875707
					 | 
					
						
						
							
							update 优化 代码生成 字段更新未同步
						
						
						
						
						
						
					 | 
					
						2022-01-17 15:49:34 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						8052d75957
					 | 
					
						
						
							
							Merge remote-tracking branch 'ruoyi-vue/master' into dev
						
						
						
						
						
						
						
						# Conflicts:
#	ruoyi-admin/src/main/resources/application.yml
#	ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
#	ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
#	ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
#	ruoyi-ui/src/views/login.vue
#	ruoyi-ui/src/views/register.vue 
						
						
					 | 
					
						2022-01-17 15:48:09 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						cc2624d08e
					 | 
					
						
						
							
							update 优化加载字典缓存数据
						
						
						
						
						
						
					 | 
					
						2022-01-17 15:46:28 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						e72cfff7bb
					 | 
					
						
						
							
							remove 删除无用同步
						
						
						
						
						
						
					 | 
					
						2022-01-17 15:27:41 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						a43e6e06e0
					 | 
					
						
						
							
							update 优化多用户体系处理 更名 LoginUtils 为 LoginHelper 支持 LoginUser 多级缓存
						
						
						
						
						
						
					 | 
					
						2022-01-17 12:03:15 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子Li
							
						 
					 | 
					
						
						
							
						
						dc0af0a419
					 | 
					
						
						
							
							fix 修复 banner 显示版本号不正确
						
						
						
						
						
						
					 | 
					
						2022-01-16 18:03:05 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								phanes
							
						 
					 | 
					
						
						
							
						
						868942e202
					 | 
					
						
						
							
							update 格式化代码结构 统一编码格式
						
						
						
						
						
						
					 | 
					
						2022-01-16 17:46:24 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子Li
							
						 
					 | 
					
						
						
							
						
						3fef2b68dc
					 | 
					
						
						
							
							!129 重命名通用 数据权限 服务接口类名称,与其他服务接口风格统一
						
						
						
						
						
						
						
						Merge pull request !129 from KonBAI/fix-rename-DataScopeService 
						
						
					 | 
					
						2022-01-15 17:44:34 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								konbai
							
						 
					 | 
					
						
						
							
						
						404cb4c7a6
					 | 
					
						
						
							
							fix 重命名通用 数据权限 服务接口类名称,与其他服务接口风格统一
						
						
						
						
						
						
					 | 
					
						2022-01-16 01:06:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SG
							
						 
					 | 
					
						
						
							
						
						a966b95a5b
					 | 
					
						
						
							
							update ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java.
						
						
						
						
						
						
						
						修正文字 
						
						
					 | 
					
						2022-01-14 09:24:15 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mingliangyang
							
						 
					 | 
					
						
						
							
						
						15f05b602f
					 | 
					
						
						
							
							fix ruoyi-vue3下点击编辑,取消修改报错问题
						
						
						
						
						
						
					 | 
					
						2022-01-14 16:26:03 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mingliangyang
							
						 
					 | 
					
						
						
							
						
						9e51d3f250
					 | 
					
						
						
							
							优化任务队列满时任务拒绝策略
						
						
						
						
						
						
					 | 
					
						2022-01-14 11:54:46 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						d7ca248bc8
					 | 
					
						
						
							
							update copyright 2022
						
						
						
						
						
						
					 | 
					
						2022-01-14 11:47:25 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						3980b2f2ff
					 | 
					
						
						
							
							定时任务屏蔽违规的字符
						
						
						
						
						
						
					 | 
					
						2022-01-14 11:47:14 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						bed9fcea46
					 | 
					
						
						
							
							优化加载字典缓存数据
						
						
						
						
						
						
					 | 
					
						2022-01-14 11:46:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						b1b82857ba
					 | 
					
						
						
							
							优化字段更新未同步
						
						
						
						
						
						
					 | 
					
						2022-01-14 11:46:05 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						0b09272a60
					 | 
					
						
						
							
							update 代码生成调整
						
						
						
						
						
						
					 | 
					
						2022-01-13 15:28:00 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						f9129bd54e
					 | 
					
						
						
							
							update 代码生成调整 删除无用导报与逻辑
						
						
						
						
						
						
					 | 
					
						2022-01-13 15:23:17 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						c0f3dff0f6
					 | 
					
						
						
							
							update 合并 satoken 解决不兼容不分
						
						
						
						
						
						
					 | 
					
						2022-01-13 11:27:09 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						6ca8535166
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/satoken' into dev
						
						
						
						
						
						
						
						# Conflicts:
#	pom.xml
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RepeatSubmitAspect.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/config/AsyncConfig.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/config/SwaggerConfig.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/handler/CreateAndUpdateMetaObjectHandler.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TokenServiceImpl.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserDetailsServiceImpl.java
#	ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml 
						
						
					 | 
					
						2022-01-13 11:14:33 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						ff4a429136
					 | 
					
						
						
							
							update 升级 springboot 2.6.X 解决 springfox 兼容性问题
						
						
						
						
						
						
					 | 
					
						2022-01-13 11:07:09 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						9a5cea2b23
					 | 
					
						
						
							
							update 降低开发环境 redis连接池数量
						
						
						
						
						
						
					 | 
					
						2022-01-13 10:46:10 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						cd1a68f15e
					 | 
					
						
						
							
							update 防止 MP 无主键警告
						
						
						
						
						
						
					 | 
					
						2022-01-13 10:26:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						a0bed51d96
					 | 
					
						
						
							
							update 格式化代码 统一间隔符
						
						
						
						
						
						
						
						update 格式化代码 统一间隔符 
						
						
					 | 
					
						2022-01-13 09:58:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						857dec38d1
					 | 
					
						
						
							
							update 代码模板 适配新改动
						
						
						
						
						
						
					 | 
					
						2022-01-13 09:49:08 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						8f6484e470
					 | 
					
						
						
							
							[重磅更新] 重写项目整体结构 数据处理下沉至 Mapper 符合 MVC 规范 减少循环依赖
						
						
						
						
						
						
					 | 
					
						2022-01-12 21:22:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						5413b37d71
					 | 
					
						
						
							
							Merge remote-tracking branch 'ruoyi-vue/master' into dev
						
						
						
						
						
						
						
						# Conflicts:
#	README.md
#	ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java
#	ruoyi-ui/src/views/index.vue 
						
						
					 | 
					
						2022-01-12 20:53:03 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						869dcf73f8
					 | 
					
						
						
							
							Vue3前端代码生成模板同步到最新
						
						
						
						
						
						
					 | 
					
						2022-01-11 17:20:50 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								若依
							
						 
					 | 
					
						
						
							
						
						96a34d1ad7
					 | 
					
						
						
							
							!409 翻页组件多了一个 :p 导致生成代码无法翻页
						
						
						
						
						
						
						
						Merge pull request !409 from guxin0123/master 
						
						
					 | 
					
						2022-01-11 09:17:31 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						26fc652d33
					 | 
					
						
						
							
							update 统一代码间隔符
						
						
						
						
						
						
					 | 
					
						2022-01-11 16:58:47 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								guxin0123
							
						 
					 | 
					
						
						
							
						
						766361ac83
					 | 
					
						
						
							
							update ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm.
						
						
						
						
						
						
						
						翻页组件多了一个 :p 导致生成代码无法翻页 
						
						
					 | 
					
						2022-01-11 04:57:26 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						fc8c96399f
					 | 
					
						
						
							
							update 防重复提交标识组合 改为 key + url + header
						
						
						
						
						
						
					 | 
					
						2022-01-11 12:36:33 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						9bad713db5
					 | 
					
						
						
							
							fix 修复 index-tree.vue.vm 漏删 #end
						
						
						
						
						
						
					 | 
					
						2022-01-11 11:30:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						6f222ab02b
					 | 
					
						
						
							
							fix 修复 通配符匹配无效
						
						
						
						
						
						
					 | 
					
						2022-01-11 09:30:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						9bd7509e87
					 | 
					
						
						
							
							添加新群号:264312783
						
						
						
						
						
						
					 | 
					
						2022-01-11 09:02:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子li
							
						 
					 | 
					
						
						
							
						
						e47596383a
					 | 
					
						
						
							
							update 删除文档无用合并
						
						
						
						
						
						
					 | 
					
						2022-01-10 15:05:03 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								疯狂的狮子Li
							
						 
					 | 
					
						
						
							
						
						7487c92a52
					 | 
					
						
						
							
							add 增加 监控中心 自定义事件通知
						
						
						
						
						
						
					 | 
					
						2022-01-09 00:54:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |