增加了资源类型的判断
Merge branch 'master' of https://github.com/cnyangyifeng/ntp.git