都对,
①Sanghai is a beautiful city with a long history.
这里with介词短语,作后置定语,修饰前面的city.
②Sanghai is a beautiful city that has a long history.
此句that引导的是定语从句,修饰前面的名词city.
定语从句：attributive clause
希望我的回答能够帮到您,祝学习进步! (*^__^*)