Unverified Commit 500509e2 authored by 乔占卫's avatar 乔占卫 Committed by GitHub
Browse files

Merge pull request #281 from qiaozhanwei/branch-1.0.2 

Scheduled scheduling, use scheduler-time
parents c2e760bf 34800ada

escheduler-common/src/main/java/cn/escheduler/common/utils/placeholder/BusinessTimeUtils.java

+2 −2
Original line number Diff line number Diff line
@@ -54,11 +54,11 @@ public class BusinessTimeUtils { 
      case SCHEDULER:

      default:

          businessDate = addDays(new Date(), -1);

          if (businessDate != null){

          if (runTime != null){

            /**

             * If there is a scheduled time, take the scheduling time. Recovery from failed nodes, suspension of recovery, re-run for scheduling

             */

            businessDate = runTime;

            businessDate = addDays(runTime, -1);

          }

          break;

    }