Merge branch 'master_activity' into base-modify

xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/interceptor/WeChatH5LoginInterceptor.java

@@ -64,7 +64,7 @@ public class WeChatH5LoginInterceptor extends HandlerInterceptorAdapter {
 			if (StringUtils.isNotBlank(redisKey)){
 				json.put("key",redisKey);
 			}
-			json.put("url","https://dev.dfangche.com/api/summit/auth/app/unauth/wxLogin?redirec_url=https://dev.dfangche.com/h5/appHtml/view/wxgzh/summitDetail.html?id=2");
+			json.put("url","https://dev.dfangche.com/api/summit/auth/app/unauth/wxLogin");
 			result.put("data",json);
 			result.put("status",1001);
 			response.setCharacterEncoding("utf-8");