diff --git a/prometheus/server/httphandler/target.go b/prometheus/server/httphandler/target.go index e01535a7cf0b946e5510b3ba181440c9a2865d9f..98b20bcac0c19556058d839827e73c38318ffd0a 100644 --- a/prometheus/server/httphandler/target.go +++ b/prometheus/server/httphandler/target.go @@ -6,6 +6,7 @@ import ( "net/http/httputil" "net/url" + "gitee.com/openeuler/PilotGo-plugins/sdk/response" "github.com/gin-gonic/gin" "openeuler.org/PilotGo/prometheus-plugin/httphandler/service" ) @@ -13,10 +14,7 @@ import ( func DBTargets(c *gin.Context) { targets, err := service.GetPrometheusTarget() if err != nil { - c.JSON(http.StatusOK, gin.H{ - "code": http.StatusBadRequest, - "data": nil, - "msg": err.Error()}) + response.Fail(c, nil, err.Error()) return } diff --git a/prometheus/server/httphandler/targetManager.go b/prometheus/server/httphandler/targetManager.go index 74678a19dc3e6b7ec68086bb8e6757a8001b518b..79e40c8200b43f79704dd524076e6113ed8a4b57 100644 --- a/prometheus/server/httphandler/targetManager.go +++ b/prometheus/server/httphandler/targetManager.go @@ -1,8 +1,7 @@ package httphandler import ( - "net/http" - + "gitee.com/openeuler/PilotGo-plugins/sdk/response" "github.com/gin-gonic/gin" "openeuler.org/PilotGo/prometheus-plugin/httphandler/service" ) @@ -11,46 +10,28 @@ import ( func AddPrometheusTarget(c *gin.Context) { var target service.PrometheusTarget if err := c.BindJSON(&target); err != nil { - c.JSON(http.StatusOK, gin.H{ - "code": http.StatusBadRequest, - "data": nil, - "msg": err.Error()}) + response.Fail(c, nil, err.Error()) return } err := service.AddPrometheusTarget(target) if err != nil { - c.JSON(http.StatusOK, gin.H{ - "code": http.StatusBadRequest, - "data": nil, - "msg": err.Error()}) + response.Fail(c, nil, err.Error()) return } - c.JSON(http.StatusOK, gin.H{ - "code": http.StatusOK, - "data": nil, - "msg": "添加成功"}) + response.Success(c, nil, "添加成功") } // 将监控target从prometheus插件db中删除 func DeletePrometheusTarget(c *gin.Context) { var target service.PrometheusTarget if err := c.BindJSON(&target); err != nil { - c.JSON(http.StatusOK, gin.H{ - "code": http.StatusBadRequest, - "data": nil, - "msg": err.Error()}) + response.Fail(c, nil, err.Error()) return } err := service.DeletePrometheusTarget(target) if err != nil { - c.JSON(http.StatusOK, gin.H{ - "code": http.StatusBadRequest, - "data": nil, - "msg": err.Error()}) + response.Fail(c, nil, err.Error()) return } - c.JSON(http.StatusOK, gin.H{ - "code": http.StatusOK, - "data": nil, - "msg": "删除成功"}) + response.Success(c, nil, "删除成功") } diff --git a/sdk/response/response.go b/sdk/response/response.go new file mode 100644 index 0000000000000000000000000000000000000000..84da343435060eda501142bd03f7df5ebc2332f7 --- /dev/null +++ b/sdk/response/response.go @@ -0,0 +1,21 @@ +package response + +import ( + "net/http" + + "github.com/gin-gonic/gin" +) + +func Success(c *gin.Context, data interface{}, msg string) { + result(c, http.StatusOK, http.StatusOK, data, msg) +} +func Fail(c *gin.Context, data interface{}, msg string) { + result(c, http.StatusOK, http.StatusBadRequest, data, msg) +} + +func result(c *gin.Context, httpStatus int, code int, data interface{}, msg string) { + c.JSON(httpStatus, gin.H{ + "code": code, + "data": data, + "msg": msg}) +}