Is China visa needed for an Australian citizen's travel to Beijing for 4 days and Shanghai for 2 day

hi I'm an Australian citizen currently based in India. I wish to travel to Beijing for 4-5 days and Shanghai for 2-3 days. Is a visa really needed or can I do this with the new policy for 3 day tourist/ transit visit to Beijing or Shanghai ? Alternatively can I visit Beijing for 3 days without visa leave Beijing for say Hong Kong and then re-enter Shanghai for 2-3 days ? pls advise