From 4c7890a506f95bfc8d06a75dbf6150bb8fcad1bb Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期六, 28 九月 2019 15:28:32 +0800
Subject: [PATCH] add logger
---
controllers/syssetcont.go | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/controllers/syssetcont.go b/controllers/syssetcont.go
index ef1888c..977aeb5 100644
--- a/controllers/syssetcont.go
+++ b/controllers/syssetcont.go
@@ -16,6 +16,8 @@
Id string `json:"id"`
AlarmIp string `json:"alarm_ip,omitempty" example:"192.168.1.182"`
AlarmPort int `json:"alarm_port,omitempty" example:"22122"`
+ AlarmThresholdType int `json:"alarm_threshold_type"`//鎶ヨ闃堝�肩被鍨嬭缃細1:鎸夋渶楂樺垎,2:鎸夐槇鍊间互涓�
+ AlarmThreshold int `json:"alarm_threshold"`//鎶ヨ闃堝��
WebPicIp string `json:"web_pic_ip,omitempty" example:""`
WebPicPort int `json:"web_pic_port,omitempty" example:"22122"`
EsPicIp string `json:"es_pic_ip,omitempty" example:""`
@@ -32,9 +34,9 @@
type Gb28181ConfigVo struct {
Id string `json:"Id"`
ServerIp string `json:"ServerIp" example:"鍥芥爣鏈嶅姟鍣↖P"`
- ServerPort int `json:"ServerPort" example:"鏈嶅姟鍣ㄧ鍙�:8060"`
- PublicId string `json:"PublicId" example:"鍥芥爣鏈嶅姟鍣↖d"`
- GbServerPort int `json:"GbServerPort" example:"鍥芥爣鏈嶅姟绔彛:7060"`
+ ServerPort int `json:"ServerPort" example:"骞冲彴鏈嶅姟绔彛:7060"`
+ PublicId string `json:"PublicId" example:"骞冲彴鏈嶅姟Id"`
+ GbServerPort int `json:"GbServerPort" example:"鍥芥爣鏈嶅姟绔彛:8060"`
IsAuth bool `json:"IsAuth" example:"鏄惁寮�鍚壌鏉�:true"`
Password string `json:"Password" example:"瀵嗙爜"`
UpdateTime string `json:"UpdateTime"`
@@ -153,7 +155,15 @@
resData["ip"] = ipv4
resData["subMask"] = mask
resData["gateway"] = gateway
- // 瀛樺湪
+
+ resData["deviceNum"] = config.Server.DeviceNum
+ resData["deviceType"] = config.Server.DeviceType
+ resData["deviceSerialNum"] = config.Server.DeviceSerialNum
+ resData["masterVersion"] = config.Server.MasterVersion
+ resData["webVersion"] = config.Server.WebVersion
+ resData["channelCount"] = config.Server.ChannelCount
+ resData["diskCount"] = config.Server.DiskCount
+
util.ResponseFormat(c, code.Success, resData)
}
}
--
Gitblit v1.8.0