From 51a9c5267092d0e377dbb3d80d78d0555e6e94f9 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期六, 28 九月 2019 17:20:38 +0800
Subject: [PATCH] area add alias

---
 controllers/syssetcont.go |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/controllers/syssetcont.go b/controllers/syssetcont.go
index 61a4116..977aeb5 100644
--- a/controllers/syssetcont.go
+++ b/controllers/syssetcont.go
@@ -34,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"`
@@ -155,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