dongpd/BiFace_Server_Lite
1
0
Fork 0
Code Issues 4 Pull Requests Releases 11 Wiki Activity

update config API

Browse Source
This commit is contained in:
dongpd 2020-12-31 08:55:37 +07:00
parent 09604d1cb8
commit 3611390586
3 changed files with 45 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
controllers/ApiController.php
View File

@ -81,7 +81,7 @@ class ApiController extends Controller {
"Confidence" => strval($post["confidence"]) "Confidence" => strval($post["confidence"])
]); ]);
$server_ip = \app\models\SyncUrl::findOne(['key_config' => 'server_api']); $server_ip = \app\models\SyncUrl::findOne(['key_config' => 'server_api']);
$ip = "dev-dc.beetai.com"; $ip = "https://dev-dc.beetai.com";
if ($server_ip) if ($server_ip)
$ip = $server_ip->data; $ip = $server_ip->data;
if ($this->is_connected($ip) && $logs) { if ($this->is_connected($ip) && $logs) {
@ -91,7 +91,7 @@ class ApiController extends Controller {
$id_camera = intval($device_id->data); $id_camera = intval($device_id->data);
$logsInfo = CaptureLogs::findOne($logs); $logsInfo = CaptureLogs::findOne($logs);
$staffInfo = ListManagement::findOne($post['id']); $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' => [ 'http' => [
'header' => "Content-Type: application/json", 'header' => "Content-Type: application/json",
'method' => "POST", 'method' => "POST",
@ -283,7 +283,7 @@ class ApiController extends Controller {
Yii::$app->response->format = "json"; Yii::$app->response->format = "json";
if ($this->is_connected()) { if ($this->is_connected()) {
$server_ip = \app\models\SyncUrl::findOne(['key_config' => 'server_api']); $server_ip = \app\models\SyncUrl::findOne(['key_config' => 'server_api']);
$ip = "dev-dc.beetai.com"; $ip = "https://dev-dc.beetai.com";
if ($server_ip) if ($server_ip)
$ip = $server_ip->data; $ip = $server_ip->data;
$device_id = \app\models\SyncUrl::findOne(['key_config' => 'device_id']); $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(); $ls = CaptureLogs::find()->andWhere(['sync_status' => null])->all();
foreach ($ls as $key => $value) { foreach ($ls as $key => $value) {
$staffInfo = ListManagement::findOne($value->staff_id); $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' => [ 'http' => [
'header' => "Content-Type: application/json", 'header' => "Content-Type: application/json",
'method' => "POST", 'method' => "POST",

57
controllers/ListManagementController.php
View File

@ -388,7 +388,7 @@ class ListManagementController extends Controller {
public function actionSyncFromServer() { public function actionSyncFromServer() {
if (Yii::$app->request->isAjax) { if (Yii::$app->request->isAjax) {
$server_ip = \app\models\SyncUrl::findOne(['key_config' => 'server_api']); $server_ip = \app\models\SyncUrl::findOne(['key_config' => 'server_api']);
$ip = "dev-dc.beetai.com"; $ip = "https://dev-dc.beetai.com";
if ($server_ip) if ($server_ip)
$ip = $server_ip->data; $ip = $server_ip->data;
$device_id = \app\models\SyncUrl::findOne(['key_config' => 'device_id']); $device_id = \app\models\SyncUrl::findOne(['key_config' => 'device_id']);
@ -396,7 +396,7 @@ class ListManagementController extends Controller {
if ($device_id) if ($device_id)
$id_camera = intval($device_id->data); $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' => [ 'http' => [
'header' => "Content-Type: application/json", 'header' => "Content-Type: application/json",
'method' => "POST", 'method' => "POST",
@ -435,7 +435,7 @@ class ListManagementController extends Controller {
$totalStart = $this->getCurrentTime(); $totalStart = $this->getCurrentTime();
$totals = intval(Yii::$app->request->post("totals")); $totals = intval(Yii::$app->request->post("totals"));
// $server_ip = \app\models\SyncUrl::findOne(['key_config' => 'server_api']); // $server_ip = \app\models\SyncUrl::findOne(['key_config' => 'server_api']);
// $ip = "dev-dc.beetai.com"; // $ip = "https://dev-dc.beetai.com";
// if ($server_ip) // if ($server_ip)
// $ip = $server_ip->data; // $ip = $server_ip->data;
// $device_id = \app\models\SyncUrl::findOne(['key_config' => 'device_id']); // $device_id = \app\models\SyncUrl::findOne(['key_config' => 'device_id']);
@ -443,7 +443,7 @@ class ListManagementController extends Controller {
// if ($device_id) // if ($device_id)
// $id_camera = intval($device_id->data); // $id_camera = intval($device_id->data);
// $start = $this->getCurrentTime(); // $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' => [ // 'http' => [
// 'header' => "Content-Type: application/json", // 'header' => "Content-Type: application/json",
// 'method' => "POST", // 'method' => "POST",
@ -467,31 +467,37 @@ class ListManagementController extends Controller {
if ($key < Yii::$app->params['maxPicture']) { if ($key < Yii::$app->params['maxPicture']) {
$fileName = "face_" . common::generateRandomString() . "_" . time() . ".png"; $fileName = "face_" . common::generateRandomString() . "_" . time() . ".png";
$start = $this->getCurrentTime(); $start = $this->getCurrentTime();
$img = file_get_contents($value); $img = false;
try {
$img = file_get_contents(str_replace("&amp;", "&", $value));
// $img = file_get_contents($value);
} catch (\Exception $e) {
}
$finish = $this->getCurrentTime(); $finish = $this->getCurrentTime();
$temp["getIMG"] = round(($finish - $start), 4); $temp["getIMG"] = round(($finish - $start), 4);
if ($img !== "null") { if ($img && $img !== "null") {
$fileTarget = $targetPath . "/" . $fileName; $fileTarget = $targetPath . "/" . $fileName;
$start = $this->getCurrentTime(); $start = $this->getCurrentTime();
if (!$this->resizeImg($img, $fileTarget)) { if (!$this->resizeImg($img, $fileTarget)) {
file_put_contents($fileTarget, $img); file_put_contents($fileTarget, $img);
} }
$finish = $this->getCurrentTime(); // $finish = $this->getCurrentTime();
$temp["saveIMG"] = round(($finish - $start), 4); // $temp["saveIMG"] = round(($finish - $start), 4);
$start = $this->getCurrentTime(); // $start = $this->getCurrentTime();
$features = json_decode(common::requestToEngine("/get-feature", [ // $features = json_decode(common::requestToEngine("/get-feature", [
"image_paths" => [ // "image_paths" => [
["url" => "/var/www/html/BiFace_Server_Lite/web/data/uploads/face/" . $fileName, "type" => "raw"] // ["url" => "/var/www/html/BiFace_Server_Lite/web/data/uploads/face/" . $fileName, "type" => "raw"]
], // ],
"type" => "128" // "type" => "128"
]), true); // ]), true);
$finish = $this->getCurrentTime(); // $finish = $this->getCurrentTime();
$temp["extract"] = round(($finish - $start), 4); // $temp["extract"] = round(($finish - $start), 4);
$ft[] = [ $ft[] = [
"url" => $fileName, "url" => $fileName,
"urlOld" => $fileName, "urlOld" => $fileName,
"features" => $features['results'][0]['feature'], "features" => [], //$features['results'][0]['feature'],
"features512" => isset($features['results'][0]['feature512']) ? $features['results'][0]['feature512'] : [] "features512" => []//isset($features['results'][0]['feature512']) ? $features['results'][0]['feature512'] : []
]; ];
} }
$extractFeature[] = $temp; $extractFeature[] = $temp;
@ -663,7 +669,7 @@ class ListManagementController extends Controller {
if (Yii::$app->request->post()) { if (Yii::$app->request->post()) {
Yii::$app->response->format = "json"; Yii::$app->response->format = "json";
$server_ip = \app\models\SyncUrl::findOne(['key_config' => 'server_api']); $server_ip = \app\models\SyncUrl::findOne(['key_config' => 'server_api']);
$ip = "dev-dc.beetai.com"; $ip = "https://dev-dc.beetai.com";
if ($server_ip) if ($server_ip)
$ip = $server_ip->data; $ip = $server_ip->data;
$device_id = \app\models\SyncUrl::findOne(['key_config' => 'device_id']); $device_id = \app\models\SyncUrl::findOne(['key_config' => 'device_id']);
@ -686,7 +692,8 @@ class ListManagementController extends Controller {
"telephone" => $StaffInfo->telephone, "telephone" => $StaffInfo->telephone,
"images" => $images "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' => [ 'http' => [
'header' => "Content-Type: application/json", 'header' => "Content-Type: application/json",
'method' => "POST", 'method' => "POST",
@ -696,7 +703,9 @@ class ListManagementController extends Controller {
]) ])
] ]
])), true); ])), 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; 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");
}
} }

10
views/list-management/list-server.tpl
View File

@ -41,10 +41,12 @@
<td>{$arr.name}</td> <td>{$arr.name}</td>
<td>{$arr.department}</td> <td>{$arr.department}</td>
<td> <td>
{foreach from=$arr.images item=img} {foreach from=$arr.images item=img key=k}
<div class='feature-img'> {if $k<Yii::$app->params['maxPicture']}
<img src="{$img}" class="img-thumbnail" style="width: 100px;height:100px;"> <div class='feature-img'>
</div> <img src="{$img}" class="img-thumbnail" style="width: 100px;height:100px;">
</div>
{/if}
{/foreach} {/foreach}
</td> </td>
<td>{$arr.code}</td> <td>{$arr.code}</td>