* [bug#58222,done,0.1h,0h] fixed actor name.

This commit is contained in:
zhaixiaojian
2025-01-13 16:13:27 +08:00
committed by 张希全
parent ef4db69897
commit aaedeb6d8f
2 changed files with 8 additions and 6 deletions
+3 -1
View File
@@ -673,7 +673,9 @@ class instance extends control
if(empty($instances)) return $this->send(array('result' => 'success', 'message' => $this->lang->instance->notices['NoCleanBackupFiles']));
/* Cycle cleaning backup. */
foreach($instances as $instance) $this->instance->cleanBackup($instance);
$sysUser = new stdclass;
$sysUser->account = 'system';
foreach($instances as $instance) $this->instance->cleanBackup($instance, $sysUser);
return $this->send(array('result' => 'success', 'message' => $this->lang->instance->notices['cleanBackupSuccess']));
}
+5 -5
View File
@@ -1386,11 +1386,11 @@ class instanceModel extends model
/**
* 清理备份
* Cleanup Backup.
*
* @param $instance
* @return void
* @param object $instance
* @param object $user
* @return bool
*/
public function cleanBackup(object $instance): bool
public function cleanBackup(object $instance, object $user): bool
{
$instance->spaceData = $this->dao->select('*')->from(TABLE_SPACE)->where('id')->eq($instance->space)->fetch();
@@ -1418,7 +1418,7 @@ class instanceModel extends model
array_push($deleteData, array('instanceId' => $instance->id, 'instanceName' => $instance->name, 'backupName' => $backupName, 'backupCreateTime' => $backup->create_time, 'cneResult' => $cneResult));
}
}
if(count($deleteData) > 0) $this->action->create('instance', $instance->id, 'deleteexpiredbackup', '', json_encode(array('result' => 'success', 'data' => $deleteData)));
if(count($deleteData) > 0) $this->action->create('instance', $instance->id, 'deleteexpiredbackup', '', json_encode(array('result' => 'success', 'data' => $deleteData), $user->account));
return true;
}