From 4497a3cc4a3849f69057f827747000dc12926949 Mon Sep 17 00:00:00 2001 From: "CHIEFSOFT\\ameye" Date: Mon, 14 Oct 2024 13:32:36 -0400 Subject: [PATCH] Optimize wallet function --- www-api/app/Controllers/WrenchWallet.php | 162 +++++++++++------------ 1 file changed, 81 insertions(+), 81 deletions(-) diff --git a/www-api/app/Controllers/WrenchWallet.php b/www-api/app/Controllers/WrenchWallet.php index ebe36d99..400a3b5a 100644 --- a/www-api/app/Controllers/WrenchWallet.php +++ b/www-api/app/Controllers/WrenchWallet.php @@ -257,87 +257,87 @@ class WrenchWallet extends BaseController log_message('critical', "***** ***** WrenchJobs::getWallet Ret "); return $this->respond( $this->summaryReturnData($in,$out), 200); } - public function getWalletOld(){ - log_message('critical', "0001"); - header('Access-Control-Allow-Origin: *'); - log_message('critical', "WrenchWallet Path getWallet 001"); - $call_backend = true; - - header("Access-Control-Allow-Headers: Origin, X-API-KEY, X-Requested-With, Content-Type, Accept, Access-Control-Request-Method, Access-Control-Allow-Headers, Authorization, observe, enctype, Content-Length, X-Csrf-Token"); - log_message('critical', "0003"); - header("Access-Control-Allow-Methods: GET, PUT, POST, DELETE, PATCH, OPTIONS"); - header("Access-Control-Allow-Credentials: true"); - header("Access-Control-Max-Age: 3600"); - header('content-type: application/json; charset=utf-8'); - $method = $_SERVER['REQUEST_METHOD']; - - $ip_loc = $this->getIpData(); - - - - - log_message('critical', "WrenchWallet Path getWallet 003"); - //$request = service('request'); - // what is the endpoint - $uri = urldecode(current_url(true)); - $findme = '?'; - $pos = strpos($uri, $findme); - if ($pos > 5) { - $uri = substr($uri, 0, $pos); - } - log_message('critical', "API-WrenchWallet URI -> ".$uri ); - $pieces = explode('/', $uri); - $psc = count($pieces); - - $endpoint = $psc > 0 ? $pieces[$psc - 1] : ''; - log_message('critical', "Endpoint-> ".$endpoint ); - - $endpoints = $this->endPointList(); - $out = array(); - $res1 = []; - - $current_env = $this->getSiteConfigurations("system.live"); - $primary_image_sever = $this->getSiteConfigurations("system.primary_image_sever"); - $server_tag = $this->getSiteConfigurations("system.server_tag"); - $micro_service_net1 = $this->getSiteConfigurations("system.micro_service_net1"); //"10.10.10.120"; - - // echo "EXYTACT INPUT DATA HERE"; - $raw_json = file_get_contents('php://input'); - $raw_array = json_decode($raw_json, true); - $local_out =[]; - if ($_SERVER['REQUEST_METHOD'] == 'GET') { - log_message('critical', "Endpoint LOC2 HERE -> ".$endpoint ); - $get_param = $_GET['reqData'] ?? null; - $raw_array = ($get_param!=null) ? json_decode($get_param, true):[]; - } - - $in = $raw_array; - $in["loc"] = $_SERVER["REMOTE_ADDR"]; - - log_message('critical', "IN ARRAY for call 0001 -> ".serialize($in)); - - $in["action"] = 'getwallets'; //WRENCHBOARD_ACCOUNT_JOBLIST; - log_message('critical', "before APIN call 0001"); - if ( $call_backend == true && $in["action"] !='' ){ - $local_url = "http://".$micro_service_net1.":3037/getwallets"; - $out = $this->APIcall('GET', $local_url, $in); - } - else - { - $out = $local_out; - } - - - - $this->doCacheStep($in, $out); - $final_out = $out; // start from all out - $final_out["environment"] = $current_env + 0; // force convert to interger = $this->getSiteConfigurations("system.live"); - $final_out["session_image_server"] = $primary_image_sever; // ( $final_out["environment"] > 0 )? 'https://apigate.nebula.g1.wrenchboard.com/en/wrench/api/v1/getmedia/' : "https://apigate.lotus.g1.wrenchboard.com/en/wrench/api/v1/getmedia/"; - $final_out["server_tag"] = $server_tag; - $final_out["language"] = "en"; - $final_out["ip_loc"] = $ip_loc; - return json_encode( $final_out ); - } +// public function getWalletOld(){ +// log_message('critical', "0001"); +// header('Access-Control-Allow-Origin: *'); +// log_message('critical', "WrenchWallet Path getWallet 001"); +// $call_backend = true; +// +// header("Access-Control-Allow-Headers: Origin, X-API-KEY, X-Requested-With, Content-Type, Accept, Access-Control-Request-Method, Access-Control-Allow-Headers, Authorization, observe, enctype, Content-Length, X-Csrf-Token"); +// log_message('critical', "0003"); +// header("Access-Control-Allow-Methods: GET, PUT, POST, DELETE, PATCH, OPTIONS"); +// header("Access-Control-Allow-Credentials: true"); +// header("Access-Control-Max-Age: 3600"); +// header('content-type: application/json; charset=utf-8'); +// $method = $_SERVER['REQUEST_METHOD']; +// +// $ip_loc = $this->getIpData(); +// +// +// +// +// log_message('critical', "WrenchWallet Path getWallet 003"); +// //$request = service('request'); +// // what is the endpoint +// $uri = urldecode(current_url(true)); +// $findme = '?'; +// $pos = strpos($uri, $findme); +// if ($pos > 5) { +// $uri = substr($uri, 0, $pos); +// } +// log_message('critical', "API-WrenchWallet URI -> ".$uri ); +// $pieces = explode('/', $uri); +// $psc = count($pieces); +// +// $endpoint = $psc > 0 ? $pieces[$psc - 1] : ''; +// log_message('critical', "Endpoint-> ".$endpoint ); +// +// $endpoints = $this->endPointList(); +// $out = array(); +// $res1 = []; +// +// $current_env = $this->getSiteConfigurations("system.live"); +// $primary_image_sever = $this->getSiteConfigurations("system.primary_image_sever"); +// $server_tag = $this->getSiteConfigurations("system.server_tag"); +// $micro_service_net1 = $this->getSiteConfigurations("system.micro_service_net1"); //"10.10.10.120"; +// +// // echo "EXYTACT INPUT DATA HERE"; +// $raw_json = file_get_contents('php://input'); +// $raw_array = json_decode($raw_json, true); +// $local_out =[]; +// if ($_SERVER['REQUEST_METHOD'] == 'GET') { +// log_message('critical', "Endpoint LOC2 HERE -> ".$endpoint ); +// $get_param = $_GET['reqData'] ?? null; +// $raw_array = ($get_param!=null) ? json_decode($get_param, true):[]; +// } +// +// $in = $raw_array; +// $in["loc"] = $_SERVER["REMOTE_ADDR"]; +// +// log_message('critical', "IN ARRAY for call 0001 -> ".serialize($in)); +// +// $in["action"] = 'getwallets'; //WRENCHBOARD_ACCOUNT_JOBLIST; +// log_message('critical', "before APIN call 0001"); +// if ( $call_backend == true && $in["action"] !='' ){ +// $local_url = "http://".$micro_service_net1.":3037/getwallets"; +// $out = $this->APIcall('GET', $local_url, $in); +// } +// else +// { +// $out = $local_out; +// } +// +// +// +// $this->doCacheStep($in, $out); +// $final_out = $out; // start from all out +// $final_out["environment"] = $current_env + 0; // force convert to interger = $this->getSiteConfigurations("system.live"); +// $final_out["session_image_server"] = $primary_image_sever; // ( $final_out["environment"] > 0 )? 'https://apigate.nebula.g1.wrenchboard.com/en/wrench/api/v1/getmedia/' : "https://apigate.lotus.g1.wrenchboard.com/en/wrench/api/v1/getmedia/"; +// $final_out["server_tag"] = $server_tag; +// $final_out["language"] = "en"; +// $final_out["ip_loc"] = $ip_loc; +// return json_encode( $final_out ); +// } public function getEscrols(){ log_message('critical', "0001");