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
..
i18n	update 用户登录 支持校验错误次数锁定登录	4 years ago
application-dev.yml	update 降低开发环境 redis连接池数量	4 years ago
application-prod.yml	update 更新 jdbc 配置参考博客地址	4 years ago
application.yml	Merge remote-tracking branch 'origin/satoken' into dev	4 years ago
banner.txt	update 更新banner	5 years ago
logback.xml	update 格式化代码 统一间隔符	4 years ago
spy.properties	remove 移除 quartz 相关代码与依赖	4 years ago