fix
Merge branch 'dev' of https://github.com/ApesRise/Thrift4AsyncMsg
merge

Conflicts:
	weixin-gen/python/mysql.cfg
fix
fix