1

刘基城
1 parent 01bbee1d
Showing 5 changed files with 44 additions and 171 deletions
src/main/java/com/cnlive/mz/live/action/UgcLiveAction.java
src/main/java/com/cnlive/mz/live/action/VideoAction.java
src/main/java/com/cnlive/mz/live/action/VodIpsAction.java
src/main/java/com/cnlive/socket/TE.java
src/main/webapp/WEB-INF/web.xml
@@ -9,28 +9,20 @@
 package com.cnlive.mz.live.action;
-import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
-import javax.servlet.http.HttpServletResponse;
-
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.smart4j.framework.dao.bean.Pager;
 import org.smart4j.framework.ioc.annotation.Inject;
-import org.smart4j.framework.mvc.DataContext;
 import org.smart4j.framework.mvc.annotation.Action;
 import org.smart4j.framework.mvc.annotation.Request;
 import org.smart4j.framework.mvc.bean.Params;
 import org.smart4j.framework.mvc.bean.Redirect;
 import org.smart4j.framework.mvc.bean.ResultBean;
-import com.cnlive.mz.commons.net.HttpReq;
-import com.cnlive.mz.live.entity.TChannel;
 import com.cnlive.mz.live.entity.TLive;
-import com.cnlive.mz.live.service.TCheckService;
-import com.cnlive.mz.live.service.TRoomService;
 import com.cnlive.mz.live.service.UgcLiveService;
 @Action
