狗日的was，兼容webservice
Merge remote-tracking branch 'origin/master'