Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

# Conflicts:
#	watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/AdminMachineController.java
#	watero-rst-web/src/main/webapp/WEB-INF/views/pts/machine/addRenovationMachine.ftl

watero-rst-core/src/main/java/com.iamberry.rst.core/tools/WeixinUtil.java

@@ -339,6 +339,7 @@ public class WeixinUtil {
 				JSONObject jsonObject = httpRequest(NameUtils.get_token_url.replaceAll("TOKEN", token), "POST", json);
 				if (jsonObject != null) {
 					if(!jsonObject.containsKey("ticket")){
+						logger.info("重新获取AccessToken"+jsonObject);
 						at = getAccessToken(appId,appSecret,pubNo,2);
 						token = at.getToken();
 						jsonObject = httpRequest(NameUtils.get_token_url.replaceAll("TOKEN", token), "POST", json);