From 3b7e6500b44c19f9dd50ccb0d1f988c5e186426d Mon Sep 17 00:00:00 2001
From: dongpd <dongpd@beetinnovators.com>
Date: Fri, 22 May 2020 15:17:32 +0700
Subject: [PATCH] config server ip

---
 controllers/ConfigController.php     |  4 ++--
 nbproject/private/private.properties |  6 +++---
 views/config/index.tpl               | 13 ++++---------
 web/js/config.js                     |  3 +--
 4 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/controllers/ConfigController.php b/controllers/ConfigController.php
index d72b1cb5..cdafc45b 100644
--- a/controllers/ConfigController.php
+++ b/controllers/ConfigController.php
@@ -166,8 +166,8 @@ class ConfigController extends Controller {
                     'header' => "Content-Type: application/json",
                     'method' => "POST",
                     'content' => json_encode([
-                        "servermqtt" => $post['servermqtt'],
-                        "url" => $post['url']
+                        "servermqtt" => $post['server'] . ":1883",
+                        "url" => "http://" . $post['server'] . ":5001/api/box/getConfig"
                     ]),
                 ]
             ];
diff --git a/nbproject/private/private.properties b/nbproject/private/private.properties
index 2455f53c..d6d16d66 100644
--- a/nbproject/private/private.properties
+++ b/nbproject/private/private.properties
@@ -1,8 +1,8 @@
 copy.src.files=false
 copy.src.on.open=false
 copy.src.target=
-remote.connection=BI-9f36c2
-remote.directory=/anpr
+remote.connection=bf_local-799e1d
+remote.directory=/BiFace_Server_Lite
 remote.upload=ON_SAVE
-run.as=LOCAL
+run.as=REMOTE
 url=http://localhost/
diff --git a/views/config/index.tpl b/views/config/index.tpl
index c1e51f72..ff921398 100644
--- a/views/config/index.tpl
+++ b/views/config/index.tpl
@@ -42,15 +42,10 @@
             <div class="col-md-4">
                 <div class="form-group">
                     <div class="input-group">
-                        <div class="input-group-addon">server_mqtt</div>
-                        <input type="input" class="form-control" name="servermqtt" value="{$apiConfig.servermqtt}">
-                    </div>
-                </div>
-                <div class="form-group">
-                    <div class="input-group">
-                        <div class="input-group-addon">url</div>
-                        <input type="input" class="form-control" name="url" value="{$apiConfig.url}">
-                    </div>
+                        <div class="input-group-addon">server IP</div>
+                        {$temp=explode(":",$apiConfig.servermqtt)}
+                        <input type="input" class="form-control" name="servermqtt" value="{$temp.0}">
+                    </div> 
                 </div>
                 <div class="text-center">
                     <button class="btn btn-primary" onclick="saveStep1(this);" data-href="{Url::to(['/config/cau-hinh-may-chu'])}">
diff --git a/web/js/config.js b/web/js/config.js
index 12c621ab..bbbca676 100644
--- a/web/js/config.js
+++ b/web/js/config.js
@@ -7,8 +7,7 @@ function saveStep1(e) {
         url: $(e).attr("data-href"),
         type: 'POST',
         data: {
-            servermqtt: $("input[name='servermqtt']").val(),
-            url: $("input[name='url']").val()
+            server: $("input[name='servermqtt']").val()
         },
         success: function (data) {
             setTimeout(function () {