From 263c7b18ce7f18f1222318f6e0e499e907895a52 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期三, 13 十一月 2019 19:33:39 +0800
Subject: [PATCH] fix
---
controllers/syssetcont.go | 225 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 217 insertions(+), 8 deletions(-)
diff --git a/controllers/syssetcont.go b/controllers/syssetcont.go
index 3edd410..810a8aa 100644
--- a/controllers/syssetcont.go
+++ b/controllers/syssetcont.go
@@ -3,7 +3,10 @@
import (
"basic.com/dbapi.git"
"github.com/gin-gonic/gin"
+ "regexp"
"webserver/extend/code"
+ "webserver/extend/config"
+ "webserver/extend/sys"
"webserver/extend/util"
)
@@ -15,6 +18,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:""`
@@ -39,8 +44,17 @@
UpdateTime string `json:"UpdateTime"`
}
-// @Summary 瀛樺偍淇℃伅鏌ヨ
-// @Description 瀛樺偍淇℃伅鏌ヨ
+type SysClockConfigVo struct {
+ TimeZone string `json:"timeZone" example:"鏃跺尯"`
+ NTP bool `json:"ntp" example:"NTP鏍℃椂"`
+ NTPServer string `json:"ntpServer" example:"NTP鏈嶅姟鍣ㄥ湴鍧�"`
+ Interval int `json:"interval" example:"鑷姩鏍℃椂闂撮殧"`
+ NewTime string `json:"newTime" example:"鎵嬪姩鎸囧畾鏃堕棿"`
+}
+
+// @Security ApiKeyAuth
+// @Summary 鍩虹璁剧疆鏌ヨ
+// @Description 鍩虹璁剧疆鏌ヨ
// @Accept json
// @Produce json
// @Tags sysset
@@ -57,8 +71,9 @@
}
}
-// @Summary 瀛樺偍淇℃伅淇敼
-// @Description 瀛樺偍淇℃伅淇敼
+// @Security ApiKeyAuth
+// @Summary 鎶ヨ璁剧疆淇敼
+// @Description 鎶ヨ璁剧疆淇敼
// @Accept json
// @Produce json
// @Tags sysset
@@ -83,8 +98,9 @@
}
}
-// @Summary 瀛樺偍淇℃伅淇敼
-// @Description 瀛樺偍淇℃伅淇敼
+// @Security ApiKeyAuth
+// @Summary 鎶ヨ鏃堕暱淇敼
+// @Description 鎶ヨ鏃堕暱淇敼
// @Accept json
// @Produce json
// @Tags sysset
@@ -105,6 +121,7 @@
}
}
+// @Security ApiKeyAuth
// @Summary 瑙嗛鎴彇鏃堕暱淇敼
// @Description 瑙嗛鎴彇鏃堕暱淇℃伅
// @Accept x-www-form-urlencoded
@@ -130,6 +147,7 @@
}
}
+// @Security ApiKeyAuth
// @Summary 鑾峰彇鍒嗘瀽璁惧淇℃伅
// @Description 鍒嗘瀽璁惧淇℃伅
// @Accept json
@@ -147,11 +165,17 @@
}else {
resData["server_id"] = sysconf.GetServerId()
resData["server_name"] = sysconf.GetServerName()
+ ipv4, mask, _ := util.GetLocalIP(config.Server.NetworkAdapter)
+ gateway, _ := util.GetDefaultRoute(config.Server.NetworkAdapter)
+ resData["ip"] = ipv4
+ resData["subMask"] = mask
+ resData["gateway"] = gateway
// 瀛樺湪
util.ResponseFormat(c, code.Success, resData)
}
}
+// @Security ApiKeyAuth
// saveDevInfo dev_id dev_name
// @Summary 淇濆瓨瑙嗛鍒嗘瀽璁惧淇℃伅
// @Description 鍒嗘瀽璁惧淇℃伅
@@ -164,7 +188,7 @@
// @Router /data/api-v/sysset/saveDevInfo [POST]
func (sset SysSetController) SaveDevInfo(c *gin.Context){
- dev_name := c.Request.FormValue("server_name")
+ dev_name := c.PostForm("server_name")
var api dbapi.SysSetApi
paramBody :=make(map[string]interface{},0)
paramBody["serverName"] = dev_name
@@ -176,7 +200,7 @@
}
}
-
+// @Security ApiKeyAuth
// @Summary GB28181璁剧疆鏌ヨ
// @Description GB28181璁剧疆淇℃伅鏌ヨ
// @Accept json
@@ -195,6 +219,7 @@
}
}
+// @Security ApiKeyAuth
// @Summary GB28181璁剧疆淇℃伅淇敼
// @Description GB28181璁剧疆淇敼
// @Accept json
@@ -220,3 +245,187 @@
util.ResponseFormat(c,code.ComError,"鏇存柊澶辫触")
}
}
+
+/*
+// @Security ApiKeyAuth
+// @Summary 鑾峰彇鏃堕棿閰嶇疆
+// @Description 绯荤粺鏃堕棿閰嶇疆淇℃伅
+// @Accept json
+// @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/clockInfo [GET]
+*/
+func (sset SysSetController) GetClockinfo(c *gin.Context) {
+ resData := make(map[string]interface{}, 0)
+ resData["time_zone"], resData["local_time"] = sys.TimeZone()
+ resData["ntp"], resData["ntp_server"], resData["interval"] = sys.NTPConfig()
+
+ util.ResponseFormat(c, code.Success, resData)
+}
+
+/*
+// @Security ApiKeyAuth
+// @Summary 娴嬭瘯鍚屾鏃堕棿
+// @Description 娴嬭瘯鍚屾鏃堕棿鏈嶅姟鍣ㄦ槸鍚﹀彲鐢�
+// @Produce json
+// @Tags sysset
+// @Param server query string true "鏃堕棿鏈嶅姟鍣╥p"
+// @Success 200 {string} json "{"code":200, msg:"鐩綍缁撴瀯鏁版嵁", success:true}"
+// @Failure 500 {string} json "{"code":500, msg:"杩斿洖閿欒淇℃伅", success:false}"
+// @Router /data/api-v/sysset/ntpTest [GET]
+*/
+func (sset SysSetController) TestNTPServer(c *gin.Context) {
+ ntpServer := c.Query("server")
+
+ if root := sys.CheckRootPermissions(); !root {
+ util.ResponseFormat(c, code.ServiceInsideError, "鏈嶅姟鍣ㄦ病鏈変慨鏀规椂闂寸殑鏉冮檺")
+ return
+ }
+
+ isConn := sys.RunNTPDate(ntpServer)
+ if !isConn {
+ util.ResponseFormat(c, code.RequestParamError, "NTP鏈嶅姟鍣ㄤ笉鍙敤")
+ return
+ }
+
+ util.ResponseFormat(c, code.Success, "")
+
+}
+
+/*
+// @Security ApiKeyAuth
+// @Summary 璁剧疆绯荤粺鏃堕棿
+// @Description 鏍℃绯荤粺鏃堕棿
+// @Accept json
+// @Produce json
+// @Tags sysset
+// @Param config body controllers.SysClockConfigVo true "鏍℃椂淇℃伅"
+// @Success 200 {string} json "{"code":200, msg:"鐩綍缁撴瀯鏁版嵁", success:true}"
+// @Failure 500 {string} json "{"code":500, msg:"杩斿洖閿欒淇℃伅", success:false}"
+// @Router /data/api-v/sysset/updateClock [POST]
+*/
+func (sset SysSetController) SetSysClock(c *gin.Context) {
+ var args SysClockConfigVo
+ err := c.BindJSON(&args)
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "鍙傛暟鏈夎")
+ return
+ }
+
+ if args.TimeZone != "CST" && args.TimeZone != "UTC" {
+ if r := sys.SetTimeZone(args.TimeZone); !r {
+ util.ResponseFormat(c, code.RequestParamError, "鏃跺尯鍙傛暟閿欒")
+ return
+ }
+ }
+
+ if !args.NTP {
+ if r := sys.SetLocalTime(args.NewTime); !r {
+ util.ResponseFormat(c, code.RequestParamError, "鎸囧畾鐨勬椂闂村弬鏁伴敊璇�")
+ return
+ }
+ } else {
+ if r := sys.EnableNTPCron(args.NTPServer, args.Interval); !r {
+ util.ResponseFormat(c, code.RequestParamError, "鎸囧畾鐨勬湇鍔″櫒鍦板潃閿欒")
+ return
+ }
+ }
+
+ util.ResponseFormat(c, code.UpdateSuccess, "閰嶇疆鎴愬姛")
+}
+
+/*
+// @Security ApiKeyAuth
+// @Summary 鏌ヨ绯荤粺杩愯淇℃伅
+// @Description 鑾峰彇褰撳墠绯荤粺鐨勮繍琛岀姸鎬侊紝CPU, GPU, 鍐呭瓨绛�
+// @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/sysinfo [GET]
+*/
+func (sset SysSetController) GetSysInfo(c *gin.Context) {
+ info := sys.GetSysInfo()
+ util.ResponseFormat(c, code.UpdateSuccess, info)
+}
+
+/*
+// @Security ApiKeyAuth
+// @Summary 鏌ヨ绯荤粺鐘舵�侀槇鍊艰缃�
+// @Description 鑾峰彇褰撳墠绯荤粺鐨勮繍琛岀姸鎬侊紝CPU, GPU, 鍐呭瓨鐨勯槇鍊奸厤缃�
+// @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/sysThresholds [GET]
+*/
+func (sset SysSetController) GetSysThresholds(c *gin.Context) {
+ util.ResponseFormat(c, code.UpdateSuccess, config.Server.SysThresholds)
+}
+
+/*
+// @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/reboot [GET]
+*/
+func (sset SysSetController) RebootOS(c *gin.Context) {
+ if isOk, msg := sys.Reboot(); !isOk {
+ util.ResponseFormat(c, code.UpdateFail, msg)
+ return
+ }
+
+ util.ResponseFormat(c, code.Success, "姝ｅ湪閲嶅惎")
+}
+
+/*
+// @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/rebootTask [GET]
+*/
+func (sset SysSetController) GetRebootTask(c *gin.Context) {
+ _, msg := sys.ReadRebootTaskInCrontab()
+ util.ResponseFormat(c, code.Success, msg)
+}
+
+/*
+// @Summary 璁剧疆瀹氭椂閲嶅惎
+// @Description 璁剧疆瀹氭椂閲嶅惎浠诲姟鐨勯厤缃鍒�
+// @Accept x-www-form-urlencoded
+// @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/rebootTask [POST]
+*/
+func (sset SysSetController) SetRebootTask(c *gin.Context) {
+ task := c.PostForm("task")
+ if len(task) < 1 {
+ sys.CleanRebootTask()
+ util.ResponseFormat(c, code.Success, "閰嶇疆鎴愬姛")
+ return
+ }
+
+ regEx := `^([0-9*]+\s){4}[0-9*]+$`
+ if r, _ := regexp.MatchString(regEx, task); !r {
+ util.ResponseFormat(c, code.RequestParamError, "鍙傛暟閿欒")
+ return
+ }
+
+ if r := sys.UpdateRebootTask(task); !r {
+ util.ResponseFormat(c, code.UpdateFail, "閰嶇疆澶辫触")
+ return
+ }
+
+ util.ResponseFormat(c, code.Success, "閰嶇疆鎴愬姛")
+}
--
Gitblit v1.8.0