consul

app/mix/controller/init.go

@@ -60,6 +60,7 @@ func Init(r *gin.Engine) {
 
 	// healthcheck
 	r.GET("/healthcheck", Healthcheck)
+	r.GET("/timeout", Timeout)
 
 	// Hello World!
 	helloWorldGroup := r.Group("/hello_world", Prepare())

app/mix/controller/timeout.go

@@ -0,0 +1,16 @@
+package controller
+
+import (
+	"github.com/gin-gonic/gin"
+	"service/bizcommon/util"
+	"time"
+)
+
+func Timeout(ctx *gin.Context) {
+	time.Sleep(time.Second * 6)
+	data := map[string]interface{}{
+		"time":     time.Now().Unix(),
+		"time_str": util.GetTodayZeroTime().Format(time.RFC3339),
+	}
+	ReplyOk(ctx, data)
+}

library/httpengine/httpengine.go

@@ -12,6 +12,7 @@ func NewRouter() *gin.Engine {
 	router := gin.New()
 	router.Use(middleware.LoggerMiddleware(gin.LoggerConfig{}))
 	router.Use(gin.RecoveryWithWriter(logger.Global.Out))
+	router.Use(middleware.TimeoutMiddleware())
 
 	return router
 }

library/httpserver/httpserver.go

@@ -94,8 +94,8 @@ func registerSD(ip string, port int) error {
 }
 
 func setServerStatusFD(status string) {
-	serverStatusFdPath := "/Users/erwin/SERVER_STATUS_FD"
+	serverStatusFdPath := "/app/SERVER_STATUS_FD"
-	cmd := exec.Command("echo", fmt.Sprintf("%s > %s", status, serverStatusFdPath))
+	cmd := exec.Command("sh", "-c", fmt.Sprintf("echo %s > %s", status, serverStatusFdPath))
 	err := cmd.Run()
 	if err != nil {
 		logger.Info("run cmd fail, p: %v, err: %v", serverStatusFdPath, err)

library/middleware/timeout.go

@@ -2,25 +2,27 @@ package middleware
 
 import (
 	"net/http"
+	"service/api/base"
+	"service/api/consts"
 	"time"
 
 	"github.com/gin-contrib/timeout"
 	"github.com/gin-gonic/gin"
 )
 
-func testResponse(c *gin.Context) {
+func timeoutHandler(ctx *gin.Context) {
-	c.JSON(http.StatusGatewayTimeout, gin.H{
+	ctx.AbortWithStatusJSON(http.StatusGatewayTimeout, base.BaseResponse{
-		"code": http.StatusGatewayTimeout,
+		Ret: consts.RetCodeFail,
-		"msg":  "timeout",
+		Msg: "出了个小问题，请稍后再试~",
 	})
 }
 
 func TimeoutMiddleware() gin.HandlerFunc {
 	return timeout.New(
-		timeout.WithTimeout(5000*time.Millisecond),
+		timeout.WithTimeout(3000*time.Millisecond),
 		timeout.WithHandler(func(c *gin.Context) {
 			c.Next()
 		}),
-		timeout.WithResponse(testResponse),
+		timeout.WithResponse(timeoutHandler),
 	)
 }