add hearbeat api for pushgw

center/router/router_heartbeat.go

@@ -35,8 +35,15 @@ func (rt *Router) heartbeat(c *gin.Context) {
 	err = json.Unmarshal(bs, &req)
 	ginx.Dangerous(err)
 
-	req.Offset = (time.Now().UnixMilli() - req.UnixTime)
-	req.RemoteAddr = c.ClientIP()
+	// maybe from pushgw
+	if req.Offset == 0 {
+		req.Offset = (time.Now().UnixMilli() - req.UnixTime)
+	}
+
+	if req.RemoteAddr == "" {
+		req.RemoteAddr = c.ClientIP()
+	}
+
 	rt.MetaSet.Set(req.Hostname, req)
 
 	gid := ginx.QueryInt64(c, "gid", 0)

pushgw/router/router_heartbeat.go

@@ -1,11 +1,45 @@
 package router
 
 import (
+	"compress/gzip"
+	json "encoding/json"
+	"io/ioutil"
+	"time"
+
+	"github.com/ccfos/nightingale/v6/models"
+	"github.com/ccfos/nightingale/v6/pkg/poster"
 	"github.com/gin-gonic/gin"
+	"github.com/toolkits/pkg/ginx"
 )
 
 // heartbeat Forward heartbeat request to the center.
 // basic auth
 func (rt *Router) heartbeat(c *gin.Context) {
+	var bs []byte
+	var err error
+	var r *gzip.Reader
+	var req models.HostMeta
+	if c.GetHeader("Content-Encoding") == "gzip" {
+		r, err = gzip.NewReader(c.Request.Body)
+		if err != nil {
+			c.String(400, err.Error())
+			return
+		}
+		defer r.Close()
+		bs, err = ioutil.ReadAll(r)
+		ginx.Dangerous(err)
+	} else {
+		defer c.Request.Body.Close()
+		bs, err = ioutil.ReadAll(c.Request.Body)
+		ginx.Dangerous(err)
+	}
 
+	err = json.Unmarshal(bs, &req)
+	ginx.Dangerous(err)
+
+	req.Offset = (time.Now().UnixMilli() - req.UnixTime)
+	req.RemoteAddr = c.ClientIP()
+	gid := ginx.QueryStr(c, "gid")
+
+	ginx.NewRender(c).Message(poster.PostByUrls(rt.Ctx, "/v1/n9e/heartbeat?gid="+gid, req))
 }