Visa for Australian citizen to visit Shanghai

Could you please advise if I need a visa for the following travel. or can we use 144 hour transit?
Flying from Canberra on the 11 pm 21st August to Shanghai, transiting through Singapore.
arrive Shanghai 3pm 22nd of August 2018. Stay in Shanghai City then depart Shanghai by Cruise Ship (MAJESTIC PRINCESS) on the 24th August 2018 at 6pm. Heading for South Korea.The Majestic Princess does not return to China mainland but does visit HONG KONG on its way back to Australia.