Ver Fonte

fix(登录授权):调整登录授权

Roc há 3 anos atrás
pai
commit
ee6ac90aba
2 ficheiros alterados com 6 adições e 65 exclusões
  1. 4 9
      controllers/base_auth.go
  2. 2 56
      controllers/base_not_auth.go

+ 4 - 9
controllers/base_auth.go

@@ -41,9 +41,9 @@ func (this *BaseAuth) Prepare() {
 	//}
 	uri := this.Ctx.Input.URI()
 	utils.FileLog.Info("URI:%s", uri)
-	if strings.Contains(uri, "/api/wechat/login") {
-		authorization = ""
-	}
+	//if strings.Contains(uri, "/h5adminapi/wechat/login") {
+	//	authorization = ""
+	//}
 	if authorization == "" {
 		this.TokenMsgError("请求异常,没有携带token!", "请求异常,没有携带token ")
 		return
@@ -86,15 +86,10 @@ func (this *BaseAuth) Prepare() {
 			return
 		}
 
-		//如果不是登录绑定接口,同时报错信息不是用户未绑定的情况下,那么就返回异常
-		if !strings.Contains(uri, "/api/admin/login") && err != services.ERR_ADMIN_NOT_BIND {
-
-		}
-
 		//错误信息,账户未绑定,跳转到绑定页面
 		if err == services.ERR_ADMIN_NOT_BIND {
 			//如果不是登录接口
-			if !strings.Contains(uri, "/api/admin/login") {
+			if !strings.Contains(uri, "/h5adminapi/admin/login") {
 				this.BindMsgError("账户未绑定!", "获取admin_wx信息异常,Err:"+err.Error())
 				return
 			}

+ 2 - 56
controllers/base_not_auth.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"hongze/hongze_mobile_admin/utils"
 	"net/url"
-	"strings"
 )
 
 //不需要授权的基类
@@ -33,60 +32,7 @@ func (this *BaseNotAuth) Prepare() {
 	}
 	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
-	//	}
-	//
-	//	var wxUser *models.WxUserItem
-	//	if session.UserId > 0 {
-	//		tmpWxUser, tmpErr := services.GetWxUserItemByUserId(session.UserId, utils.WxPcPlatform)
-	//		wxUser = tmpWxUser
-	//		err = tmpErr
-	//	} else if session.OpenId != "" {
-	//		tmpWxUser, tmpErr := services.GetWxUserItemByOpenId(session.OpenId)
-	//		wxUser = tmpWxUser
-	//		err = tmpErr
-	//	} else {
-	//		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
-	//		}
-	//		this.JSON(models.BaseResponse{Ret: 408, Msg: "网络异常,请稍后重试!", ErrMsg: "获取wx_user信息异常,Eerr:" + err.Error()}, 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
+	//if strings.Contains(uri, "/h5adminapi/wechat/login") {
+	//	authorization = ""
 	//}
-	//this.Token = authorization
 }