Merge branch 'master' into hotfix_0307

@@ -37,6 +37,7 @@
                             <value>/pushUnionOrders</value>
                             <value>/ClickUnionRest/addUnion4Jump</value>
                             <value>/ClickUnionRest/addUnion4Jump/goitunes</value>
+                            <value>/ClickUnionRest/addUnion4Jump/goandroid</value>
                             <value>/PayChannelRest/getChannelType</value>
                             <value>/UnionRest/addBigData</value>
                             <value>/tencentMkt/TencentMktController/sendSms</value>

@@ -175,7 +175,7 @@ public class ClickUnionRest {
 		}
 	}
 	
-	@RequestMapping(value = {"/addUnion4Jump", "/addUnion4Jump/goitunes"})
+	@RequestMapping(value = {"/addUnion4Jump", "/addUnion4Jump/goitunes", "/addUnion4Jump/goandroid"})
 	public void addUnion4Stream(ClickUnionRequestBO bo, HttpServletRequest request, HttpServletResponse response) {
 		clickUnion.info("addUnion4Stream ClickUnionRequestBO{}", bo);
 		if (null == bo || StringUtils.isEmpty(bo.getUnion_type())) {
@@ -183,7 +183,9 @@ public class ClickUnionRest {
 		}
 		String downloadDirect = "Y";
 		if(null != request && null != request.getRequestURI() && request.getRequestURI().endsWith("goitunes")){
-			downloadDirect = "N";
+			downloadDirect = "ios";
+		}else if(null != request && null != request.getRequestURI() && request.getRequestURI().endsWith("goandroid")){
+			downloadDirect = "android";
 		}
 		String clientIp = null;
 		String IP = RemoteIPInterceptor.getRemoteIP();
@@ -371,8 +373,10 @@ public class ClickUnionRest {
 			response.setStatus(301);
 			//response.setHeader("Location",url);
 			//如果不需要直接下载, 配置参数downloadDirect=N, 跳转应用宝下载
-			if(null != downloadDirect && "N".equals(downloadDirect.trim())){
+			if(null != downloadDirect && "ios".equals(downloadDirect.trim())){
 				url = "https://itunes.apple.com/cn/app/yoho!-you-huo/id490655927?mt=8";
+			}else if(null != downloadDirect && "android".equals(downloadDirect.trim())){
+				url = "http://a.app.qq.com/o/simple.jsp?pkgname=com.yoho&g_f=995445";
 			}
 			response.sendRedirect(url);
 		} catch (Exception e) {

@@ -43,11 +43,11 @@
             a.async = 1;
             a.src = j;
             m.parentNode.insertBefore(a, m);
-        }(window, document, 'script', (document.location.protocol === 'https:' ? 'https:' : 'http:') + '//cdn.yoho.cn/yas-jssdk/2.3.4/yas.js', '_yas'));
+        }(window, document, 'script', (document.location.protocol === 'https:' ? 'https:' : 'http:') + '//cdn.yoho.cn/yas-jssdk/2.3.5/yas.js', '_yas'));
 
         (function() {
             if (window._yas) {
-                window._yas(1 * new Date(), '2.3.4', 'yohobuy_m', '', '', '');
+                window._yas(1 * new Date(), '2.3.5', 'yohobuy_m', '', '', '');
             }
         }());
 
@@ -63,6 +63,9 @@
     	    return str == null ? "" : str;
     	}
 		 var activityCode = getQueryStr("code");
+        if (activityCode == ""){
+            activityCode = getQueryStr("union_type");
+        }
 		 var activityData = null;
 
         let search = window.location.search;