疯狂的狮子li 6f6a3566ac Merge remote-tracking branch 'origin/dev' into satoken ...

# Conflicts:
#	pom.xml
#	ruoyi-framework/src/main/java/com/ruoyi/framework/config/AsyncConfig.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java

2021-09-26 17:15:40 +08:00

..

i18n

add 增加 完整国际化解决方案

2021-08-06 18:59:08 +08:00

application-dev.yml

add 增加 redis redisson 集群配置

2021-09-14 16:57:07 +08:00

application-prod.yml

add 增加 redis redisson 集群配置

2021-09-14 16:57:07 +08:00

application.yml

Merge remote-tracking branch 'origin/dev' into satoken

2021-09-26 17:15:40 +08:00

banner.txt

update 更新banner

2021-05-10 23:53:15 +08:00

logback.xml

update admin 实时监控日志 改为保留一天

2021-05-16 10:42:47 +08:00

spy.properties

update 优化spy配置文件为 UTF8编码 解决中文注释乱码问题

2021-08-24 16:00:33 +08:00