Merge "修改nginx.conf"