What visa for 4 nights in Shanghai and reenter into Beijing 2 nights on the way back from Canada

We are Australians flying from Singapore to Shanghai for 4 nights and then to Vancover for 2 weeks and on the way back we will fly into Beijing for 2 nights and back to Singapore.