diff --git a/commands/SyncController.php b/commands/SyncController.php index 0df6a920..988bceb1 100644 --- a/commands/SyncController.php +++ b/commands/SyncController.php @@ -30,29 +30,18 @@ class SyncController extends Controller { if ($this->is_connected()) { $sync = \app\models\SyncUrl::find()->one(); if ($sync) { - $logs = \app\models\FaceLogs::find()->all(); + $logs = \app\models\WaitingReq::find()->all(); foreach ($logs as $key => $value) { $options = [ 'http' => [ 'header' => "Content-Type: application/json", 'method' => "POST", - 'content' => json_encode([ - "camera_id" => $value->camera_id, - "confidence" => $value->confidence, - "enable_door" => $value->enable_door, - "encoded_person_image" => $value->encoded_person_image, - "frametime" => $value->frametime, - "id" => $value->face_id, - "image" => $value->image, - "name" => $value->name, - "person_id" => $value->person_id, - "status" => $value->status, - "stt" => $value->stt, - "timezone" => $value->timezone - ]), + 'content' => $value->content ] ]; - file_get_contents($sync->data, false, stream_context_create($options)); + $res = json_decode(file_get_contents($sync->data, false, stream_context_create($options)), true); + $modelRes = new \app\models\ResponseReq(); + $modelRes->create(json_encode($res)); $value->delete(); } } diff --git a/controllers/ApiController.php b/controllers/ApiController.php index 3f98c380..f948f42c 100644 --- a/controllers/ApiController.php +++ b/controllers/ApiController.php @@ -62,10 +62,10 @@ class ApiController extends Controller { } public function actionTest() { - $ls = \app\models\WaitingReq::find()->limit(10)->all(); - $c = \app\models\WaitingReq::find()->count(); + $test1 = \app\models\WaitingReq::find()->count(); + $test = \app\models\ResponseReq::find()->count(); echo "
";
-        var_dump($c, $ls);
+        var_dump($test1, $test);
         echo "
"; return; } diff --git a/db/app.db b/db/app.db index 22242a14..bf97113a 100644 Binary files a/db/app.db and b/db/app.db differ diff --git a/models/ResponseReq.php b/models/ResponseReq.php new file mode 100644 index 00000000..1c94bce3 --- /dev/null +++ b/models/ResponseReq.php @@ -0,0 +1,60 @@ + 'ID', + 'content' => 'Content', + 'time' => 'Time', + ]; + } + + public function create($data) { + $r = $this->load([ + 'content' => json_encode($data), + 'time' => time() + ], ''); + if ($r) { + try { + $this->save(); + return $this->id; + } catch (\Exception $ex) { + return false; + } + } + } + +} diff --git a/nbproject/private/private.properties b/nbproject/private/private.properties index d6d16d66..f9b3b45f 100644 --- a/nbproject/private/private.properties +++ b/nbproject/private/private.properties @@ -1,7 +1,7 @@ copy.src.files=false copy.src.on.open=false copy.src.target= -remote.connection=bf_local-799e1d +remote.connection=BiFace-99bab6 remote.directory=/BiFace_Server_Lite remote.upload=ON_SAVE run.as=REMOTE diff --git a/web/index.php b/web/index.php index 20ef696c..ac1919d0 100644 --- a/web/index.php +++ b/web/index.php @@ -1,8 +1,8 @@