修改加入黑名单

刘基城
1 parent 9edef5c1
Showing 2 changed files with 49 additions and 207 deletions
src/main/java/com/cnlive/mz/live/action/CheckAction.java
src/main/java/com/cnlive/mz/live/action/LiveAction.java
 package com.cnlive.mz.live.action;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.util.List;
-import java.util.Map;
-
 import org.smart4j.framework.dao.bean.Pager;
 import org.smart4j.framework.ioc.annotation.Inject;
 import org.smart4j.framework.mvc.DataContext;
@@ -15,11 +10,8 @@ import org.smart4j.framework.mvc.bean.Result;
 import org.smart4j.framework.mvc.bean.View;
 import org.smart4j.framework.util.CastUtil;
-import com.cnlive.mz.commons.JsonUtil;
-import com.cnlive.mz.commons.net.HttpReq;
 import com.cnlive.mz.live.common.LiveUtils;
 import com.cnlive.mz.live.entity.TLive;
-import com.cnlive.mz.live.rest.BaseUtil;
 import com.cnlive.mz.live.service.TCheckService;
 import com.cnlive.mz.live.service.TLiveService;
 import com.cnlive.mz.live.service.TRoomService;
@@ -34,89 +26,61 @@ public class CheckAction {
 	@Inject
 	private TCheckService tCheckService;
-	// @Request.Get("/check/list/{page_number}")
-	// public View list(int page_number) {
-	// int user_id =
-	// CastUtil.castInt(DataContext.getRequest().getSession().getAttribute(LiveUtils.SESSION_KEY_ID));
-	// System.out.println(user_id);
-	// Pager<TLive> tLive = tCheckService.getTCheckLivePager(page_number, 9,
-	// user_id);
-	// List list = tLiveService.getLives(user_id);
-	// View view = new View("check/check_management.jsp");
-	// view.data("tLive", tLive);
-	// view.data("list", list);
-	// return view;
-	// //return new View("check/demo.html");
-	// }
+	/**
+	 * 切断直播流
+	 * @param id
+	 * @param params
+	 * @return
+	 */
 	@Request.Post("/check/close/{id}")
-	public Result coseLive(int id, Params params) throws UnsupportedEncodingException {
-		String userId = params.getString("user_id");
-		String streamName = userId + "_" + id;
-		String accesskey = BaseUtil.getAccessKey();
-		accesskey = java.net.URLEncoder.encode(accesskey, "utf-8");
-		String signature = BaseUtil.signature(streamName);
-		String del = "del";
-		String delsignature = BaseUtil.signature(del, streamName);
-		String expire = BaseUtil.getTimestamp();
-		System.out.println(expire + "---expire---");
-		// ��ӵ�������
-		try {
-			addBlackList(signature, accesskey, expire, streamName);
-			delBlackList(delsignature, accesskey, expire, streamName);
-		} catch (UnsupportedEncodingException e) {
-			e.printStackTrace();
-		}
-		boolean flag = tCheckService.closeLive(id);
+	public Result cose(int id, Params params)  {
+		String streamName = params.getString("user_id");
+		String uuid = params.getString("uuid");
+		boolean flag = tCheckService.close(streamName,id,uuid);
 		return new Result(flag);
 	}
 	/**
-	 * ��ӵ�����
-	 * 
-	 * @param signature
-	 * @param accesskey
-	 * @param expire
-	 * @param streamName
+	 * 回复黑名单
+	 * @param id
+	 * @param params
 	 * @return
-	 * @throws UnsupportedEncodingException
 	 */
-	public String addBlackList(String signature, String accesskey, String expire, String streamName)
-			throws UnsupportedEncodingException {
-		String url = "http://cnlive.dashboard.ks-cdn.com/blacklist?signature=" + signature + "&accesskey=" + accesskey
-				+ "&expire=" + expire + "&app=live&method=add&name=" + streamName;
-		System.out.println(url);
-		String jsonArrStr = HttpReq.getRequestWidthResult(url);
-		int status = HttpReq.getRequest(url);
-		System.out.println(status + "......and......" + jsonArrStr);
-		/*
-		 * Map map = JsonUtil.getMapFromJsonObjStr(jsonArrStr); String
-		 * chatRoomid = (String) map.get("Content-Length");
-		 */
-		return jsonArrStr;
+	@Request.Post("/check/resume/{id}")
+	public Result resume(int id, Params params){
+		String streamName = params.getString("user_id");
+		boolean flag = tCheckService.resume(streamName,id);
+		return new Result(flag);
 	}
+	
-	/**
-	 * �Ӻ���ɾ��
-	 * 
-	 * @param signature
-	 * @param accesskey
-	 * @param expire
-	 * @param streamName
-	 * @return
-	 * @throws UnsupportedEncodingException
-	 */
-	public Object delBlackList(String signature, String accesskey, String expire, String streamName)
-			throws UnsupportedEncodingException {
-		String url = "http://cnlive.dashboard.ks-cdn.com/blacklist?signature=" + signature + "&accesskey=" + accesskey
-				+ "&expire=" + expire + "&app=live&method=del&name=" + streamName;
-		System.out.println("..url.." + url);
-		String jsonArrStr = HttpReq.getRequestWidthResult(url);
-		System.out.println("..jsonArrStr.." + jsonArrStr);
-		/*
-		 * Map map = JsonUtil.getMapFromJsonObjStr(jsonArrStr); String
-		 * chatRoomid = (String) map.get("Content-Length");
-		 */
-		return jsonArrStr;
+	@Request.Get("/check/list/{page_number}")
+	public View check(int page_number) {
+		int user_id = CastUtil.castInt(DataContext.getRequest().getSession().getAttribute(LiveUtils.SESSION_KEY_ID));
+		Pager<TLive> tLive = tLiveService.getTCheckLivePager(page_number, 12, user_id);
+		View view = new View("check/monitor.jsp");
+		view.data("tLive", tLive);
+		return view;
+	}
+
+	// 置顶
+	@Request.Get("/check/top/{id}")
+	public Result top(int id) {
+		tLiveService.top(id);
+		return new Result(true);
+	}
+
+	// 通过审核
+	@Request.Get("/check/pass/{id}")
+	public Result pass(int id) {
+		tLiveService.pass(id);
+		return new Result(true);
+	}
+
+	@Request.Post("/check/close/{id}/{uuid}")
+	public Result coseLive(int id, String uuid) {
+		boolean flag = tLiveService.closeLive(id, uuid);
+		return new Result(flag);
 	}
 }
@@ -28,7 +28,6 @@ import org.smart4j.framework.mvc.bean.Params;
 import org.smart4j.framework.mvc.bean.Result;
 import org.smart4j.framework.mvc.bean.ResultBean;
 import org.smart4j.framework.mvc.bean.View;
-import org.smart4j.framework.orm.DataSet;
 import org.smart4j.framework.util.CastUtil;
 import com.cnlive.mz.commons.Constants;
@@ -36,7 +35,6 @@ import com.cnlive.mz.commons.net.HttpReq;
 import com.cnlive.mz.live.common.LiveUtils;
 import com.cnlive.mz.live.entity.TLive;
 import com.cnlive.mz.live.entity.TRoom;
-import com.cnlive.mz.live.rest.BaseUtil;
 import com.cnlive.mz.live.service.TCheckService;
 import com.cnlive.mz.live.service.TLiveService;
 import com.cnlive.mz.live.service.TRoomService;
@@ -109,107 +107,6 @@ public class LiveAction {
 		return view;
 	}
-	@Request.Get("/check/list/{page_number}")
-	public View check(int page_number) {
-		int user_id = CastUtil.castInt(DataContext.getRequest().getSession().getAttribute(LiveUtils.SESSION_KEY_ID));
-		Pager<TLive> tLive = tLiveService.getTCheckLivePager(page_number, 12, user_id);
-		View view = new View("check/monitor.jsp");
-		view.data("tLive", tLive);
-		return view;
-	}
-
-	// 置顶
-	@Request.Get("/check/top/{id}")
-	public Result top(int id) {
-		tLiveService.top(id);
-		return new Result(true);
-	}
-
-	// 切断
-	@Request.Post("/check/cut/{id}")
-	public Result cut(int id, Params params) throws UnsupportedEncodingException {
-		String live_url = params.getString("live_url");
-		if (live_url.isEmpty()) {
-			return null;
-		} else {
-			int index = live_url.lastIndexOf("/");
-			String streamName = live_url.substring(index + 1);
-			System.out.println("streamName===" + streamName);
-			String accesskey = BaseUtil.getAccessKey();
-			accesskey = java.net.URLEncoder.encode(accesskey, "utf-8");
-			String add = "add";
-			String signature = BaseUtil.signature(add, streamName);
-			String del = "del";
-			String delsignature = BaseUtil.signature(del, streamName);
-			String expire = BaseUtil.getTimestamp();
-			System.out.println(expire + "---expire---");
-			// 断流。
-			try {
-				addBlackList(signature, accesskey, expire, streamName);
-				// delBlackList(delsignature, accesskey, expire, streamName);
-			} catch (UnsupportedEncodingException e) {
-				e.printStackTrace();
-			}
-			// 直播通知
-			// tLiveService.notify(video_uuid, -1);
-			boolean flag = tCheckService.closeLive(id);
-			return new Result(flag);
-		}
-	}
-
-	// 通过审核
-	@Request.Get("/check/pass/{id}")
-	public Result pass(int id) {
-		tLiveService.pass(id);
-		return new Result(true);
-	}
-
-	@Request.Post("/check/close/{id}/{uuid}")
-	public Result coseLive(int id, String uuid) {
-		boolean flag = tLiveService.closeLive(id, uuid);
-		return new Result(flag);
-	}
-
-	/**
-	 * 添加到黑名单
-	 * 
-	 * @param signature
-	 * @param accesskey
-	 * @param expire
-	 * @param streamName
-	 * @return
-	 * @throws UnsupportedEncodingException
-	 */
-	public String addBlackList(String signature, String accesskey, String expire, String streamName)
-			throws UnsupportedEncodingException {
-		String url = "http://cnlive.dashboard.ks-cdn.com/blacklist?signature=" + signature + "&accesskey=" + accesskey
-				+ "&expire=" + expire + "&app=live&method=add&name=" + streamName;
-		String jsonArrStr = HttpReq.getRequestWidthResult(url);
-		int status = HttpReq.getRequest(url);
-		System.out.println(status + "......and......" + jsonArrStr);
-		return jsonArrStr;
-	}
-
-	/**
-	 * 从黑名单删除
-	 * 
-	 * @param signature
-	 * @param accesskey
-	 * @param expire
-	 * @param streamName
-	 * @return
-	 * @throws UnsupportedEncodingException
-	 */
-	public Object delBlackList(String signature, String accesskey, String expire, String streamName)
-			throws UnsupportedEncodingException {
-		String url = "http://cnlive.dashboard.ks-cdn.com/blacklist?signature=" + signature + "&accesskey=" + accesskey
-				+ "&expire=" + expire + "&app=live&method=del&name=" + streamName;
-		String jsonArrStr = HttpReq.getRequestWidthResult(url);
-		System.out.println("..jsonArrStr.." + jsonArrStr);
-		return jsonArrStr;
-
-	}
-
 	@Request.Get("/live/alllive/{page_number}")
 	public View liveList(int page_number) {
 		int user_id = CastUtil.castInt(DataContext.getRequest().getSession().getAttribute(LiveUtils.SESSION_KEY_ID));
@@ -297,11 +194,10 @@ public class LiveAction {
 				log.error("创建活动失败,活动ID已存在");
 				return rb;
 			} else {
-
 				boolean flag = tLiveService.addAcitvity(params);
 				if (flag) {
 					Map<String, Object> map = new HashMap<String, Object>();
-					map.put("location", "rtmp://jsrtmp.up.cnlive.com/live/1234");
+					map.put("location", com.cnlive.mz.live.common.Constants.KS_HOST_UP_RTMP+channelID+"?vdoid=" + activityId);
 					rb.setData(map);
 					rb.setErrorCode("0");
 					rb.setErrorMessage("创建活动成功");
@@ -382,24 +278,6 @@ public class LiveAction {
 			int index = live_url.lastIndexOf("/");
 			String streamName = live_url.substring(index + 1);
 			System.out.println("streamName===" + streamName);
-			String accesskey = BaseUtil.getAccessKey();
-			try {
-				accesskey = java.net.URLEncoder.encode(accesskey, "utf-8");
-				String add = "add";
-				String signature = BaseUtil.signature(add, streamName);
-				String del = "del";
-				String delsignature = BaseUtil.signature(del, streamName);
-				String expire = BaseUtil.getTimestamp();
-				System.out.println(expire + "---expire---");
-				// 断流。
-				addBlackList(signature, accesskey, expire, streamName);
-			} catch (UnsupportedEncodingException e1) {
-				// TODO Auto-generated catch block
-				e1.printStackTrace();
-			}
-			// 直播通知
-			// tLiveService.notify(video_uuid, -1);
-			boolean flag = tCheckService.closeLive(Integer.parseInt(activityid));
 			Map<String, Object> map = new HashMap<String, Object>();
 			map.put("location", tLive.getLive_url());
 			rb.setData(map);
@@ -505,6 +383,7 @@ public class LiveAction {
 		rb.setErrorMessage("失败");
 		return rb;
 	}
+
 	public static void main(String[] args) {
 		/*
 		 * Map<String, Object> mapFiles = new HashMap<String, Object>();
@@ -548,8 +427,7 @@ public class LiveAction {
 		nvp[5] = nv6;
 		String ss = HttpReq.postRequestWidthResult("http://bc.cnlive.com/live/epg/createActivity", nvp);
 		System.out.println(ss);
-		String aa = HttpReq
-				.getRequestWidthResult("http://bc.cnlive.com/live/epg/startActivity?appId=123&activityId=234");
+		String aa = HttpReq.getRequestWidthResult("http://bc.cnlive.com/live/epg/startActivity?appId=123&activityId=234");
 		System.out.println(aa);
 	}
 }
 \ No newline at end of file