Merge branch 'master_activity' into base-modify

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

@@ -67,7 +67,7 @@ public class WeChatH5LoginInterceoptor extends HandlerInterceptorAdapter {
 				String redirec_url=curr_url+"?" + WECHAT_AUTOLOGIN_CALLBACKURL_KEY+ "=" + encrypt_curr_url;
 				String oauth_api=weixinService.getAuthorize(curr_url);
 				log.info("curr_url=====" + curr_url);
-				response.sendRedirect(oauth_api);
+				response.sendRedirect("https://www.baidu.com");
 				return false;
 			}
 			// 有code, 换取openid