From 626b172c78b21336a9a924afc943bf0f9f2d7469 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=B5=9C=EC=A4=80=ED=9D=A0?= <choi.jh@prime-idc.jp>
Date: Fri, 11 Oct 2024 12:58:52 +0900
Subject: [PATCH] cfmgrv4 init...2

---
 app/Config/Routes.php                    |  2 +-
 app/{ => Controllers}/CLI/Cloudflare.php | 23 ++++++++++++++---------
 2 files changed, 15 insertions(+), 10 deletions(-)
 rename app/{ => Controllers}/CLI/Cloudflare.php (84%)

diff --git a/app/Config/Routes.php b/app/Config/Routes.php
index d4dbb97..0aed15a 100644
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -18,7 +18,7 @@ $routes->group('/user', function ($routes) {
     $routes->get('google_login', 'UserController::google_login');
     $routes->get('logout', 'UserController::logout');
 });
-$routes->group('cli', ['namespace' => 'App\CLI'], function ($routes) {
+$routes->group('cli', ['namespace' => 'App\Controllers\CLI'], function ($routes) {
     $routes->group('cloudflare', function ($routes) {
         $routes->cli('reload', 'Cloudflare::reload');
     });
diff --git a/app/CLI/Cloudflare.php b/app/Controllers/CLI/Cloudflare.php
similarity index 84%
rename from app/CLI/Cloudflare.php
rename to app/Controllers/CLI/Cloudflare.php
index d11e265..5c8772d 100644
--- a/app/CLI/Cloudflare.php
+++ b/app/Controllers/CLI/Cloudflare.php
@@ -1,20 +1,25 @@
 <?php
 
-namespace App\CLI;
+namespace App\Controllers\CLI;
 
-use App\Models\Cloudflare\AuthModel;
-use App\Libraries\Cloudflare\Zone;
-use App\Libraries\Cloudflare\Record;
-use App\Libraries\Cloudflare\Account;
-use App\Entities\Cloudflare\ZoneEntity;
-use App\Entities\Cloudflare\AuthEntity;
+use App\Controllers\BaseController;
 use App\Entities\Cloudflare\AccountEntity;
+use App\Entities\Cloudflare\AuthEntity;
+use App\Entities\Cloudflare\ZoneEntity;
+use App\Libraries\Cloudflare\Account;
+use App\Libraries\Cloudflare\Record;
+use App\Libraries\Cloudflare\Zone;
+use App\Models\Cloudflare\AuthModel;
+use CodeIgniter\HTTP\RequestInterface;
+use CodeIgniter\HTTP\ResponseInterface;
+use Psr\Log\LoggerInterface;
 
-class Cloudflare
+class Cloudflare extends BaseController
 {
     private $_db = null;
-    public function __construct()
+    public function initController(RequestInterface $request, ResponseInterface $response, LoggerInterface $logger)
     {
+        parent::initController($request, $response, $logger);
         $this->_db = \Config\Database::connect();
     }
     private function getAuthModel(): AuthModel