add web service from beijing api
add some test cases
conflict resolve