UPDATE:重构代码，优化抛出异常处理
Merge branch 'qunar-0705' into qunar