测试
Merge branch 'source' of github.com:zhaoyan106/zhaoyan106.github.com into source
完成定位及编码