增加定位相关配置
Merge origin/master