cfmgrv4 init...3

This commit is contained in:
최준흠 2024-10-19 18:22:08 +09:00
parent b19763fa96
commit af72a4f7c3
4 changed files with 14 additions and 17 deletions

View File

@ -5,7 +5,6 @@ namespace App\Services\Cloudflare;
use App\Models\Cloudflare\AccountModel;
use App\Entities\Cloudflare\AuthEntity;
use App\Entities\Cloudflare\AccountEntity;
use Psr\Http\Message\ResponseInterface;
class Account extends Cloudflare
{
@ -47,13 +46,13 @@ class Account extends Cloudflare
protected function getArrayByResult(\stdClass $result, array $formDatas = []): array
{
$formDatas[AccountModel::PK] = $result->id;
$formDatas[AccountModel::PK] = $result->id;
$formDatas[AccountModel::PARENT] = $this->getAuthEntity()->getPK();
$formDatas[AccountModel::TITLE] = $result->name;
$formDatas['type'] = $result->type;
$formDatas['status'] = $this->getAuthEntity()->status;
$formDatas['updated_at'] = date("Y-m-d H:i:s");
$formDatas['created_at'] = $result->created_on;
$formDatas['type'] = $result->type;
$formDatas['status'] = $this->getAuthEntity()->status;
$formDatas['updated_at'] = date("Y-m-d H:i:s");
$formDatas['created_at'] = $result->created_on;
return $formDatas;
}
@ -62,7 +61,7 @@ class Account extends Cloudflare
log_message("notice", "\n----------Auth {$this->getAuthEntity()->getTitle()}의 Account 처리 시작-----------");
$entitys = [];
try {
$results = $this->reload_procedure("accounts");
$results = $this->reload_procedure("accounts");
if (count($results) > 0) {
foreach ($results as $result) {
$formDatas = $this->getArrayByResult($result);

View File

@ -6,7 +6,6 @@ use App\Entities\Cloudflare\FirewallEntity;
use App\Entities\Cloudflare\ZoneEntity;
use App\Models\Cloudflare\AccountModel;
use App\Models\Cloudflare\FirewallModel;
use Psr\Http\Message\ResponseInterface;
class Firewall extends Cloudflare
{
@ -55,9 +54,10 @@ class Firewall extends Cloudflare
$formDatas[FirewallModel::TITLE] = $result->name;
$formDatas['action'] = $result->action;
$formDatas['description'] = $result->description;
$formDatas['priority'] = (int)$result->priority;
$formDatas['expression'] = $result->expression;
$formDatas['paused'] = isset($result->paused) && $result->paused ? "off" : "on";
$formDatas['priority'] = (int) $result->priority;
$formDatas['filter_id'] = $result->filter->id;
$formDatas['filter_expression'] = $result->filter->expression;
$formDatas['filter_paused'] = isset($result->filter->paused) && $result->filter->paused ? "off" : "on";
$formDatas['updated_at'] = date("Y-m-d H:i:s");
$formDatas['created_at'] = $result->created_on;
// log_message("debug", print_r($formDatas, true));
@ -142,7 +142,7 @@ class Firewall extends Cloudflare
if (count(value: $results_array) > 0) {
foreach ($results_array as $results) {
foreach ($results as $result) {
$formDatas = $this->getArrayByResult($result);
$formDatas = $this->getArrayByResult($result);
$entitys[$formDatas[FirewallModel::PK]] = $this->getModel()->modify(new FirewallEntity(), $formDatas);
}
}

View File

@ -6,7 +6,6 @@ use App\Entities\Cloudflare\RecordEntity;
use App\Entities\Cloudflare\ZoneEntity;
use App\Models\Cloudflare\AccountModel;
use App\Models\Cloudflare\RecordModel;
use Psr\Http\Message\ResponseInterface;
class Record extends Cloudflare
{
@ -148,7 +147,7 @@ class Record extends Cloudflare
if (count(value: $results_array) > 0) {
foreach ($results_array as $results) {
foreach ($results as $result) {
$formDatas = $this->getArrayByResult($result);
$formDatas = $this->getArrayByResult($result);
$entitys[$formDatas[RecordModel::PK]] = $this->getModel()->modify(new RecordEntity(), $formDatas);
}
}

View File

@ -5,7 +5,6 @@ namespace App\Services\Cloudflare;
use App\Entities\Cloudflare\AccountEntity;
use App\Entities\Cloudflare\ZoneEntity;
use App\Models\Cloudflare\ZoneModel;
use Psr\Http\Message\ResponseInterface;
class Zone extends Cloudflare
{
@ -154,8 +153,8 @@ class Zone extends Cloudflare
if (count(value: $results_array) > 0) {
foreach ($results_array as $results) {
foreach ($results as $result) {
$formDatas = $this->getArrayByResult($result);
$formDatas = $this->getCFSetting($formDatas[ZoneModel::PK], $formDatas);
$formDatas = $this->getArrayByResult($result);
$formDatas = $this->getCFSetting($formDatas[ZoneModel::PK], $formDatas);
$entitys[$formDatas[ZoneModel::PK]] = $this->getModel()->modify(new ZoneEntity(), $formDatas);
}
}