From c9fd11390ca85a7f3fd7e30ec5f1402d362f0c12 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期二, 17 十二月 2019 19:52:36 +0800
Subject: [PATCH] add filePort
---
controllers/syssetcont.go | 8 +++++++-
go.sum | 4 ++--
go.mod | 2 +-
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/controllers/syssetcont.go b/controllers/syssetcont.go
index 8bc66fc..0bbe12b 100644
--- a/controllers/syssetcont.go
+++ b/controllers/syssetcont.go
@@ -38,6 +38,7 @@
IpType int `json:"ipType"` //0:鏈満ip锛�1锛氭紓绉籭p
ServiceIp string `json:"serviceIp"` //澶栭儴鏈嶅姟ip
Domain string `json:"domain"` //鍩熷悕
+ FilePort int `json:"filePort"`
}
type Gb28181ConfigVo struct {
@@ -457,7 +458,12 @@
var sysApi dbapi.SysSetApi
b,d := sysApi.GetResourceConfig()
if b {
- util.ResponseFormat(c,code.Success,d)
+ util.ResponseFormat(c,code.Success,map[string]interface{}{
+ "ipType":d.IpType,
+ "serviceIp": d.ServiceIp,
+ "domain": d.Domain,
+ "filePort": d.FilePort,
+ })
} else {
util.ResponseFormat(c,code.ComError,"")
}
diff --git a/go.mod b/go.mod
index a34b3a1..043e00b 100644
--- a/go.mod
+++ b/go.mod
@@ -8,7 +8,7 @@
basic.com/gb28181api.git v0.0.0-20191028082253-472438a8407b // indirect
basic.com/pubsub/cache.git v0.0.0-20190718093725-6a413e1d7d48 // indirect
basic.com/pubsub/esutil.git v0.0.0-20191120125514-865efa73a9ae // indirect
- basic.com/pubsub/protomsg.git v0.0.0-20191214074537-d14cd01b7d11 // indirect
+ basic.com/pubsub/protomsg.git v0.0.0-20191217114717-83e84039a99d // indirect
basic.com/valib/capture.git v0.0.0-20191126081138-bf954c0fa627 // indirect
basic.com/valib/deliver.git v0.0.0-20190531095353-25d8c3b20051
basic.com/valib/gopherdiscovery.git v0.0.0-20190605034340-15d89d8b4e28 // indirect
diff --git a/go.sum b/go.sum
index 443c8bf..87f9ffb 100644
--- a/go.sum
+++ b/go.sum
@@ -8,8 +8,8 @@
basic.com/pubsub/cache.git v0.0.0-20190718093725-6a413e1d7d48/go.mod h1:gHLJZz2ee1cGL0X0ae69fs56bAxkDgEQwDhhXZJNUcY=
basic.com/pubsub/esutil.git v0.0.0-20191120125514-865efa73a9ae h1:/j1dIDLxzEp51N+ZHZIq1xeYVK9zz8epWEAfw01uWe8=
basic.com/pubsub/esutil.git v0.0.0-20191120125514-865efa73a9ae/go.mod h1:yIvppFPFGC61DOdm71ujnsxZBMFUu2yKjr5O43bMWCw=
-basic.com/pubsub/protomsg.git v0.0.0-20191214074537-d14cd01b7d11 h1:w3sAb5ntp+io6lgGevU1W/ue9bvdvpm8cDvcjlDDwlE=
-basic.com/pubsub/protomsg.git v0.0.0-20191214074537-d14cd01b7d11/go.mod h1:un5NV5VWQoblVLZfx1Rt5vyLgwR0jI92d3VJhfrJhWU=
+basic.com/pubsub/protomsg.git v0.0.0-20191217114717-83e84039a99d h1:8dxtZCRIBdaZwCbqREyRdgXkBqyufK8WJxbrWbNweEA=
+basic.com/pubsub/protomsg.git v0.0.0-20191217114717-83e84039a99d/go.mod h1:un5NV5VWQoblVLZfx1Rt5vyLgwR0jI92d3VJhfrJhWU=
basic.com/valib/capture.git v0.0.0-20191126081138-bf954c0fa627 h1:26J3wU05U/v72SvUvtFc6Ymgvlill9SXbRn/cMGE5k0=
basic.com/valib/capture.git v0.0.0-20191126081138-bf954c0fa627/go.mod h1:y+h7VUnoSQ3jOtf2K3twXNA8fYDfyUsifSswcyKLgNw=
basic.com/valib/deliver.git v0.0.0-20190531095353-25d8c3b20051/go.mod h1:bkYiTUGzckyNOjAgn9rB/DOjFzwoSHJlruuWQ6hu6IY=
--
Gitblit v1.8.0