Merge remote-tracking branch 'origin/feature/app_dev' into feature/app_dev

go/gopath/src/fohow.com/apps/init.go

@@ -268,7 +268,6 @@ func (self *BaseController) GetCurrentWxUser(useCache bool) *user_model.WxUser {
 	return u
 }
 
-
 //sceneId, 关注场景id
 func (self *BaseController) CheckWxUserSubscribe(sceneId int64) {
 	beego.BeeLogger.Info("check wx_user subscribe")
@@ -336,26 +335,28 @@ func checkWxUserLogin(ctx *context.Context) {
 				//换成userNeedLogin
 				ctx.Output.SetStatus(403)
 				ctx.Output.JSON(errCode, true, true)
-			}
-			inputToken = authorizationData[1]
-			var wxUser *user_model.WxUser
-			user_token, err := token_model.ValidateToken(inputToken)
-			if err != nil {
-				beego.BeeLogger.Warn("token error : %v", err)
-				// 验证 Token 无效
-				errCode := &ErrCode{
-					Code:     UserNeedLogin[0],
-					Msg:      UserNeedLogin[1],
-					Redirect: "",
-					Data:     nil,
+			} else {
+				inputToken = authorizationData[1]
+				var wxUser *user_model.WxUser
+				user_token, err := token_model.ValidateToken(inputToken)
+				if err != nil {
+					beego.BeeLogger.Warn("token error : %v", err)
+					// 验证 Token 无效
+					errCode := &ErrCode{
+						Code:     UserNeedLogin[0],
+						Msg:      UserNeedLogin[1],
+						Redirect: "",
+						Data:     nil,
+					}
+					ctx.Output.SetStatus(403)
+					ctx.Output.JSON(errCode, true, true)
+				} else {
+					wxUser = user_model.GetWxUserById(user_token.Id, true)
+					ctx.Output.Session(SessionUserKey, wxUser.UserId)
+					ctx.Output.Session(SessionWxUserKey, wxUser.Id)
 				}
-				ctx.Output.SetStatus(403)
-				ctx.Output.JSON(errCode, true, true)
-			}else{
-				wxUser = user_model.GetWxUserById(user_token.Id, true)
-				ctx.Output.Session(SessionUserKey, wxUser.UserId)
-				ctx.Output.Session(SessionWxUserKey, wxUser.Id)
 			}
+
 		} else {
 			errCode := &ErrCode{
 				Code:     UserNeedLogin[0],