浏览代码

feat(新增不登录基类):新增不登录基类

Roc 4 年之前
父节点
当前提交
8c8c595735
共有 4 个文件被更改,包括 146 次插入12 次删除
  1. 0 6
      controllers/base_common.go
  2. 132 0
      controllers/base_not_auth.go
  3. 11 6
      controllers/user.go
  4. 3 0
      routers/router.go

+ 0 - 6
controllers/base_common.go

@@ -62,12 +62,6 @@ func (this *BaseCommonController) Prepare() {
 		//wxUser, err := models.GetWxUserItemByUserId(session.UserId)
 		wxUser, err := services.GetWxUserItemByOpenId(session.OpenId)
 		if err != nil {
-			//用户openid没有绑定用户
-			if err == services.ERR_USER_NOT_BIND{
-				this.JSON(models.BaseResponse{Ret: 408, Msg: "信息已变更,请重新登陆!", ErrMsg: "获取admin 信息失败 " + strconv.Itoa(session.UserId)}, false, false)
-				this.StopRun()
-				return
-			}
 			//没有找到记录
 			if err.Error() == utils.ErrNoRow() {
 				this.JSON(models.BaseResponse{Ret: 408, Msg: "信息已变更,请重新登陆!", ErrMsg: "获取admin 信息失败 " + strconv.Itoa(session.UserId)}, false, false)

+ 132 - 0
controllers/base_not_auth.go

@@ -0,0 +1,132 @@
+package controllers
+
+import (
+	"encoding/json"
+	"hongze/hongze_api/services"
+	"net/http"
+	"net/url"
+	"strconv"
+	"strings"
+
+	"github.com/astaxie/beego"
+
+	"hongze/hongze_api/models"
+	"hongze/hongze_api/utils"
+)
+
+type BaseNotAuthController struct {
+	beego.Controller
+	User  *models.WxUserItem
+	Token string
+}
+
+func (this *BaseNotAuthController) Prepare() {
+	var requestBody string
+	method := this.Ctx.Input.Method()
+	if method == "GET" {
+		requestBody = this.Ctx.Request.RequestURI
+	} else {
+		requestBody, _ = url.QueryUnescape(string(this.Ctx.Input.RequestBody))
+	}
+	ip := this.Ctx.Input.IP()
+	apiLog.Println("请求地址:", this.Ctx.Input.URI(), "RequestBody:", requestBody, "IP:", ip)
+
+	authorization := this.Ctx.Input.Header("Authorization")
+	if authorization == "" {
+		cookie := this.Ctx.GetCookie("rddp_access_token")
+		utils.FileLog.Info("authorization:%s,cookie:%s", authorization, cookie)
+		authorization = cookie
+	}
+	uri := this.Ctx.Input.URI()
+	utils.FileLog.Info("URI:%s", uri)
+	if strings.Contains(uri, "/api/wechat/login") {
+		authorization = ""
+	}
+	if authorization != "" {
+		session, err := models.GetSessionByToken(authorization)
+		if err != nil {
+			if err.Error() == utils.ErrNoRow() {
+				this.JSON(models.BaseResponse{Ret: 408, Msg: "信息已变更,请重新登陆!", ErrMsg: "Token 信息已变更:Token: " + authorization}, false, false)
+				this.StopRun()
+				return
+			}
+			this.JSON(models.BaseResponse{Ret: 408, Msg: "网络异常,请稍后重试!", ErrMsg: "获取用户信息异常,Eerr:" + err.Error()}, false, false)
+			this.StopRun()
+			return
+		}
+		if session == nil {
+			this.JSON(models.BaseResponse{Ret: 408, Msg: "网络异常,请稍后重试!", ErrMsg: "sesson is empty "}, false, false)
+			this.StopRun()
+			return
+		}
+		//wxUser, err := models.GetWxUserItemByUserId(session.UserId)
+		wxUser, err := services.GetWxUserItemByOpenId(session.OpenId)
+		if err != nil {
+			//没有找到记录
+			if err.Error() == utils.ErrNoRow() {
+				this.JSON(models.BaseResponse{Ret: 408, Msg: "信息已变更,请重新登陆!", ErrMsg: "获取admin 信息失败 " + strconv.Itoa(session.UserId)}, false, false)
+				this.StopRun()
+				return
+			}
+
+			//用户openid没有绑定用户
+			if err != services.ERR_USER_NOT_BIND{
+				this.JSON(models.BaseResponse{Ret: 408, Msg: "信息已变更,请重新登陆!", ErrMsg: "获取admin 信息失败 " + strconv.Itoa(session.UserId)}, false, false)
+				this.StopRun()
+				return
+			}
+		}
+		if wxUser == nil {
+			this.JSON(models.BaseResponse{Ret: 408, Msg: "网络异常,请稍后重试!", ErrMsg: "admin is empty "}, false, false)
+			this.StopRun()
+			return
+		}
+		this.User = wxUser
+	}
+	this.Token = authorization
+}
+
+func (c *BaseNotAuthController) ServeJSON(encoding ...bool) {
+	var (
+		hasIndent   = false
+		hasEncoding = false
+	)
+	if beego.BConfig.RunMode == beego.PROD {
+		hasIndent = false
+	}
+	if len(encoding) > 0 && encoding[0] == true {
+		hasEncoding = true
+	}
+	if c.Data["json"] == nil {
+		go utils.SendEmail(utils.APPNAME+" "+utils.RunMode+"异常提醒", "接口:"+"URI:"+c.Ctx.Input.URI()+";无返回值", utils.EmailSendToUsers)
+		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)
+	}
+	c.JSON(c.Data["json"], hasIndent, hasEncoding)
+}
+
+func (c *BaseNotAuthController) JSON(data interface{}, hasIndent bool, coding bool) error {
+	c.Ctx.Output.Header("Content-Type", "application/json; charset=utf-8")
+	var content []byte
+	var err error
+	if hasIndent {
+		content, err = json.MarshalIndent(data, "", "  ")
+	} else {
+		content, err = json.Marshal(data)
+	}
+	if err != nil {
+		http.Error(c.Ctx.Output.Context.ResponseWriter, err.Error(), http.StatusInternalServerError)
+		return err
+	}
+	ip := c.Ctx.Input.IP()
+	requestBody, _ := url.QueryUnescape(string(c.Ctx.Input.RequestBody))
+	apiLog.Println("请求地址:", c.Ctx.Input.URI(), "Authorization:", c.Ctx.Input.Header("Authorization"), "RequestBody:", requestBody, "ResponseBody", string(content), "IP:", ip)
+
+	if coding {
+		content = []byte(utils.StringsToJSON(string(content)))
+	}
+	return c.Ctx.Output.Body(content)
+}

+ 11 - 6
controllers/user.go

@@ -21,6 +21,11 @@ type UserCommonController struct {
 	BaseCommonController
 }
 
+//用户不登录
+type UserNotAuthController struct{
+	BaseNotAuthController
+}
+
 // @Title 获取用户详情
 // @Description 获取用户详情接口
 // @Success 200 {object} models.UserDetail
@@ -74,7 +79,7 @@ func (this *UserController) Detail() {
 // @Param   AreaNum   query   string  true       "地区编码"
 // @Success Ret=200 获取成功
 // @router /getSmsCode [get]
-func (this *UserCommonController) GetSmsCode() {
+func (this *UserNotAuthController) GetSmsCode() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
 		this.Data["json"] = br
@@ -121,7 +126,7 @@ func (this *UserCommonController) GetSmsCode() {
 // @Param	request	body models.CheckSmsCodeReq true "type json string"
 // @Success Ret=200 校验成功
 // @router /checkSmsCode [post]
-func (this *UserCommonController) CheckSmsCode() {
+func (this *UserNotAuthController) CheckSmsCode() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
 		this.Data["json"] = br
@@ -170,7 +175,7 @@ func (this *UserCommonController) CheckSmsCode() {
 // @Param   Email   query   string  true       "邮箱"
 // @Success Ret=200 获取成功
 // @router /getEmailCode [get]
-func (this *UserCommonController) GetEmailCode() {
+func (this *UserNotAuthController) GetEmailCode() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
 		this.Data["json"] = br
@@ -222,7 +227,7 @@ func (this *UserCommonController) GetEmailCode() {
 // @Param	request	body models.CheckEmailCodeReq true "type json string"
 // @Success Ret=200 校验成功
 // @router /checkEmailCode [post]
-func (this *UserCommonController) CheckEmailCode() {
+func (this *UserNotAuthController) CheckEmailCode() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
 		this.Data["json"] = br
@@ -271,7 +276,7 @@ func (this *UserCommonController) CheckEmailCode() {
 // @Param	request	body models.LoginReq true "type json string"
 // @Success 200 {object} models.LoginResp
 // @router /login [post]
-func (this *UserController) Login() {
+func (this *UserNotAuthController) Login() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
 		this.Data["json"] = br
@@ -609,7 +614,7 @@ func (this *UserController) SmallLimit() {
 // @Param	request	body models.CheckEmailCodeReq true "type json string"
 // @Success Ret=200 校验成功
 // @router /test [get]
-func (this *UserCommonController) Test() {
+func (this *UserNotAuthController) Test() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
 		this.Data["json"] = br

+ 3 - 0
routers/router.go

@@ -65,6 +65,9 @@ func init() {
 			beego.NSInclude(
 				&controllers.UserCommonController{},
 			),
+			beego.NSInclude(
+				&controllers.UserNotAuthController{},
+			),
 		),
 		beego.NSNamespace("/video",
 			beego.NSInclude(