auth fix

@@ -73,9 +73,9 @@ func GetRequestHeader(ctx *context.Context)*protocol.RequestHeader{
 
 
 //过滤器
 //过滤器
 func FilterComm(ctx *context.Context){
 func FilterComm(ctx *context.Context){
-	if strings.HasSuffix(ctx.Request.RequestURI,"login"){
-		return
-	}
+	//if strings.HasSuffix(ctx.Request.RequestURI,"login"){
+	//	return
+	//}
 	if beego.BConfig.RunMode!="prod"{
 	if beego.BConfig.RunMode!="prod"{
 		return
 		return
 	}
 	}

@@ -61,6 +61,9 @@ type RefreshTokenRequest struct {
 	ClientId string `json:"clientId" valid:"Required"`
 	ClientId string `json:"clientId" valid:"Required"`
 	ClientSecret string `json:"clientSecret" valid:"Required"`
 	ClientSecret string `json:"clientSecret" valid:"Required"`
 	RefreshToken string `json:"refreshToken" valid:"Required"`
 	RefreshToken string `json:"refreshToken" valid:"Required"`
+
+	Uid int64 `json:"-"`
+	LoginType string `json:"-"`
 }
 }
 type RefreshTokenResponse struct {
 type RefreshTokenResponse struct {
 	RefreshToken string `json:"refreshToken"`
 	RefreshToken string `json:"refreshToken"`

@@ -8,7 +8,7 @@ import (
 	"gitlab.fjmaimaimai.com/mmm-go/gocomm/pkg/log"
 	"gitlab.fjmaimaimai.com/mmm-go/gocomm/pkg/log"
 	"strings"
 	"strings"
 )
 )
-
+//登录
 func Login(request *protocol.LoginRequest)(rsp *protocol.LoginResponse,err error){
 func Login(request *protocol.LoginRequest)(rsp *protocol.LoginResponse,err error){
 	var (
 	var (
 		user *models.Users
 		user *models.Users
@@ -17,12 +17,16 @@ func Login(request *protocol.LoginRequest)(rsp *protocol.LoginResponse,err error
 	user,err =models.GetUsersByMobile(request.Phone)
 	user,err =models.GetUsersByMobile(request.Phone)
 	if err!=nil{
 	if err!=nil{
 		log.Error(err)
 		log.Error(err)
+		err =common.NewError(2020,err)//账号不存在
 		return
 		return
 	}
 	}
 	switch request.GrantType {
 	switch request.GrantType {
 	case protocol.LoginPassPord:
 	case protocol.LoginPassPord:
 		if strings.Compare(user.Password,request.PassWord)==0{
 		if strings.Compare(user.Password,request.PassWord)==0{
 			goto Success
 			goto Success
+		}else{
+			err =common.NewError(2021,err)//登录密码错误
+			return
 		}
 		}
 		break
 		break
 	case protocol.LoginSmdcode:
 	case protocol.LoginSmdcode:
@@ -43,16 +47,16 @@ func Login(request *protocol.LoginRequest)(rsp *protocol.LoginResponse,err error
 		}
 		}
 	return
 	return
 }
 }
-
+//短信验证码
 func SmsCode(request *protocol.SmsCodeRequest)(rsp *protocol.SmsCodeResponse,err error){
 func SmsCode(request *protocol.SmsCodeRequest)(rsp *protocol.SmsCodeResponse,err error){
 	return nil,nil
 	return nil,nil
 }
 }
-
+//更新设备信息
 func UpdateDevice(request *protocol.UpdateDeviceRequest)(rsp *protocol.UpdateDeviceResponse,err error){
 func UpdateDevice(request *protocol.UpdateDeviceRequest)(rsp *protocol.UpdateDeviceResponse,err error){
 	return nil,nil
 	return nil,nil
 }
 }
 
 
-
+//获取accessToken
 func AccessToken(request *protocol.AccessTokenRequest)(rsp *protocol.AccessTokenResponse,err error){
 func AccessToken(request *protocol.AccessTokenRequest)(rsp *protocol.AccessTokenResponse,err error){
 	var (
 	var (
 		userInfo *models.UserInfo
 		userInfo *models.UserInfo
@@ -73,7 +77,7 @@ func AccessToken(request *protocol.AccessTokenRequest)(rsp *protocol.AccessToken
 	}
 	}
 	return
 	return
 }
 }
-
+//刷新token
 func RefreshToken(request *protocol.RefreshTokenRequest)(rsp *protocol.RefreshTokenResponse,err error){
 func RefreshToken(request *protocol.RefreshTokenRequest)(rsp *protocol.RefreshTokenResponse,err error){
 	var (
 	var (
 		userInfo *models.UserInfo
 		userInfo *models.UserInfo
@@ -87,7 +91,8 @@ func RefreshToken(request *protocol.RefreshTokenRequest)(rsp *protocol.RefreshTo
 		err = common.NewErrorWithMsg(2,"refresh token error.")
 		err = common.NewErrorWithMsg(2,"refresh token error.")
 		return
 		return
 	}
 	}
-	if newAccess,err =refreshToken(userInfo.Id,"");err!=nil{
+	request.Uid,request.LoginType = userInfo.Id,"mobile"
+	if newAccess,err =refreshToken(request);err!=nil{
 		return
 		return
 	}
 	}
 	rsp = &protocol.RefreshTokenResponse{
 	rsp = &protocol.RefreshTokenResponse{
@@ -97,12 +102,14 @@ func RefreshToken(request *protocol.RefreshTokenRequest)(rsp *protocol.RefreshTo
 	}
 	}
 	return
 	return
 }
 }
-
-//loginType  mobile  im
-func refreshToken(uid int64,loginType string)(rsp *protocol.Access,err error){
+//刷新token loginType  mobile  im   web
+func refreshToken(request *protocol.RefreshTokenRequest)(rsp *protocol.Access,err error){
+	if request.Uid==0{
+		return
+	}
 	return nil,nil
 	return nil,nil
 }
 }
-
+//检查token有效性
 func CheckToken(request *protocol.CheckTokenRequest)(rsp *protocol.CheckTokenResponse,err error){
 func CheckToken(request *protocol.CheckTokenRequest)(rsp *protocol.CheckTokenResponse,err error){
 	var (
 	var (
 		userInfo *models.UserInfo
 		userInfo *models.UserInfo
@@ -122,7 +129,7 @@ func CheckToken(request *protocol.CheckTokenRequest)(rsp *protocol.CheckTokenRes
 	}
 	}
 	return
 	return
 }
 }
-
+//检查uuid 是否重复
 func CheckUuid(request *protocol.CheckUuidRequest)(rsp *protocol.CheckUuidResponse,err error){
 func CheckUuid(request *protocol.CheckUuidRequest)(rsp *protocol.CheckUuidResponse,err error){
 	var (
 	var (
 		logUuid *models.LogUuid
 		logUuid *models.LogUuid