Pārlūkot izejas kodu

fix:整理代码

zqbao 9 mēneši atpakaļ
vecāks
revīzija
0e30067281
4 mainītis faili ar 11 papildinājumiem un 13 dzēšanām
  1. 3 6
      controllers/base_auth.go
  2. 3 5
      controllers/base_common.go
  3. 3 2
      main.go
  4. 2 0
      utils/constants.go

+ 3 - 6
controllers/base_auth.go

@@ -143,10 +143,9 @@ func (c *BaseAuthController) ServeJSON(encoding ...bool) {
 		hasEncoding = true
 	}
 	if c.Data["json"] == nil {
-		//go utils.SendEmail("异常提醒:", "接口:"+"URI:"+c.Ctx.Input.URI()+";无返回值", utils.EmailSendToUsers)
 		body := "接口:" + "URI:" + c.Ctx.Input.URI() + ";无返回值"
 		fmt.Println(body)
-		// go alarm_msg.SendAlarmMsg(body, 1)
+		utils.ApiLog.Notice(body)
 		return
 	}
 	baseRes := c.Data["json"].(*models.BaseResponse)
@@ -160,14 +159,12 @@ func (c *BaseAuthController) ServeJSON(encoding ...bool) {
 			//requestBody, _ = url.QueryUnescape(string(c.Ctx.Input.RequestBody))
 			requestBody = string(c.Ctx.Input.RequestBody)
 		}
-		if baseRes.Ret != 200 && baseRes.IsSendEmail {
-			//go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"失败提醒", "URI:"+c.Ctx.Input.URI()+"<br/> "+"Params"+requestBody+" <br/>"+"ErrMsg:"+baseRes.ErrMsg+";<br/>Msg:"+baseRes.Msg+";<br/> Body:"+string(body)+"<br/>"+c.SysUser.RealName, utils.EmailSendToUsers)
+		if baseRes.Ret != 200 {
 			body := "URI:" + c.Ctx.Input.URI() + "<br/> " + "Params" + requestBody + " <br/>" + "ErrMsg:" + baseRes.ErrMsg + ";<br/>Msg:" + baseRes.Msg + ";<br/> Body:" + string(body) + "<br/>" + c.SysUser.SysRealName
-			// go alarm_msg.SendAlarmMsg(body, 1)
 			fmt.Println(body)
+			utils.ApiLog.Notice(body)
 		}
 		if baseRes.IsAddLog && c.SysUser != nil {
-			// go cache.RecordNewLogs(c.SysUser.AdminId, requestBody, string(body), c.SysUser.RealName, c.Ctx.Input.IP(), c.Ctx.Input.URI())
 			return
 		}
 	}

+ 3 - 5
controllers/base_common.go

@@ -40,14 +40,12 @@ func (c *BaseCommonController) ServeJSON(encoding ...bool) {
 		hasEncoding = true
 	}
 	if c.Data["json"] == nil {
-		//go utils.SendEmail("异常提醒:"+utils.RunMode, "接口:"+"URI:"+c.Ctx.Input.URI()+";无返回值", utils.EmailSendToUsers)
-		// go alarm_msg.SendAlarmMsg("接口:URI:"+c.Ctx.Input.URI()+";无返回值", 3)
+		utils.ApiLog.Notice("异常提醒:"+utils.RunMode, "接口:"+"URI:"+c.Ctx.Input.URI()+";无返回值")
 		return
 	}
 	baseRes := c.Data["json"].(*models.BaseResponse)
-	if baseRes != nil && !baseRes.Success && baseRes.IsSendEmail {
-		//go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"失败提醒", "URI:"+c.Ctx.Input.URI()+" ErrMsg:"+baseRes.ErrMsg+";Msg"+baseRes.Msg, utils.EmailSendToUsers)
-		// go alarm_msg.SendAlarmMsg("失败提醒:URI:"+c.Ctx.Input.URI()+" ErrMsg:"+baseRes.ErrMsg+";Msg"+baseRes.Msg, 3)
+	if baseRes != nil && !baseRes.Success {
+		utils.ApiLog.Notice("异常提醒:"+utils.RunMode, "接口:"+"URI:"+c.Ctx.Input.URI()+";ErrMsg:"+baseRes.ErrMsg+";Msg"+baseRes.Msg)
 		return
 	}
 

+ 3 - 2
main.go

@@ -4,8 +4,10 @@ import (
 	"eta/eta_mini_crm/controllers"
 	_ "eta/eta_mini_crm/routers"
 	"eta/eta_mini_crm/scheduler"
+	"eta/eta_mini_crm/utils"
 	"fmt"
 	"runtime"
+	"time"
 
 	"github.com/beego/beego/v2/core/logs"
 	"github.com/beego/beego/v2/server/web"
@@ -55,8 +57,7 @@ func Recover(ctx *context.Context, conf *web.Config) {
 			logs.Critical(fmt.Sprintf("%s:%d", file, line))
 			stack = stack + fmt.Sprintln(fmt.Sprintf("%s:%d</br>", file, line))
 		}
-		//go utils.SendEmail(utils.APPNAME+"崩了"+time.Now().Format("2006-01-02 15:04:05"), stack, utils.EmailSendToUsers)
-		// go alarm_msg.SendAlarmMsg(utils.APPNAME+"崩了"+time.Now().Format("2006-01-02 15:04:05")+"<br/>"+stack, 3)
+		utils.ApiLog.Notice(utils.APPNAME + "崩了" + time.Now().Format("2006-01-02 15:04:05") + "<br/>" + stack)
 	}
 	return
 }

+ 2 - 0
utils/constants.go

@@ -60,3 +60,5 @@ var NoAuthApiMap = map[string]bool{
 	"/classify/list":          true,
 	"/seller/list":            true,
 }
+
+var APPNAME string = "东吴CRM"