fix bug and goo login(not finish)
merge