Visa?

My friend and I will be traveling from in February Canada to Shanghai and staying for 2 days, then flying on to Tokyo, then to Thailand then to Beijing for 2 days then back to Canada. Will I need a visa with the new rules? Can i go to both Chinese cities with the visa excemption? Is it 72 hours total or for each city?