fernando/luos
1
0
Fork 0
Code Releases Activity

Merge branch 'develop' of bitbucket.org:colosa/processmaker into feature/PMCORE-3871

Browse Source
This commit is contained in:
henry jordan
2022-06-29 15:23:20 +00:00
parent 5b4600636b 4d5b6cbebf
commit ed7971accc
7 changed files with 176 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

145
workflow/engine/src/ProcessMaker/BusinessModel/TaskSchedulerBM.php
View File

@@ -2,6 +2,8 @@
namespace ProcessMaker\BusinessModel;
use Bootstrap;
use Illuminate\Support\Facades\Log;
use ProcessMaker\Core\System;
use ProcessMaker\Model\TaskScheduler;
@@ -223,13 +225,14 @@ class TaskSchedulerBM
]
/*----------------------------------********---------------------------------*/
];
/**
* Return the records in Schedule Table by category
*/
public static function getSchedule($category)
{
$tasks = TaskScheduler::all();
$count = $tasks->count();
$count = $tasks->count();
if ($count == 0) {
TaskSchedulerBM::generateInitialData();
$tasks = TaskScheduler::all();
@@ -244,6 +247,7 @@ class TaskSchedulerBM
return $tasks;
}
}
/**
* Save the record Schedule in Schedule Table
*/
@@ -251,55 +255,122 @@ class TaskSchedulerBM
{
$task = TaskScheduler::find($request['id']);
if (isset($request['enable'])) {
$task->enable = $request['enable'];
$task->enable = $request['enable'];
}
if (isset($request['expression'])) {
$task->expression = $request['expression'];
$task->startingTime = $request['startingTime'];
$task->endingTime = $request['endingTime'];
$task->timezone = $request['timezone'];
$task->everyOn = $request['everyOn'];
$task->interval = $request['interval'];
$task->startingTime = $request['startingTime'];
$task->endingTime = $request['endingTime'];
$task->timezone = $request['timezone'];
$task->everyOn = $request['everyOn'];
$task->interval = $request['interval'];
}
$task->save();
return $task;
}
/**
* Initial data for Schedule Table, with default values
*/
public static function generateInitialData()
{
$arraySystemConfiguration = System::getSystemConfiguration('', '', config("system.workspace"));
$toSave = [];
$win = strtoupper(substr(PHP_OS, 0, 3)) === 'WIN';
foreach (TaskSchedulerBM::$services as $service) {
$task = new TaskScheduler;
$task->title = $service["title"];
$task->category = $service["category"];
$task->description = $service["description"];
$task->startingTime = $service["startingTime"];
$task->endingTime = $service["endingTime"];
if ($win) {
$task->body = 'php "' . PATH_TRUNK . $service["filew"] . '" ' . $service["service"] . ' +w' . config("system.workspace") . ' +force +async';
} else {
$task->body = 'su -s /bin/sh -c "php ' . PATH_TRUNK . $service["file"] . " " . $service["service"] . ' +w' . config("system.workspace") . ' +force +async"';
}
$task->expression = $service["expression"];
$task->type = "shell";
$task->system = 1;
$task->enable = $service["enable"];
$task->everyOn = $service["everyOn"];
$task->interval = $service["interval"];
$task->timezone = $service["timezone"] == "default" ? date_default_timezone_get() : null;
$task->default_value = json_encode([
"startingTime" => $service["startingTime"],
"endingTime" => $service["endingTime"],
"everyOn" => $service["everyOn"],
"interval" => $service["interval"],
"expression" => $service["expression"],
"timezone" => $task->timezone
]);
$task->save();
self::registerScheduledTask($service);
}
}
/**
* Register scheduled task.
* @param array $service
* @return TaskScheduler
*/
private static function registerScheduledTask(array $service)
{
$task = new TaskScheduler;
$task->title = $service["title"];
$task->category = $service["category"];
$task->description = $service["description"];
$task->startingTime = $service["startingTime"];
$task->endingTime = $service["endingTime"];
$task->body = self::buildBody($service);
$task->expression = $service["expression"];
$task->type = "shell";
$task->system = 1;
$task->enable = $service["enable"];
$task->everyOn = $service["everyOn"];
$task->interval = $service["interval"];
$task->timezone = $service["timezone"] == "default" ? date_default_timezone_get() : null;
$task->default_value = json_encode([
"startingTime" => $service["startingTime"],
"endingTime" => $service["endingTime"],
"everyOn" => $service["everyOn"],
"interval" => $service["interval"],
"expression" => $service["expression"],
"timezone" => $task->timezone
]);
$task->save();
return $task;
}
/**
* Build body parameter.
* @param array $service
* @return string
*/
private static function buildBody(array $service): string
{
if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
return 'php "' . PATH_TRUNK . $service["filew"] . '" ' . $service["service"] . ' +w' . config("system.workspace") . ' +force +async';
} else {
return 'su -s /bin/sh -c "php ' . PATH_TRUNK . $service["file"] . " " . $service["service"] . ' +w' . config("system.workspace") . ' +force +async"';
}
}
/**
* Check data integrity.
* @return array
*/
public static function checkDataIntegrity(): array
{
$beforeChanges = TaskScheduler::select()->get();
//remove missing register
$titleCondition = [];
$descriptionCondition = [];
foreach (self::$services as $service) {
$titleCondition[] = $service['title'];
$descriptionCondition[] = $service['description'];
}
TaskScheduler::whereNotIn('title', $titleCondition)
->whereNotIn('description', $descriptionCondition)
->delete();
//update register or create new register
foreach (self::$services as $service) {
$scheduler = TaskScheduler::select()
->where('title', '=', $service['title'])
->where('description', '=', $service['description'])
->get()
->first();
if (is_null($scheduler)) {
self::registerScheduledTask($service);
} else {
$scheduler->body = self::buildBody($service);
$scheduler->type = 'shell';
$scheduler->category = $service['category'];
$scheduler->system = 1;
$scheduler->update();
}
}
//log changes
$afterChanges = TaskScheduler::select()->get();
$result = [
'beforeChanges' => $beforeChanges,
'afterChanges' => $afterChanges
];
$message = 'Check SCHEDULER table integrity';
Log::channel(':taskSchedulerCheckDataIntegrity')->info($message, Bootstrap::context($result));
return $result;
}
}

