Merge branch 'feature/app_dev' of http://git.hiwavo.com/Fohow/fohow_api into feature/app_dev

* 'feature/app_dev' of http://git.hiwavo.com/Fohow/fohow_api:
  add token secret 64 bit
  add token secrit 64 bit
  token generate session

# Conflicts:
#	go/gopath/src/fohow.com/apps/init.go

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

@@ -535,7 +535,11 @@ 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) {