You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

疯狂的狮子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		4 years ago
..
aspectj	Merge remote-tracking branch 'origin/satoken' into dev	4 years ago
config	Merge remote-tracking branch 'origin/satoken' into dev	4 years ago
handler	Merge remote-tracking branch 'origin/satoken' into dev	4 years ago
interceptor	update 优化web拦截器 使用原生接口处理 默认非生产环境开启	4 years ago
jackson	update 统一代码间隔符	4 years ago
listener	update 合并 dev 处理差异	4 years ago
manager	update 统一代码间隔符	4 years ago
satoken	update [重磅更新] 登录流程升级 支持缓存	4 years ago
web/exception	update 过滤离线用户	4 years ago