改版token验证规则

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

@@ -537,24 +537,6 @@ func (self *BaseController) Prepare() {
 			}
 		}
 	}
-	/*
-		<<<<<<< HEAD
-				// FIXME : userId 与 wxUserId已统一,故不做userid登录check
-		=======
-				// FIXME : userId 与 wxUserId已统一
-		>>>>>>> b24580bdd09b3e2b6278d2deb8d368bb9c21d652
-				if len(self.ExceptCheckUserLoginAction) > 0 {
-					for _, an := range self.ExceptCheckUserLoginAction {
-						if strings.ToLower(an) == "*" || strings.ToLower(an) == strings.ToLower(actionName) {
-							needChkUserLogin = false
-							break
-						}
-					}
-				}
-				if needChkUserLogin {
-					checkUserLogin(self.Ctx)
-				}
-	*/
 
 	if needChkWxUserLogin {
 		checkWxUserLogin(self.Ctx)