pull from xjplke/wxauth

pull from xjplke/wxauth