集成修改
Merge branch 'master' of https://github.com/linking12/WeiChat.git

Conflicts:
	pom.xml
	src/main/java/net/chat/constants/MessageTypeConstants.java
	src/main/java/net/chat/dao/WxMessageDao.java