Merge pull request #55 from qkhj/master

modify
url被覆盖了
去掉wshost， oa里没用
Merge pull request #56 from tanwh/master

url被覆盖了
Merge pull request #13 from JohnCny/master

merge