调整接口实现
Merge branch 'ericlinj'