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

update dhcp check

Browse Source
This commit is contained in:
dongpd 2022-11-18 09:46:24 +07:00
parent 8954a2fc25
commit 5450124be9
6 changed files with 67 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/params.php
View File

@ -2,6 +2,7 @@
return [ return [
'adminEmail' => 'admin@example.com', 'adminEmail' => 'admin@example.com',
"type" => "BiFace", // BiFace, BiTable
"maxLogs" => 50000, "maxLogs" => 50000,
"maxPicture" => 9999, "maxPicture" => 9999,
"version" => "1.0.7", "version" => "1.0.7",

10
controllers/ConfigController.php
View File

@ -159,6 +159,8 @@ class ConfigController extends Controller {
public function actionIndex() { public function actionIndex() {
$this->view->title = Yii::t("app", "CAU_HINH_MAY_CHU"); $this->view->title = Yii::t("app", "CAU_HINH_MAY_CHU");
if (Yii::$app->params['type'] != "BiFace")
return $this->redirect(['cau-hinh-ip']);
$options = [ $options = [
'http' => [ 'http' => [
'header' => "Content-Type: application/json", 'header' => "Content-Type: application/json",
@ -260,6 +262,8 @@ class ConfigController extends Controller {
return true; return true;
} else { } else {
$this->view->title = Yii::t("app", "CAU_HINH_NHAN_DIEN"); $this->view->title = Yii::t("app", "CAU_HINH_NHAN_DIEN");
if (Yii::$app->params['type'] != "BiFace")
return $this->redirect(['cau-hinh-ip']);
$tempConfig = json_decode(file_get_contents("http://localhost:4004/ReadEngineConfig", false, stream_context_create([ $tempConfig = json_decode(file_get_contents("http://localhost:4004/ReadEngineConfig", false, stream_context_create([
'http' => [ 'http' => [
'header' => "Content-Type: application/json", 'header' => "Content-Type: application/json",
@ -424,6 +428,8 @@ class ConfigController extends Controller {
public function actionCauHinhThietBi() { public function actionCauHinhThietBi() {
$this->view->title = Yii::t("app", "CAU_HINH_THIET_BI"); $this->view->title = Yii::t("app", "CAU_HINH_THIET_BI");
if (Yii::$app->params['type'] != "BiFace")
return $this->redirect(['cau-hinh-ip']);
$tempConfig = json_decode(file_get_contents("http://localhost:4004/ReadEngineConfig", false, stream_context_create([ $tempConfig = json_decode(file_get_contents("http://localhost:4004/ReadEngineConfig", false, stream_context_create([
'http' => [ 'http' => [
@ -529,9 +535,9 @@ class ConfigController extends Controller {
if (Yii::$app->request->post()) { if (Yii::$app->request->post()) {
Yii::$app->response->format = "json"; Yii::$app->response->format = "json";
$post = Yii::$app->request->post(); $post = Yii::$app->request->post();
if (!isset($this->subnet[$post['subnet_mask']])) if (!$post['dhcp'] && !isset($this->subnet[$post['subnet_mask']]))
return ["status" => false]; return ["status" => false];
$post['subnet_mask'] = $this->subnet[$post['subnet_mask']]; $post['subnet_mask'] = isset($this->subnet[$post['subnet_mask']]) ? $this->subnet[$post['subnet_mask']] : "";
$options = [ $options = [
'http' => [ 'http' => [
'header' => "Content-Type: application/json", 'header' => "Content-Type: application/json",

42
vendor/dmstr/yii2-adminlte-asset/example-views/yiisoft/yii2-app/layouts/header.php vendored
View File

@ -41,26 +41,28 @@ use yii\widgets\ActiveForm;
<i class="fa fa-cogs"></i> <?php echo Yii::t("app", "CAU_HINH"); ?> <i class="fa fa-cogs"></i> <?php echo Yii::t("app", "CAU_HINH"); ?>
</a> </a>
</li> </li>
<li> <?php if (Yii::$app->params['type'] === "BiFace") { ?>
<a href="<?php echo yii\helpers\Url::to(['/config/reset']); ?>" onclick="common.resetForm(this);return false;"> <li>
<i class="fa fa-refresh"></i> <?php echo Yii::t("app", "RESET_THIET_BI"); ?> <a href="<?php echo yii\helpers\Url::to(['/config/reset']); ?>" onclick="common.resetForm(this);return false;">
</a> <i class="fa fa-refresh"></i> <?php echo Yii::t("app", "RESET_THIET_BI"); ?>
</li> </a>
<li class="<?php if (Yii::$app->controller->id == "list-management") echo "active"; ?>"> </li>
<a href="<?php echo yii\helpers\Url::to(['/list-management']); ?>"> <li class="<?php if (Yii::$app->controller->id == "list-management") echo "active"; ?>">
<i class="fa fa-list"></i> <?php echo Yii::t("app", "QUAN_LY_MAU"); ?> <a href="<?php echo yii\helpers\Url::to(['/list-management']); ?>">
</a> <i class="fa fa-list"></i> <?php echo Yii::t("app", "QUAN_LY_MAU"); ?>
</li> </a>
<li class="dropdown <?php if (in_array(Yii::$app->controller->id, ['capture-logs', 'control-logs'])) echo "active"; ?>"> </li>
<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false"> <li class="dropdown <?php if (in_array(Yii::$app->controller->id, ['capture-logs', 'control-logs'])) echo "active"; ?>">
<i class="fa fa-list-alt"></i> <?php echo Yii::t("app", "LICH_SU_HE_THONG"); ?> <a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
</a> <i class="fa fa-list-alt"></i> <?php echo Yii::t("app", "LICH_SU_HE_THONG"); ?>
<ul class="dropdown-menu" role="menu"> </a>
<li><a href="<?php echo \yii\helpers\Url::to(['/capture-logs']); ?>"><i class="fa fa-camera"></i> <?php echo Yii::t("app", "LICH_SU_HE_THONG"); ?></a></li> <ul class="dropdown-menu" role="menu">
<li><a href="<?php echo \yii\helpers\Url::to(['/control-logs']); ?>"><i class="fa fa-database"></i> <?php echo Yii::t("app", "DANH_SACH_NHAN_DIEN"); ?></a></li> <li><a href="<?php echo \yii\helpers\Url::to(['/capture-logs']); ?>"><i class="fa fa-camera"></i> <?php echo Yii::t("app", "LICH_SU_HE_THONG"); ?></a></li>
<li><a href="<?php echo \yii\helpers\Url::to(['/capture-logs/face-comparison']); ?>"><i class="fa fa-users"></i> <?php echo Yii::t("app", "SO_SANH_MAT"); ?></a></li> <li><a href="<?php echo \yii\helpers\Url::to(['/control-logs']); ?>"><i class="fa fa-database"></i> <?php echo Yii::t("app", "DANH_SACH_NHAN_DIEN"); ?></a></li>
</ul> <li><a href="<?php echo \yii\helpers\Url::to(['/capture-logs/face-comparison']); ?>"><i class="fa fa-users"></i> <?php echo Yii::t("app", "SO_SANH_MAT"); ?></a></li>
</li> </ul>
</li>
<?php } ?>
</ul> </ul>
</div> </div>
<div class="navbar-custom-menu"> <div class="navbar-custom-menu">

7
views/config/ip.tpl
View File

@ -23,6 +23,9 @@
<br> <br>
<div class="row"> <div class="row">
<div class="col-md-3"> <div class="col-md-3">
<div class="form-group" id="dhcp">
<input type='checkbox' name='dhcp' id='dhcp_check' value="" {if $network.dhcp=="yes"}checked=""{/if}> DHCP
</div>
<div class="form-group" id="device_ip"> <div class="form-group" id="device_ip">
<div class="input-group"> <div class="input-group">
<div class="input-group-addon">{Yii::t("app", "IP Address")}</div> <div class="input-group-addon">{Yii::t("app", "IP Address")}</div>
@ -44,13 +47,13 @@
<div class="form-group" id="dns1"> <div class="form-group" id="dns1">
<div class="input-group"> <div class="input-group">
<div class="input-group-addon">{Yii::t("app", "DNS1")}</div> <div class="input-group-addon">{Yii::t("app", "DNS1")}</div>
<input type="input" class="form-control" name="dns1" value="{$network.dns[0]|default:""}"> <input type="input" class="form-control" name="dns1" value="{$network.dns1|default:""}">
</div> </div>
</div> </div>
<div class="form-group" id="dns2"> <div class="form-group" id="dns2">
<div class="input-group"> <div class="input-group">
<div class="input-group-addon">{Yii::t("app", "DNS2")}</div> <div class="input-group-addon">{Yii::t("app", "DNS2")}</div>
<input type="input" class="form-control" name="dns2" value="{$network.dns[1]|default:""}"> <input type="input" class="form-control" name="dns2" value="{$network.dns2|default:""}">
</div> </div>
</div> </div>
<div class="text-center"> <div class="text-center">

54
views/config/menu.tpl
View File

@ -1,33 +1,35 @@
{use class="yii\helpers\Url"} {use class="yii\helpers\Url"}
<div class="mt-element-step"> {if Yii::$app->params["type"]==="BiFace"}
<div class="row step-thin"> <div class="mt-element-step">
<div class="col-md-3 bg-grey mt-step-col {if $tab=="device_config"}active{/if}"> <div class="row step-thin">
<div class="mt-step-number bg-white font-grey">1</div> <div class="col-md-3 bg-grey mt-step-col {if $tab=="device_config"}active{/if}">
<div class="mt-step-title uppercase font-grey-cascade" style="cursor: pointer;" onclick="window.location = '{Url::to(['/config/cau-hinh-thiet-bi'])}';"> <div class="mt-step-number bg-white font-grey">1</div>
{Yii::t("app", "CAU_HINH_THIET_BI")} <div class="mt-step-title uppercase font-grey-cascade" style="cursor: pointer;" onclick="window.location = '{Url::to(['/config/cau-hinh-thiet-bi'])}';">
{Yii::t("app", "CAU_HINH_THIET_BI")}
</div>
<div class="mt-step-content font-grey-cascade">{Yii::t("app", "DEVICE_CONFIG")}</div>
</div> </div>
<div class="mt-step-content font-grey-cascade">{Yii::t("app", "DEVICE_CONFIG")}</div> <div class="col-md-3 bg-grey mt-step-col {if $tab=="server_config"}active{/if}">
</div> <div class="mt-step-number bg-white font-grey">2</div>
<div class="col-md-3 bg-grey mt-step-col {if $tab=="server_config"}active{/if}"> <div class="mt-step-title uppercase font-grey-cascade" style="cursor: pointer;" onclick="window.location = '{Url::to(['/config'])}';">
<div class="mt-step-number bg-white font-grey">2</div> {Yii::t("app", "CAU_HINH_MAY_CHU")}
<div class="mt-step-title uppercase font-grey-cascade" style="cursor: pointer;" onclick="window.location = '{Url::to(['/config'])}';"> </div>
{Yii::t("app", "CAU_HINH_MAY_CHU")} <div class="mt-step-content font-grey-cascade">{Yii::t("app", "SERVER_CONFIG")}</div>
</div> </div>
<div class="mt-step-content font-grey-cascade">{Yii::t("app", "SERVER_CONFIG")}</div> <div class="col-md-3 bg-grey mt-step-col {if $tab=="engine_config"}active{/if}">
</div> <div class="mt-step-number bg-white font-grey">3</div>
<div class="col-md-3 bg-grey mt-step-col {if $tab=="engine_config"}active{/if}"> <div class="mt-step-title uppercase font-grey-cascade" style="cursor: pointer;" onclick="window.location = '{Url::to(['/config/cau-hinh-nhan-dien'])}';">
<div class="mt-step-number bg-white font-grey">3</div> {Yii::t("app", "CAU_HINH_NHAN_DIEN")}
<div class="mt-step-title uppercase font-grey-cascade" style="cursor: pointer;" onclick="window.location = '{Url::to(['/config/cau-hinh-nhan-dien'])}';"> </div>
{Yii::t("app", "CAU_HINH_NHAN_DIEN")} <div class="mt-step-content font-grey-cascade">{Yii::t("app", "ENGINE_CONFIG")}</div>
</div> </div>
<div class="mt-step-content font-grey-cascade">{Yii::t("app", "ENGINE_CONFIG")}</div> <div class="col-md-3 bg-grey mt-step-col {if $tab=="ip_config"}active{/if}">
</div> <div class="mt-step-number bg-white font-grey">4</div>
<div class="col-md-3 bg-grey mt-step-col {if $tab=="ip_config"}active{/if}"> <div class="mt-step-title uppercase font-grey-cascade" style="cursor: pointer;" onclick="window.location = '{Url::to(['/config/cau-hinh-ip'])}';">
<div class="mt-step-number bg-white font-grey">4</div> {Yii::t("app", "CAU_HINH_IP")}
<div class="mt-step-title uppercase font-grey-cascade" style="cursor: pointer;" onclick="window.location = '{Url::to(['/config/cau-hinh-ip'])}';"> </div>
{Yii::t("app", "CAU_HINH_IP")} <div class="mt-step-content font-grey-cascade">{Yii::t("app", "IP_CONFIG")}</div>
</div> </div>
<div class="mt-step-content font-grey-cascade">{Yii::t("app", "IP_CONFIG")}</div>
</div> </div>
</div> </div>
</div> {/if}

3
web/js/config.js
View File

@ -125,6 +125,8 @@ function ValidateIPaddress(ipaddress) {
function validData(inputName) { function validData(inputName) {
var ip = $("input[name='" + inputName + "']").val(); var ip = $("input[name='" + inputName + "']").val();
if (ip == "" && document.getElementById('dhcp_check').checked)
return true;
if (!ValidateIPaddress(ip)) { if (!ValidateIPaddress(ip)) {
common.error(inputName, ""); common.error(inputName, "");
return false; return false;
@ -160,6 +162,7 @@ function changeIP(e) {
gateway: $("input[name='gateway']").val(), gateway: $("input[name='gateway']").val(),
dns1: $("input[name='dns1']").val(), dns1: $("input[name='dns1']").val(),
dns2: $("input[name='dns2']").val(), dns2: $("input[name='dns2']").val(),
dhcp: document.getElementById('dhcp_check').checked
}, },
success: function (data) { success: function (data) {
common.modalBlock(false); common.modalBlock(false);