Merge remote-tracking branch 'origin/master'

src/main/java/org/springblade/modules/api/task/ConsignSchedulingTask.java

@@ -39,7 +39,7 @@ public class ConsignSchedulingTask implements SchedulingConfigurer {
 	private static final String PATTERN_DATETIME = org.springblade.core.tool.utils.DateUtil.PATTERN_DATETIME;
 
 	private static final String TASK_NAME = "【定时修改进货订单数据】";
-
+	public static boolean isStartTask =false;
 	@Autowired
 	private IConsignService consignService;
 
@@ -48,6 +48,9 @@ public class ConsignSchedulingTask implements SchedulingConfigurer {
 
 	@Override
 	public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
+		if(!isStartTask){
+			return;
+		}
 		Runnable task = new Runnable() {
 			@Override
 			public void run() {

src/main/java/org/springblade/modules/api/task/GrantSchedulingTask.java

@@ -19,6 +19,8 @@ import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.List;
 
+import static org.springblade.modules.api.task.ConsignSchedulingTask.isStartTask;
+
 @Component
 public class GrantSchedulingTask implements SchedulingConfigurer {
 
@@ -27,7 +29,6 @@ public class GrantSchedulingTask implements SchedulingConfigurer {
 	private static final String PATTERN_DATE = org.springblade.core.tool.utils.DateUtil.PATTERN_DATE;
 
 	private static final String TASK_NAME = "【解冻支付宝账号】";
-
 	@Autowired
 	private IOrderGrantService orderGrantService;
 
@@ -36,6 +37,10 @@ public class GrantSchedulingTask implements SchedulingConfigurer {
 
 	@Override
 	public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
+		if(!isStartTask){
+			return;
+		}
+
 		Runnable task = new Runnable() {
 			@Override
 			public void run() {

src/main/java/org/springblade/modules/api/task/ScoreSchedulingTask.java

@@ -12,13 +12,18 @@ import org.springframework.stereotype.Component;
 import java.time.LocalDateTime;
 import java.util.Date;
 
+import static org.springblade.modules.api.task.ConsignSchedulingTask.isStartTask;
+
 @Component
 public class ScoreSchedulingTask implements SchedulingConfigurer {
 
 	private static final Logger log = LoggerFactory.getLogger(ScoreSchedulingTask.class);
-
 	@Override
 	public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
+		if(!isStartTask){
+			return;
+		}
+
 		Runnable task = new Runnable() {
 			@Override
 			public void run() {