!414 优化任务队列满时任务拒绝策略

Merge pull request !414 from root/master

@@ -3,6 +3,7 @@ package com.ruoyi.common.core.domain.entity;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import javax.validation.constraints.Size;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -30,7 +31,7 @@ public class SysMenu extends BaseEntity
     private Long parentId;
     private Long parentId;
 
 
     /** 显示顺序 */
     /** 显示顺序 */
-    private String orderNum;
+    private Integer orderNum;
 
 
     /** 路由地址 */
     /** 路由地址 */
     private String path;
     private String path;
@@ -107,13 +108,13 @@ public class SysMenu extends BaseEntity
         this.parentId = parentId;
         this.parentId = parentId;
     }
     }
 
 
-    @NotBlank(message = "显示顺序不能为空")
-    public String getOrderNum()
+    @NotNull(message = "显示顺序不能为空")
+    public Integer getOrderNum()
     {
     {
         return orderNum;
         return orderNum;
     }
     }
 
 
-    public void setOrderNum(String orderNum)
+    public void setOrderNum(Integer orderNum)
     {
     {
         this.orderNum = orderNum;
         this.orderNum = orderNum;
     }
     }

 package com.ruoyi.framework.config;
 package com.ruoyi.framework.config;
 
 
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ScheduledThreadPoolExecutor;
-import java.util.concurrent.ThreadPoolExecutor;
+import com.ruoyi.common.utils.Threads;
 import org.apache.commons.lang3.concurrent.BasicThreadFactory;
 import org.apache.commons.lang3.concurrent.BasicThreadFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
-import com.ruoyi.common.utils.Threads;
+
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.ThreadPoolExecutor;
 
 
 /**
 /**
  * 线程池配置
  * 线程池配置
@@ -49,7 +50,8 @@ public class ThreadPoolConfig
     protected ScheduledExecutorService scheduledExecutorService()
     protected ScheduledExecutorService scheduledExecutorService()
     {
     {
         return new ScheduledThreadPoolExecutor(corePoolSize,
         return new ScheduledThreadPoolExecutor(corePoolSize,
-                new BasicThreadFactory.Builder().namingPattern("schedule-pool-%d").daemon(true).build())
+                new BasicThreadFactory.Builder().namingPattern("schedule-pool-%d").daemon(true).build(),
+                new ThreadPoolExecutor.CallerRunsPolicy())
         {
         {
             @Override
             @Override
             protected void afterExecute(Runnable r, Throwable t)
             protected void afterExecute(Runnable r, Throwable t)