疯狂的狮子li 695cb6d76b Merge remote-tracking branch 'origin/dev' into satoken ... # Conflicts: # ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java # ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java # ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java # ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java # ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java # ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java # ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java # ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java # ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java # ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java # ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java # ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java # ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java # ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java # ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.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/constant/GenConstants.java # ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java # ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java # ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java # ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java # ruoyi-framework/src/main/java/com/ruoyi/framework/mybatisplus/CreateAndUpdateMetaObjectHandler.java # ruoyi-framework/src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java # ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java # ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java # ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java # ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java # ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.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		2021-10-27 13:16:19 +08:00
..
BusinessStatus.java	update 统一格式化代码结构	2021-10-22 10:04:15 +08:00
BusinessType.java	update 统一格式化代码结构	2021-10-22 10:04:15 +08:00
CaptchaCategory.java	update 优化验证码配置 使用泛型 防止错误输入	2021-09-02 15:19:18 +08:00
CaptchaType.java	update 优化验证码配置 使用泛型 防止错误输入	2021-09-02 15:19:18 +08:00
DataSourceType.java	update 统一格式化代码结构	2021-10-22 10:04:15 +08:00
DeviceType.java	update 适配单体系与多体系用户权限	2021-09-28 17:56:19 +08:00
HttpMethod.java	update 统一格式化代码结构	2021-10-22 10:04:15 +08:00
LimitType.java	update 统一格式化代码结构	2021-10-22 10:04:15 +08:00
OperatorType.java	update 统一格式化代码结构	2021-10-22 10:04:15 +08:00
ThreadPoolRejectedPolicy.java	update 更新线程池策略说明	2021-09-27 15:00:36 +08:00
UserStatus.java	update 统一格式化代码结构	2021-10-22 10:04:15 +08:00
UserType.java	update 适配单体系与多体系用户权限	2021-09-28 17:56:19 +08:00