Merge pull request #649 from youyong205/master

refactor the server config manager