@@ -39,7 +31,6 @@ public class UgcLiveAction {
 	private Logger log = Logger.getLogger("UgcLiveAction");
 	@Inject
 	private UgcLiveService ugcLiveService;
- 
 	/**
 	 * 1.0 获取直播活动信息接口Server.md
@@ -190,7 +181,7 @@ public class UgcLiveAction {
 				String streamName = live_url.substring(index + 1);
 				System.out.println("streamName===" + streamName);
 				// 直播断流。
-				ugcLiveService.stop(appId,activityid);
+				ugcLiveService.stop(appId, activityid);
 			}
 			map.put("location", tLive.getLive_url());
 			rb.setData(map);
@@ -313,49 +304,10 @@ public class UgcLiveAction {
 	 * @return 302 跳转播放地址
 	 */
 	@Request.Get("/live/epg/play/app")
-	public Redirect appURL(Params params) throws IOException {
+	public Redirect app(Params params) {
 		log.info(params);
 		Redirect r = new Redirect();
-		String c = "http://wideo03.cnlive.com/video/data1/2016/0821/143844/800/8352b125fc404807851daa21d7e8f417_143844_800.m3u8";
-		String appId = params.getString("appId");
-		String activityid = params.getString("activityId");
-		String isHLS = params.getString("isHLS");
-		if (StringUtils.isEmpty(activityid)) {
-			// sdk 请求
-			if (appId.isEmpty()) {
-				appId = params.getString("sp_id");
-			}
-			String channelID = params.getString("channelID");
-			TLive tLive = ugcLiveService.selectByRelationId(channelID);
-			TChannel tchannel = ugcLiveService.selectChannel(tLive.getRelation_id());
-			if (tchannel != null) {
-				// pgc直播
-				r.setRedirectUrl("http://ips.cnlive.com/IPS/liveplayByAPP.action?appId=" + appId + "&channelID=" + tLive.getRelation_id());
-			} else {
-				// ugc直播
-				if (StringUtils.isNotEmpty(isHLS) && isHLS.equals("1")) {
-					r.setRedirectUrl(tLive.getHls_live_url());
-				} else {
-					r.setRedirectUrl(tLive.getLive_url());
-				}
-				// r.setRedirectUrl(c);
-			}
-		} else {
-			TLive tLive = ugcLiveService.getTLiveByActivityId(appId, activityid);
-			TChannel tchannel = ugcLiveService.selectChannel(tLive.getRelation_id());
-			if (tchannel != null) {
-				// pgc直播
-				r.setRedirectUrl("http://ips.cnlive.com/IPS/liveplayByAPP.action?appId=" + appId + "&channelID=" + tLive.getRelation_id());
-			} else {
-				// ugc直播
-				if (StringUtils.isNotEmpty(isHLS) && isHLS.equals("1")) {
-					r.setRedirectUrl(tLive.getHls_live_url());
-				} else {
-					r.setRedirectUrl(tLive.getLive_url());
-				}
-				// r.setRedirectUrl(c);
-			}
-		}
+		r.setRedirectUrl(ugcLiveService.getAppPlayUrl(params));
 		return r;
 	}
@@ -366,46 +318,11 @@ public class UgcLiveAction {
 	 * @return
 	 */
 	@Request.Get("/live/epg/play/h5")
-	public ResultBean h5URL(Params params) {
-		HttpServletResponse response = DataContext.getResponse();
-		ResultBean rb = new ResultBean();
-		String appId = params.getString("appId");
-		String activityid = params.getString("activityId");
-		Map<String, Object> map = new HashMap<String, Object>();
-		if (StringUtils.isEmpty(appId) || StringUtils.isEmpty(activityid)) {
-			map.put("location", "");
-			rb.setData(map);
-			rb.setErrorCode("500");
-			rb.setErrorMessage("启动h5活动失败");
-			return rb;
-		} else {
-			TLive tLive = ugcLiveService.getTLiveByActivityId(appId, activityid);
-			if (tLive == null) {
-				map.put("location", "");
-				rb.setData(map);
-				rb.setErrorCode("500");
-				rb.setErrorMessage("启动h5活动失败,活动对象为空");
-				return rb;
-			} else {
-				TChannel tchannel = ugcLiveService.selectChannel(tLive.getRelation_id());
-				if (tchannel != null) {
-					// 重定向到h5.......
-					redirect(response, "http://ips.cnlive.com/IPS/liveplayByH5?appId=" + appId + "&channelID=" + tLive.getRelation_id());
-					map.put("location", "");
-					rb.setData(map);
-					rb.setErrorCode("0");
-					rb.setErrorMessage("302重定向到h5");
-					return rb;
-				} else {
-					map.put("location", tLive.getLive_url());
-					rb.setData(map);
-					rb.setErrorCode("0");
-					rb.setErrorMessage("启动h5活动成功");
-					return rb;
-				}
-			}
-		}
-
+	public Redirect h5(Params params) {
+		String url = ugcLiveService.getH5PlayUrl(params);
+		Redirect r = new Redirect();
+		r.setRedirectUrl(url);
+		return r;
 	}
 	/**
@@ -415,47 +332,18 @@ public class UgcLiveAction {
 	 * @return
 	 */
 	@Request.Get("/live/epg/play/swf")
-	public ResultBean swfURL(Params params) {
-		HttpServletResponse response = DataContext.getResponse();
+	public ResultBean swf(Params params) {
 		ResultBean rb = new ResultBean();
-		String appId = params.getString("appId");
-		String activityid = params.getString("activityId");
 		Map<String, Object> map = new HashMap<String, Object>();
-		if (StringUtils.isEmpty(appId) || StringUtils.isEmpty(activityid)) {
-			map.put("location", "");
-			rb.setData(map);
-			rb.setErrorCode("500");
-			rb.setErrorMessage("启动swf活动失败");
-			return rb;
-		} else {
-			TLive tLive = ugcLiveService.getTLiveByActivityId(appId, activityid);
-			if (tLive == null) {
-				map.put("location", "");
-				rb.setData(map);
-				rb.setErrorCode("500");
-				rb.setErrorMessage("启动swf活动失败,活动对象为空");
-				return rb;
-			} else {
-				TChannel tchannel = ugcLiveService.selectChannel(tLive.getRelation_id());
-				rb.setData(map);
-				rb.setErrorCode("0");
-				if (tchannel != null) {
-					// 302重定向到swf.......
-					redirect(response, "http://ips.cnlive.com/IPS/liveplayBySWF.action?appId=" + appId + "&channelID=" + tLive.getRelation_id());
-					map.put("location", "");
-					rb.setErrorMessage("302重定向到swf");
-					return rb;
-				} else {
-					map.put("location", tLive.getLive_url());
-					rb.setErrorMessage("启动swf活动成功");
-					return rb;
-				}
-			}
-		}
+		String url = ugcLiveService.getH5PlayUrl(params);
+		map.put("location", url);
+		rb.setErrorMessage("启动swf活动成功");
+		rb.setErrorCode("0");
+		return rb;
 	}
-	@Request.Post("/live/epg/error500")
-	public ResultBean error(Params params) {
+	@Request.Get("/live/serverError")
+	public ResultBean error500() {
 		ResultBean rb = new ResultBean();
 		Map<String, Object> map = new HashMap<String, Object>();
 		map.put("location", "");
@@ -464,40 +352,16 @@ public class UgcLiveAction {
 		rb.setErrorMessage("失败");
 		return rb;
 	}
-
-	public static void redirect(HttpServletResponse response, String redirectUrl) {
-		try {
-			response.setContentType("application/mpegurl");
-			response.setStatus(302);
-			response.setHeader("Location", redirectUrl);
-			response.setHeader("Connection", "close");
-		} catch (Exception e) {
-			throw new RuntimeException(e);
-		}
-	}
-
-	public static void main(String[] args) {
-
-		/*
-		 * NameValuePair[] nvp = new NameValuePair[6]; NameValuePair nv1 = new
-		 * NameValuePair(); nv1.setName("appId"); nv1.setValue("123"); nvp[0] =
-		 * nv1; NameValuePair nv2 = new NameValuePair();
-		 * nv2.setName("activityId"); nv2.setValue("234e"); nvp[1] = nv2;
-		 * NameValuePair nv3 = new NameValuePair(); nv3.setName("activityName");
-		 * nv3.setValue("ee"); nvp[2] = nv3; NameValuePair nv4 = new
-		 * NameValuePair(); nv4.setName("activityStatus"); nv4.setValue("11");
-		 * nvp[3] = nv4; NameValuePair nv5 = new NameValuePair();
-		 * nv5.setName("isHorizontalScreen"); nv5.setValue("321"); nvp[4] = nv5;
-		 * NameValuePair nv6 = new NameValuePair(); nv6.setName("channelId");
-		 * nv6.setValue("ww"); nvp[5] = nv6; String ss =
-		 * HttpReq.postRequestWidthResult(
-		 * "http://bc.cnlive.com/live/epg/createActivity", nvp);
-		 * System.out.println(ss); <<<<<<< HEAD String aa = HttpReq
-		 * .getRequestWidthResult(
-		 * "http://bc.cnlive.com/live/epg/startActivity?appId=123&activityId=234"
-		 * ); System.out.println(aa);
-		 */
-		String aa = HttpReq.getRequestWidthResult("http://bc.cnlive.com/live/epg/startActivity?appId=123&activityId=234");
-		System.out.println(aa);
+	
+	
+	@Request.Get("/live/clientError")
+	public ResultBean error404() {
+		ResultBean rb = new ResultBean();
+		Map<String, Object> map = new HashMap<String, Object>();
+		map.put("location", "");
+		rb.setData(map);
+		rb.setErrorCode("404");
+		rb.setErrorMessage("失败");
+		return rb;
 	}
 }
 \ No newline at end of file
@@ -115,6 +115,7 @@ public class VideoAction {
 			} else {
 				tLive.setDirect(Integer.parseInt(direct));
 			}
+			tLive.setHls_live_url(Constants.KS_HOST_HTTP + tLive.getT_user_id() + "/index.m3u8");
 			tLive.setLive_url(Constants.KS_HOST_RTMP + tLive.getT_user_id() );
 			success = tLiveService.startLive(tLive);
 		}
@@ -26,8 +26,9 @@ public class VodIpsAction {
 	private Logger log = Logger.getLogger("VodIpsAction");
-	@Request.Get("/vodips/h5/{id}")
-	public Redirect h5(int id, Params params) {
+	@Request.Get("/vodips/h5")
+	public Redirect h5(Params params) {
+		System.out.println(params);
 		String vId=params.getString("vId");
 		int rate=params.getInt("rate");
 		Redirect r = new Redirect();
@@ -36,8 +37,9 @@ public class VodIpsAction {
 		return r;
 	}
-	@Request.Get("/vodips/app/{id}")
-	public Redirect app(int id, Params params) {
+	@Request.Get("/vodips/app")
+	public Redirect app(Params params) {
+		System.out.println(params);
 		String vId=params.getString("vId");
 		int rate=params.getInt("rate");
 		String url=vodIpsServer.getAppPlayUrl(vId, rate);
@@ -46,8 +48,9 @@ public class VodIpsAction {
 		return r;
 	}
-	@Request.Get("/vodips/flash/{id}")
-	public ResultBean flash(int id, Params params) {
+	@Request.Get("/vodips/swf")
+	public ResultBean flash(Params params) {
+		System.out.println(params);
 		String vId=params.getString("vId");
 		int rate=params.getInt("rate");
 		String url=vodIpsServer.getFlashPlayUrl(vId, rate);
@@ -14,7 +14,7 @@ import org.apache.commons.httpclient.methods.GetMethod;
 public class TE {
 public static void main(String[] args) {
-	new TE().doGet("http://bc.cnlive.com/live/epg/play/app?app_id=60_irg1rhs308&channelID=1471754157393");
+	new TE().doGet("http://bc.cnlive.com/live/epg/play/app?appId=inbevnr031&channelID=1472020387351&isHLS=0&platform_id=com.cnlive.libs&timestamp=1471942267&uid=7C1B686C33E0456B883295A57CBBDA87_1471941483046&sp_id=inbevnr031&activityId=1472020387351");
 }
 private HttpClient getHttpClient() {
@@ -31,6 +31,7 @@ public void  doGet(String url) {
 	InputStream stream = null;
 	try {
 		int exeCode = client.executeMethod(method);
+		System.out.println(exeCode);
 		StatusLine status = method.getStatusLine();
 		int statusCode = status.getStatusCode();
 		StringBuffer buf = new StringBuffer();
@@ -11,6 +11,10 @@
   </servlet>
   <error-page>
     <error-code>500</error-code>
-    <location>/live/epg/error500</location>
+    <location>/live/serverError</location>
+  </error-page>
+   <error-page>
+    <error-code>404</error-code>
+    <location>/live/clientError</location>
   </error-page>
 </web-app>
 \ No newline at end of file