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 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		4 years ago
..
annotation	Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev	4 years ago
captcha	update 优化随机数生成方式 避免容易生成两个相同随机数的问题	4 years ago
config	update 去除链式调用注解 不符合规范导致很多奇葩问题 例如: copy为空问题	4 years ago
constant	update 简化查询用户功能	4 years ago
convert	update 移除掉 StringUtils 语义不明确的api方法 使用特定工具替换	4 years ago
core	Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev	4 years ago
enums	update 简化 全局线程池配置 使用cpu核心数自动处理	4 years ago
excel	update 移除 包错误引用	4 years ago
exception	update 格式化代码结构 统一编码格式	4 years ago
filter	update 格式化代码结构 统一编码格式	4 years ago
helper	update 优化 getLoginUser 获取 使用一级缓存	4 years ago
jackson	fix 修复脱敏实现逻辑问题	4 years ago
utils	add 增加 RedisUtils 操作原子值方法	4 years ago
xss	add 增加 自定义 Xss 校验注解 用户导入增加 Bean 校验	4 years ago