Merge branch 'igirl-channel-gateway' of http://gitlab.gongsibao.com/jiangyong/zhichan into igirl-channel-gateway