Merge branch 'master' of https://git.we-zone.com/wezone/Ry-master
# Conflicts: # ruoyi-admin/src/main/resources/application-dev.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/ScheduleConstants.java # ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java # ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java # ruoyi-common/src/main/java/com/ruoyi/common/enums/LimitType.java # ruoyi-common/src/main/java/com/ruoyi/common/exception/GlobalException.java # ruoyi-common/src/main/java/com/ruoyi/common/exception/ServiceException.java # ruoyi-common/src/main/java/com/ruoyi/common/exception/job/TaskException.java # ruoyi-generator/src/main/resources/generator.yml # ruoyi-generator/src/main/resources/vm/java/sub-domain.java.vm # ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java # ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/CronUtils.java # ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzDisallowConcurrentExecution.java # ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzJobExecution.java # ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java # ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml # ruoyi-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml # ruoyi-ui/public/html/ie.html # ruoyi-ui/public/robots.txt # ruoyi-ui/src/api/monitor/cache.js # ruoyi-ui/src/assets/images/dark.svg # ruoyi-ui/src/assets/images/light.svg # ruoyi-ui/src/components/DictTag/index.vue # ruoyi-ui/src/components/RightToolbar/index.vue # ruoyi-ui/src/components/iFrame/index.vue # ruoyi-ui/src/directive/dialog/drag.js # ruoyi-ui/src/layout/components/InnerLink/index.vue # ruoyi-ui/src/utils/generator/config.js # ruoyi-ui/src/utils/generator/css.js # ruoyi-ui/src/utils/generator/drawingDefalut.js # ruoyi-ui/src/utils/generator/html.js # ruoyi-ui/src/utils/generator/js.js # ruoyi-ui/src/utils/generator/render.js # ruoyi-ui/src/views/index_v1.vue # ruoyi-ui/src/views/monitor/cache/index.vue # ruoyi-ui/src/views/system/role/authUser.vue # ruoyi-ui/src/views/system/role/selectUser.vue # ruoyi-ui/src/views/tool/build/CodeTypeDialog.vue # ruoyi-ui/src/views/tool/build/DraggableItem.vue # ruoyi-ui/src/views/tool/build/IconsDialog.vue # ruoyi-ui/src/views/tool/build/RightPanel.vue # ruoyi-ui/src/views/tool/build/TreeNodeDialog.vue # sql/quartz.sql
This commit is contained in:
commit
a72109cd7a