5
workflow/engine/src/ProcessMaker/Log/AuditLog.php
View File

@@ -104,9 +104,10 @@ class AuditLog
"ExportLanguage" => G::LoadTranslation("ID_EXPORT_LANGUAGE"),
"DeleteLanguage" => G::LoadTranslation("ID_DELETE_LAGUAGE"),
// Settings
"UploadSystemSettings" => G::LoadTranslation("ID_UPLOAD_SYSTEM_SETTINGS"),
"UpdateEmailSettings" => G::LoadTranslation("ID_UPDATE_EMAIL_SETTINGS"),
"CreateEmailSettings" => G::LoadTranslation("ID_CREATE_EMAIL_SETTINGS"),
"DeleteEmailSettings" => G::LoadTranslation("ID_DELETE_EMAIL_SETTINGS"),
"UpdateEmailSettings" => G::LoadTranslation("ID_UPDATE_EMAIL_SETTINGS"),
"UploadSystemSettings" => G::LoadTranslation("ID_UPLOAD_SYSTEM_SETTINGS"),
// Logo
"UploadLogo" => G::LoadTranslation("ID_UPLOAD_LOGO"),
"DeleteLogo" => G::LoadTranslation("ID_DELETE_LOGO"),

2
workflow/engine/src/ProcessMaker/Services/Api/Group.php
View File

@@ -26,7 +26,7 @@ class Group extends Api
$user = new User();
$usrUid = $this->getUserId();
// Review the permissions roles to access the API
if (!$user->checkPermission($usrUid, "PM_USERS") || !$user->checkPermission($usrUid, "PM_FACTORY")) {
if (!$user->checkPermission($usrUid, "PM_USERS") && !$user->checkPermission($usrUid, "PM_FACTORY")) {
throw new Exception(G::LoadTranslation("ID_USER_NOT_HAVE_PERMISSION", [$usrUid]));
}
} catch (Exception $e) {