WrenchBoard/WrenchBoradWeb
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix hooks issues

Browse Source
This commit is contained in:
CHIEFSOFT\ameye
2024-07-05 18:35:35 -04:00
parent 547630a4de
commit 6e9ecee654
3 changed files with 51 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
www-api/app/Controllers/WrenchBanners.php
+15 -12
View File
@@ -65,10 +65,11 @@ class WrenchBanners extends BaseController
]);
}
$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";
// $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');
@@ -98,7 +99,7 @@ class WrenchBanners extends BaseController
}
if ( $call_backend == true && $in["action"] !='' ){
$local_url = "http://".$micro_service_net1.":3032/familybanners";
$local_url = "http://".$this->micro_service_net1.":3032/familybanners";
$out = $this->APIcall('GET', $local_url, $in);
}
else
@@ -107,13 +108,15 @@ class WrenchBanners extends BaseController
}
$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 );
// $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 );
return $this->summaryReturnData($in,$out); //json_encode( $final_out );
}
}