RuoYi-Vue-Plus/ruoyi-framework/src/main/java/com/ruoyi/framework
疯狂的狮子Li 5ced7e05f5 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
 Conflicts:
	README.md
	pom.xml
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java
	ruoyi-common/pom.xml
	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java
	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
	ruoyi-common/src/main/java/com/ruoyi/common/core/text/Convert.java
	ruoyi-common/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
	ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml
	ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
	ruoyi-ui/src/views/index.vue
2022-05-28 22:30:06 +08:00
..
aspectj 升级fastjson到最新版2.0.4 2022-05-26 09:02:32 +08:00
config Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 2022-05-28 22:30:06 +08:00
handler update 优化 是否为管理员的判断 2022-02-19 16:15:44 +08:00
interceptor 升级fastjson到最新版2.0.4 2022-05-26 09:02:32 +08:00
jackson update 统一代码间隔符 2022-01-11 16:58:47 +08:00
listener update springboot-admin 2.6.6 => 2.6.7 2022-05-10 14:42:02 +08:00
manager update 统一代码间隔符 2022-01-11 16:58:47 +08:00
satoken fix 修复 token 超时时间设置 -1 导致的单位转换问题 2022-05-11 23:47:05 +08:00
web/exception add 增加 Mybatis 全局异常处理 开启多数据源切换 严格模式 找不到数据源报错 2022-04-08 11:39:40 +08:00