Merge remote-tracking branch 'ruoyi-vue/master' into dev

# Conflicts:
#	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java
#	ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java

@@ -11,6 +11,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
 /**

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

@@ -13,6 +13,7 @@ import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import java.util.concurrent.RejectedExecutionHandler;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.ThreadPoolExecutor;
 
 /**
  * 线程池配置
@@ -44,7 +45,8 @@ public class ThreadPoolConfig {
     @Bean(name = "scheduledExecutorService")
     protected ScheduledExecutorService scheduledExecutorService() {
         return new ScheduledThreadPoolExecutor(threadPoolProperties.getCorePoolSize(),
-            new BasicThreadFactory.Builder().namingPattern("schedule-pool-%d").daemon(true).build()) {
+            new BasicThreadFactory.Builder().namingPattern("schedule-pool-%d").daemon(true).build(),
+            new ThreadPoolExecutor.CallerRunsPolicy()) {
             @Override
             protected void afterExecute(Runnable r, Throwable t) {
                 super.afterExecute(r, t);

ruoyi-ui/src/plugins/tab.js

@@ -4,20 +4,21 @@ import router from '@/router';
 export default {
   // 刷新当前tab页签
   refreshPage(obj) {
-    const { path, matched } = router.currentRoute;
+    const { path, query, matched } = router.currentRoute;
     if (obj === undefined) {
       matched.forEach((m) => {
         if (m.components && m.components.default && m.components.default.name) {
           if (!['Layout', 'ParentView'].includes(m.components.default.name)) {
-            obj = { name: m.components.default.name, path: path };
+            obj = { name: m.components.default.name, path: path, query: query };
           }
         }
       });
     }
     return store.dispatch('tagsView/delCachedView', obj).then(() => {
-      const { path } = obj
+      const { path, query } = obj
       router.replace({
-        path: '/redirect' + path
+        path: '/redirect' + path,
+        query: query
       })
     })
   },