diff --git a/app/Controllers/Admin/Cloudflare/AccountController.php b/app/Controllers/Admin/Cloudflare/AccountController.php index c4a444a..5d06e89 100644 --- a/app/Controllers/Admin/Cloudflare/AccountController.php +++ b/app/Controllers/Admin/Cloudflare/AccountController.php @@ -3,7 +3,7 @@ namespace App\Controllers\Admin\Cloudflare; use App\Helpers\Cloudflare\AccountHelper; -use App\Libraries\Cloudflare\Account; +use App\Services\Cloudflare\Account; use App\Models\Cloudflare\AccountModel; use CodeIgniter\HTTP\DownloadResponse; use CodeIgniter\HTTP\RedirectResponse; diff --git a/app/Controllers/Admin/Cloudflare/RecordController.php b/app/Controllers/Admin/Cloudflare/RecordController.php index 586a1c5..f037037 100644 --- a/app/Controllers/Admin/Cloudflare/RecordController.php +++ b/app/Controllers/Admin/Cloudflare/RecordController.php @@ -3,7 +3,7 @@ namespace App\Controllers\Admin\Cloudflare; use App\Helpers\Cloudflare\RecordHelper; -use App\Libraries\Cloudflare\Record; +use App\Services\Cloudflare\Record; use App\Models\Cloudflare\RecordModel; use App\Models\Cloudflare\ZoneModel; use CodeIgniter\HTTP\DownloadResponse; diff --git a/app/Controllers/Admin/Cloudflare/ZoneController.php b/app/Controllers/Admin/Cloudflare/ZoneController.php index 6d4a1ad..0dc44ed 100644 --- a/app/Controllers/Admin/Cloudflare/ZoneController.php +++ b/app/Controllers/Admin/Cloudflare/ZoneController.php @@ -3,8 +3,8 @@ namespace App\Controllers\Admin\Cloudflare; use App\Helpers\Cloudflare\ZoneHelper; -use App\Libraries\Cloudflare\Record; -use App\Libraries\Cloudflare\Zone; +use App\Services\Cloudflare\Zone; +use App\Services\Cloudflare\Record; use App\Models\Cloudflare\AccountModel; use App\Models\Cloudflare\ZoneModel; use CodeIgniter\HTTP\DownloadResponse; diff --git a/app/Libraries/Cloudflare/Account.php b/app/Services/Cloudflare/Account.php similarity index 98% rename from app/Libraries/Cloudflare/Account.php rename to app/Services/Cloudflare/Account.php index 4d99041..1984bab 100644 --- a/app/Libraries/Cloudflare/Account.php +++ b/app/Services/Cloudflare/Account.php @@ -1,6 +1,6 @@ _auth_entity = $auth_entity; - parent::__construct(); } abstract protected function getArrayByResult($result, array $formDatas = []): array; final public function getMySocket(): CloudflareSocket @@ -40,14 +37,6 @@ abstract class Cloudflare extends CommonLibrary } return $this->_authModel; } - final protected function getAccountModel(): AccountModel - { - if ($this->_accountModel === null) { - $this->_accountModel = new AccountModel(); - } - return $this->_accountModel; - } - private function reload_page(string $uri, int $page, int $per_page = 50): mixed { $query = [ diff --git a/app/Libraries/Cloudflare/Record.php b/app/Services/Cloudflare/Record.php similarity index 96% rename from app/Libraries/Cloudflare/Record.php rename to app/Services/Cloudflare/Record.php index e60501d..dac8eee 100644 --- a/app/Libraries/Cloudflare/Record.php +++ b/app/Services/Cloudflare/Record.php @@ -1,14 +1,16 @@ _model; } + final protected function getAccountModel(): AccountModel + { + if ($this->_accountModel === null) { + $this->_accountModel = new AccountModel(); + } + return $this->_accountModel; + } public function getArrayByResult($result, array $formDatas = []): array { $formDatas[RecordModel::PK] = $result->id; diff --git a/app/Libraries/Cloudflare/Zone.php b/app/Services/Cloudflare/Zone.php similarity index 99% rename from app/Libraries/Cloudflare/Zone.php rename to app/Services/Cloudflare/Zone.php index 89474f7..26f89e1 100644 --- a/app/Libraries/Cloudflare/Zone.php +++ b/app/Services/Cloudflare/Zone.php @@ -1,6 +1,6 @@