Merge branch 'ETA_1.2.6' into debug

controllers/base_auth.go

@@ -3,7 +3,6 @@ package controllers
 import (
 	"encoding/json"
 	"eta/eta_hub/models"
-	"eta/eta_hub/services/alarm_msg"
 	"eta/eta_hub/utils"
 	"fmt"
 	"github.com/beego/beego/v2/server/web"
@@ -83,8 +82,8 @@ func (c *BaseAuthController) ServeJSON(encoding ...bool) {
 	}
 	if c.Data["json"] == nil {
 		//go utils.SendEmail("异常提醒:", "接口:"+"URI:"+c.Ctx.Input.URI()+";无返回值", utils.EmailSendToUsers)
-		body := "接口:" + "URI:" + c.Ctx.Input.URI() + ";无返回值"
-		go alarm_msg.SendAlarmMsg(body, 1)
+		//body := "接口:" + "URI:" + c.Ctx.Input.URI() + ";无返回值"
+		//go alarm_msg.SendAlarmMsg(body, 1)
 		return
 	}