From d8da1b2f89d51bbb381f4cddb511db07a9c9ce22 Mon Sep 17 00:00:00 2001 From: "DESKTOP-GBA0BK8\\Admin" Date: Mon, 10 Apr 2023 10:53:40 -0400 Subject: [PATCH] Cache prefix --- app/Config/Boot/development.php | 4 +++- app/Config/Boot/production.php | 3 +++ app/Config/Boot/testing.php | 3 +++ app/Config/Cache.php | 3 ++- app/Config/Routes.php | 7 +++++-- app/Controllers/BaseController.php | 23 +++++++++++++++++++---- app/Controllers/FloatWeb.php | 19 ++++++++++++++----- 7 files changed, 49 insertions(+), 13 deletions(-) diff --git a/app/Config/Boot/development.php b/app/Config/Boot/development.php index 1c99194..936edac 100644 --- a/app/Config/Boot/development.php +++ b/app/Config/Boot/development.php @@ -38,4 +38,6 @@ define('HOME_PAGE_BACKGROUND', 'api_bk.jpg'); define('MYFIT_DATABASE_HOSTNAME', '10.20.30.60'); define('MYFIT_DATABASE_USERNAME', 'myfit'); define('MYFIT_DATABASE_PASSWORD', 'myfit'); -define('MYFIT_DATABASE', 'myfit_dev'); \ No newline at end of file +define('MYFIT_DATABASE', 'myfit_dev'); + +define('CACHE_DOMAIN', 'float.dev'); diff --git a/app/Config/Boot/production.php b/app/Config/Boot/production.php index 1418b81..e543992 100644 --- a/app/Config/Boot/production.php +++ b/app/Config/Boot/production.php @@ -28,3 +28,6 @@ define('MYFIT_DATABASE_HOSTNAME', '172.31.4.60'); define('MYFIT_DATABASE_USERNAME', 'myfit'); define('MYFIT_DATABASE_PASSWORD', 'myfit'); define('MYFIT_DATABASE', 'myfit_prod'); + +define('CACHE_DOMAIN', 'float.prod'); + diff --git a/app/Config/Boot/testing.php b/app/Config/Boot/testing.php index 9c7017e..e69a29c 100644 --- a/app/Config/Boot/testing.php +++ b/app/Config/Boot/testing.php @@ -40,3 +40,6 @@ define('MYFIT_DATABASE_HOSTNAME', '10.20.30.60'); define('MYFIT_DATABASE_USERNAME', 'myfit'); define('MYFIT_DATABASE_PASSWORD', 'myfit'); define('MYFIT_DATABASE', 'myfit_dev'); + + +define('CACHE_DOMAIN', 'float.dev'); diff --git a/app/Config/Cache.php b/app/Config/Cache.php index e468be4..77cbe8b 100644 --- a/app/Config/Cache.php +++ b/app/Config/Cache.php @@ -152,7 +152,7 @@ class Cache extends BaseConfig * * @var array */ - public $redis2 = [ + public $redis22 = [ 'host' => '10.0.0.112', 'password' => 'adae59706edf22f9f61180578cd16cc2038703c7230ae012e3c783ace1d09d64', 'port' => 6379, @@ -166,6 +166,7 @@ class Cache extends BaseConfig 'port' => 6378, 'timeout' => 0, 'database' => 0, + 'prefix' => 'TOKSLAW', ]; /** * -------------------------------------------------------------------------- diff --git a/app/Config/Routes.php b/app/Config/Routes.php index 6fb8ea2..4436ac6 100644 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -35,8 +35,11 @@ $routes->setAutoRoute(true); $routes->get('/', 'Home::index'); $routes->get('/wp/', 'Dengine::index'); -$routes->get('/en/floatweb/api/v1/blogdata/', 'FloatWeb::blogData'); -$routes->get('/en/floatweb/api/v1/blogdata/(:any)', 'FloatWeb::blogData/$1'); +//$routes->get('/en/floatweb/api/v1/blogdata/', 'FloatWeb::blogData'); +//$routes->get('/en/floatweb/api/v1/blogdata/(:any)', 'FloatWeb::blogData/$1'); + +$routes->get('/en/floatweb/api/v1/blogdata/', 'FloatWeb::website'); +$routes->get('/en/floatweb/api/v1/blogdata/(:any)', 'FloatWeb::website/$1'); $routes->get('/en/floatweb/api/v1/faq', 'FloatWeb::website'); $routes->post('/en/floatweb/api/v1/contact', 'FloatWeb::website'); diff --git a/app/Controllers/BaseController.php b/app/Controllers/BaseController.php index 9825bf9..6c4d415 100644 --- a/app/Controllers/BaseController.php +++ b/app/Controllers/BaseController.php @@ -53,15 +53,30 @@ class BaseController extends Controller } - public function runCache($cacheKey,$data){ - $cache = \Config\Services::cache(); + public function saveCache($cacheKey,$data){ + $cacheKey = CACHE_DOMAIN."-".$cacheKey; + // $cache = \Config\Services::cache(); if (! $foo = cache($cacheKey)) { echo 'Saving to the cache!
'; - cache()->save($cacheKey, $this->data_stringify($data), 3000); + // cache()->save($cacheKey, $this->data_stringify($data), 3000); + cache()->save($cacheKey, serialize($data), 3000); + + //serialize } - // $foo = $cache->get('foo'); + $foo = cache()->get($cacheKey); + log_message('critical', "FROM Cache -> ".$foo ); + } + public function getCache($cacheKey){ + $data = []; + $cacheKey = CACHE_DOMAIN."-".$cacheKey; + if (cache($cacheKey)) { + // echo 'Getting Data From Cache!
'; + $data = unserialize(cache()->get($cacheKey)); + } + return $data; + } private function data_stringify($data) { switch (gettype($data)) { case 'string' : return '\''.addcslashes($data, "'\\").'\''; diff --git a/app/Controllers/FloatWeb.php b/app/Controllers/FloatWeb.php index 86fdc4c..2edd1fe 100644 --- a/app/Controllers/FloatWeb.php +++ b/app/Controllers/FloatWeb.php @@ -519,14 +519,23 @@ variations from the norm, and in addition other reproductive organ issue } - public function blogData() + public function blogData($endpoint,$raw_array) { + /* $rawData = $this->apiData(); // $res1= $rawData[0]['payload']; $res1= $rawData; //[0]['payload']; - $this->runCache('blogdata',$res1['payload']); - $resJson = $this->response->setJson($res1); - return $resJson; + $this->saveCache('blogdata',$res1['payload']); + */ + + $res1 = $this->getCache($endpoint); + if (count($res1)==0){ + $res1 = $this->apiData(); + //$res1= $rawData; //[0]['payload']; + $this->saveCache($endpoint,$res1['payload']); + } + //$resJson = $this->response->setJson($res1); + return $res1; } public function index() @@ -591,7 +600,7 @@ variations from the norm, and in addition other reproductive organ issue $res1 = (new \App\Models\faqData())->getSiteFaq([]); break; case 'blogdata': - // $res = $this->dummyData($raw_array); + $res1 = $this->blogData($endpoint,$raw_array); break; case 'contact': $res1 = $this->contact($raw_array);