Visa for China from Abu Dhabi with NZ passport.

I am on a new Zealand passport, planning on traveling to shanghai for two nights at the end of this month (august) do I still need a visa? Or can one be done on arrival? I live in Abu dhabi currently, how would I go about getting a visa from here of required?