定时任务问题优化

问题说明：定时任务时、分类型设置0时n分时报错

修改文件：app\services\system\timer\SystemTimerServices

修改方法：getTimerCycleTime()

public function getTimerCycleTime($type, $cycle, $time, $start_time = 0)
    {
        if (!$time) $time = time();
        switch ($type) {
            case 1: // N分钟
                $cycle_time = 60 * $cycle;
                $i = $time - $start_time;
                $more = $i % $cycle_time;
                if ($more == 0) {
                    $cycle_time = $time;
                } else {
                    $cycle_time = $time - $more + $cycle_time;
                }
                break;
            case 2: //N小时
                $arr = explode('/', $cycle);
                $todaystart = strtotime(date('Y-m-d H' . ':00:00', $time));
                $start_time = strtotime(date('Y-m-d H' . ':00:00', $start_time));
                if ($arr[0] <= 0) {
                    $cycle_time = 60 * $arr[1];
                    $i = $time - $start_time;
                    $more = $i % $cycle_time;
                    if ($more == 0) {
                        $cycle_time = $time;
                    } else {
                        $cycle_time = $time - $more + $cycle_time;
                    }
                } else {
                    $h = ($todaystart - $start_time) / 3600;
                    $h = floor($h);
                    $more = $h % $arr[0];
                    if ($more == 0) {
                        $cycle_time = 60 * $arr[1];
                        $cycle_time1 = $todaystart + $cycle_time;
                        if ($cycle_time1 < $time) {
                            $cycle_time = 60 * 60 * $arr[0] + 60 * $arr[1];
                        }
                    } else {
                        $sh = $arr[0] - $more;
                        $cycle_time = 60 * 60 * $sh + 60 * $arr[1];
                    }
                    $cycle_time = $todaystart + $cycle_time;
                }
                break;
            case 3: //每小时
                $cycle_time = strtotime(date('Y-m-d ' . 'H:' . $cycle . ':00', $time));
                break;
            case 4: //每天
                $arr = explode('/', $cycle);
                $cycle_time = strtotime(date('Y-m-d ' . $arr[0] . ':' . $arr[1] . ':00', $time));
                break;
            case 5: //N天
                $arr = explode('/', $cycle);
                $todaystart = strtotime(date('Y-m-d ' . '00:00:00', $time));
                $start_time = strtotime(date('Y-m-d ' . '00:00:00', $start_time));
                $d = ($todaystart - $start_time) / 86400;
                $d = floor($d);
                $more = $d % $arr[0];
                if ($more == 0) {
                    $cycle_time = 60 * 60 * $arr[1] + 60 * $arr[2];
                    $cycle_time1 = $todaystart + $cycle_time;
                    if ($cycle_time1 < $time) {
                        $cycle_time = 60 * 60 * 24 * $more + 60 * 60 * $arr[1] + 60 * $arr[2];
                    }
                } else {
                    $sd = $arr[0] - $more;
                    $cycle_time = 60 * 60 * 24 * $sd + 60 * 60 * $arr[1] + 60 * $arr[2];
                }
                $cycle_time = $todaystart + $cycle_time;
                break;
            case 6: //每星期
                $arr = explode('/', $cycle);
                $todaystart = strtotime(date('Y-m-d ' . '00:00:00', $time));
                $w = date("w");
                if ($w > $arr[0]) {
                    $d = 7 - $w + $arr[0];
                    $cycle_time = $todaystart + 60 * 60 * 24 * $d + 60 * 60 * $arr[1] + 60 * $arr[2];
                } else if ($w == $arr[0]) {
                    $to_time = 60 * 60 * $arr[1] + 60 * $arr[2];
                    $to_time = $todaystart + $to_time;
                    if ($time > $to_time) {
                        $d = 7 - $w + $arr[0];
                        $cycle_time = $todaystart + 60 * 60 * 24 * $d + 60 * 60 * $arr[1] + 60 * $arr[2];
                    } else {
                        $cycle_time = $to_time;
                    }
                } else {
                    $d = $arr[0] - $w;
                    $cycle_time = $todaystart + 60 * 60 * 24 * $d + 60 * 60 * $arr[1] + 60 * $arr[2];
                }
                break;
            case 7: //每月
                $arr = explode('/', $cycle);
                $current_d = date("d");
                $firstDate = date('Y-m-01', $time);
                $max_d = date('d', strtotime("$firstDate + 1 month -1 day"));
                $todaystart = strtotime(date('Y-m-d ' . '00:00:00', $time));
                if ($current_d > $arr[0]) {
                    $d = $max_d - $current_d + $arr[0];
                    $cycle_time = $todaystart + 60 * 60 * 24 * $d + 60 * 60 * $arr[1] + 60 * $arr[2];
                } elseif ($current_d == $arr[0]) {
                    $to_time = 60 * 60 * $arr[1] + 60 * $arr[2];
                    $to_time = $todaystart + $to_time;
                    if ($time > $to_time) {
                        $d = $max_d - $current_d + $arr[0];
                        $cycle_time = $todaystart + 60 * 60 * 24 * $d + 60 * 60 * $arr[1] + 60 * $arr[2];
                    } else {
                        $cycle_time = $to_time;
                    }
                } else {
                    $d = $arr[0] - $current_d;
                    $cycle_time = $todaystart + 60 * 60 * 24 * $d + 60 * 60 * $arr[1] + 60 * $arr[2];
                }
                break;
            case 8: //每年
                $arr = explode('/', $cycle);
                $cycle_time = strtotime(date('Y-' . $arr[0] . '-' . $arr[1] . ' ' . $arr[2] . ':' . $arr[3] . ':00', $time));
                break;
            default:
                $cycle_time = 0;
                break;
        }
        return ['cycle_time' => $cycle_time];
    }