修改wx
wx api
Merge branch 'master' of https://github.com/bestaone/wxserver

Conflicts:
	wxserver-web/src/main/java/com/dzh/inms/web/controller/ApiController.java
	wxserver-web/src/main/java/com/dzh/inms/wx/service/MessageService.java
	wxserver-web/src/main/java/com/dzh/inms/wx/servlet/WxServlet.java
	wxserver-web/src/main/webapp/WEB-INF/web.xml