Merge pull request #648 from youyong205/master

fix bug
refactor server config