Merge branch 'master_activity' into base-modify

xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/service/WeixinService.java

@@ -70,6 +70,7 @@ public class WeixinService {
     public  JSONObject getBaseUserInfo(String openid){
         String url = "https://api.weixin.qq.com/cgi-bin/user/info?access_token=" + tokenService.getAccessTokenStr() + "&openid=" + openid + "&lang=zh_CN";
         String result = HttpRequestUtil.httpGet(url);
+        log.info("---result===="+result);
         JSONObject data = JSON.parseObject(result);
         return data;
     }