From 6039aa226412c1ffbd78460a4ca623873a177f74 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期五, 13 十二月 2019 19:59:27 +0800
Subject: [PATCH] add resourceConfig
---
controllers/syssetcont.go | 71 ++++++++++++++++++++++++-----------
go.sum | 4 +-
go.mod | 2
router/router.go | 3 +
4 files changed, 54 insertions(+), 26 deletions(-)
diff --git a/controllers/syssetcont.go b/controllers/syssetcont.go
index 9bf8b56..c9f7f23 100644
--- a/controllers/syssetcont.go
+++ b/controllers/syssetcont.go
@@ -34,14 +34,10 @@
RealMax int `json:"real_max"` //瀹炴椂澶勭悊鐨勬渶澶ц矾鏁�
}
-type ServerConfigSaveVo struct {
- ServiceIpType int `json:"serviceIpType"` //0:鏈満ip锛�1锛氭紓绉籭p
- ServiceIp string `json:"serviceIp"` //澶栭儴鏈嶅姟ip
- Domain string `json:"domain"` //鍩熷悕
-
- ImgPort int `json:"imgPort"` //鍥剧墖绔彛
- VideoPort int `json:"videoPort"` //瑙嗛绔彛
- AudioPort int `json:"audioPort"` //闊抽绔彛
+type ResourceConfigVo struct {
+ IpType int `json:"ipType"` //0:鏈満ip锛�1锛氭紓绉籭p
+ ServiceIp string `json:"serviceIp"` //澶栭儴鏈嶅姟ip
+ Domain string `json:"domain"` //鍩熷悕
}
type Gb28181ConfigVo struct {
@@ -62,21 +58,6 @@
Interval int `json:"interval" example:"鑷姩鏍℃椂闂撮殧"`
NewTime string `json:"newTime" example:"鎵嬪姩鎸囧畾鏃堕棿"`
}
-
-/*
-// @Security ApiKeyAuth
-// @Summary 淇濆瓨瀵瑰鏈嶅姟ip銆佸綍鍍忔椂闀夸互鍙婇煶瑙嗛绔彛
-// @Description 淇濆瓨瀵瑰鏈嶅姟ip銆佸綍鍍忔椂闀夸互鍙婇煶瑙嗛绔彛
-// @Accept json
-// @Produce json
-// @Tags sysset
-// @Param config body controllers.ServerConfigSaveVo true "鍙傛暟"
-// @Success 200 {string} json "{"code":200, msg:"", success:true}"
-// @Failure 500 {string} json "{"code":500, msg:"", success:false}"
-// @Router /data/api-v/sysset/saveConfig [POST]
-func (sset SysSetController) SaveConfig(c *gin.Context) {
-
-}*/
// @Security ApiKeyAuth
// @Summary 瀛樺偍淇℃伅鏌ヨ
@@ -457,3 +438,47 @@
util.ResponseFormat(c, code.Success, "閰嶇疆鎴愬姛")
}
+
+// @Security ApiKeyAuth
+// @Summary 鑾峰彇瀛樺偍瀵瑰鏈嶅姟淇℃伅
+// @Description 鑾峰彇瀛樺偍瀵瑰鏈嶅姟淇℃伅
+// @Produce json
+// @Tags sysset
+// @Success 200 {string} json "{"code":200, msg:"", success:true}"
+// @Failure 500 {string} json "{"code":500, msg:"", success:false}"
+// @Router /data/api-v/sysset/getResourceConfig [get]
+func (sset SysSetController) GetResourceConfig(c *gin.Context) {
+ var sysApi dbapi.SysSetApi
+ b,d := sysApi.GetResourceConfig()
+ if b {
+ util.ResponseFormat(c,code.Success,d)
+ } else {
+ util.ResponseFormat(c,code.ComError,"")
+ }
+}
+
+// @Security ApiKeyAuth
+// @Summary 瀛樺偍瀵瑰鏈嶅姟淇℃伅
+// @Description 瀛樺偍瀵瑰鏈嶅姟淇℃伅
+// @Accept json
+// @Produce json
+// @Tags sysset
+// @Param reqBoby body controllers.ResourceConfigVo true "post璇锋眰锛宩son鍙傛暟"
+// @Success 200 {string} json "{"code":200, msg:"", success:true}"
+// @Failure 500 {string} json "{"code":500, msg:"", success:false}"
+// @Router /data/api-v/sysset/saveResourceConfig [post]
+func (sset SysSetController) SaveResourceConfig(c *gin.Context) {
+ var reqBody ResourceConfigVo
+ c.BindJSON(&reqBody)
+ if reqBody.ServiceIp == "" && reqBody.Domain == "" {
+ util.ResponseFormat(c,code.RequestParamError,"")
+ return
+ }
+ var sysApi dbapi.SysSetApi
+ paramBody := util.Struct2Map(reqBody)
+ if b,_ := sysApi.SaveResourceConfig(paramBody); b {
+ util.ResponseFormat(c,code.Success,"")
+ } else {
+ util.ResponseFormat(c,code.ComError,"")
+ }
+}
\ No newline at end of file
diff --git a/go.mod b/go.mod
index 4a65c2e..1815fae 100644
--- a/go.mod
+++ b/go.mod
@@ -3,7 +3,7 @@
go 1.12
require (
- basic.com/dbapi.git v0.0.0-20191212060052-90d268dbd544 // indirect
+ basic.com/dbapi.git v0.0.0-20191213115425-eab8959710d4 // indirect
basic.com/fileServer/WeedFSClient.git v0.0.0-20190919054037-0182b6c3f5cb // indirect
basic.com/gb28181api.git v0.0.0-20191028082253-472438a8407b // indirect
basic.com/pubsub/cache.git v0.0.0-20190718093725-6a413e1d7d48 // indirect
diff --git a/go.sum b/go.sum
index faa2f5e..3411eba 100644
--- a/go.sum
+++ b/go.sum
@@ -1,5 +1,5 @@
-basic.com/dbapi.git v0.0.0-20191212060052-90d268dbd544 h1:bcy08xFgjJnXa4T0LzsV6+wQIWauq9wG4ZoPY+j7aFw=
-basic.com/dbapi.git v0.0.0-20191212060052-90d268dbd544/go.mod h1:eDXPnxaz6jZPDvBSk7ya7oSASWPCuUEgRTJCjsfKt/Q=
+basic.com/dbapi.git v0.0.0-20191213115425-eab8959710d4 h1:SGXoh3HxiCgWI0TnESJGLWXLNCcNLXtm/cVRhPpyGkw=
+basic.com/dbapi.git v0.0.0-20191213115425-eab8959710d4/go.mod h1:eDXPnxaz6jZPDvBSk7ya7oSASWPCuUEgRTJCjsfKt/Q=
basic.com/fileServer/WeedFSClient.git v0.0.0-20190919054037-0182b6c3f5cb h1:fM6DojeInFSCFO+wkba1jtyPiSDqw0jYKi4Tk+e+ka4=
basic.com/fileServer/WeedFSClient.git v0.0.0-20190919054037-0182b6c3f5cb/go.mod h1:FTryK8BsVLfUplx8a3+l8hJWub6VbAWZCUH7sPRZaso=
basic.com/gb28181api.git v0.0.0-20191028082253-472438a8407b h1:Qh7x2PY3HA9B404Llq+olY5/YlGYrM58bpOHa2CGcro=
diff --git a/router/router.go b/router/router.go
index 0400d5c..2d8aca3 100644
--- a/router/router.go
+++ b/router/router.go
@@ -231,6 +231,9 @@
vsset.GET("/reboot", ssController.RebootOS)
vsset.GET("/rebootTask", ssController.GetRebootTask)
vsset.POST("/rebootTask", ssController.SetRebootTask)
+
+ vsset.GET("/getResourceConfig",ssController.GetResourceConfig)
+ vsset.POST("/saveResourceConfig",ssController.SaveResourceConfig)
}
//绠楁硶搴撴搷浣�
--
Gitblit v1.8.0