|
@@ -4,6 +4,7 @@ import (
|
|
|
"encoding/json"
|
|
|
"eta/eta_mini_api/models"
|
|
|
"eta/eta_mini_api/utils"
|
|
|
+ "fmt"
|
|
|
"net/http"
|
|
|
|
|
|
"github.com/beego/beego/v2/server/web"
|
|
@@ -22,7 +23,7 @@ func (c *BaseAuthController) Prepare() {
|
|
|
if method == "POST" || method == "GET" {
|
|
|
authorization := c.Ctx.Input.Header("authorization")
|
|
|
if authorization == "" {
|
|
|
- c.JSON(models.BaseResponse{Ret: 408, Msg: "请重新授权!", ErrMsg: "请重新授权:Token is empty or account is empty"})
|
|
|
+ c.JSON(models.BaseResponse{Ret: 408, Msg: "请重新授权!", ErrMsg: "请重新授权:Token is empty or account is empty"}, false, false)
|
|
|
c.StopRun()
|
|
|
return
|
|
|
}
|
|
@@ -30,36 +31,80 @@ func (c *BaseAuthController) Prepare() {
|
|
|
session, err := models.GetWxSessionByAccessToken(token)
|
|
|
if err != nil {
|
|
|
if err.Error() == utils.ErrNoRow() {
|
|
|
- c.JSON(models.BaseResponse{Ret: 408, Msg: "信息已变更,请重新登陆!", ErrMsg: "Token 信息已变更:Token: " + token})
|
|
|
+ c.JSON(models.BaseResponse{Ret: 408, Msg: "信息已变更,请重新登陆!", ErrMsg: "Token 信息已变更:Token: " + token}, false, false)
|
|
|
c.StopRun()
|
|
|
return
|
|
|
}
|
|
|
- c.JSON(models.BaseResponse{Ret: 408, Msg: "网络异常,请稍后重试!", ErrMsg: "获取用户信息异常,Err:" + err.Error()})
|
|
|
+ c.JSON(models.BaseResponse{Ret: 408, Msg: "网络异常,请稍后重试!", ErrMsg: "获取用户信息异常,Err:" + err.Error()}, false, false)
|
|
|
c.StopRun()
|
|
|
return
|
|
|
}
|
|
|
if session == nil {
|
|
|
- c.JSON(models.BaseResponse{Ret: 408, Msg: "网络异常,请稍后重试!", ErrMsg: "session is empty "})
|
|
|
+ c.JSON(models.BaseResponse{Ret: 408, Msg: "网络异常,请稍后重试!", ErrMsg: "session is empty "}, false, false)
|
|
|
c.StopRun()
|
|
|
return
|
|
|
}
|
|
|
user, err := models.GetUserByOpenId(session.OpenId)
|
|
|
if err != nil && err.Error() != utils.ErrNoRow() {
|
|
|
- c.JSON(models.BaseResponse{Ret: 408, Msg: "网络异常,请稍后重试!", ErrMsg: "获取用户信息异常,Err:" + err.Error()})
|
|
|
+ c.JSON(models.BaseResponse{Ret: 408, Msg: "网络异常,请稍后重试!", ErrMsg: "获取用户信息异常,Err:" + err.Error()}, false, false)
|
|
|
c.StopRun()
|
|
|
return
|
|
|
}
|
|
|
c.User = user
|
|
|
c.Session = session
|
|
|
} else {
|
|
|
- c.JSON(models.BaseResponse{Ret: 408, Msg: "请求异常,请联系客服!", ErrMsg: "POST之外的请求,暂不支持"})
|
|
|
+ c.JSON(models.BaseResponse{Ret: 408, Msg: "请求异常,请联系客服!", ErrMsg: "POST之外的请求,暂不支持"}, false, false)
|
|
|
c.StopRun()
|
|
|
return
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-func (c *BaseAuthController) JSON(data interface{}) error {
|
|
|
+func (c *BaseAuthController) ServeJSON(encoding ...bool) {
|
|
|
+ var (
|
|
|
+ hasIndent = false
|
|
|
+ hasEncoding = false
|
|
|
+ )
|
|
|
+ if web.BConfig.RunMode == web.PROD {
|
|
|
+ hasIndent = false
|
|
|
+ }
|
|
|
+ if len(encoding) > 0 && encoding[0] == true {
|
|
|
+ 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)
|
|
|
+ return
|
|
|
+ }
|
|
|
+ baseRes := c.Data["json"].(*models.BaseResponse)
|
|
|
+ if baseRes != nil && baseRes.Ret != 408 {
|
|
|
+ body, _ := json.Marshal(baseRes)
|
|
|
+ var requestBody string
|
|
|
+ method := c.Ctx.Input.Method()
|
|
|
+ if method == "GET" {
|
|
|
+ requestBody = c.Ctx.Request.RequestURI
|
|
|
+ } else {
|
|
|
+ //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)
|
|
|
+ body := "URI:" + c.Ctx.Input.URI() + "<br/> " + "Params" + requestBody + " <br/>" + "ErrMsg:" + baseRes.ErrMsg + ";<br/>Msg:" + baseRes.Msg + ";<br/> Body:" + string(body) + "<br/>" + c.User.RealName
|
|
|
+ // go alarm_msg.SendAlarmMsg(body, 1)
|
|
|
+ fmt.Println(body)
|
|
|
+ }
|
|
|
+ if baseRes.IsAddLog && c.User != nil {
|
|
|
+ // go cache.RecordNewLogs(c.SysUser.AdminId, requestBody, string(body), c.SysUser.RealName, c.Ctx.Input.IP(), c.Ctx.Input.URI())
|
|
|
+ return
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ c.JSON(c.Data["json"], hasIndent, hasEncoding)
|
|
|
+}
|
|
|
+
|
|
|
+func (c *BaseAuthController) JSON(data interface{}, hasIndent bool, coding bool) error {
|
|
|
c.Ctx.Output.Header("Content-Type", "application/json; charset=utf-8")
|
|
|
desEncrypt := utils.DesBase64Encrypt([]byte(utils.DesKey), utils.DesKeySalt)
|
|
|
c.Ctx.Output.Header("Dk", string(desEncrypt)) // des3加解密key
|
|
@@ -75,5 +120,8 @@ func (c *BaseAuthController) JSON(data interface{}) error {
|
|
|
content = utils.DesBase64Encrypt(content, utils.DesKey)
|
|
|
content = []byte(`"` + string(content) + `"`)
|
|
|
}
|
|
|
+ if coding {
|
|
|
+ content = []byte(utils.StringsToJSON(string(content)))
|
|
|
+ }
|
|
|
return c.Ctx.Output.Body(content)
|
|
|
}
|