合并分支 'dev' 到 'test'

Dev



查看合并请求 !17

@@ -15,7 +15,9 @@ func CheckJWTToken(ctx *context.Context) {
 	var (
 	var (
 		msg *protocol.ResponseMessage
 		msg *protocol.ResponseMessage
 	)
 	)
+
 	token := ctx.Input.Header("x-mmm-accesstoken")
 	token := ctx.Input.Header("x-mmm-accesstoken")
+
 	if strings.HasSuffix(ctx.Request.RequestURI, "login") ||
 	if strings.HasSuffix(ctx.Request.RequestURI, "login") ||
 		strings.HasSuffix(ctx.Request.RequestURI, "accessToken") ||
 		strings.HasSuffix(ctx.Request.RequestURI, "accessToken") ||
 		strings.HasSuffix(ctx.Request.RequestURI, "refreshToken") ||
 		strings.HasSuffix(ctx.Request.RequestURI, "refreshToken") ||
@@ -29,11 +31,13 @@ func CheckJWTToken(ctx *context.Context) {
 		strings.HasSuffix(ctx.Request.RequestURI, "changePassword") {
 		strings.HasSuffix(ctx.Request.RequestURI, "changePassword") {
 		return
 		return
 	}
 	}
+
 	defer func() {
 	defer func() {
 		if msg != nil {
 		if msg != nil {
 			ctx.Output.JSON(msg, false, false)
 			ctx.Output.JSON(msg, false, false)
 		}
 		}
 	}()
 	}()
+
 	if u, err := utils.ParseJWTToken(token); err != nil {
 	if u, err := utils.ParseJWTToken(token); err != nil {
 		msg = protocol.NewMesage(4141)
 		msg = protocol.NewMesage(4141)
 		return
 		return

@@ -6,9 +6,10 @@ import (
 )
 )
 
 
 func init() {
 func init() {
+	beego.Router("/auth/checkPassword", &controllers.AuthController{}, "Post:CheckPassword")
 	nsV1 := beego.NewNamespace("v1") //, beego.NSBefore(middleware.CheckJWTToken)
 	nsV1 := beego.NewNamespace("v1") //, beego.NSBefore(middleware.CheckJWTToken)
 	nsV1.Router("/auth/login", &controllers.AuthController{}, "Post:Login")
 	nsV1.Router("/auth/login", &controllers.AuthController{}, "Post:Login")
-	nsV1.Router("/auth/checkPassword", &controllers.AuthController{}, "Post:CheckPassword") // 校验密码
+	//nsV1.Router("/auth/checkPassword", &controllers.AuthController{}, "Post:CheckPassword") // 校验密码
 	nsV1.Router("/auth/smsCode", &controllers.AuthController{}, "Post:SmsCode")
 	nsV1.Router("/auth/smsCode", &controllers.AuthController{}, "Post:SmsCode")
 	nsV1.Router("/auth/accessToken", &controllers.AuthController{}, "Post:AccessToken")
 	nsV1.Router("/auth/accessToken", &controllers.AuthController{}, "Post:AccessToken")
 	nsV1.Router("/auth/refreshToken", &controllers.AuthController{}, "Post:RefreshToken")
 	nsV1.Router("/auth/refreshToken", &controllers.AuthController{}, "Post:RefreshToken")