From 361139058626bf1820425a073d43296cc7419d65 Mon Sep 17 00:00:00 2001 From: dongpd Date: Thu, 31 Dec 2020 08:55:37 +0700 Subject: [PATCH] update config API --- controllers/ApiController.php | 8 ++-- controllers/ListManagementController.php | 57 +++++++++++++++--------- views/list-management/list-server.tpl | 10 +++-- 3 files changed, 45 insertions(+), 30 deletions(-) diff --git a/controllers/ApiController.php b/controllers/ApiController.php index 091697ae..72079475 100644 --- a/controllers/ApiController.php +++ b/controllers/ApiController.php @@ -81,7 +81,7 @@ class ApiController extends Controller { "Confidence" => strval($post["confidence"]) ]); $server_ip = \app\models\SyncUrl::findOne(['key_config' => 'server_api']); - $ip = "dev-dc.beetai.com"; + $ip = "https://dev-dc.beetai.com"; if ($server_ip) $ip = $server_ip->data; if ($this->is_connected($ip) && $logs) { @@ -91,7 +91,7 @@ class ApiController extends Controller { $id_camera = intval($device_id->data); $logsInfo = CaptureLogs::findOne($logs); $staffInfo = ListManagement::findOne($post['id']); - $res = json_decode(file_get_contents("https://" . $ip . "/api/oem/face_recognition", false, stream_context_create([ + $res = json_decode(file_get_contents($ip . "/api/oem/face_recognition", false, stream_context_create([ 'http' => [ 'header' => "Content-Type: application/json", 'method' => "POST", @@ -283,7 +283,7 @@ class ApiController extends Controller { Yii::$app->response->format = "json"; if ($this->is_connected()) { $server_ip = \app\models\SyncUrl::findOne(['key_config' => 'server_api']); - $ip = "dev-dc.beetai.com"; + $ip = "https://dev-dc.beetai.com"; if ($server_ip) $ip = $server_ip->data; $device_id = \app\models\SyncUrl::findOne(['key_config' => 'device_id']); @@ -293,7 +293,7 @@ class ApiController extends Controller { $ls = CaptureLogs::find()->andWhere(['sync_status' => null])->all(); foreach ($ls as $key => $value) { $staffInfo = ListManagement::findOne($value->staff_id); - $res = json_decode(file_get_contents("https://" . $ip . "/api/oem/face_recognition", false, stream_context_create([ + $res = json_decode(file_get_contents($ip . "/api/oem/face_recognition", false, stream_context_create([ 'http' => [ 'header' => "Content-Type: application/json", 'method' => "POST", diff --git a/controllers/ListManagementController.php b/controllers/ListManagementController.php index baeb2431..bc5c76a0 100644 --- a/controllers/ListManagementController.php +++ b/controllers/ListManagementController.php @@ -388,7 +388,7 @@ class ListManagementController extends Controller { public function actionSyncFromServer() { if (Yii::$app->request->isAjax) { $server_ip = \app\models\SyncUrl::findOne(['key_config' => 'server_api']); - $ip = "dev-dc.beetai.com"; + $ip = "https://dev-dc.beetai.com"; if ($server_ip) $ip = $server_ip->data; $device_id = \app\models\SyncUrl::findOne(['key_config' => 'device_id']); @@ -396,7 +396,7 @@ class ListManagementController extends Controller { if ($device_id) $id_camera = intval($device_id->data); - $datas = json_decode(file_get_contents("https://" . $ip . "/api/oem/get_all_image", false, stream_context_create([ + $datas = json_decode(file_get_contents($ip . "/api/oem/get_all_image", false, stream_context_create([ 'http' => [ 'header' => "Content-Type: application/json", 'method' => "POST", @@ -435,7 +435,7 @@ class ListManagementController extends Controller { $totalStart = $this->getCurrentTime(); $totals = intval(Yii::$app->request->post("totals")); // $server_ip = \app\models\SyncUrl::findOne(['key_config' => 'server_api']); -// $ip = "dev-dc.beetai.com"; +// $ip = "https://dev-dc.beetai.com"; // if ($server_ip) // $ip = $server_ip->data; // $device_id = \app\models\SyncUrl::findOne(['key_config' => 'device_id']); @@ -443,7 +443,7 @@ class ListManagementController extends Controller { // if ($device_id) // $id_camera = intval($device_id->data); // $start = $this->getCurrentTime(); -// $res = json_decode(file_get_contents("https://" . $ip . "/api/oem/get_all_image", false, stream_context_create([ +// $res = json_decode(file_get_contents($ip . "/api/oem/get_all_image", false, stream_context_create([ // 'http' => [ // 'header' => "Content-Type: application/json", // 'method' => "POST", @@ -467,31 +467,37 @@ class ListManagementController extends Controller { if ($key < Yii::$app->params['maxPicture']) { $fileName = "face_" . common::generateRandomString() . "_" . time() . ".png"; $start = $this->getCurrentTime(); - $img = file_get_contents($value); + $img = false; + try { + $img = file_get_contents(str_replace("&", "&", $value)); +// $img = file_get_contents($value); + } catch (\Exception $e) { + + } $finish = $this->getCurrentTime(); $temp["getIMG"] = round(($finish - $start), 4); - if ($img !== "null") { + if ($img && $img !== "null") { $fileTarget = $targetPath . "/" . $fileName; $start = $this->getCurrentTime(); if (!$this->resizeImg($img, $fileTarget)) { file_put_contents($fileTarget, $img); } - $finish = $this->getCurrentTime(); - $temp["saveIMG"] = round(($finish - $start), 4); - $start = $this->getCurrentTime(); - $features = json_decode(common::requestToEngine("/get-feature", [ - "image_paths" => [ - ["url" => "/var/www/html/BiFace_Server_Lite/web/data/uploads/face/" . $fileName, "type" => "raw"] - ], - "type" => "128" - ]), true); - $finish = $this->getCurrentTime(); - $temp["extract"] = round(($finish - $start), 4); +// $finish = $this->getCurrentTime(); +// $temp["saveIMG"] = round(($finish - $start), 4); +// $start = $this->getCurrentTime(); +// $features = json_decode(common::requestToEngine("/get-feature", [ +// "image_paths" => [ +// ["url" => "/var/www/html/BiFace_Server_Lite/web/data/uploads/face/" . $fileName, "type" => "raw"] +// ], +// "type" => "128" +// ]), true); +// $finish = $this->getCurrentTime(); +// $temp["extract"] = round(($finish - $start), 4); $ft[] = [ "url" => $fileName, "urlOld" => $fileName, - "features" => $features['results'][0]['feature'], - "features512" => isset($features['results'][0]['feature512']) ? $features['results'][0]['feature512'] : [] + "features" => [], //$features['results'][0]['feature'], + "features512" => []//isset($features['results'][0]['feature512']) ? $features['results'][0]['feature512'] : [] ]; } $extractFeature[] = $temp; @@ -663,7 +669,7 @@ class ListManagementController extends Controller { if (Yii::$app->request->post()) { Yii::$app->response->format = "json"; $server_ip = \app\models\SyncUrl::findOne(['key_config' => 'server_api']); - $ip = "dev-dc.beetai.com"; + $ip = "https://dev-dc.beetai.com"; if ($server_ip) $ip = $server_ip->data; $device_id = \app\models\SyncUrl::findOne(['key_config' => 'device_id']); @@ -686,7 +692,8 @@ class ListManagementController extends Controller { "telephone" => $StaffInfo->telephone, "images" => $images ]; - $res = json_decode(file_get_contents("https://" . $ip . "/api/oem/data_sync_pro", false, stream_context_create([ + $start = $this->getCurrentTime(); + $res = json_decode(file_get_contents($ip . "/api/oem/data_sync_pro", false, stream_context_create([ 'http' => [ 'header' => "Content-Type: application/json", 'method' => "POST", @@ -696,7 +703,9 @@ class ListManagementController extends Controller { ]) ] ])), true); - return $res; //["status" => true]; + $finish = $this->getCurrentTime(); + $processTime = round(($finish - $start), 4); + return $processTime; //$res; //["status" => true]; } } @@ -717,4 +726,8 @@ class ListManagementController extends Controller { return false; } + public function actionTest() { + return file_get_contents("http://minio1.beetai.com/biface-school/origin/385/454_20201126101221879048.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minioadmin%2F20201230%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20201230T081350Z&X-Amz-Expires=604800&X-Amz-SignedHeaders=host&X-Amz-Signature=df7586a01bb128c0585edd87d1024b1ddb33483fd335e81238103fd2467b4772"); + } + } diff --git a/views/list-management/list-server.tpl b/views/list-management/list-server.tpl index 7a200a3c..7d4e931c 100644 --- a/views/list-management/list-server.tpl +++ b/views/list-management/list-server.tpl @@ -41,10 +41,12 @@ {$arr.name} {$arr.department} - {foreach from=$arr.images item=img} -
- -
+ {foreach from=$arr.images item=img key=k} + {if $kparams['maxPicture']} +
+ +
+ {/if} {/foreach} {$arr.code}