Merge branch 'cron' into 'master'

- Remove useless code.

See merge request easycorp/zentaopms!7069
This commit is contained in:
朱金勇
2023-02-26 13:05:34 +00:00
3 changed files with 4 additions and 6 deletions
+1 -1
View File
@@ -197,7 +197,7 @@ class cron extends control
if($now > $cron['time'])
{
if(!$this->cron->changeStatusRunning($id, $cronInfo->lastTime)) continue;
if(!$this->cron->changeStatusRunning($id)) continue;
$parsedCrons[$id]['time'] = $cron['cron']->getNextRunDate();
/* Execution command. */
+2 -3
View File
@@ -77,13 +77,12 @@ class cronTest
* Change cron status to running test.
*
* @param int $cronID
* @param string $lastTime
* @access public
* @return bool|int
*/
public function changeStatusRunningTest($cronID, $lastTime)
public function changeStatusRunningTest($cronID)
{
$objects = $this->objectModel->changeStatusRunning($cronID, $lastTime);
$objects = $this->objectModel->changeStatusRunning($cronID);
if(dao::isError()) return dao::getError();
+1 -2
View File
@@ -18,8 +18,7 @@ pid=1
$cron = new cronTest();
$cronID = 4;
$lastTime = '0000-00-00 00:00:00';
$result = $cron->changeStatusRunningTest($cronID, $lastTime);
$result = $cron->changeStatusRunningTest($cronID);
$cronInfo = $tester->cron->getById($cronID);
r($result) && p() && e('1'); // 更新之后查看返回值是否是1