疯狂的狮子li 8231953e29 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev ...

 Conflicts:

	pom.xml

	ruoyi-admin/pom.xml

	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java

	ruoyi-admin/src/main/resources/application.yml

	ruoyi-common/pom.xml

	ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java

	ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java

	ruoyi-framework/pom.xml

	ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

	ruoyi-generator/pom.xml

	ruoyi-quartz/pom.xml

	ruoyi-system/pom.xml

	ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java

	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java

	ruoyi-ui/package.json

	ruoyi-ui/src/components/HeaderSearch/index.vue

	ruoyi-ui/src/layout/components/AppMain.vue

	ruoyi-ui/src/router/index.js

	ruoyi-ui/src/store/modules/permission.js

	ruoyi-ui/src/views/index.vue

2021-07-12 09:37:23 +08:00

..

aspectj

集成lock4j框架，删除redisson锁，使用lock4j的锁。

2021-06-22 16:06:02 +08:00

captcha

update 验证码生成更新为无符号整数计算

2021-05-19 22:57:34 +08:00

config

Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

2021-07-12 09:37:23 +08:00

interceptor

update 移除 fastjson 增加 jackson 工具类 重写相关业务

2021-06-13 15:39:35 +08:00

manager

update 优化 异步工厂重写 使用 spring 异步处理

2021-06-12 20:14:50 +08:00

mybatisplus

update 优化 增加MP注入异常拦截

2021-07-02 09:39:07 +08:00

security

update 移除 fastjson 增加 jackson 工具类 重写相关业务

2021-06-13 15:39:35 +08:00

web

update 优化 异步工厂重写 使用 spring 异步处理

2021-06-12 20:14:50 +08:00