修复关键字，新增服务判断
Merge branch 'master' of https://github.com/bigoranger/Orange