Merge remote-tracking branch 'ruoyi-vue/master' into dev
# Conflicts:
# README.md
# pom.xml
# ruoyi-admin/pom.xml
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java
# ruoyi-admin/src/main/resources/application.yml
# ruoyi-common/pom.xml
# ruoyi-common/src/main/java/com/ruoyi/common/annotation/RateLimiter.java
# ruoyi-common/src/main/java/com/ruoyi/common/constant/CacheConstants.java
# ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
# ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java
# ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatedlyRequestWrapper.java
# ruoyi-common/src/main/java/com/ruoyi/common/filter/XssFilter.java
# ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java
# ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java
# ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
# ruoyi-framework/pom.xml
# ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java
# ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
# ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java
# ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java
# ruoyi-generator/pom.xml
# ruoyi-job/pom.xml
# ruoyi-system/pom.xml
# ruoyi-system/src/main/java/com/ruoyi/system/domain/SysCache.java
# ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java
# ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
# ruoyi-ui/package.json
# ruoyi-ui/src/views/index.vue
# ruoyi-ui/src/views/monitor/cache/list.vue
# ruoyi-ui/src/views/system/dict/data.vue
# ruoyi-ui/vue.config.js
# sql/ry_20220625.sql
|
疯狂的狮子li
RuoYi