From e0e105baaa6cb6e3e8bc2a37c9de6e37416a9465 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=B5=9C=EC=A4=80=ED=9D=A0?= Date: Fri, 14 Mar 2025 11:06:29 +0900 Subject: [PATCH] cfmgrv4 init...10 --- app/Models/MapurlModel.php | 2 +- app/Services/Cloudflare/AccountService.php | 15 ++++------- app/Services/Cloudflare/RecordService.php | 15 ++++------- app/Services/Cloudflare/ZoneService.php | 14 ++++------ app/Services/MapurlService.php | 14 ++++------ app/Traits/MylogTrait.php | 31 ++++++++++++++++++++++ 6 files changed, 52 insertions(+), 39 deletions(-) create mode 100644 app/Traits/MylogTrait.php diff --git a/app/Models/MapurlModel.php b/app/Models/MapurlModel.php index 9931411..f052c5b 100644 --- a/app/Models/MapurlModel.php +++ b/app/Models/MapurlModel.php @@ -77,6 +77,6 @@ class MapurlModel extends CommonModel public function setList_WordFilter(string $word): void { $this->orLike(self::TABLE . "." . self::TITLE, $word, 'both'); - $this->orLike(self::TABLE . '.new_url', $word, 'both'); + $this->orLike(self::TABLE . '.newurl', $word, 'both'); } } diff --git a/app/Services/Cloudflare/AccountService.php b/app/Services/Cloudflare/AccountService.php index f454744..8eb22b1 100644 --- a/app/Services/Cloudflare/AccountService.php +++ b/app/Services/Cloudflare/AccountService.php @@ -6,10 +6,11 @@ use App\Entities\Cloudflare\AccountEntity; use App\Entities\Cloudflare\AuthEntity; use App\Models\Cloudflare\AccountModel; use stdClass; -use App\Services\MyLogService; +use App\Traits\MylogTrait; class AccountService extends CloudflareService { + use MylogTrait; private ?AuthEntity $_parent_entity = null; private ?AccountModel $_model = null; @@ -45,9 +46,7 @@ class AccountService extends CloudflareService //부모데이터정의 $this->setParentEntity($parent_entity); //생성값 formDatas Log남기기 - foreach ($formDatas as $field => $value) { - MyLogService::add("info", "{$field}:{$value}"); - } + $this->add_MylogTrait(__FUNCTION__, $formDatas); return $this->getModel()->create($formDatas); } @@ -56,9 +55,7 @@ class AccountService extends CloudflareService //부모데이터정의 $this->setParentEntity($parent_entity); //변경전 entity 값, 변경값 formDatas Log남기기 - foreach ($this->getModel()->getFields() as $field) { - MyLogService::add("info", "{$field}:{$entity->$field}=>{$formDatas[$field]}"); - } + $this->add_MylogTrait(__FUNCTION__, $formDatas, $entity); return $this->getModel()->modify($entity, $formDatas); } @@ -67,9 +64,7 @@ class AccountService extends CloudflareService //부모데이터정의 $this->setParentEntity($parent_entity); //삭제전 entity 값 Log남기기 - foreach ($this->getModel()->getFields() as $field) { - MyLogService::add("info", "{$field}:{$entity->$field}"); - } + $this->add_MylogTrait(__FUNCTION__, [], $entity); $this->getModel()->delete($entity->getPK()); } diff --git a/app/Services/Cloudflare/RecordService.php b/app/Services/Cloudflare/RecordService.php index 1e29719..b24ac65 100644 --- a/app/Services/Cloudflare/RecordService.php +++ b/app/Services/Cloudflare/RecordService.php @@ -6,10 +6,11 @@ use App\Entities\Cloudflare\RecordEntity; use App\Entities\Cloudflare\ZoneEntity; use App\Models\Cloudflare\AccountModel; use App\Models\Cloudflare\RecordModel; -use App\Services\MyLogService; +use App\Traits\MylogTrait; class RecordService extends CloudflareService { + use MylogTrait; private ?ZoneEntity $_parent_entity = null; private ?RecordModel $_model = null; private ?AccountModel $_accountModel = null; @@ -91,9 +92,7 @@ class RecordService extends CloudflareService $body = json_decode($response->getBody()); $formDatas = $this->getArrayByResult($body->result); //생성값 formDatas Log남기기 - foreach ($formDatas as $field => $value) { - MyLogService::add("info", "{$field}:{$value}"); - } + $this->add_MylogTrait(__FUNCTION__, $formDatas); //DB생성 $entity = $this->getModel()->create($formDatas); // log_message("debug", $this->getModel()->getLastQuery()); @@ -135,9 +134,7 @@ class RecordService extends CloudflareService $body = json_decode($response->getBody()); $formDatas = $this->getArrayByResult($body->result); //변경전 entity 값, 변경값 formDatas Log남기기 - foreach ($this->getModel()->getFields() as $field) { - MyLogService::add("info", "{$field}:{$entity->$field}=>{$formDatas[$field]}"); - } + $this->add_MylogTrait(__FUNCTION__, $formDatas, $entity); //DB수정 $entity = $this->getModel()->modify($entity, $formDatas); // log_message("debug", $this->getModel()->getLastQuery()); @@ -152,9 +149,7 @@ class RecordService extends CloudflareService //DB삭제 $this->getModel()->delete($entity->getPK()); //삭제전 entity 값 Log남기기 - foreach ($this->getModel()->getFields() as $field) { - MyLogService::add("info", "{$field}:{$entity->$field}"); - } + $this->add_MylogTrait(__FUNCTION__, [], $entity); // log_message("debug", $this->getModel()->getLastQuery()); return $entity; } diff --git a/app/Services/Cloudflare/ZoneService.php b/app/Services/Cloudflare/ZoneService.php index f979495..d7a696f 100644 --- a/app/Services/Cloudflare/ZoneService.php +++ b/app/Services/Cloudflare/ZoneService.php @@ -6,9 +6,11 @@ use App\Entities\Cloudflare\AccountEntity; use App\Entities\Cloudflare\ZoneEntity; use App\Models\Cloudflare\ZoneModel; use App\Services\MyLogService; +use App\Traits\MylogTrait; class ZoneService extends CloudflareService { + use MylogTrait; private ?AccountEntity $_parent_entity = null; private ?ZoneModel $_model = null; private array $_setting_fields = [ @@ -120,9 +122,7 @@ class ZoneService extends CloudflareService $formDatas[$field] = $this->setCFSetting($formDatas[ZoneModel::PK], $field, $default); } //생성값 formDatas Log남기기 - foreach ($formDatas as $field => $value) { - MyLogService::add("info", "{$field}:{$value}"); - } + $this->add_MylogTrait(__FUNCTION__, $formDatas); //DB생성 $entity = $this->getModel()->create($formDatas); // log_message("debug", $this->getModel()->getLastQuery()); @@ -138,9 +138,7 @@ class ZoneService extends CloudflareService $formDatas[$field] = $this->setCFSetting($entity->getPK(), $field, $value); } //변경전 entity 값, 변경값 formDatas Log남기기 - foreach ($this->getModel()->getFields() as $field) { - MyLogService::add("info", "{$field}:{$entity->$field}=>{$formDatas[$field]}"); - } + $this->add_MylogTrait(__FUNCTION__, $formDatas, $entity); //DB수정 $entity = $this->getModel()->modify($entity, $formDatas); // log_message("debug", $this->getModel()->getLastQuery()); @@ -155,9 +153,7 @@ class ZoneService extends CloudflareService //DB삭제 $this->getModel()->delete($entity->getPK()); //삭제전 entity 값 Log남기기 - foreach ($this->getModel()->getFields() as $field) { - MyLogService::add("info", "{$field}:{$entity->$field}"); - } + $this->add_MylogTrait(__FUNCTION__, [], $entity); // log_message("debug", $this->getModel()->getLastQuery()); return $entity; } diff --git a/app/Services/MapurlService.php b/app/Services/MapurlService.php index 8c3a081..fc612c4 100644 --- a/app/Services/MapurlService.php +++ b/app/Services/MapurlService.php @@ -4,9 +4,11 @@ namespace App\Services; use App\Models\MapurlModel; use App\Entities\MapurlEntity; +use App\Traits\MylogTrait; class MapurlService extends CommonService { + use MylogTrait; private ?MapurlModel $_model = null; public function __construct() { @@ -22,25 +24,19 @@ class MapurlService extends CommonService public function create(array $formDatas): MapurlEntity { //생성값 formDatas Log남기기 - foreach ($formDatas as $field => $value) { - MyLogService::add("info", "{$field}:{$value}"); - } + $this->add_MylogTrait(__FUNCTION__, $formDatas); return $this->getModel()->create($formDatas); } public function modify(MapurlEntity $entity, array $formDatas): MapurlEntity { //변경전 entity 값, 변경값 formDatas Log남기기 - foreach ($this->getModel()->getFields() as $field) { - MyLogService::add("info", "{$field}:{$entity->$field}=>{$formDatas[$field]}"); - } + $this->add_MylogTrait(__FUNCTION__, $formDatas, $entity); return $this->getModel()->modify($entity, $formDatas); } public function delete(MapurlEntity $entity): void { //삭제전 entity 값 Log남기기 - foreach ($this->getModel()->getFields() as $field) { - MyLogService::add("info", "{$field}:{$entity->$field}"); - } + $this->add_MylogTrait(__FUNCTION__, [], $entity); $this->getModel()->delete($entity->getPK()); } } diff --git a/app/Traits/MylogTrait.php b/app/Traits/MylogTrait.php new file mode 100644 index 0000000..baa3dba --- /dev/null +++ b/app/Traits/MylogTrait.php @@ -0,0 +1,31 @@ + $value) { + MyLogService::add("info", "{$field}:{$value}"); + } + break; + case 'modify': + foreach ($formDatas as $field => $value) { + MyLogService::add("info", "{$field}:{$entity->$field}=>{$formDatas[$field]}"); + } + break; + case 'delete': + foreach ($this->getModel()->getFields() as $field) { + MyLogService::add("info", "{$field}:{$entity->$field}"); + } + break; + } + } +}