Merge branch 'master' of http://bj.gitlab.cnlive.com/liujicheng/cnlive_live_web

# Conflicts: # .settings/org.eclipse.wst.common.component # target/m2e-wtp/web-resources/META-INF/MANIFEST.MF # target/m2e-wtp/web-resources/META-INF/maven/com.cnlive.mz.live.web/cnlive_live_web/pom.properties

Merge branch 'master' of http://bj.gitlab.cnlive.com/liujicheng/cnlive_live_web
# Conflicts: # .settings/org.eclipse.wst.common.component # target/m2e-wtp/web-resources/META-INF/MANIFEST.MF # target/m2e-wtp/web-resources/META-INF/maven/com.cnlive.mz.live.web/cnlive_live_web/pom.properties
刘基城
2 parents 1ac037e4 cb801165
Showing 26 changed files with 2494 additions and 2156 deletions
.classpath
.settings/org.eclipse.core.resources.prefs
.settings/org.eclipse.wst.common.project.facet.core.xml
WebContent/META-INF/MANIFEST.MF
src/main/java/com/cnlive/mz/live/action/CheckAction.java
src/main/java/com/cnlive/mz/live/action/HttpPostArgumentTest2.java
src/main/java/com/cnlive/mz/live/action/LiveAction.java
src/main/java/com/cnlive/mz/live/action/UserAction.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/mz/live/action/WordAction.java
src/main/java/com/cnlive/mz/live/aspect/AuthFilter.java
src/main/java/com/cnlive/mz/live/rest/BaseUtil.java
src/main/java/com/cnlive/mz/live/servlet/InitServlet.java
src/main/java/com/cnlive/socket/SocketServer.java
src/main/resources/log4j.properties
src/main/resources/smart.properties
src/main/resources/stream-config.properties
src/main/webapp/WEB-INF/tags/pager3.tag
src/main/webapp/WEB-INF/web.xml
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" path="src/main/resources/i18n"/>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" path="src/main/resources/i18n"/>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+		<attributes>
+			<attribute name="owner.project.facets" value="java"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
 eclipse.preferences.version=1
 encoding//src/main/java=UTF-8
 encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
 encoding/<project>=UTF-8
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
-  <installed facet="jst.web" version="3.0"/>
-  <installed facet="wst.jsdt.web" version="1.0"/>
-  <installed facet="jst.jaxrs" version="1.1"/>
-  <installed facet="java" version="1.6"/>
-</faceted-project>
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <installed facet="jst.web" version="3.0"/>
+  <installed facet="wst.jsdt.web" version="1.0"/>
+  <installed facet="jst.jaxrs" version="1.1"/>
+  <installed facet="java" version="1.7"/>
+</faceted-project>
-Manifest-Version: 1.0
-Class-Path: 
-
-
-
-
-
-
+Manifest-Version: 1.0
+Class-Path: 
+
+
+
+
+
+
 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);
 	}
  
 }
-package com.cnlive.mz.live.action;
-
-import java.io.File;
-import java.io.IOException;
-
-import org.apache.commons.httpclient.NameValuePair;
-import org.apache.commons.httpclient.params.HttpMethodParams;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
-import org.apache.http.HttpStatus;
-import org.apache.http.ParseException;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.entity.mime.MultipartEntity;
-import org.apache.http.entity.mime.content.FileBody;
-import org.apache.http.entity.mime.content.StringBody;
-import org.apache.http.impl.client.DefaultHttpClient;
-import org.apache.http.util.EntityUtils;
-
-import com.cnlive.mz.commons.net.HttpReq;
-
-public class HttpPostArgumentTest2 {
-
-	private static String user_access_key = "cf34f28db21b46678237bfa849e239ea";
-	private static String app_access_key = "7338ebf9cab441c0843e437a18d85549";
-
-	public void SubmitPost(String url, String filepath) {
-		HttpClient httpclient = new DefaultHttpClient();
-		try {
-			HttpPost httppost = new HttpPost(url);
-			FileBody bin = new FileBody(new File(filepath));
-			MultipartEntity reqEntity = new MultipartEntity();
-			// reqEntity.addPart("file", bin);
-			reqEntity.addPart("app_access_key", new StringBody("7338ebf9cab441c0843e437a18d85549"));
-			reqEntity.addPart("user_access_key", new StringBody("cf34f28db21b46678237bfa849e239ea"));
-			reqEntity.addPart("direct", new StringBody("0"));
-			reqEntity.addPart("upload_type", new StringBody("1"));
-			reqEntity.addPart("md5", new StringBody("liujicheng"));
-			reqEntity.addPart("title", new StringBody("title"));
-			reqEntity.addPart("name", new StringBody("中投视频宣传片熊猫test"));
-			reqEntity.addPart("server_access_key", new StringBody("3830ce241dad4b9f844d131c890231ae"));
-
-			httppost.setEntity(reqEntity);
-			HttpResponse response = httpclient.execute(httppost);
-			int statusCode = response.getStatusLine().getStatusCode();
-			System.out.println(statusCode);
-			System.out.println("服务器正常响应.....");
-			HttpEntity resEntity = response.getEntity();
-			System.out.println(EntityUtils.toString(resEntity));
-			System.out.println(resEntity.getContent());
-			EntityUtils.consume(resEntity);
-
-		} catch (ParseException e) {
-			e.printStackTrace();
-		} catch (IOException e) {
-			e.printStackTrace();
-		} finally {
-			try {
-				httpclient.getConnectionManager().shutdown();
-			} catch (Exception ignore) {
-				ignore.printStackTrace();
-			}
-		}
-	}
-
-	public static void redirect() {
-		NameValuePair[] param = { new NameValuePair("relation_id", "283645"), new NameValuePair("video_type", "3"),
-				new NameValuePair("user_access_key", user_access_key),
-				new NameValuePair("app_access_key", app_access_key) };
-		String c = HttpReq.postRequestWidthResult("http://bc.cnlive.com/api/video/redirect", param);
-		System.out.println(c);
-	}
-
-	public static void delete() {
-		NameValuePair[] param = { new NameValuePair("video_type", "2"),
-				new NameValuePair("app_access_key", "7338ebf9cab441c0843e437a18d85549"),
-				new NameValuePair("user_access_key", "cf34f28db21b46678237bfa849e239ea"),
-				new NameValuePair("video_uuid", "a8794762b3e92c7d6589a6157cf1ef27,7e26dee78a584f8c5ab1d93a9c878f1d") };
-		String c = HttpReq.postRequestWidthResult("http://bc.cnlive.com/api/video/delete", param);
-		System.out.println(c);
-	}
-
-	private static String md5 = "ffa699fb66750acab30b71b8ceb0172d1";
-
-	public static void supload() {
-		NameValuePair[] param = { new NameValuePair("app_access_key", app_access_key),
-				new NameValuePair("user_access_key", user_access_key), new NameValuePair("video_type", "3"),
-				new NameValuePair("upload_type", "0"), new NameValuePair("direct", "1"), new NameValuePair("md5", md5),
-				new NameValuePair("title", "tit三道恩le1"), new NameValuePair("relation_id", "615207"),
-				new NameValuePair("custom_args", "custom_args1"), new NameValuePair("name", "VID_20151224_105421.mp4"),
-				new NameValuePair("server_access_key", "3830ce241dad4b9f844d131c890231ae") };
-		String c = HttpReq.postRequestWidthResult("http://localhost:8080/cnlive_live_web/api/video/supload", param);
-		System.out.println(c);
-	}
-
-	public static void uploadNotify() {
-		NameValuePair[] param = { new NameValuePair("app_access_key", app_access_key),
-				new NameValuePair("user_access_key", user_access_key), new NameValuePair("upload_type", "1"),
-				new NameValuePair("video_type", "2"), new NameValuePair("state", "200"),
-				new NameValuePair("video_uuid", md5) };
-		String c = HttpReq
-				.postRequestWidthResult("http://localhost:8080/cnlive_live_web/api/video/uploadNotify", param);
-		System.out.println(c);
-	}
-
-	public static void all() {
-		NameValuePair[] param = { new NameValuePair("app_access_key", app_access_key),
-				new NameValuePair("relation_id", "498122"),
-
-				new NameValuePair("user_access_key", user_access_key), new NameValuePair("upload_type", "1"),
-				new NameValuePair("video_type", "2"), new NameValuePair("page_no", "1"),
-				new NameValuePair("video_uuid", md5) };
-		String c = HttpReq.postRequestWidthResult("http://localhost:8080/cnlive_live_web/api/video/all", param);
-		System.out.println(c);
-	}
-
-	public static void main(String[] args) {
-		// new HttpPostArgumentTest2().delete();
-		//HttpPostArgumentTest2.all();
-		 HttpPostArgumentTest2.redirect();
-		// HttpReq.postRequestWidthResult("http://120.132.76.51:9696/cnlive_encoding_job/task",
-		// "json", "jsonjsonjsonjson");r
-	}
-
-}
+package com.cnlive.mz.live.action;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.apache.commons.httpclient.NameValuePair;
+import org.apache.commons.httpclient.params.HttpMethodParams;
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.HttpStatus;
+import org.apache.http.ParseException;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.mime.MultipartEntity;
+import org.apache.http.entity.mime.content.FileBody;
+import org.apache.http.entity.mime.content.StringBody;
+import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.util.EntityUtils;
+
+import com.cnlive.mz.commons.net.HttpReq;
+
+public class HttpPostArgumentTest2 {
+
+	private static String user_access_key = "cf34f28db21b46678237bfa849e239ea";
+	private static String app_access_key = "7338ebf9cab441c0843e437a18d85549";
+
+	public void SubmitPost(String url, String filepath) {
+		HttpClient httpclient = new DefaultHttpClient();
+		try {
+			HttpPost httppost = new HttpPost(url);
+			FileBody bin = new FileBody(new File(filepath));
+			MultipartEntity reqEntity = new MultipartEntity();
+			// reqEntity.addPart("file", bin);
+			reqEntity.addPart("app_access_key", new StringBody("7338ebf9cab441c0843e437a18d85549"));
+			reqEntity.addPart("user_access_key", new StringBody("cf34f28db21b46678237bfa849e239ea"));
+			reqEntity.addPart("direct", new StringBody("0"));
+			reqEntity.addPart("upload_type", new StringBody("1"));
+			reqEntity.addPart("md5", new StringBody("liujicheng"));
+			reqEntity.addPart("title", new StringBody("title"));
+			reqEntity.addPart("name", new StringBody("中投视频宣传片熊猫test"));
+			reqEntity.addPart("server_access_key", new StringBody("3830ce241dad4b9f844d131c890231ae"));
+
+			httppost.setEntity(reqEntity);
+			HttpResponse response = httpclient.execute(httppost);
+			int statusCode = response.getStatusLine().getStatusCode();
+			System.out.println(statusCode);
+			System.out.println("服务器正常响应.....");
+			HttpEntity resEntity = response.getEntity();
+			System.out.println(EntityUtils.toString(resEntity));
+			System.out.println(resEntity.getContent());
+			EntityUtils.consume(resEntity);
+
+		} catch (ParseException e) {
+			e.printStackTrace();
+		} catch (IOException e) {
+			e.printStackTrace();
+		} finally {
+			try {
+				httpclient.getConnectionManager().shutdown();
+			} catch (Exception ignore) {
+				ignore.printStackTrace();
+			}
+		}
+	}
+
+	public static void redirect() {
+		NameValuePair[] param = { new NameValuePair("relation_id", "283645"), new NameValuePair("video_type", "3"),
+				new NameValuePair("user_access_key", user_access_key),
+				new NameValuePair("app_access_key", app_access_key) };
+		String c = HttpReq.postRequestWidthResult("http://bc.cnlive.com/api/video/redirect", param);
+		System.out.println(c);
+	}
+
+	public static void delete() {
+		NameValuePair[] param = { new NameValuePair("video_type", "2"),
+				new NameValuePair("app_access_key", "7338ebf9cab441c0843e437a18d85549"),
+				new NameValuePair("user_access_key", "cf34f28db21b46678237bfa849e239ea"),
+				new NameValuePair("video_uuid", "a8794762b3e92c7d6589a6157cf1ef27,7e26dee78a584f8c5ab1d93a9c878f1d") };
+		String c = HttpReq.postRequestWidthResult("http://bc.cnlive.com/api/video/delete", param);
+		System.out.println(c);
+	}
+
+	private static String md5 = "ffa699fb66750acab30b71b8ceb0172d1";
+
+	public static void supload() {
+		NameValuePair[] param = { new NameValuePair("app_access_key", app_access_key),
+				new NameValuePair("user_access_key", user_access_key), new NameValuePair("video_type", "3"),
+				new NameValuePair("upload_type", "0"), new NameValuePair("direct", "1"), new NameValuePair("md5", md5),
+				new NameValuePair("title", "tit三道恩le1"), new NameValuePair("relation_id", "615207"),
+				new NameValuePair("custom_args", "custom_args1"), new NameValuePair("name", "VID_20151224_105421.mp4"),
+				new NameValuePair("server_access_key", "3830ce241dad4b9f844d131c890231ae") };
+		String c = HttpReq.postRequestWidthResult("http://localhost:8080/cnlive_live_web/api/video/supload", param);
+		System.out.println(c);
+	}
+
+	public static void uploadNotify() {
+		NameValuePair[] param = { new NameValuePair("app_access_key", app_access_key),
+				new NameValuePair("user_access_key", user_access_key), new NameValuePair("upload_type", "1"),
+				new NameValuePair("video_type", "2"), new NameValuePair("state", "200"),
+				new NameValuePair("video_uuid", md5) };
+		String c = HttpReq
+				.postRequestWidthResult("http://localhost:8080/cnlive_live_web/api/video/uploadNotify", param);
+		System.out.println(c);
+	}
+
+	public static void all() {
+		NameValuePair[] param = { new NameValuePair("app_access_key", app_access_key),
+				new NameValuePair("relation_id", "498122"),
+
+				new NameValuePair("user_access_key", user_access_key), new NameValuePair("upload_type", "1"),
+				new NameValuePair("video_type", "2"), new NameValuePair("page_no", "1"),
+				new NameValuePair("video_uuid", md5) };
+		String c = HttpReq.postRequestWidthResult("http://localhost:8080/cnlive_live_web/api/video/all", param);
+		System.out.println(c);
+	}
+
+	public static void main(String[] args) {
+		// new HttpPostArgumentTest2().delete();
+		//HttpPostArgumentTest2.all();
+		 HttpPostArgumentTest2.redirect();
+		// HttpReq.postRequestWidthResult("http://120.132.76.51:9696/cnlive_encoding_job/task",
+		// "json", "jsonjsonjsonjson");r
+	}
+
+}
@@ -9,11 +9,15 @@
  
 package com.cnlive.mz.live.action;
  
+import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
  
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
 import org.apache.commons.httpclient.NameValuePair;
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
@@ -28,12 +32,12 @@ 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;
 import com.cnlive.mz.commons.net.HttpReq;
 import com.cnlive.mz.live.common.LiveUtils;
+import com.cnlive.mz.live.entity.TChannel;
 import com.cnlive.mz.live.entity.TLive;
 import com.cnlive.mz.live.entity.TRoom;
 import com.cnlive.mz.live.rest.BaseUtil;
@@ -109,107 +113,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,15 +200,17 @@ 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("创建活动成功");
 					log.info("创建活动成功");
+					// 通知cms直播
+					// boolean success = tLiveService.startLive(tLive);
 					return rb;
 				} else {
 					Map<String, Object> map = new HashMap<String, Object>();
@@ -338,23 +243,25 @@ public class LiveAction {
 	@Request.Get("/live/epg/startActivity")
 	public ResultBean startActivity(Params params) {
 		ResultBean rb = new ResultBean();
+		log.info(params);
 		String appId = params.getString("appId");
 		String activityid = params.getString("activityId");
 		if (StringUtils.isEmpty(appId) || StringUtils.isEmpty(activityid)) {
-			Map<String, Object> map = new HashMap<String, Object>();
-			map.put("location", "");
-			rb.setData(map);
 			rb.setErrorCode("500");
-			rb.setErrorMessage("启动活动失败");
+			rb.setErrorMessage("启动活动失败,参数不正确");
 			return rb;
 		} else {
 			TLive tLive = tLiveService.selectByParams(appId, activityid);
-			Map<String, Object> map = new HashMap<String, Object>();
-			map.put("location", tLive.getLive_url());
-			rb.setData(map);
-			rb.setErrorCode("0");
-			rb.setErrorMessage("启动活动成功");
-			return rb;
+			if (tLive == null) {
+				log.info("tLive为空......");
+				rb.setErrorCode("500");
+				rb.setErrorMessage("启动活动失败,活动对象为空");
+				return rb;
+			} else {
+				rb.setErrorCode("0");
+				rb.setErrorMessage("启动活动成功");
+				return rb;
+			}
 		}
 	}
  
@@ -366,48 +273,41 @@ public class LiveAction {
 	 */
 	@Request.Get("/live/epg/stopActivity")
 	public ResultBean stopActivity(Params params) {
+		log.info(params);
 		ResultBean rb = new ResultBean();
 		String appId = params.getString("appId");
 		String activityid = params.getString("activityId");
+		TLive tLive = tLiveService.selectByParams(appId, activityid);
+		Map<String, Object> map = new HashMap<String, Object>();
 		if (StringUtils.isEmpty(appId) || StringUtils.isEmpty(activityid)) {
-			Map<String, Object> map = new HashMap<String, Object>();
 			map.put("location", "");
 			rb.setData(map);
 			rb.setErrorCode("500");
 			rb.setErrorMessage("停止直播失败,参数不正确");
 			return rb;
 		} else {
-			TLive tLive = tLiveService.selectByParams(appId, activityid);
-			String live_url = tLive.getLive_url();
-			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();
+			if (tLive == null) {
+				map.put("location", "");
+				rb.setData(map);
+				rb.setErrorCode("500");
+				rb.setErrorMessage("停止直播失败,活动对象为空");
+				return rb;
+			} else {
+				String live_url = tLive.getLive_url();
+				int index = live_url.lastIndexOf("/");
+				String streamName = live_url.substring(index + 1);
+				System.out.println("streamName===" + streamName);
+				// 直播断流。
+				tCheckService.close(streamName, tLive.getId(), tLive.getUuid());
 			}
 			// 直播通知
 			// 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);
 			rb.setErrorCode("0");
 			rb.setErrorMessage("停止直播成功");
 			return rb;
 		}
-
 	}
  
 	/**
@@ -427,14 +327,21 @@ public class LiveAction {
 			map.put("location", "");
 			rb.setData(map);
 			rb.setErrorCode("500");
-			rb.setErrorMessage("获取活动列表失败,字段不正确");
+			rb.setErrorMessage("获取活动列表失败,参数不正确");
 			return rb;
 		} else {
 			Pager<TLive> tLive = tLiveService.getActivityPager(pageNo, pageSize, appId);
-			rb.setData(tLive);
-			rb.setErrorCode("0");
-			rb.setErrorMessage("获取活动列表成功");
-			return rb;
+			if (tLive == null) {
+				rb.setData("");
+				rb.setErrorCode("500");
+				rb.setErrorMessage("获取活动列表失败,活动对象为空");
+				return rb;
+			} else {
+				rb.setData(tLive);
+				rb.setErrorCode("0");
+				rb.setErrorMessage("获取活动列表成功");
+				return rb;
+			}
  
 		}
 	}
@@ -449,21 +356,28 @@ public class LiveAction {
 		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<String, Object> map = new HashMap<String, Object>();
 			map.put("location", "");
 			rb.setData(map);
 			rb.setErrorCode("500");
-			rb.setErrorMessage("获取直播回放失败");
+			rb.setErrorMessage("获取直播回放失败,参数不正确");
 			return rb;
 		} else {
 			TLive tLive = tLiveService.selectByParams(appId, activityid);
-			Map<String, Object> map = new HashMap<String, Object>();
-			map.put("location", tLive.getPlayback_url());
-			rb.setData(map);
-			rb.setErrorCode("0");
-			rb.setErrorMessage("获取直播回放成功");
-			return rb;
+			if (tLive == null) {
+				map.put("location", "");
+				rb.setData(map);
+				rb.setErrorCode("500");
+				rb.setErrorMessage("获取直播回放失败,活动对象为空");
+				return rb;
+			} else {
+				map.put("location", tLive.getPlayback_url());
+				rb.setData(map);
+				rb.setErrorCode("0");
+				rb.setErrorMessage("获取直播回放成功");
+				return rb;
+			}
 		}
 	}
  
@@ -474,6 +388,192 @@ public class LiveAction {
 	 */
 	@Request.Get("/live/epg/liveplayByAPP")
 	public ResultBean liveplayByAPP(Params params) {
+		log.info(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("获取直播回放失败,参数不正确");
+			return rb;
+		} else {
+			TLive tLive = tLiveService.selectByParams(appId, activityid);
+			if (tLive == null) {
+				map.put("location", "");
+				rb.setData(map);
+				rb.setErrorCode("500");
+				rb.setErrorMessage("获取直播回放失败,活动对象为空");
+				return rb;
+			} else {
+				map.put("location", tLive.getPlayback_url());
+				rb.setData(map);
+				rb.setErrorCode("0");
+				rb.setErrorMessage("获取直播回放成功");
+				return rb;
+			}
+		}
+	}
+
+	/**
+	 * 1.8 获取APP直播URL接口.md
+	 * 
+	 * @param params
+	 * @return
+	 */
+	@Request.Get("/live/epg/play/app")
+	public ResultBean appURL(Params params) throws IOException {
+		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("启动app活动失败");
+			return rb;
+		} else {
+			TLive tLive = tLiveService.selectByParams(appId, activityid);
+			if (tLive == null) {
+				map.put("location", "");
+				rb.setData(map);
+				rb.setErrorCode("500");
+				rb.setErrorMessage("启动app活动失败,活动对象为空");
+				return rb;
+			} else {
+				TChannel tchannel = tLiveService.selectChannel(tLive.getRelation_id());
+				if (tchannel != null) {
+					// 请求到app.......
+					redirect(response, "http://ips.cnlive.com/IPS/liveplayByAPP.action?appId=" + appId + "&channelID="
+							+ tLive.getRelation_id());
+					map.put("location", "");
+					rb.setData(map);
+					rb.setErrorCode("0");
+					rb.setErrorMessage("302重定向到app");
+					return rb;
+				} else {
+					map.put("location", tLive.getLive_url());
+					rb.setData(map);
+					rb.setErrorCode("0");
+					rb.setErrorMessage("启动app活动成功");
+					return rb;
+				}
+			}
+		}
+
+	}
+
+	/**
+	 * 1.9 获取H5直播URL接口.md
+	 * 
+	 * @param params
+	 * @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 = tLiveService.selectByParams(appId, activityid);
+			if (tLive == null) {
+				map.put("location", "");
+				rb.setData(map);
+				rb.setErrorCode("500");
+				rb.setErrorMessage("启动h5活动失败,活动对象为空");
+				return rb;
+			} else {
+				TChannel tchannel = tLiveService.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;
+				}
+			}
+		}
+
+	}
+
+	/**
+	 * 2.0 获取SWF直播URL接口.md
+	 * 
+	 * @param params
+	 * @return
+	 */
+	@Request.Get("/live/epg/play/swf")
+	public ResultBean swfURL(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("启动swf活动失败");
+			return rb;
+		} else {
+			TLive tLive = tLiveService.selectByParams(appId, activityid);
+			if (tLive == null) {
+				map.put("location", "");
+				rb.setData(map);
+				rb.setErrorCode("500");
+				rb.setErrorMessage("启动swf活动失败,活动对象为空");
+				return rb;
+			} else {
+				TChannel tchannel = tLiveService.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;
+				}
+			}
+		}
+
+	}
+
+	/**
+	 * 2.1 获取推流直播播放地址.md
+	 * 
+	 * @param params
+	 * @return
+	 */
+	@Request.Get("/live/epg/play")
+	public ResultBean startLiveActivity(Params params) {
 		ResultBean rb = new ResultBean();
 		String appId = params.getString("appId");
 		String activityid = params.getString("activityId");
@@ -482,15 +582,15 @@ public class LiveAction {
 			map.put("location", "");
 			rb.setData(map);
 			rb.setErrorCode("500");
-			rb.setErrorMessage("获取直播回放失败");
+			rb.setErrorMessage("启动活动失败");
 			return rb;
 		} else {
 			TLive tLive = tLiveService.selectByParams(appId, activityid);
 			Map<String, Object> map = new HashMap<String, Object>();
-			map.put("location", tLive.getPlayback_url());
+			map.put("location", tLive.getLive_url());
 			rb.setData(map);
 			rb.setErrorCode("0");
-			rb.setErrorMessage("获取直播回放成功");
+			rb.setErrorMessage("启动活动成功");
 			return rb;
 		}
 	}
@@ -505,49 +605,45 @@ public class LiveAction {
 		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);
+		}
+	}
+
+	@Request.Get("/live/epg/302")
+	public void red302() {
+		HttpServletResponse response = DataContext.getResponse();
+		redirect(response, "http://ips.cnlive.com/IPS/liveplayBySWF.action?activityId=12345");
+	}
+
 	public static void main(String[] args) {
+
 		/*
-		 * Map<String, Object> mapFiles = new HashMap<String, Object>();
-		 * mapFiles.put("app_id", null); mapFiles.put("start_time", "");
-		 * mapFiles.put("end_time",""); // TODO 活动id mapFiles.put("category",
-		 * ""); boolean flag = DataSet.insert(TLive.class, mapFiles);
-		 * System.out.println(flag);
+		 * 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 appId = params.getString("appId");
-		// String activityid = params.getString("activityid");
-		// String activityname = params.getString("activityname");
-		// int activitystatus = params.getInt("activitystatus");
-		// int isHorizontalScreen = params.getInt("isHorizontalScreen");
-		// String channelID = params.getString("channelID");
-		// NameValuePair nv1 = new NameValuePair("appId", "123");
-		// NameValuePair nv2 = new NameValuePair("activityid", "234");
-		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);
 		String aa = HttpReq
 				.getRequestWidthResult("http://bc.cnlive.com/live/epg/startActivity?appId=123&activityId=234");
 		System.out.println(aa);
-package com.cnlive.mz.live.action;
-
-import org.smart4j.framework.dao.bean.Pager;
-import org.smart4j.framework.ioc.annotation.Inject;
-import org.smart4j.framework.mvc.annotation.Action;
-import org.smart4j.framework.mvc.annotation.Request;
-import org.smart4j.framework.mvc.bean.Result;
-import org.smart4j.framework.mvc.bean.View;
-
-import com.cnlive.mz.live.entity.TLive;
-import com.cnlive.mz.live.entity.TUser;
-import com.cnlive.mz.live.service.TUserService;
-
-@Action
-public class UserAction {
-
-	@Inject
-	private TUserService tUserService;
-
-	/**
-	 * 获取用户列表页
-	 * 
-	 * @param pageNumber
-	 * @return
-	 */
-	@Request.Get("/user/list/{pageNumber}")
-	public View list(int pageNumber) {
-		Pager<TUser> userPage = tUserService.getTUserPage(pageNumber);
-		return new View("user/user_list.jsp").data("userPage", userPage);
-	}
-
-	@Request.Get("/user/live/{userId}/{pageNumber}")
-	public View livelist(int userId, int pageNumber) {
-		Pager<TLive> userPage = tUserService.getTLivePage(userId, pageNumber);
-		return new View("user/user_live_list.jsp").data("userPage", userPage);
-	}
-
-	@Request.Get("/user/report/{userId}/{type}")
-	public Result report(int userId,String type) {
-		return new Result(tUserService.addReport(userId,type));
-	}
-}
+package com.cnlive.mz.live.action;
+
+import org.smart4j.framework.dao.bean.Pager;
+import org.smart4j.framework.ioc.annotation.Inject;
+import org.smart4j.framework.mvc.annotation.Action;
+import org.smart4j.framework.mvc.annotation.Request;
+import org.smart4j.framework.mvc.bean.Result;
+import org.smart4j.framework.mvc.bean.View;
+
+import com.cnlive.mz.live.entity.TLive;
+import com.cnlive.mz.live.entity.TUser;
+import com.cnlive.mz.live.service.TUserService;
+
+@Action
+public class UserAction {
+
+	@Inject
+	private TUserService tUserService;
+
+	/**
+	 * 获取用户列表页
+	 * 
+	 * @param pageNumber
+	 * @return
+	 */
+	@Request.Get("/user/list/{pageNumber}")
+	public View list(int pageNumber) {
+		Pager<TUser> userPage = tUserService.getTUserPage(pageNumber);
+		return new View("user/user_list.jsp").data("userPage", userPage);
+	}
+
+	@Request.Get("/user/live/{userId}/{pageNumber}")
+	public View livelist(int userId, int pageNumber) {
+		Pager<TLive> userPage = tUserService.getTLivePage(userId, pageNumber);
+		return new View("user/user_live_list.jsp").data("userPage", userPage);
+	}
+
+	@Request.Get("/user/report/{userId}/{type}")
+	public Result report(int userId,String type) {
+		return new Result(tUserService.addReport(userId,type));
+	}
+}
@@ -115,7 +115,7 @@ public class VideoAction {
 			} else {
 				tLive.setDirect(Integer.parseInt(direct));
 			}
-			tLive.setLive_url(Constants.KS_HOST_RTMP + tLive.getT_user_id() + "_" + uuid);
+			tLive.setLive_url(Constants.KS_HOST_RTMP + tLive.getT_user_id() );
 			success = tLiveService.startLive(tLive);
 		}
 		data.put("video_uuid", uuid);
@@ -4,41 +4,56 @@ import java.util.HashMap;
 import java.util.Map;
  
 import org.apache.log4j.Logger;
+import org.smart4j.framework.ioc.annotation.Inject;
 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.live.service.VodIpsServer;
+
 /**
  * 点播调度
+ * 
  * @author adm
  *
  */
 @Action
 public class VodIpsAction {
+	@Inject
+	VodIpsServer vodIpsServer;
  
 	private Logger log = Logger.getLogger("VodIpsAction");
- 
+
 	@Request.Get("/vodips/h5/{id}")
-	public Redirect h5(int id,Params params) {
-		Redirect r=new Redirect();
-		r.setRedirectUrl("http://wideo03.cnlive.com/video/data1/2016/0808/141118/1500/878e13fc40754c2caf1476f7cad5f7b9_141118_1500.m3u8");
+	public Redirect h5(int id, Params params) {
+		String vId=params.getString("vId");
+		int rate=params.getInt("rate");
+		Redirect r = new Redirect();
+		String url=vodIpsServer.getH5PlayUrl(vId, rate);
+		r.setRedirectUrl(url);
 		return r;
 	}
-	
+
 	@Request.Get("/vodips/app/{id}")
-	public Redirect app(int id,Params params) {
-		Redirect r=new Redirect();
-		r.setRedirectUrl("http://wideo03.cnlive.com/video/data1/2016/0808/141118/1500/878e13fc40754c2caf1476f7cad5f7b9_141118_1500.m3u8");
+	public Redirect app(int id, Params params) {
+		String vId=params.getString("vId");
+		int rate=params.getInt("rate");
+		String url=vodIpsServer.getAppPlayUrl(vId, rate);
+		Redirect r = new Redirect();
+		r.setRedirectUrl(url);
 		return r;
 	}
-	
+
 	@Request.Get("/vodips/flash/{id}")
-	public ResultBean flash(int id,Params params) {
-		ResultBean rb =new ResultBean();
-		Map  map =new HashMap();
-		map.put("\"location\"", "http://wideo01.cnlive.com/video/data1/2016/0524/124025/800/b7e34cfee140449f9e04c5e85b66aa56_124025_800.mp4");
+	public ResultBean flash(int id, Params params) {
+		String vId=params.getString("vId");
+		int rate=params.getInt("rate");
+		String url=vodIpsServer.getFlashPlayUrl(vId, rate);
+		ResultBean rb = new ResultBean();
+		Map map = new HashMap();
+		map.put("location",url);
 		rb.setData(map);
 		rb.setErrorCode("0");
 		rb.setErrorMessage("成功");
-package com.cnlive.mz.live.action;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import org.smart4j.framework.ioc.annotation.Inject;
-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.Result;
-import org.smart4j.framework.mvc.bean.View;
-
-import com.cnlive.mz.live.entity.TRoom;
-import com.cnlive.mz.live.service.SensitiveWordService;
-
-@Action
-public class WordAction {
-	
-	@Inject
-	private SensitiveWordService sensitiveWord;
-	
-	@Request.Post("/word/add")
-	public Result add(Params params){
-		Map  map = params.getFieldMap();
-		String str = (String) map.get("words");
-		str=str.replace(",", ",3.");
-		str=str+",3.";
-		return new Result(sensitiveWord.add(str));
-	}
-	
-	@Request.Get("/word/list")
-	public View list(){
-		View view = new View("word/word_management.jsp");
-		List<String> str = sensitiveWord.list();
-		view.data("str", str);
-		return view;
-	}
-}
+package com.cnlive.mz.live.action;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.smart4j.framework.ioc.annotation.Inject;
+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.Result;
+import org.smart4j.framework.mvc.bean.View;
+
+import com.cnlive.mz.live.entity.TRoom;
+import com.cnlive.mz.live.service.SensitiveWordService;
+
+@Action
+public class WordAction {
+	
+	@Inject
+	private SensitiveWordService sensitiveWord;
+	
+	@Request.Post("/word/add")
+	public Result add(Params params){
+		Map  map = params.getFieldMap();
+		String str = (String) map.get("words");
+		str=str.replace(",", ",3.");
+		str=str+",3.";
+		return new Result(sensitiveWord.add(str));
+	}
+	
+	@Request.Get("/word/list")
+	public View list(){
+		View view = new View("word/word_management.jsp");
+		List<String> str = sensitiveWord.list();
+		view.data("str", str);
+		return view;
+	}
+}
-package com.cnlive.mz.live.aspect;
-
-import java.io.IOException;
-
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.annotation.WebFilter;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-
-import org.smart4j.framework.core.ConfigHelper;
-
-import com.cnlive.mz.live.common.LiveUtils;
-
-/*
- * 
-
- 属性                                                是否必须                              说明
- asyncSupported        否				 该Filter是否支持异步操作模式
- dispatcherType        否    			 指定Filter对那种dispatcher模式进行过滤 该属性支持 Async,Error Forward,include,request 
- displayName           否				 File 显示的名称
- filterName            是				Filter的名称
- initParams		                 否				Filter的配置参数
- servletNames          否                                  可以指定多个,表示对这几个特定的的serlet 进行过滤
- urlPatterns/value     否 				指定 Filter拦截的 URL
-
-
-
-
- @WebFilter(filterName="log",urlPatterns={"/*"})*/
-@WebFilter(filterName = "AuthFilter", urlPatterns = { "/activity/*", "/channel/*", "/signal/*", "/index/*",
-		"/switch/*", "/doswitch/*", "/wowza/*" })
-public class AuthFilter implements Filter {
-
-	private FilterConfig config;
-
-	@Override
-	public void destroy() {
-		this.config = null;
-	}
-
-	@Override
-	public void doFilter(ServletRequest arg0, ServletResponse arg1, FilterChain chain) throws IOException,
-			ServletException {
-		HttpServletRequest request = (HttpServletRequest) arg0;
-		HttpServletResponse response = (HttpServletResponse) arg1;
-		String requestUrl = request.getRequestURI();
-		HttpSession session = request.getSession();
-		String webUrl =  ConfigHelper.getString("website.url");
-		String a=(String) session.getAttribute(LiveUtils.SESSION_KEY_NAME) ;
-		if (a== null) {
-			boolean authEnable = ConfigHelper.getBoolean("auth.enable");
-			String loginUrl = ConfigHelper.getString("auth.login.url");
-			if (authEnable) {
-				//去登录认证
-				String url=loginUrl + webUrl+"/login/success";
-				response.sendRedirect(url);
-				return;
-			} else {
-				String userName = "liujicheng";
-				request.getSession().setAttribute(LiveUtils.SESSION_KEY_NAME, userName);
-				request.getSession().setAttribute(LiveUtils.SESSION_KEY_ID, 1);
-			}
-		} else {
-			chain.doFilter(arg0, arg1);
-		}
-		// 验证用户是否是退出，进行sessioin销毁
-		if (requestUrl.contains("logout")) {
-			String logoutUrl = ConfigHelper.getString("auth.logout.url");
-			session.removeAttribute(LiveUtils.SESSION_KEY_NAME);
-			session.removeAttribute(LiveUtils.SESSION_KEY_ID);
-			session.invalidate();
-			response.sendRedirect(logoutUrl);
-		}
-	}
-
-	@Override
-	public void init(FilterConfig config) throws ServletException {
-		this.config = config;
-	}
-
-}
+package com.cnlive.mz.live.aspect;
+
+import java.io.IOException;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.annotation.WebFilter;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.smart4j.framework.core.ConfigHelper;
+
+import com.cnlive.mz.live.common.LiveUtils;
+
+/*
+ * 
+
+ 属性                                                是否必须                              说明
+ asyncSupported        否				 该Filter是否支持异步操作模式
+ dispatcherType        否    			 指定Filter对那种dispatcher模式进行过滤 该属性支持 Async,Error Forward,include,request 
+ displayName           否				 File 显示的名称
+ filterName            是				Filter的名称
+ initParams		                 否				Filter的配置参数
+ servletNames          否                                  可以指定多个,表示对这几个特定的的serlet 进行过滤
+ urlPatterns/value     否 				指定 Filter拦截的 URL
+
+
+
+
+ @WebFilter(filterName="log",urlPatterns={"/*"})*/
+@WebFilter(filterName = "AuthFilter", urlPatterns = { "/activity/*", "/channel/*", "/signal/*", "/index/*",
+		"/switch/*", "/doswitch/*", "/wowza/*" })
+public class AuthFilter implements Filter {
+
+	private FilterConfig config;
+
+	@Override
+	public void destroy() {
+		this.config = null;
+	}
+
+	@Override
+	public void doFilter(ServletRequest arg0, ServletResponse arg1, FilterChain chain) throws IOException,
+			ServletException {
+		HttpServletRequest request = (HttpServletRequest) arg0;
+		HttpServletResponse response = (HttpServletResponse) arg1;
+		String requestUrl = request.getRequestURI();
+		HttpSession session = request.getSession();
+		String webUrl =  ConfigHelper.getString("website.url");
+		String a=(String) session.getAttribute(LiveUtils.SESSION_KEY_NAME) ;
+		if (a== null) {
+			boolean authEnable = ConfigHelper.getBoolean("auth.enable");
+			String loginUrl = ConfigHelper.getString("auth.login.url");
+			if (authEnable) {
+				//去登录认证
+				String url=loginUrl + webUrl+"/login/success";
+				response.sendRedirect(url);
+				return;
+			} else {
+				String userName = "liujicheng";
+				request.getSession().setAttribute(LiveUtils.SESSION_KEY_NAME, userName);
+				request.getSession().setAttribute(LiveUtils.SESSION_KEY_ID, 1);
+			}
+		} else {
+			chain.doFilter(arg0, arg1);
+		}
+		// 验证用户是否是退出，进行sessioin销毁
+		if (requestUrl.contains("logout")) {
+			String logoutUrl = ConfigHelper.getString("auth.logout.url");
+			session.removeAttribute(LiveUtils.SESSION_KEY_NAME);
+			session.removeAttribute(LiveUtils.SESSION_KEY_ID);
+			session.invalidate();
+			response.sendRedirect(logoutUrl);
+		}
+	}
+
+	@Override
+	public void init(FilterConfig config) throws ServletException {
+		this.config = config;
+	}
+
+}
-package com.cnlive.mz.live.rest;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.PrintWriter;
-import java.io.UnsupportedEncodingException;
-import java.net.URL;
-import java.net.URLConnection;
-import java.security.MessageDigest;
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.Locale;
-import java.util.UUID;
-
-import javax.crypto.Mac;
-import javax.crypto.spec.SecretKeySpec;
-
-import org.apache.commons.codec.binary.Base64;
-
-import com.cnlive.mz.commons.net.HttpReq;
-
-import sun.misc.BASE64Encoder;
-
-public class BaseUtil {
-
-	private static final String ENCODING = "UTF-8";
-
-	// AccessKey、SecretKey
-	private static final String SECRET_KEY = "UIWPYVeaV8kq2vWImDkLBvWs/pwmTJVF9MCNHDsC";
-	private static final String ACCESS_KEY = "fWUN8KDtJZJGo0ArQ4qo";
-
-	/*
-	 * 计算MD5+BASE64
-	 */
-	public static String MD5Base64(String s) {
-		if (s == null)
-			return null;
-		String encodeStr = "";
-		byte[] utfBytes = s.getBytes();
-		MessageDigest mdTemp;
-		try {
-			mdTemp = MessageDigest.getInstance("MD5");
-			mdTemp.update(utfBytes);
-			byte[] md5Bytes = mdTemp.digest();
-			BASE64Encoder b64Encoder = new BASE64Encoder();
-			encodeStr = b64Encoder.encode(md5Bytes);
-		} catch (Exception e) {
-			throw new Error("Failed to generate MD5 : " + e.getMessage());
-		}
-		return encodeStr;
-	}
-
-	/*
-	 * 哈希计算 HMAC-SHA1 base64
-	 */
-	public static String HMACSha1(String data, String key) {
-		String result;
-		try {
-			SecretKeySpec signingKey = new SecretKeySpec(key.getBytes(), "HmacSHA1");
-			Mac mac = Mac.getInstance("HmacSHA1");
-			mac.init(signingKey);
-			byte[] rawHmac = mac.doFinal(data.getBytes());
-			// result = new String(Base64.encodeBase64(rawHmac, false), ENCODING);
-			// result = (new BASE64Encoder()).encode(rawHmac);
-			result = new String(Base64.encodeBase64(rawHmac), ENCODING);
-		} catch (Exception e) {
-			throw new Error("Failed to generate HMAC : " + e.getMessage());
-		}
-		return result;
-	}
-
-	/**
-	 * 获取当前前一天的时间戳
-	 * 
-	 * @return
-	 */
-	public static String getTimestamp() {
-		DateFormat df = new SimpleDateFormat("yyyyMMdd");
-		Date date = null;
-		try {
-			Calendar calendar = Calendar.getInstance();
-			calendar.add(Calendar.DATE, +1);
-			SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
-			String motoday = sdf.format(calendar.getTime());
-			date = df.parse(motoday);
-		} catch (ParseException e) {
-			e.printStackTrace();
-		}
-		Calendar cal = Calendar.getInstance();
-		cal.setTime(date);
-		long timestamp = cal.getTimeInMillis();
-		System.out.println("------timestamp-----" + timestamp);
-		return String.valueOf(timestamp);
-
-	}
-
-	/**
-	 * 签名算法:signature 字符串格式，由三部分组成：GET+”\n”+Expire+”\n”+Resource 2016 0602171212
-	 * 
-	 * @return
-	 * @throws UnsupportedEncodingException
-	 */
-	public static String signature(String streamName) throws UnsupportedEncodingException {
-
-		String method = "GET";
-		String expire = BaseUtil.getTimestamp();
-		String app = "live";
-		String methodadd = "add";
-		String name = streamName;
-		app = java.net.URLEncoder.encode(app, "utf-8");
-		methodadd = java.net.URLEncoder.encode(methodadd, "utf-8");
-		name = java.net.URLEncoder.encode(name, "utf-8");
-		System.out.println(expire + "---expire----");
-		String Resource = "app=" + app + "&method=" + methodadd + "&name=" + name;
-		// Resource = java.net.URLEncoder.encode(Resource, "utf-8");
-		String stringToSign = method + "\n" + expire + "\n" + Resource;
-		System.out.println("--stringToSign--" + stringToSign);
-		// 2.计算 HMAC-SHA1
-		String signature = HMACSha1(stringToSign, SECRET_KEY);
-		System.out.println("---signature---" + signature);
-		signature = java.net.URLEncoder.encode(signature, "utf-8");
-		return signature;
-	}
-
-	public static String signature(String methodName, String streamName) throws UnsupportedEncodingException {
-
-		String method = "GET";
-		String expire = BaseUtil.getTimestamp();
-		String app = "live";
-		app = java.net.URLEncoder.encode(app, "utf-8");
-		methodName = java.net.URLEncoder.encode(methodName, "utf-8");
-		streamName = java.net.URLEncoder.encode(streamName, "utf-8");
-		System.out.println(expire + "---expire----");
-		String Resource = "app=" + app + "&method=" + methodName + "&name=" + streamName;
-		// Resource = java.net.URLEncoder.encode(Resource, "utf-8");
-		String stringToSign = method + "\n" + expire + "\n" + Resource;
-		System.out.println("--stringToSign--" + stringToSign);
-		// 2.计算 HMAC-SHA1
-		String signature = HMACSha1(stringToSign, SECRET_KEY);
-		System.out.println("---signature---" + signature);
-		signature = java.net.URLEncoder.encode(signature, "utf-8");
-		return signature;
-	}
-
-	public static String UUid() {
-
-		String uuid = UUID.randomUUID().toString();
-		uuid = uuid.replaceAll("-", "");
-		return uuid;
-	}
-
-	public static String getAccessKey() {
-		return ACCESS_KEY;
-	}
-
-	public static int random_7(int number) {
-		int x = (int) (Math.random() * 10);
-		for (int i = 0; i < number; i++) {
-			String num = Math.random() * 10 + "";
-		}
-		return x;
-	}
-
-	/*
-	 * 等同于javaScript中的 new Date().toUTCString();
-	 */
-	public static String toGMTString(Date date) {
-		SimpleDateFormat df = new SimpleDateFormat("E, dd MMM yyyy HH:mm:ss z", Locale.UK);
-		df.setTimeZone(new java.util.SimpleTimeZone(0, "GMT"));
-		return df.format(date);
-	}
-
-	/*
-	 * 发送POST请求
-	 */
-	public static String sendPost(String url, String body, String ak_id, String ak_secret) {
-		PrintWriter out = null;
-		BufferedReader in = null;
-		String result = "";
-		try {
-			URL realUrl = new URL(url);
-
-			/*
-			 * http header 参数
-			 */
-			String method = "POST";
-			String accept = "json";
-			String content_type = "application/json";
-			String path = realUrl.getFile();
-			String date = toGMTString(new Date());
-
-			// 1.对body做MD5+BASE64加密
-			String bodyMd5 = MD5Base64(body);
-			String stringToSign = method + "\n" + accept + "\n" + bodyMd5 + "\n" + content_type + "\n" + date + "\n"
-					+ path;
-			// 2.计算 HMAC-SHA1
-			String signature = HMACSha1(stringToSign, ak_secret);
-			// 3.得到 authorization header
-			String authHeader = "Dataplus " + ak_id + ":" + signature;
-
-			// 打开和URL之间的连接
-			URLConnection conn = realUrl.openConnection();
-			// 设置通用的请求属性
-			conn.setRequestProperty("accept", accept);
-			conn.setRequestProperty("content-type", content_type);
-			conn.setRequestProperty("date", date);
-			conn.setRequestProperty("Authorization", authHeader);
-			// 发送POST请求必须设置如下两行
-			conn.setDoOutput(true);
-			conn.setDoInput(true);
-			// 获取URLConnection对象对应的输出流
-			out = new PrintWriter(conn.getOutputStream());
-			// 发送请求参数
-			out.print(body);
-			// flush输出流的缓冲
-			out.flush();
-			// 定义BufferedReader输入流来读取URL的响应
-			in = new BufferedReader(new InputStreamReader(conn.getInputStream()));
-			String line;
-			while ((line = in.readLine()) != null) {
-				result += line;
-			}
-		} catch (Exception e) {
-			System.out.println("发送 POST 请求出现异常！" + e);
-			e.printStackTrace();
-		}
-		// 使用finally块来关闭输出流、输入流
-		finally {
-			try {
-				if (out != null) {
-					out.close();
-				}
-				if (in != null) {
-					in.close();
-				}
-			} catch (IOException ex) {
-				ex.printStackTrace();
-			}
-		}
-		return result;
-	}
-
-	/*
-	 * GET请求
-	 */
-
-	public static String sendGet(String url, String ak_id, String ak_secret) {
-		String result = "";
-		BufferedReader in = null;
-		try {
-			URL realUrl = new URL(url);
-			/*
-			 * http header 参数
-			 */
-			// String method = "GET";
-			// String Expire = "1436976000";
-			// String Resource =
-			// "nonce=4e1f2519c626cbfbab1520c255830c26&public=0&vdoid=12345";
-			// String content_type = "application/json";
-			// String path = realUrl.getFile();
-			// String date = toGMTString(new Date());
-			// // 1.对body做MD5+BASE64加密
-			// // String bodyMd5 = MD5Base64(body);
-			// String stringToSign = method + "\n" + Expire + "\n" + Resource;
-			// // 2.计算 HMAC-SHA1
-			// String signature = HMACSha1(stringToSign, ak_secret);
-			// // 3.得到 authorization header
-			// String authHeader = "Dataplus " + ak_id + ":" + signature;
-			// 打开和URL之间的连接
-			URLConnection connection = realUrl.openConnection();
-			// 设置通用的请求属性
-			// connection.setRequestProperty("accept", "json");
-			// connection.setRequestProperty("content-type", content_type);
-			// connection.setRequestProperty("date", date);
-			// connection.setRequestProperty("Authorization", authHeader);
-			// 建立实际的连接
-			connection.connect();
-			// 定义 BufferedReader输入流来读取URL的响应
-			in = new BufferedReader(new InputStreamReader(connection.getInputStream()));
-			String line;
-			while ((line = in.readLine()) != null) {
-				result += line;
-			}
-		} catch (Exception e) {
-			System.out.println("发送GET请求出现异常！" + e);
-			e.printStackTrace();
-		}
-		// 使用finally块来关闭输入流
-		finally {
-			try {
-				if (in != null) {
-					in.close();
-				}
-			} catch (Exception e) {
-				e.printStackTrace();
-			}
-		}
-		return result;
-	}
-
-	public static void main(String[] args) throws Exception {
-		// 发送POST请求示例
-		/*
-		 * String ak_id = "fWUN8KDtJZJGo0ArQ4qo"; // 用户ak String ak_secret =
-		 * "UIWPYVeaV8kq2vWImDkLBvWs/pwmTJVF9MCNHDsC"; // 用户ak_secret String url
-		 * = "https://kmr-cn-beijing.ksyun.com"; String body =
-		 * "{\"param1\": \"GET\n1436976000\nnonce=4e1f2519c626cbfbab1520c255830c26&public=0&vdoid=12345\", \"param2\":\"fWUN8KDtJZJGo0ArQ4qo\"}"
-		 * ; System.out.println("response body:" + sendPost(url, body, AK_ID,
-		 * AK_SECRET));
-		 */
-
-		Date date = new Date();
-		System.out.println(toGMTString(date));
-		String hh = HMACSha1("GET\n1436976124\nnonce=4e1f2519c626cbfbab1520c255830c26&public=1&vdoid=1",
-				"fWUN8KDtJZJGo0ArQ4qo");
-		String hhhh = MD5Base64(hh);
-		System.out.println(hh);
-		System.out.println("..............");
-
-		// String str = signature();
-		// System.out.println(str);//L2muBoImPzyvwyzfBtGXEu+wRNE=
-
-		// 发送GET请求
-		String url1 = "http://cnlive.dashboard.ks-cdn.com/blacklist?signature=iDPKaesXXW3A26CScNyjpNkzxZs%3D&accesskey=I3TC8a4xboPUMe5xlp22&expire=1483200000&app=live&method=add&stream=310166_863";
-		System.out.println("response body:" + sendGet(url1, ACCESS_KEY, SECRET_KEY));
-
-		// long d = getTimestamp();
-		// System.out.println(d);
-
-		// String str = signature();
-		// System.out.println(str);//L2muBoImPzyvwyzfBtGXEu+wRNE=
-		/*
-		 * // 发送GET请求 String ak_id1 = "fWUN8KDtJZJGo0ArQ4qo"; //用户ak String
-		 * ak_secret1 = "UIWPYVeaV8kq2vWImDkLBvWs/pwmTJVF9MCNHDsC"; //
-		 * 用户ak_secret String url1 =
-		 * "http://cnlive.uplive.ks-cdn.com?signature=L2muBoImPzyvwyzfBtGXEu+wRNE=&accesskey=fWUN8KDtJZJGo0ArQ4qo&expire=1436976000&method=add&app=live&name=498122_57";
-		 * System.out.println("response body:" +sendGet(url1, ak_id1,
-		 * ak_secret1));
-		 */
-		// long d = getTimestamp();
-		// System.out.println(d);
-
-	}
-}
+package com.cnlive.mz.live.rest;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.PrintWriter;
+import java.io.UnsupportedEncodingException;
+import java.net.URL;
+import java.net.URLConnection;
+import java.security.MessageDigest;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.Locale;
+import java.util.UUID;
+
+import javax.crypto.Mac;
+import javax.crypto.spec.SecretKeySpec;
+
+import org.apache.commons.codec.binary.Base64;
+
+import com.cnlive.mz.commons.net.HttpReq;
+
+import sun.misc.BASE64Encoder;
+
+public class BaseUtil {
+
+	private static final String ENCODING = "UTF-8";
+
+	// AccessKey、SecretKey
+	private static final String SECRET_KEY = "UIWPYVeaV8kq2vWImDkLBvWs/pwmTJVF9MCNHDsC";
+	private static final String ACCESS_KEY = "fWUN8KDtJZJGo0ArQ4qo";
+
+	/*
+	 * 计算MD5+BASE64
+	 */
+	public static String MD5Base64(String s) {
+		if (s == null)
+			return null;
+		String encodeStr = "";
+		byte[] utfBytes = s.getBytes();
+		MessageDigest mdTemp;
+		try {
+			mdTemp = MessageDigest.getInstance("MD5");
+			mdTemp.update(utfBytes);
+			byte[] md5Bytes = mdTemp.digest();
+			BASE64Encoder b64Encoder = new BASE64Encoder();
+			encodeStr = b64Encoder.encode(md5Bytes);
+		} catch (Exception e) {
+			throw new Error("Failed to generate MD5 : " + e.getMessage());
+		}
+		return encodeStr;
+	}
+
+	/*
+	 * 哈希计算 HMAC-SHA1 base64
+	 */
+	public static String HMACSha1(String data, String key) {
+		String result;
+		try {
+			SecretKeySpec signingKey = new SecretKeySpec(key.getBytes(), "HmacSHA1");
+			Mac mac = Mac.getInstance("HmacSHA1");
+			mac.init(signingKey);
+			byte[] rawHmac = mac.doFinal(data.getBytes());
+			// result = new String(Base64.encodeBase64(rawHmac, false), ENCODING);
+			// result = (new BASE64Encoder()).encode(rawHmac);
+			result = new String(Base64.encodeBase64(rawHmac), ENCODING);
+		} catch (Exception e) {
+			throw new Error("Failed to generate HMAC : " + e.getMessage());
+		}
+		return result;
+	}
+
+	/**
+	 * 获取当前前一天的时间戳
+	 * 
+	 * @return
+	 */
+	public static String getTimestamp() {
+		DateFormat df = new SimpleDateFormat("yyyyMMdd");
+		Date date = null;
+		try {
+			Calendar calendar = Calendar.getInstance();
+			calendar.add(Calendar.DATE, +1);
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+			String motoday = sdf.format(calendar.getTime());
+			date = df.parse(motoday);
+		} catch (ParseException e) {
+			e.printStackTrace();
+		}
+		Calendar cal = Calendar.getInstance();
+		cal.setTime(date);
+		long timestamp = cal.getTimeInMillis();
+		System.out.println("------timestamp-----" + timestamp);
+		return String.valueOf(timestamp);
+
+	}
+
+	/**
+	 * 签名算法:signature 字符串格式，由三部分组成：GET+”\n”+Expire+”\n”+Resource 2016 0602171212
+	 * 
+	 * @return
+	 * @throws UnsupportedEncodingException
+	 */
+	public static String signature(String streamName) throws UnsupportedEncodingException {
+
+		String method = "GET";
+		String expire = BaseUtil.getTimestamp();
+		String app = "live";
+		String methodadd = "add";
+		String name = streamName;
+		app = java.net.URLEncoder.encode(app, "utf-8");
+		methodadd = java.net.URLEncoder.encode(methodadd, "utf-8");
+		name = java.net.URLEncoder.encode(name, "utf-8");
+		System.out.println(expire + "---expire----");
+		String Resource = "app=" + app + "&method=" + methodadd + "&name=" + name;
+		// Resource = java.net.URLEncoder.encode(Resource, "utf-8");
+		String stringToSign = method + "\n" + expire + "\n" + Resource;
+		System.out.println("--stringToSign--" + stringToSign);
+		// 2.计算 HMAC-SHA1
+		String signature = HMACSha1(stringToSign, SECRET_KEY);
+		System.out.println("---signature---" + signature);
+		signature = java.net.URLEncoder.encode(signature, "utf-8");
+		return signature;
+	}
+
+	public static String signature(String methodName, String streamName) throws UnsupportedEncodingException {
+
+		String method = "GET";
+		String expire = BaseUtil.getTimestamp();
+		String app = "live";
+		app = java.net.URLEncoder.encode(app, "utf-8");
+		methodName = java.net.URLEncoder.encode(methodName, "utf-8");
+		streamName = java.net.URLEncoder.encode(streamName, "utf-8");
+		System.out.println(expire + "---expire----");
+		String Resource = "app=" + app + "&method=" + methodName + "&name=" + streamName;
+		// Resource = java.net.URLEncoder.encode(Resource, "utf-8");
+		String stringToSign = method + "\n" + expire + "\n" + Resource;
+		System.out.println("--stringToSign--" + stringToSign);
+		// 2.计算 HMAC-SHA1
+		String signature = HMACSha1(stringToSign, SECRET_KEY);
+		System.out.println("---signature---" + signature);
+		signature = java.net.URLEncoder.encode(signature, "utf-8");
+		return signature;
+	}
+
+	public static String UUid() {
+
+		String uuid = UUID.randomUUID().toString();
+		uuid = uuid.replaceAll("-", "");
+		return uuid;
+	}
+
+	public static String getAccessKey() {
+		return ACCESS_KEY;
+	}
+
+	public static int random_7(int number) {
+		int x = (int) (Math.random() * 10);
+		for (int i = 0; i < number; i++) {
+			String num = Math.random() * 10 + "";
+		}
+		return x;
+	}
+
+	/*
+	 * 等同于javaScript中的 new Date().toUTCString();
+	 */
+	public static String toGMTString(Date date) {
+		SimpleDateFormat df = new SimpleDateFormat("E, dd MMM yyyy HH:mm:ss z", Locale.UK);
+		df.setTimeZone(new java.util.SimpleTimeZone(0, "GMT"));
+		return df.format(date);
+	}
+
+	/*
+	 * 发送POST请求
+	 */
+	public static String sendPost(String url, String body, String ak_id, String ak_secret) {
+		PrintWriter out = null;
+		BufferedReader in = null;
+		String result = "";
+		try {
+			URL realUrl = new URL(url);
+
+			/*
+			 * http header 参数
+			 */
+			String method = "POST";
+			String accept = "json";
+			String content_type = "application/json";
+			String path = realUrl.getFile();
+			String date = toGMTString(new Date());
+
+			// 1.对body做MD5+BASE64加密
+			String bodyMd5 = MD5Base64(body);
+			String stringToSign = method + "\n" + accept + "\n" + bodyMd5 + "\n" + content_type + "\n" + date + "\n"
+					+ path;
+			// 2.计算 HMAC-SHA1
+			String signature = HMACSha1(stringToSign, ak_secret);
+			// 3.得到 authorization header
+			String authHeader = "Dataplus " + ak_id + ":" + signature;
+
+			// 打开和URL之间的连接
+			URLConnection conn = realUrl.openConnection();
+			// 设置通用的请求属性
+			conn.setRequestProperty("accept", accept);
+			conn.setRequestProperty("content-type", content_type);
+			conn.setRequestProperty("date", date);
+			conn.setRequestProperty("Authorization", authHeader);
+			// 发送POST请求必须设置如下两行
+			conn.setDoOutput(true);
+			conn.setDoInput(true);
+			// 获取URLConnection对象对应的输出流
+			out = new PrintWriter(conn.getOutputStream());
+			// 发送请求参数
+			out.print(body);
+			// flush输出流的缓冲
+			out.flush();
+			// 定义BufferedReader输入流来读取URL的响应
+			in = new BufferedReader(new InputStreamReader(conn.getInputStream()));
+			String line;
+			while ((line = in.readLine()) != null) {
+				result += line;
+			}
+		} catch (Exception e) {
+			System.out.println("发送 POST 请求出现异常！" + e);
+			e.printStackTrace();
+		}
+		// 使用finally块来关闭输出流、输入流
+		finally {
+			try {
+				if (out != null) {
+					out.close();
+				}
+				if (in != null) {
+					in.close();
+				}
+			} catch (IOException ex) {
+				ex.printStackTrace();
+			}
+		}
+		return result;
+	}
+
+	/*
+	 * GET请求
+	 */
+
+	public static String sendGet(String url, String ak_id, String ak_secret) {
+		String result = "";
+		BufferedReader in = null;
+		try {
+			URL realUrl = new URL(url);
+			/*
+			 * http header 参数
+			 */
+			// String method = "GET";
+			// String Expire = "1436976000";
+			// String Resource =
+			// "nonce=4e1f2519c626cbfbab1520c255830c26&public=0&vdoid=12345";
+			// String content_type = "application/json";
+			// String path = realUrl.getFile();
+			// String date = toGMTString(new Date());
+			// // 1.对body做MD5+BASE64加密
+			// // String bodyMd5 = MD5Base64(body);
+			// String stringToSign = method + "\n" + Expire + "\n" + Resource;
+			// // 2.计算 HMAC-SHA1
+			// String signature = HMACSha1(stringToSign, ak_secret);
+			// // 3.得到 authorization header
+			// String authHeader = "Dataplus " + ak_id + ":" + signature;
+			// 打开和URL之间的连接
+			URLConnection connection = realUrl.openConnection();
+			// 设置通用的请求属性
+			// connection.setRequestProperty("accept", "json");
+			// connection.setRequestProperty("content-type", content_type);
+			// connection.setRequestProperty("date", date);
+			// connection.setRequestProperty("Authorization", authHeader);
+			// 建立实际的连接
+			connection.connect();
+			// 定义 BufferedReader输入流来读取URL的响应
+			in = new BufferedReader(new InputStreamReader(connection.getInputStream()));
+			String line;
+			while ((line = in.readLine()) != null) {
+				result += line;
+			}
+		} catch (Exception e) {
+			System.out.println("发送GET请求出现异常！" + e);
+			e.printStackTrace();
+		}
+		// 使用finally块来关闭输入流
+		finally {
+			try {
+				if (in != null) {
+					in.close();
+				}
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+		}
+		return result;
+	}
+
+	public static void main(String[] args) throws Exception {
+		// 发送POST请求示例
+		/*
+		 * String ak_id = "fWUN8KDtJZJGo0ArQ4qo"; // 用户ak String ak_secret =
+		 * "UIWPYVeaV8kq2vWImDkLBvWs/pwmTJVF9MCNHDsC"; // 用户ak_secret String url
+		 * = "https://kmr-cn-beijing.ksyun.com"; String body =
+		 * "{\"param1\": \"GET\n1436976000\nnonce=4e1f2519c626cbfbab1520c255830c26&public=0&vdoid=12345\", \"param2\":\"fWUN8KDtJZJGo0ArQ4qo\"}"
+		 * ; System.out.println("response body:" + sendPost(url, body, AK_ID,
+		 * AK_SECRET));
+		 */
+
+		Date date = new Date();
+		System.out.println(toGMTString(date));
+		String hh = HMACSha1("GET\n1436976124\nnonce=4e1f2519c626cbfbab1520c255830c26&public=1&vdoid=1",
+				"fWUN8KDtJZJGo0ArQ4qo");
+		String hhhh = MD5Base64(hh);
+		System.out.println(hh);
+		System.out.println("..............");
+
+		// String str = signature();
+		// System.out.println(str);//L2muBoImPzyvwyzfBtGXEu+wRNE=
+
+		// 发送GET请求
+		String url1 = "http://cnlive.dashboard.ks-cdn.com/blacklist?signature=iDPKaesXXW3A26CScNyjpNkzxZs%3D&accesskey=I3TC8a4xboPUMe5xlp22&expire=1483200000&app=live&method=add&stream=310166_863";
+		System.out.println("response body:" + sendGet(url1, ACCESS_KEY, SECRET_KEY));
+
+		// long d = getTimestamp();
+		// System.out.println(d);
+
+		// String str = signature();
+		// System.out.println(str);//L2muBoImPzyvwyzfBtGXEu+wRNE=
+		/*
+		 * // 发送GET请求 String ak_id1 = "fWUN8KDtJZJGo0ArQ4qo"; //用户ak String
+		 * ak_secret1 = "UIWPYVeaV8kq2vWImDkLBvWs/pwmTJVF9MCNHDsC"; //
+		 * 用户ak_secret String url1 =
+		 * "http://cnlive.uplive.ks-cdn.com?signature=L2muBoImPzyvwyzfBtGXEu+wRNE=&accesskey=fWUN8KDtJZJGo0ArQ4qo&expire=1436976000&method=add&app=live&name=498122_57";
+		 * System.out.println("response body:" +sendGet(url1, ak_id1,
+		 * ak_secret1));
+		 */
+		// long d = getTimestamp();
+		// System.out.println(d);
+
+	}
+}
+package com.cnlive.mz.live.servlet;
+
+import java.io.IOException;
+
+import javax.servlet.Servlet;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import com.cnlive.socket.SocketServer;
+
+/**
+ * Servlet implementation class InitServlet
+ */
+@WebServlet(name = "initServlet", urlPatterns = { "/initServlet" })
+public class InitServlet extends HttpServlet {
+	private static final long serialVersionUID = 1L;
+       
+    /**
+     * @see HttpServlet#HttpServlet()
+     */
+    public InitServlet() {
+        super();
+        // TODO Auto-generated constructor stub
+    }
+
+	/**
+	 * @see Servlet#init(ServletConfig)
+	 */
+	public void init(ServletConfig config) throws ServletException {
+		System.out.println("kaishi.......init");
+		    int port = 65432;  
+		    SocketServer server = new SocketServer(port);  
+	        server.start();  
+	}
+
+	/**
+	 * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response)
+	 */
+	protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+		// TODO Auto-generated method stub
+		response.getWriter().append("Served at: ").append(request.getContextPath());
+	}
+
+	/**
+	 * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response)
+	 */
+	protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+		// TODO Auto-generated method stub
+		doGet(request, response);
+	}
+
+}
+package com.cnlive.socket;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.OutputStream;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.util.concurrent.ConcurrentHashMap;
+
+public class SocketServer {
+
+	/** 
+     * 要处理客户端发来的对象，并返回一个对象，可实现该接口。 
+     */  
+    public interface ObjectAction{  
+        Object doAction(Object rev);  
+    }  
+      
+    /*public static final class DefaultObjectAction implements ObjectAction{  
+        public Object doAction(Object rev) {  
+            System.out.println("处理并返回："+rev);  
+            return rev;  
+        }  
+    }  */
+      
+    public static void main(String[] args) {  
+        int port = 65432;  
+        SocketServer server = new SocketServer(port);  
+        server.start();  
+    }  
+      
+    private int port;  
+    private volatile boolean running=false;  
+    private long receiveTimeDelay=7000;  
+    private ConcurrentHashMap<Class, ObjectAction> actionMapping = new ConcurrentHashMap<Class,ObjectAction>();  
+    private Thread connWatchDog;  
+      
+    public SocketServer(int port) {  
+        this.port = port;  
+    }  
+  
+    public void start(){  
+        if(running)return;  
+        running=true;  
+        connWatchDog = new Thread(new ConnWatchDog());  
+        connWatchDog.start();  
+    }  
+      
+    @SuppressWarnings("deprecation")  
+    public void stop(){  
+        if(running)running=false;  
+        if(connWatchDog!=null)connWatchDog.stop();  
+    }  
+      
+    public void addActionMap(Class<Object> cls,ObjectAction action){  
+        actionMapping.put(cls, action);  
+    }  
+      
+    class ConnWatchDog implements Runnable{  
+        public void run(){  
+            try {  
+                ServerSocket ss = new ServerSocket(port,5);  
+                while(running){  
+                	System.out.println("等待客服端。。。");
+                    Socket s = ss.accept();  
+                    new Thread(new SocketAction(s)).start();  
+                }  
+            } catch (IOException e) {  
+                e.printStackTrace();  
+                SocketServer.this.stop();  
+            }  
+              
+        }  
+    }  
+      
+    class SocketAction implements Runnable{  
+        Socket s;  
+        boolean run=true;  
+        long lastReceiveTime = System.currentTimeMillis(); 
+        public SocketAction(Socket s) {  
+            this.s = s;  
+        }  
+        public void run() {  
+            while(running && run){ 
+            	try {
+					Thread.sleep(3000);
+				} catch (InterruptedException e1) {
+					// TODO Auto-generated catch block
+					e1.printStackTrace();
+				}
+                    try {  
+                        InputStream in = s.getInputStream();  
+              	        OutputStream out = s.getOutputStream();
+              	      byte[] recData = null;
+              	      while(true) {
+              	        recData = new byte[1024];
+              	        int r = in.read(recData);
+              	      if(r>-1) {
+            	          String data = new String(recData);
+            	         /* if(data.trim().equals("over")) {
+            	            s.close();
+            	            break;
+            	          }*/
+            	          System.out.println("读取到客户端发送的来数据："+data);
+              	      }
+              	      }
+                       /* if(in.available()>0){  
+                        		 BufferedReader br = new BufferedReader(new InputStreamReader(in));  
+                        	     //out = new PrintWriter(socket.getOutputStream(), true);  
+                        	     String line = br.readLine();  
+                        	     System.out.println("you input is : " + line);  
+                        	     //out.println("you input is :" + line);  
+                        	     //out.close();  
+                        	    // in.close(); 
+                        }*/
+                            /*ObjectInputStream ois = new ObjectInputStream(in);  
+                            Object obj = ois.readObject();  
+                            lastReceiveTime = System.currentTimeMillis();  
+                            System.out.println("接收：\t"+obj);  
+                            ObjectAction oa = actionMapping.get(obj.getClass());  
+                            oa = oa==null?new DefaultObjectAction():oa;  
+                            Object out = oa.doAction(obj);  
+                            if(out!=null){  
+                                ObjectOutputStream oos = new ObjectOutputStream(s.getOutputStream());  
+                                oos.writeObject(out);  
+                                oos.flush();  
+                            }  */
+                    } catch (Exception e) {  
+                    	System.out.println(System.currentTimeMillis()-lastReceiveTime);
+                        e.printStackTrace();  
+                        overThis();  
+                    }   
+                }  
+            }  
+          
+        private void overThis() {  
+            if(run)run=false;  
+            if(s!=null){  
+                try {  
+                    s.close();  
+                } catch (IOException e) {  
+                    e.printStackTrace();  
+                }  
+            }  
+            System.out.println("关闭："+s.getRemoteSocketAddress());  
+        }  
+          
+    }  
+}
-log4j.rootLogger=INFO,console,file,action,content,video,httpreq
-#Console  
-log4j.appender.console.Target=System.out 
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.ConversionPattern=%m%n
-
-
-log4j.appender.file=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.file.File=${catalina.home}/logs/cnlive_live_web/log
-log4j.appender.file.DatePattern='_'yyyyMMdd
-log4j.appender.file.encoding=UTF-8
-log4j.appender.file.layout=org.apache.log4j.PatternLayout
-log4j.appender.file.layout.ConversionPattern=%d{HH:mm:ss,SSS} %p %c (%L) - %m%n
-
-#log4j.logger.org.apache=ERROR
-log4j.logger.org.smart4j=DEBUG
-
-
-#action
-
-log4j.appender.action=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.action.File=${catalina.home}/logs/action.log
-log4j.appender.action.layout=org.apache.log4j.PatternLayout
-log4j.appender.action.layout.ConversionPattern=[%d{yyyy-MM-dd HH:mm:ss}] %5p [%t] %C{1} - %m%n
-log4j.appender.action.DatePattern='.'yyyy-MM-dd
-log4j.appender.action.Encoding=UTF-8
-
-#content
-log4j.appender.content=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.content.File=${catalina.home}/logs/content.log
-log4j.appender.content.layout=org.apache.log4j.PatternLayout
-log4j.appender.content.layout.ConversionPattern=[%d{yyyy-MM-dd HH:mm:ss}] %5p [%t] %C{1} - %m%n
-log4j.appender.content.DatePattern='.'yyyy-MM-dd
-log4j.appender.content.Encoding=UTF-8
-
-
-
-#video
-log4j.appender.video=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.video.File=${catalina.home}/logs/video.log
-log4j.appender.video.layout=org.apache.log4j.PatternLayout
-log4j.appender.video.layout.ConversionPattern=[%d{yyyy-MM-dd HH:mm:ss}] %5p [%t] %C{1} - %m%n
-log4j.appender.video.DatePattern='.'yyyy-MM-dd
-log4j.appender.video.Encoding=UTF-8
-
-
-
-#httpreq
-log4j.appender.httpreq=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.httpreq.File=${catalina.home}/logs/httpreq.log
-log4j.appender.httpreq.layout=org.apache.log4j.PatternLayout
-log4j.appender.httpreq.layout.ConversionPattern=[%d{yyyy-MM-dd HH:mm:ss}] %5p [%t] %C{1} - %m%n
-log4j.appender.httpreq.DatePattern='.'yyyy-MM-dd
-log4j.appender.httpreq.Encoding=UTF-8
-
-
-#log4j.logger.com.ksyun.ks3=DEBUG,stdout
-#log4j.logger.org.apache.http=DEBUG,stdout
-#log4j.logger.org.apache.http.wire=ERROR,stdout
-
-#log4j.addivity.org.apache=true
-#log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-#log4j.appender.stdout.Target=System.out
-#log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.rootLogger=INFO,console,file,action,content,video,httpreq
+#Console  
+log4j.appender.console.Target=System.out 
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+log4j.appender.console.layout.ConversionPattern=%m%n
+
+
+log4j.appender.file=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.file.File=${catalina.home}/logs/cnlive_live_web/log
+log4j.appender.file.DatePattern='_'yyyyMMdd
+log4j.appender.file.encoding=UTF-8
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=%d{HH:mm:ss,SSS} %p %c (%L) - %m%n
+
+#log4j.logger.org.apache=ERROR
+log4j.logger.org.smart4j=DEBUG
+
+
+#action
+
+log4j.appender.action=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.action.File=${catalina.home}/logs/action.log
+log4j.appender.action.layout=org.apache.log4j.PatternLayout
+log4j.appender.action.layout.ConversionPattern=[%d{yyyy-MM-dd HH:mm:ss}] %5p [%t] %C{1} - %m%n
+log4j.appender.action.DatePattern='.'yyyy-MM-dd
+log4j.appender.action.Encoding=UTF-8
+
+#content
+log4j.appender.content=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.content.File=${catalina.home}/logs/content.log
+log4j.appender.content.layout=org.apache.log4j.PatternLayout
+log4j.appender.content.layout.ConversionPattern=[%d{yyyy-MM-dd HH:mm:ss}] %5p [%t] %C{1} - %m%n
+log4j.appender.content.DatePattern='.'yyyy-MM-dd
+log4j.appender.content.Encoding=UTF-8
+
+
+
+#video
+log4j.appender.video=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.video.File=${catalina.home}/logs/video.log
+log4j.appender.video.layout=org.apache.log4j.PatternLayout
+log4j.appender.video.layout.ConversionPattern=[%d{yyyy-MM-dd HH:mm:ss}] %5p [%t] %C{1} - %m%n
+log4j.appender.video.DatePattern='.'yyyy-MM-dd
+log4j.appender.video.Encoding=UTF-8
+
+
+
+#httpreq
+log4j.appender.httpreq=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.httpreq.File=${catalina.home}/logs/httpreq.log
+log4j.appender.httpreq.layout=org.apache.log4j.PatternLayout
+log4j.appender.httpreq.layout.ConversionPattern=[%d{yyyy-MM-dd HH:mm:ss}] %5p [%t] %C{1} - %m%n
+log4j.appender.httpreq.DatePattern='.'yyyy-MM-dd
+log4j.appender.httpreq.Encoding=UTF-8
+
+
+#log4j.logger.com.ksyun.ks3=DEBUG,stdout
+#log4j.logger.org.apache.http=DEBUG,stdout
+#log4j.logger.org.apache.http.wire=ERROR,stdout
+
+#log4j.addivity.org.apache=true
+#log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+#log4j.appender.stdout.Target=System.out
+#log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
 #log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss SSS} %-5p [%t]%C{1}.%M(%L) - %m%n
 \ No newline at end of file
-smart.framework.app.base_package=com.cnlive.mz.live
-smart.framework.app.home_page=/index
-smart.framework.app.www_path=/static/
-smart.framework.app.jsp_path=/pages/
-smart.framework.custom.ds_factory=org.smart4j.plugin.dbcp.DbcpDataSourceFactory
-
-
-smart.framework.jdbc.type=mysql
-smart.framework.jdbc.driver=com.mysql.jdbc.Driver
-#smart.framework.jdbc.url=jdbc:mysql://124.193.218.90:3306/cnlive_live?autoReconnect=true&failOverReadOnly=false
-#smart.framework.jdbc.username=cnlive_oa
-#smart.framework.jdbc.password=H8rf#_3@ccx9(
-
-smart.framework.jdbc.url=jdbc:mysql://123.59.27.186:23306/cnlive_live?autoReconnect=true&failOverReadOnly=false
-smart.framework.jdbc.username=ugc
-smart.framework.jdbc.password=liujicheng@cnlive.COM
-
-
-#smart.framework.jdbc.url=jdbc:mysql://localhost:3306/cnlive_live?autoReconnect=true&failOverReadOnly=false
-#smart.framework.jdbc.username=root
-#smart.framework.jdbc.password=root
-
-#
-smart.plugin.i18n.reloadable=true
-smart.plugin.rest.log=true
-smart.plugin.rest.jsonp=true
-smart.plugin.rest.jsonp.function=callback
-
-#smart.plugin.security.realms=custom
-#smart.plugin.security.custom.class=org.smart4j.sample.CustomSmartSecurity
-#smart.plugin.security.cacheable=true
-
-sample.upload_path=/www/upload/
-
-mail.template_path=D:/apache-tomcat-7.0.61/webapps/cnlive_live_web/pages/mail.html
-website.url=http://localhost:8080/cnlive_live_web/
-auth.enable=true
-auth.login.url=http://sso.staff.cnlive.com/CnliveSSO/login?from=mam-live&callbackUrl=
-auth.logout.url=http://sso.staff.cnlive.com/CnliveSSO/logOut?from=mam-live&callbackUrl=
-auth.userinfo.url=http://sso.staff.cnlive.com/CnliveSSO/getUserInfo?username=
- 
+smart.framework.app.base_package=com.cnlive.mz.live
+smart.framework.app.home_page=/index
+smart.framework.app.www_path=/static/
+smart.framework.app.jsp_path=/pages/
+smart.framework.custom.ds_factory=org.smart4j.plugin.dbcp.DbcpDataSourceFactory
+
+
+smart.framework.jdbc.type=mysql
+smart.framework.jdbc.driver=com.mysql.jdbc.Driver
+#smart.framework.jdbc.url=jdbc:mysql://124.193.218.90:3306/cnlive_live?autoReconnect=true&failOverReadOnly=false
+#smart.framework.jdbc.username=cnlive_oa
+#smart.framework.jdbc.password=H8rf#_3@ccx9(
+
+smart.framework.jdbc.url=jdbc:mysql://123.59.27.186:23306/cnlive_live?autoReconnect=true&failOverReadOnly=false
+smart.framework.jdbc.username=ugc
+smart.framework.jdbc.password=liujicheng@cnlive.COM
+
+
+#smart.framework.jdbc.url=jdbc:mysql://localhost:3306/cnlive_live?autoReconnect=true&failOverReadOnly=false
+#smart.framework.jdbc.username=root
+#smart.framework.jdbc.password=root
+
+#
+smart.plugin.i18n.reloadable=true
+smart.plugin.rest.log=true
+smart.plugin.rest.jsonp=true
+smart.plugin.rest.jsonp.function=callback
+
+#smart.plugin.security.realms=custom
+#smart.plugin.security.custom.class=org.smart4j.sample.CustomSmartSecurity
+#smart.plugin.security.cacheable=true
+
+sample.upload_path=/www/upload/
+
+mail.template_path=D:/apache-tomcat-7.0.61/webapps/cnlive_live_web/pages/mail.html
+website.url=http://localhost:8080/cnlive_live_web/
+auth.enable=true
+auth.login.url=http://sso.staff.cnlive.com/CnliveSSO/login?from=mam-live&callbackUrl=
+auth.logout.url=http://sso.staff.cnlive.com/CnliveSSO/logOut?from=mam-live&callbackUrl=
+auth.userinfo.url=http://sso.staff.cnlive.com/CnliveSSO/getUserInfo?username=
+ 
  
 \ No newline at end of file
+# file stored repository (Chinese words need ASCII, help tool @http://tool.oschina.net/encode?type=3)
+STREAM_FILE_REPOSITORY=
+
+# when the file has uploaded, whether delete it.
+STREAM_DELETE_FINISH=false
+
+# this server whether allow other different domain[s] upload file to this server
+STREAM_IS_CROSS=false
+
+# allowed domain (PS: flash method need modifying the `crossdomain.xml`)
+STREAM_CROSS_ORIGIN=*
+
+# when Browser @http:www.A.com, the file will upload to @STREAM_CROSS_SERVER
+STREAM_CROSS_SERVER=http://customers.duapp.com
+<%@ tag pageEncoding="UTF-8"%>
+<%@ include file="/pages/common/taglib.jsp"%>
+<%@ attribute name="id" required="true" type="java.lang.String"%>
+<%@ attribute name="pager" required="true" type="org.smart4j.framework.dao.bean.Pager"%>
+<c:set var="pageNumber" value="${pager.pageNumber}" />
+<c:set var="pageSize" value="${pager.pageSize}" />
+<c:set var="totalRecord" value="${pager.totalRecord}" />
+<c:set var="totalPage" value="${pager.totalPage}" />
+
+<div class="css-row">
+	<div class="css-right">
+		<div id="${id}">
+			<!--  <span>每页记录数:</span>
+            ${pageSize} -->
+			<div class="css-button-group ext-pager-button">
+				<c:choose>
+					<c:when test="${pageNumber > 1 && pageNumber <= totalPage}">
+						<button  class="btn btn-xs btn-danger" type="button" onclick="next_pager(1);"  data-pn="1">|第一页</button>
+						<button  class="btn btn-xs btn-danger" type="button" onclick="next_pager(${pageNumber - 1});"  data-pn="${pageNumber - 1}">&lt;上一页</button>
+					</c:when>
+					<c:otherwise>
+						<button  class="btn btn-xs btn-danger" type="button" disabled>|&lt;首页</button>
+						<button  class="btn btn-xs btn-danger" type="button" disabled>&lt;上一页</button>
+					</c:otherwise>
+				</c:choose>
+				<span class="green middle bolder">${pageNumber}/${totalPage}</span>
+				<c:choose>
+					<c:when test="${pageNumber < totalPage}">
+						<button  class="btn btn-xs btn-danger"  type="button"  onclick="next_pager(${pageNumber + 1});" data-pn="${pageNumber + 1}">下一页&gt;</button>
+						<button  class="btn btn-xs btn-danger"  type="button"  onclick="next_pager(${totalPage});"  data-pn="${totalPage}">最后一页&gt;|</button>
+					</c:when>
+					<c:otherwise>
+						<button  class="btn btn-xs btn-danger" type="button" disabled>下一页&gt;</button>
+						<button  class="btn btn-xs btn-danger" type="button" disabled>最后一页&gt;|</button>
+					</c:otherwise>
+				</c:choose>
+				<span class="green middle bolder">总记录数:${totalRecord}</span>
+			</div>
+		</div>
+	</div>
+</div>
 \ No newline at end of file
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" version="3.0">
-  <servlet>
-    <servlet-name>init_job</servlet-name>
-    <servlet-class>com.cnlive.mz.live.servlet.InitServlet</servlet-class>
-    <init-param>
-      <param-name>shutdown-on-unload</param-name>
-      <param-value>true</param-value>
-    </init-param>
-    <load-on-startup>2</load-on-startup>
-  </servlet>
-  <error-page>
-    <error-code>500</error-code>
-    <location>/live/epg/error500</location>
-  </error-page>
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" version="3.0">
+  <servlet>
+    <servlet-name>init_job</servlet-name>
+    <servlet-class>com.cnlive.mz.live.servlet.InitServlet</servlet-class>
+    <init-param>
+      <param-name>shutdown-on-unload</param-name>
+      <param-value>true</param-value>
+    </init-param>
+    <load-on-startup>2</load-on-startup>
+  </servlet>
+  <error-page>
+    <error-code>500</error-code>
+    <location>/live/epg/error500</location>
+  </error-page>
 </web-app>
 \ No newline at end of file
-<%@ page language="java" pageEncoding="UTF-8"
-	deferredSyntaxAllowedAsLiteral="true"%>
-<%@ include file="/pages/common/taglib.jsp"%>
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="UTF-8">
-<title>监审管理 | <f:message key="common.title" /></title>
-<meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no'
-	name='viewport'>
-<%@ include file="/pages/common/css.jsp"%>
-<style type="text/css">
-body {
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	line-height: 20px;
-	color: #000000;
-}
-
-#main_box {
-	/*正文区大容器*/
-	width: 770px;
-	margin-right: auto;
-	margin-left: auto;
-}
-
-.row {
-	/*定义每行*/
-	width: 100%;
-	clear: both;
-}
-
-.left3 {
-	/*用在五列布局上*/
-	border: 1px solid #00ff00;
-	width: 25%;
-	height: 150px;
-	float: left;
-}
-
-.divleft {
-	width: 24%;
-	height: 600px;
-	float: left;
-}
-
-.divright {
-	width: 74%;
-	height: 600px;
-	float: right;
-}
-
-.leftTop {
-	width: 100%;
-	height: 340px;
-	float: right;
-}
-
-.leftBootom {
-	width: 100%;
-	height: 250px;
-	float: right;
-}
-</style>
-</head>
-<body class="skin-blue  fixed ">
-	<div class="wrapper">
-		<%@ include file="/pages/common/top.jsp"%>
-		<%@ include file="/pages/common/left.jsp"%>
-		<div class="content-wrapper">
-			<!-- Content Header (Page header) -->
-			<section class="content-header">
-				<h1>
-					监审管理<small><a href="../../live/preload"><i
-							class="fa fa-plus"></i>直播监审</a> </small> <small class="label label-warning"
-						style="display: none" id="info_tab_span"><i
-						class="fa fa-bell-o"></i></small>
-				</h1>
-
-				<ol class="breadcrumb">
-					<li><a><i class="fa fa-dashboard"></i> 首页</a></li>
-					<li class="active">监审管理</li>
-				</ol>
-			</section>
-			<!-- Main content -->
-			<section class="content">
-				<div class="row">
-					<div class="col-xs-12">
-						<div class="box  box-warning">
-							<div class="box-header with-border">
-								<h3 class="box-title"></h3>
-								<div class="box-tools">
-									<div class="input-group">
-										<div class="box-footer clearfix">
-											<center>
-												<tag:pager3 id="product_pager" pager="${tLive}" />
-											</center>
-										</div>
-									</div>
-								</div>
-							</div>
-							<!-- /.box-header -->
-							<div class="box-body">
-
-								<div class="divleft">
-									<div class="leftTop" id="leftTopPlay"></div>
-									<div class="leftBootom">
-
-										<table class="table table-bordered">
-
-											<h4>直播活动详情：</h4>
-
-											<tr>
-												<th width="30%">活动名称</th>
-												<th id="live_name"></th>
-
-											</tr>
-											<tr>
-												<th width="30%">开始时间</th>
-												<th id="start_time"></th>
-											</tr>
-											<tr>
-												<th width="30%">结束时间</th>
-												<th id="end_time"></th>
-											</tr>
-											<tr>
-												<th width="30%">活动简述</th>
-												<th id="live_desper"></th>
-											</tr>
-											<tr>
-												<th width="30%">live_url</th>
-												<th id="live_url"></th>
-											</tr>
-											<tr>
-												<th width="30%">活动简述</th>
-												<th id=""></th>
-											</tr>
-
-										</table>
-									</div>
-								</div>
-								<div class="divright">
-									<!--五列开始-->
-									<div class="row">
-										<c:forEach var="item" items="${tLive.recordList}"
-											varStatus="stat">
-											<!-- <div style="border: 1px solid #00ff00; width: 33%; height: 200px; background: #888; float: left;"> -->
-											<div class="warp"
-												style="border: 1px solid #00ff00; width: 33%; height: 203px; float: left;"
-												id="divShow_${item.id}"
-												onclick="getParam('${item.id}','${item.title}','${item.live_url}','${item.start_time}','${item.end_time}')">
-												<!-- <div class="warp" style="height: 24px; background: #;"> -->
-												<button type="button" class="close" data-dismiss="modal"
-													id="colseLive" onclick="coseLive(event,'${item.id}','${item.t_user_id}')">
-													<span aria-hidden="true">&times;</span><span
-														class="sr-only">Close</span>
-												</button>
-												<h5 class="modal-title" id="myModalLabel">正在直播：${item.title}</h5>
-												<!-- </div> -->
-												<div id="a1_${item.id}" class="a1_class"
-													style="height: 150px">
-													<input type="hidden" value='${item.id}' name="liveid"
-														id="liveid"> 
-														<input type="hidden"value='${item.title}' name="title" id="title"> 
-														<input type="hidden" value='${item.live_url}' name="live_url"
-														id="live_url_${item.id}">
-													   <input type="hidden"value='${item.start_time}' name="start_time"
-														id="start_time"> 
-													   <input type="hidden"value='${item.end_time}' name="end_time" id="end_time">
-													    <input type="hidden"value='${item.t_user_id}' name="t_user_id" id="t_user_${item.id}">
-													<%-- <h4 class="blue smaller">
-														<i class="icon-picture orange"></i>视频源 : ${item.title}
-													</h4> --%>
-												</div>
-												<div class="" style="height: 30px;">
-													<input type="button" value="置顶" id="makeTop"
-														onclick="makeTop(event,'${item.id}',this)"> <input
-														type="button" value="关闭活动" id="closeLive"
-														onclick="coseLive(event,'${item.id}','${item.t_user_id}')">
-												</div>
-											</div>
-											<!-- </div> -->
-										</c:forEach>
-									</div>
-								</div>
-							</div>
-
-						</div>
-						<!-- /.box-body -->
-					</div>
-				</div>
-			</section>
-		</div>
-	</div>
-	<%@ include file="/pages/common/bottom.jsp"%>
-	<%@ include file="/pages/common/js.jsp"%>
-	<script type="text/javascript" src="../../pages/check/js/ckplayer.js" charset="utf-8"></script>
-	<script type="text/javascript" src="../../pages/check/js/offlights.js" charset="utf-8"></script>
-	<script type="text/javascript">
-		var flashvars = {
-			p : 1,
-			e : 1,
-			hl : '',
-			ht : '20',
-		};
-		var video = [ '' ];
-		var support = [ 'all' ];
-		CKobject.embedHTML5('leftTopPlay', 'ckplayer_leftTopPlay', 250, 290,
-				video, flashvars, support);
-
-		$(".a1_class #liveid").each(function() {
-							var id = $(this).val();
-							 var live_url = $('#live_url_' + id).val();
-							 var t_user_id = $('#t_user_'+id).val();
-							 
-							  var flashvars = {
-								p : 1,
-								e : 1,
-								hl : live_url,
-								ht : '20'
-							};
-							var video = [live_url ];
-							var support = [ 'all' ];
-							CKobject.embedHTML5('a1_' + id, 'ckplayer_' + id,250, 153, video, flashvars, support);   
-							 
-							 //m3u8 文件播放
-								/*   var flashvars={
-									        f:'http://localhost:8080/cnlive_live_web/static/assets/ckplayer/m3u8.swf',
-									        a:live_url,
-									        s:4,
-									        c:0,
-									        p:1
-									    };
-									    var params={bgcolor:'#FFF',allowFullScreen:true,allowScriptAccess:'always',wmode:'transparent'};
-									    var video=[live_url];
-									    CKobject.embed('http://localhost:8080/cnlive_live_web/static/assets/ckplayer/ckplayer.swf', 'a1_' + id, 'ckplayer_' + id, 250, 153,false,flashvars,video,params);   */
-							// rtmp 直播流播放。
-							/*  var flashvars = {
-								// f:'rtmp://localhost/live/livestreame',
-								f :'http://cnlive.uplive.ks-cdn.com/live/'+t_user_id+'_'+id,
-								c : 0
-							};
-							var video = [ 'http://cnlive.hlslive.ks-cdn.com/live/'+t_user_id+'_'+id+'/index.m3u8'];
-							CKobject.embed('../../static/assets/ckplayer/ckplayer.swf','a1_' + id, 'ckplayer_' + id, 250,
-											153, false, flashvars, video);  */
-
-						});
-
-		function getParam(id, name, live_url, start_time, end_time) {
-
-			$("#live_name").html(name);
-			$("#start_time").html(start_time);
-			$("#end_time").html(end_time);
-			$("#live_url").html(live_url);
-			var flashvars = {
-				p : 1,
-				e : 1,
-				hl : 'http://movie.ks.js.cn/flv/other/1_0.mp4',
-			};
-			var video = [ live_url ];
-			var support = [ 'all' ];
-			CKobject.embedHTML5('leftTopPlay', 'ckplayer_leftTopPlay', 250,
-					290, video, flashvars, support);
-		}
-		function coseLive(e, id,user_id) {
-			e.cancelBubble = true;
-			$.ajax({
-				url : '../../check/close/' + id,
-				type : 'post',
-				datatype : "json",
-				async : true,
-				data:{"user_id":user_id},
-				error : function() {
-					alert('关闭时发生错误!');
-				},
-				success : function(data) {
-					location.href = '../../check/list/1';
-					alert("关闭成功");
-				}
-			});
-		}
-		/**
-		 置顶 。。。
-		 */
-		
-			function makeTop(event, id, obj) {
-				event.cancelBubble = true;
-				$(obj.parentElement.parentElement).insertBefore($('.warp').first())
-				alert(obj.parentElement.parentElement);
-			};
-	</script>
-</body>
-</html>
+<%@ page language="java" pageEncoding="UTF-8"
+	deferredSyntaxAllowedAsLiteral="true"%>
+<%@ include file="/pages/common/taglib.jsp"%>
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>监审管理 | <f:message key="common.title" /></title>
+<meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no'
+	name='viewport'>
+<%@ include file="/pages/common/css.jsp"%>
+<style type="text/css">
+body {
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	line-height: 20px;
+	color: #000000;
+}
+
+#main_box {
+	/*正文区大容器*/
+	width: 770px;
+	margin-right: auto;
+	margin-left: auto;
+}
+
+.row {
+	/*定义每行*/
+	width: 100%;
+	clear: both;
+}
+
+.left3 {
+	/*用在五列布局上*/
+	border: 1px solid #00ff00;
+	width: 25%;
+	height: 150px;
+	float: left;
+}
+
+.divleft {
+	width: 24%;
+	height: 600px;
+	float: left;
+}
+
+.divright {
+	width: 74%;
+	height: 600px;
+	float: right;
+}
+
+.leftTop {
+	width: 100%;
+	height: 340px;
+	float: right;
+}
+
+.leftBootom {
+	width: 100%;
+	height: 250px;
+	float: right;
+}
+</style>
+</head>
+<body class="skin-blue  fixed ">
+	<div class="wrapper">
+		<%@ include file="/pages/common/top.jsp"%>
+		<%@ include file="/pages/common/left.jsp"%>
+		<div class="content-wrapper">
+			<!-- Content Header (Page header) -->
+			<section class="content-header">
+				<h1>
+					监审管理<small><a href="../../live/preload"><i
+							class="fa fa-plus"></i>直播监审</a> </small> <small class="label label-warning"
+						style="display: none" id="info_tab_span"><i
+						class="fa fa-bell-o"></i></small>
+				</h1>
+
+				<ol class="breadcrumb">
+					<li><a><i class="fa fa-dashboard"></i> 首页</a></li>
+					<li class="active">监审管理</li>
+				</ol>
+			</section>
+			<!-- Main content -->
+			<section class="content">
+				<div class="row">
+					<div class="col-xs-12">
+						<div class="box  box-warning">
+							<div class="box-header with-border">
+								<h3 class="box-title"></h3>
+								<div class="box-tools">
+									<div class="input-group">
+										<div class="box-footer clearfix">
+											<center>
+												<tag:pager3 id="product_pager" pager="${tLive}" />
+											</center>
+										</div>
+									</div>
+								</div>
+							</div>
+							<!-- /.box-header -->
+							<div class="box-body">
+
+								<div class="divleft">
+									<div class="leftTop" id="leftTopPlay"></div>
+									<div class="leftBootom">
+
+										<table class="table table-bordered">
+
+											<h4>直播活动详情：</h4>
+
+											<tr>
+												<th width="30%">活动名称</th>
+												<th id="live_name"></th>
+
+											</tr>
+											<tr>
+												<th width="30%">开始时间</th>
+												<th id="start_time"></th>
+											</tr>
+											<tr>
+												<th width="30%">结束时间</th>
+												<th id="end_time"></th>
+											</tr>
+											<tr>
+												<th width="30%">活动简述</th>
+												<th id="live_desper"></th>
+											</tr>
+											<tr>
+												<th width="30%">live_url</th>
+												<th id="live_url"></th>
+											</tr>
+											<tr>
+												<th width="30%">活动简述</th>
+												<th id=""></th>
+											</tr>
+
+										</table>
+									</div>
+								</div>
+								<div class="divright">
+									<!--五列开始-->
+									<div class="row">
+										<c:forEach var="item" items="${tLive.recordList}"
+											varStatus="stat">
+											<!-- <div style="border: 1px solid #00ff00; width: 33%; height: 200px; background: #888; float: left;"> -->
+											<div class="warp"
+												style="border: 1px solid #00ff00; width: 33%; height: 203px; float: left;"
+												id="divShow_${item.id}"
+												onclick="getParam('${item.id}','${item.title}','${item.live_url}','${item.start_time}','${item.end_time}')">
+												<!-- <div class="warp" style="height: 24px; background: #;"> -->
+												<button type="button" class="close" data-dismiss="modal"
+													id="colseLive" onclick="coseLive(event,'${item.id}','${item.t_user_id}')">
+													<span aria-hidden="true">&times;</span><span
+														class="sr-only">Close</span>
+												</button>
+												<h5 class="modal-title" id="myModalLabel">正在直播：${item.title}</h5>
+												<!-- </div> -->
+												<div id="a1_${item.id}" class="a1_class"
+													style="height: 150px">
+													<input type="hidden" value='${item.id}' name="liveid"
+														id="liveid"> 
+														<input type="hidden"value='${item.title}' name="title" id="title"> 
+														<input type="hidden" value='${item.live_url}' name="live_url"
+														id="live_url_${item.id}">
+													   <input type="hidden"value='${item.start_time}' name="start_time"
+														id="start_time"> 
+													   <input type="hidden"value='${item.end_time}' name="end_time" id="end_time">
+													    <input type="hidden"value='${item.t_user_id}' name="t_user_id" id="t_user_${item.id}">
+													<%-- <h4 class="blue smaller">
+														<i class="icon-picture orange"></i>视频源 : ${item.title}
+													</h4> --%>
+												</div>
+												<div class="" style="height: 30px;">
+													<input type="button" value="置顶" id="makeTop"
+														onclick="makeTop(event,'${item.id}',this)"> <input
+														type="button" value="关闭活动" id="closeLive"
+														onclick="coseLive(event,'${item.id}','${item.t_user_id}')">
+												</div>
+											</div>
+											<!-- </div> -->
+										</c:forEach>
+									</div>
+								</div>
+							</div>
+
+						</div>
+						<!-- /.box-body -->
+					</div>
+				</div>
+			</section>
+		</div>
+	</div>
+	<%@ include file="/pages/common/bottom.jsp"%>
+	<%@ include file="/pages/common/js.jsp"%>
+	<script type="text/javascript" src="../../pages/check/js/ckplayer.js" charset="utf-8"></script>
+	<script type="text/javascript" src="../../pages/check/js/offlights.js" charset="utf-8"></script>
+	<script type="text/javascript">
+		var flashvars = {
+			p : 1,
+			e : 1,
+			hl : '',
+			ht : '20',
+		};
+		var video = [ '' ];
+		var support = [ 'all' ];
+		CKobject.embedHTML5('leftTopPlay', 'ckplayer_leftTopPlay', 250, 290,
+				video, flashvars, support);
+
+		$(".a1_class #liveid").each(function() {
+							var id = $(this).val();
+							 var live_url = $('#live_url_' + id).val();
+							 var t_user_id = $('#t_user_'+id).val();
+							 
+							  var flashvars = {
+								p : 1,
+								e : 1,
+								hl : live_url,
+								ht : '20'
+							};
+							var video = [live_url ];
+							var support = [ 'all' ];
+							CKobject.embedHTML5('a1_' + id, 'ckplayer_' + id,250, 153, video, flashvars, support);   
+							 
+							 //m3u8 文件播放
+								/*   var flashvars={
+									        f:'http://localhost:8080/cnlive_live_web/static/assets/ckplayer/m3u8.swf',
+									        a:live_url,
+									        s:4,
+									        c:0,
+									        p:1
+									    };
+									    var params={bgcolor:'#FFF',allowFullScreen:true,allowScriptAccess:'always',wmode:'transparent'};
+									    var video=[live_url];
+									    CKobject.embed('http://localhost:8080/cnlive_live_web/static/assets/ckplayer/ckplayer.swf', 'a1_' + id, 'ckplayer_' + id, 250, 153,false,flashvars,video,params);   */
+							// rtmp 直播流播放。
+							/*  var flashvars = {
+								// f:'rtmp://localhost/live/livestreame',
+								f :'http://cnlive.uplive.ks-cdn.com/live/'+t_user_id+'_'+id,
+								c : 0
+							};
+							var video = [ 'http://cnlive.hlslive.ks-cdn.com/live/'+t_user_id+'_'+id+'/index.m3u8'];
+							CKobject.embed('../../static/assets/ckplayer/ckplayer.swf','a1_' + id, 'ckplayer_' + id, 250,
+											153, false, flashvars, video);  */
+
+						});
+
+		function getParam(id, name, live_url, start_time, end_time) {
+
+			$("#live_name").html(name);
+			$("#start_time").html(start_time);
+			$("#end_time").html(end_time);
+			$("#live_url").html(live_url);
+			var flashvars = {
+				p : 1,
+				e : 1,
+				hl : 'http://movie.ks.js.cn/flv/other/1_0.mp4',
+			};
+			var video = [ live_url ];
+			var support = [ 'all' ];
+			CKobject.embedHTML5('leftTopPlay', 'ckplayer_leftTopPlay', 250,
+					290, video, flashvars, support);
+		}
+		function coseLive(e, id,user_id) {
+			e.cancelBubble = true;
+			$.ajax({
+				url : '../../check/close/' + id,
+				type : 'post',
+				datatype : "json",
+				async : true,
+				data:{"user_id":user_id},
+				error : function() {
+					alert('关闭时发生错误!');
+				},
+				success : function(data) {
+					location.href = '../../check/list/1';
+					alert("关闭成功");
+				}
+			});
+		}
+		/**
+		 置顶 。。。
+		 */
+		
+			function makeTop(event, id, obj) {
+				event.cancelBubble = true;
+				$(obj.parentElement.parentElement).insertBefore($('.warp').first())
+				alert(obj.parentElement.parentElement);
+			};
+	</script>
+</body>
+</html>
-<%@ page language="java" pageEncoding="UTF-8"%>
-<%@ include file="/pages/common/taglib.jsp"%>
-<!DOCTYPE html>
-<html>
-<head>
-<style type="text/css">
-.text-overflow {
-	display: block; /*内联对象需加*/
-	width: 31em;
-	word-break: keep-all; /* 不换行 */
-	white-space: nowrap; /* 不换行 */
-	overflow: hidden; /* 内容超出宽度时隐藏超出部分的内容 */
-	text-overflow: ellipsis;
-	/* 当对象内文本溢出时显示省略标记(...) ；需与overflow:hidden;一起使用。*/
-}
-</style>
-<meta charset="UTF-8">
-<title>监审管理 |<f:message key="common.title" /></title>
-<meta
-	content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no'
-	name='viewport'>
-<%@ include file="/pages/common/css.jsp"%>
-<script src="${BASE}/static/assets/cnlive/js/check.js"></script>
-<script src="${BASE}/static/assets/jwplayer/jwplayer.js"></script>
-<script src="${BASE}/static/assets/jwplayer/jwplayer.html5.js"></script>
-<script type="text/javascript">jwplayer.key="MGAzpXRYxGnaVXhH8jSdKXzDe7ucAAvZGWggIA==";</script>
-
-</head>
-<body class="skin-blue  sidebar-collapse sidebar-mini">
-	<div class="wrapper">
-		<%@ include file="/pages/common/top.jsp"%>
-		<%@ include file="/pages/common/left.jsp"%>
-		<!-- Content Wrapper. Contains page content -->
-		<div class="content-wrapper">
-			<!-- Content Header (Page header) -->
-			<section class="content-header">
-				<h1>
-					监审管理 <small>monitor panel</small>
-				</h1>
-				<ol class="breadcrumb">
-					<li><a href="#"><i class="fa fa-dashboard"></i> 首页</a></li>
-					<li class="active">监审管理</li>
-				</ol>
-			</section>
-			<section class="content">
-				<div class="row">
-					<div class="col-md-4">
-						<div class="box box-solid">
-							<div class="box-header with-border">
-								<h3 class="box-title">监控平台</h3>
-							</div>
-							<div class="box-body no-padding">
-								<div class="col-md-12" id="divShow_${item.id}">
-									<div class="box box-success box-solid">
-										<div class="box-header with-border">
-											<div class="text-overflow">
-												<h3 class="box-title" id="hidId">${item.title}</h3>
-											</div>
-											<div class="box-tools pull-right">
-												<button class="btn btn-sm" id="play_button_${item.id}"
-													onclick="play(${item.id});">重新载入</button>
-											</div>
-										</div>
-										<div id="playId" class="box-body">
-											<%-- <input type="hidden" name="play_url_${item.id}"
-												id="play_url_${item.id}" value="${item.live_url}" /> <span
-												class="mailbox-attachment-icon has-img"
-												id="player_span_${item.id}"> <img
-												src="../../static/assets/dist/img/photo2.png"
-												alt="Attachment">
-											</span> --%>
-										</div>
-									</div>
-								</div>
-							</div>
-						</div>
-						<div class="box-header with-border">
-							<h3 class="box-title">直播信息：</h3>
-						</div>
-						<div class="box-body no-padding">
-							<ul class="nav nav-pills nav-stacked">
-								<li id="userId"><a><i class="fa fa-file-text-o"></i>用户ID:</a></li>
-								<li id="title"><a><i class="fa fa-file-text-o"></i>TITLE:
-								</a></li>
-								<li id="startTime"><a><i class="fa fa-file-text-o"></i>开播时间:
-								</a></li>
-							</ul>
-						</div>
-					</div>
-					<div class="col-md-8">
-						<div class="box box-primary">
-							<div class="box-header with-border">
-								<h3 class="box-title">监控</h3>
-								<tag:pager id="product_pager" pager="${tLive}" />
-							</div>
-							<div class="box-body no-padding">
-								<div class="row">
-									<c:forEach var="item" items="${tLive.recordList}"
-										varStatus="stat">
-										<div class="col-md-3" id="divShow_${item.id}">
-											<div
-												class="box ${item.check_sort eq null  ? 'box-warning':'box-success'} box-solid">
-												<div class="box-header with-border">
-													<div class="text-overflow">
-														<h3 class="box-title">${item.title}</h3>
-													</div>
-													<div class="box-tools pull-right">
-														<button class="btn btn-sm btn-danger"
-															onclick="changePlay('${item.id}','${item.live_url}','${item.t_user_id}','${item.title}','${item.start_time}');">左</button>
-														<button class="btn btn-sm btn-danger"
-															onclick="to_pass(${item.id});">过</button>
-														<button class="btn btn-sm btn-danger"
-															onclick="to_top(${item.id});">顶</button>
-														<button class="btn btn-sm btn-danger"
-															onclick="play_close('${item.id}','${item.live_url}','${item.uuid}');">断</button>
-													</div>
-												</div>
-												<div class="box-body">
-													<input type="hidden" name="play_url_${item.id}"
-														id="play_url_${item.id}" value="${item.live_url}" /> <span
-														class="mailbox-attachment-icon has-img"
-														id="player_span_${item.id}"> <img
-														src="../../static/assets/dist/img/photo2.png"
-														alt="Attachment">
-													</span>
-												</div>
-											</div>
-										</div>
-									</c:forEach>
-								</div>
-							</div>
-						</div>
-					</div>
-				</div>
-				<%@ include file="/pages/common/js.jsp"%>
-				<script src="${BASE}/static/assets/cnlive/js/player_m3u8.js"></script>
-			</section>
-		</div>
-	</div>
-</body>
-<script type="text/javascript">
-jwplayer("playId").setup({ 
-	file: "", 
-	height: 260, 
-	image: "/assets/myVideo.jpg", 
-	autostart:true,
-	rtmp: { 
-		bufferlength: 0.1 
-	}, 
-	width: 370 
-});
-</script>
+<%@ page language="java" pageEncoding="UTF-8"%>
+<%@ include file="/pages/common/taglib.jsp"%>
+<!DOCTYPE html>
+<html>
+<head>
+<style type="text/css">
+.text-overflow {
+	display: block; /*内联对象需加*/
+	width: 31em;
+	word-break: keep-all; /* 不换行 */
+	white-space: nowrap; /* 不换行 */
+	overflow: hidden; /* 内容超出宽度时隐藏超出部分的内容 */
+	text-overflow: ellipsis;
+	/* 当对象内文本溢出时显示省略标记(...) ；需与overflow:hidden;一起使用。*/
+}
+</style>
+<meta charset="UTF-8">
+<title>监审管理 |<f:message key="common.title" /></title>
+<meta
+	content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no'
+	name='viewport'>
+<%@ include file="/pages/common/css.jsp"%>
+<script src="${BASE}/static/assets/cnlive/js/check.js"></script>
+<script src="${BASE}/static/assets/jwplayer/jwplayer.js"></script>
+<script src="${BASE}/static/assets/jwplayer/jwplayer.html5.js"></script>
+<script type="text/javascript">jwplayer.key="MGAzpXRYxGnaVXhH8jSdKXzDe7ucAAvZGWggIA==";</script>
+
+</head>
+<body class="skin-blue  sidebar-collapse sidebar-mini">
+	<div class="wrapper">
+		<%@ include file="/pages/common/top.jsp"%>
+		<%@ include file="/pages/common/left.jsp"%>
+		<!-- Content Wrapper. Contains page content -->
+		<div class="content-wrapper">
+			<!-- Content Header (Page header) -->
+			<section class="content-header">
+				<h1>
+					监审管理 <small>monitor panel</small>
+				</h1>
+				<ol class="breadcrumb">
+					<li><a href="#"><i class="fa fa-dashboard"></i> 首页</a></li>
+					<li class="active">监审管理</li>
+				</ol>
+			</section>
+			<section class="content">
+				<div class="row">
+					<div class="col-md-4">
+						<div class="box box-solid">
+							<div class="box-header with-border">
+								<h3 class="box-title">监控平台</h3>
+							</div>
+							<div class="box-body no-padding">
+								<div class="col-md-12" id="divShow_${item.id}">
+									<div class="box box-success box-solid">
+										<div class="box-header with-border">
+											<div class="text-overflow">
+												<h3 class="box-title" id="hidId">${item.title}</h3>
+											</div>
+											<div class="box-tools pull-right">
+												<button class="btn btn-sm" id="play_button_${item.id}"
+													onclick="play(${item.id});">重新载入</button>
+											</div>
+										</div>
+										<div id="playId" class="box-body">
+											<%-- <input type="hidden" name="play_url_${item.id}"
+												id="play_url_${item.id}" value="${item.live_url}" /> <span
+												class="mailbox-attachment-icon has-img"
+												id="player_span_${item.id}"> <img
+												src="../../static/assets/dist/img/photo2.png"
+												alt="Attachment">
+											</span> --%>
+										</div>
+									</div>
+								</div>
+							</div>
+						</div>
+						<div class="box-header with-border">
+							<h3 class="box-title">直播信息：</h3>
+						</div>
+						<div class="box-body no-padding">
+							<ul class="nav nav-pills nav-stacked">
+								<li id="userId"><a><i class="fa fa-file-text-o"></i>用户ID:</a></li>
+								<li id="title"><a><i class="fa fa-file-text-o"></i>TITLE:
+								</a></li>
+								<li id="startTime"><a><i class="fa fa-file-text-o"></i>开播时间:
+								</a></li>
+							</ul>
+						</div>
+					</div>
+					<div class="col-md-8">
+						<div class="box box-primary">
+							<div class="box-header with-border">
+								<h3 class="box-title">监控</h3>
+								<tag:pager id="product_pager" pager="${tLive}" />
+							</div>
+							<div class="box-body no-padding">
+								<div class="row">
+									<c:forEach var="item" items="${tLive.recordList}"
+										varStatus="stat">
+										<div class="col-md-3" id="divShow_${item.id}">
+											<div
+												class="box ${item.check_sort eq null  ? 'box-warning':'box-success'} box-solid">
+												<div class="box-header with-border">
+													<div class="text-overflow">
+														<h3 class="box-title">${item.title}</h3>
+													</div>
+													<div class="box-tools pull-right">
+														<button class="btn btn-sm btn-danger"
+															onclick="changePlay('${item.id}','${item.live_url}','${item.t_user_id}','${item.title}','${item.start_time}');">左</button>
+														<button class="btn btn-sm btn-danger"
+															onclick="to_pass(${item.id});">过</button>
+														<button class="btn btn-sm btn-danger"
+															onclick="to_top(${item.id});">顶</button>
+														<button class="btn btn-sm btn-danger"
+															onclick="play_close('${item.id}','${item.live_url}','${item.uuid}');">断</button>
+													</div>
+												</div>
+												<div class="box-body">
+													<input type="hidden" name="play_url_${item.id}"
+														id="play_url_${item.id}" value="${item.live_url}" /> <span
+														class="mailbox-attachment-icon has-img"
+														id="player_span_${item.id}"> <img
+														src="../../static/assets/dist/img/photo2.png"
+														alt="Attachment">
+													</span>
+												</div>
+											</div>
+										</div>
+									</c:forEach>
+								</div>
+							</div>
+						</div>
+					</div>
+				</div>
+				<%@ include file="/pages/common/js.jsp"%>
+				<script src="${BASE}/static/assets/cnlive/js/player_m3u8.js"></script>
+			</section>
+		</div>
+	</div>
+</body>
+<script type="text/javascript">
+jwplayer("playId").setup({ 
+	file: "", 
+	height: 260, 
+	image: "/assets/myVideo.jpg", 
+	autostart:true,
+	rtmp: { 
+		bufferlength: 0.1 
+	}, 
+	width: 370 
+});
+</script>
 </html>
 \ No newline at end of file
-<%@ page language="java" pageEncoding="utf-8"%>
-
-<script src="${BASE}/static/assets/plugins/jQuery/jQuery-2.1.4.min.js"></script>
-<!-- Bootstrap 3.3.2 JS -->
-<script src="${BASE}/static/assets/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
-<!-- Slimscroll -->
-<script src="${BASE}/static/assets/plugins/slimScroll/jquery.slimscroll.min.js" type="text/javascript"></script>
-<!-- FastClick -->
-<script src='${BASE}/static/assets/plugins/fastclick/fastclick.min.js'></script>
-<!-- AdminLTE App -->
-<script src="${BASE}/static/assets/dist/js/app.min.js" type="text/javascript"></script>
-<!-- AdminLTE for demo purposes -->
-<script src="${BASE}/static/assets/dist/js/demo.js" type="text/javascript"></script>
-<script src="${BASE}/static/assets/plugins/iCheck/1.0.2/icheck.js?v=1.0.2"></script>
-<!-- InputMask -->
-<script src="${BASE}/static/assets/plugins/input-mask/jquery.inputmask.js" type="text/javascript"></script>
-<script src="${BASE}/static/assets/plugins/input-mask/jquery.inputmask.date.extensions.js" type="text/javascript"></script>
-<script src="${BASE}/static/assets/plugins/input-mask/jquery.inputmask.extensions.js" type="text/javascript"></script>
-<!-- date-range-picker -->
-<script src="${BASE}/static/assets/third-party/moment.min.js" type="text/javascript"></script>
-<script src="${BASE}/static/assets/plugins/daterangepicker/daterangepicker.js" type="text/javascript"></script>
-<!-- bootstrap time picker -->
-<script src="${BASE}/static/assets/plugins/timepicker/bootstrap-timepicker.min.js" type="text/javascript"></script>
-<!-- iCheck 1.0.1 -->
-<script src="${BASE}/static/assets/plugins/iCheck/icheck.min.js" type="text/javascript"></script>
-<script src="${BASE}/static/assets/plugins/slimScroll/jquery.slimscroll.min.js" type="text/javascript"></script>
-
-<link rel="stylesheet" href="${BASE}/static/assets/plugins/fileinput/fileinput.css" />
-<link rel="stylesheet" href="${BASE}/static/assets/plugins/fileinput/fileinput.min.css" />
-<script src="${BASE}/static/assets/plugins/fileinput/fileinput.js"></script>
-<script src="${BASE}/static/assets/plugins/fileinput/fileinput.min.js"></script> 
-<script src="${BASE}/static/assets/plugins/fileinput/fileinput_locale_zh.js"></script>  
-
-<!-------直播系统所需  js 文件-->
-<script src="${BASE}/static/assets/cnlive/js/all_live.js" type="text/javascript"></script>
-<script src="${BASE}/static/assets/cnlive/js/live.js" type="text/javascript"></script>
-<script src="${BASE}/static/assets/cnlive/js/room.js" type="text/javascript"></script>
-<script src="${BASE}/static/assets/cnlive/js/channel.js" type="text/javascript"></script>
-<script src="${BASE}/static/assets/cnlive/js/signal.js" type="text/javascript"></script>
-<script src="${BASE}/static/assets/cnlive/js/wowza.js"  type="text/javascript"></script>
-<script src="${BASE}/static/assets/cnlive/js/activity.js" type="text/javascript"></script>
-<script src="${BASE}/static/assets/cnlive/js/ajax_rest.js" type="text/javascript"></script>
-<!-- cnlive validate -->
-<script src="${BASE}/static/assets/plugins/validate/jquery.form.js"></script>
-<script src="${BASE}/static/assets/plugins/validate/jquery.metadata.js"></script>
-<script src="${BASE}/static/assets/plugins/validate/jquery.validate.js"></script>
-
-<script src="${BASE}/static/assets/plugins/easytree/easyTree.js"></script>
-<script src="${BASE}/static/assets/cnlive/js/common.js"></script>
-<script src="${BASE}/static/assets/cnlive/js/global.js"></script>
-<script type="text/javascript">
-    BASE = '${BASE}';
+<%@ page language="java" pageEncoding="utf-8"%>
+
+<script src="${BASE}/static/assets/plugins/jQuery/jQuery-2.1.4.min.js"></script>
+<!-- Bootstrap 3.3.2 JS -->
+<script src="${BASE}/static/assets/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
+<!-- Slimscroll -->
+<script src="${BASE}/static/assets/plugins/slimScroll/jquery.slimscroll.min.js" type="text/javascript"></script>
+<!-- FastClick -->
+<script src='${BASE}/static/assets/plugins/fastclick/fastclick.min.js'></script>
+<!-- AdminLTE App -->
+<script src="${BASE}/static/assets/dist/js/app.min.js" type="text/javascript"></script>
+<!-- AdminLTE for demo purposes -->
+<script src="${BASE}/static/assets/dist/js/demo.js" type="text/javascript"></script>
+<script src="${BASE}/static/assets/plugins/iCheck/1.0.2/icheck.js?v=1.0.2"></script>
+<!-- InputMask -->
+<script src="${BASE}/static/assets/plugins/input-mask/jquery.inputmask.js" type="text/javascript"></script>
+<script src="${BASE}/static/assets/plugins/input-mask/jquery.inputmask.date.extensions.js" type="text/javascript"></script>
+<script src="${BASE}/static/assets/plugins/input-mask/jquery.inputmask.extensions.js" type="text/javascript"></script>
+<!-- date-range-picker -->
+<script src="${BASE}/static/assets/third-party/moment.min.js" type="text/javascript"></script>
+<script src="${BASE}/static/assets/plugins/daterangepicker/daterangepicker.js" type="text/javascript"></script>
+<!-- bootstrap time picker -->
+<script src="${BASE}/static/assets/plugins/timepicker/bootstrap-timepicker.min.js" type="text/javascript"></script>
+<!-- iCheck 1.0.1 -->
+<script src="${BASE}/static/assets/plugins/iCheck/icheck.min.js" type="text/javascript"></script>
+<script src="${BASE}/static/assets/plugins/slimScroll/jquery.slimscroll.min.js" type="text/javascript"></script>
+
+<link rel="stylesheet" href="${BASE}/static/assets/plugins/fileinput/fileinput.css" />
+<link rel="stylesheet" href="${BASE}/static/assets/plugins/fileinput/fileinput.min.css" />
+<script src="${BASE}/static/assets/plugins/fileinput/fileinput.js"></script>
+<script src="${BASE}/static/assets/plugins/fileinput/fileinput.min.js"></script> 
+<script src="${BASE}/static/assets/plugins/fileinput/fileinput_locale_zh.js"></script>  
+
+<!-------直播系统所需  js 文件-->
+<script src="${BASE}/static/assets/cnlive/js/all_live.js" type="text/javascript"></script>
+<script src="${BASE}/static/assets/cnlive/js/live.js" type="text/javascript"></script>
+<script src="${BASE}/static/assets/cnlive/js/room.js" type="text/javascript"></script>
+<script src="${BASE}/static/assets/cnlive/js/channel.js" type="text/javascript"></script>
+<script src="${BASE}/static/assets/cnlive/js/signal.js" type="text/javascript"></script>
+<script src="${BASE}/static/assets/cnlive/js/wowza.js"  type="text/javascript"></script>
+<script src="${BASE}/static/assets/cnlive/js/activity.js" type="text/javascript"></script>
+<script src="${BASE}/static/assets/cnlive/js/ajax_rest.js" type="text/javascript"></script>
+<!-- cnlive validate -->
+<script src="${BASE}/static/assets/plugins/validate/jquery.form.js"></script>
+<script src="${BASE}/static/assets/plugins/validate/jquery.metadata.js"></script>
+<script src="${BASE}/static/assets/plugins/validate/jquery.validate.js"></script>
+
+<script src="${BASE}/static/assets/plugins/easytree/easyTree.js"></script>
+<script src="${BASE}/static/assets/cnlive/js/common.js"></script>
+<script src="${BASE}/static/assets/cnlive/js/global.js"></script>
+<script type="text/javascript">
+    BASE = '${BASE}';
 </script>
 \ No newline at end of file
-<%@ page language="java" pageEncoding="utf-8"%>
-<%@ include file="/pages/common/taglib.jsp"%>
-<aside class="main-sidebar">
-	<section class="sidebar">
-		<div class="user-panel">
-			<div class="pull-left image">
-				<img src="${BASE}/static/assets/dist/img/user2-160x160.jpg"
-					class="img-circle" alt="User Image" />
-			</div>
-			<div class="pull-left info">
-				<p>
-					<a href="${BASE}/index">刘基城</a>
-				</p>
-				<i class="fa fa-circle text-success"></i>
-				<c:if test="${sessionScope.roleId=='1'}">超级管理员</c:if>
-				<c:if test="${sessionScope.roleId=='0'}">普通用户</c:if>
-				<c:if test="${sessionScope.roleId=='2'}">总编室用户</c:if>
-			</div>
-		</div>
-		<ul class="sidebar-menu">
-			<c:if test="${sessionScope.roleId=='1'}">
-				<li class="header">导航栏</li>
-				<li>
-					<a href="${BASE}/switch"><i class="fa fa-circle-o text-blue"></i>全局切换</a>
-				</li>
-				<li>
-					<a href="${BASE}/channel/monitor/1"><i class="fa fa-circle-o text-yellow"></i>直播监控</a>
-				</li>
-				<li>
-					<a href="${BASE}/activity/preload"><i class="fa fa-circle-o"></i>新增活动</a>
-				</li>
-				<li>
-					<a href="${BASE}/activity/list/1"><i class="fa fa-circle-o text-red"></i>活动管理</a>
-				</li>
-				
-				<li class="header">系统设置</li>
-				<li>
-					<a href="${BASE}/channel/list/1"><i class="fa fa-circle-o text-green"></i>频道管理</a>
-			    </li>
-				<li>
-					<a href="${BASE}/wowza/list/1"><i class="fa fa-circle-o text-blue"></i>播出服务管理</a>
-				</li>
-				<li>
-					<a href="${BASE}/signal/list/1"><i class="fa fa-circle-o text-red"></i>信源管理</a>
-			    </li>
-			</c:if>
-				<c:if test="${sessionScope.roleId=='2'}">
-				    <li class="header">UGC直播审查</li>
-				    <li>
-						<a href="${BASE}/user/list/1"><i class="fa fa-circle-o text-yellow"></i>主播管理</a>
-					</li>
-					<li>
-						<a href="${BASE}/check/list/1"><i class="fa fa-circle-o text-red"></i>直播审查</a>
-					</li>
-					<li>
-						<a href="${BASE}/video/check/1"><i class="fa fa-circle-o text-green"></i>点播审查</a>
-					</li>
-					<li>
-						<a href="${BASE}/live/alllive/1"><i class="fa fa-circle-o text-yellow"></i>直播管理</a>
-					</li>
-					<li>
-						<a href="${BASE}/word/list"><i class="fa fa-circle-o text-yellow"></i>敏感词管理</a>
-					</li>
-				</c:if>
-		</ul>
-	</section>
-	<!-- /.sidebar -->
+<%@ page language="java" pageEncoding="utf-8"%>
+<%@ include file="/pages/common/taglib.jsp"%>
+<aside class="main-sidebar">
+	<section class="sidebar">
+		<div class="user-panel">
+			<div class="pull-left image">
+				<img src="${BASE}/static/assets/dist/img/user2-160x160.jpg"
+					class="img-circle" alt="User Image" />
+			</div>
+			<div class="pull-left info">
+				<p>
+					<a href="${BASE}/index">刘基城</a>
+				</p>
+				<i class="fa fa-circle text-success"></i>
+				<c:if test="${sessionScope.roleId=='1'}">超级管理员</c:if>
+				<c:if test="${sessionScope.roleId=='0'}">普通用户</c:if>
+				<c:if test="${sessionScope.roleId=='2'}">总编室用户</c:if>
+			</div>
+		</div>
+		<ul class="sidebar-menu">
+			<c:if test="${sessionScope.roleId=='1'}">
+				<li class="header">导航栏</li>
+				<li>
+					<a href="${BASE}/switch"><i class="fa fa-circle-o text-blue"></i>全局切换</a>
+				</li>
+				<li>
+					<a href="${BASE}/channel/monitor/1"><i class="fa fa-circle-o text-yellow"></i>直播监控</a>
+				</li>
+				<li>
+					<a href="${BASE}/activity/preload"><i class="fa fa-circle-o"></i>新增活动</a>
+				</li>
+				<li>
+					<a href="${BASE}/activity/list/1"><i class="fa fa-circle-o text-red"></i>活动管理</a>
+				</li>
+				
+				<li class="header">系统设置</li>
+				<li>
+					<a href="${BASE}/channel/list/1"><i class="fa fa-circle-o text-green"></i>频道管理</a>
+			    </li>
+				<li>
+					<a href="${BASE}/wowza/list/1"><i class="fa fa-circle-o text-blue"></i>播出服务管理</a>
+				</li>
+				<li>
+					<a href="${BASE}/signal/list/1"><i class="fa fa-circle-o text-red"></i>信源管理</a>
+			    </li>
+			</c:if>
+				<c:if test="${sessionScope.roleId=='2'}">
+				    <li class="header">UGC直播审查</li>
+				    <li>
+						<a href="${BASE}/user/list/1"><i class="fa fa-circle-o text-yellow"></i>主播管理</a>
+					</li>
+					<li>
+						<a href="${BASE}/check/list/1"><i class="fa fa-circle-o text-red"></i>直播审查</a>
+					</li>
+					<li>
+						<a href="${BASE}/video/check/1"><i class="fa fa-circle-o text-green"></i>点播审查</a>
+					</li>
+					<li>
+						<a href="${BASE}/live/alllive/1"><i class="fa fa-circle-o text-yellow"></i>直播管理</a>
+					</li>
+					<li>
+						<a href="${BASE}/word/list"><i class="fa fa-circle-o text-yellow"></i>敏感词管理</a>
+					</li>
+				</c:if>
+		</ul>
+	</section>
+	<!-- /.sidebar -->
 </aside>
 \ No newline at end of file
-<%@ page language="java" pageEncoding="UTF-8"%>
-<%@ include file="/pages/common/taglib.jsp"%>
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="UTF-8">
-<title>直播管理 | <f:message key="common.title" /></title>
-<meta
-	content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no'
-	name='viewport'>
-<%@ include file="/pages/common/css.jsp"%>
-</head>
-<body class="skin-blue  fixed ">
-	<div class="wrapper">
-		<%@ include file="/pages/common/top.jsp"%>
-		<%@ include file="/pages/common/left.jsp"%>
-		<div class="content-wrapper">
-			<!-- Content Header (Page header) -->
-			<section class="content-header">
-				<h1>
-					直播管理<small class="label label-warning" style="display: none"
-						id="info_tab_span"><i class="fa fa-bell-o"></i></small>
-				</h1>
-
-				<ol class="breadcrumb">
-					<li><a><i class="fa fa-dashboard"></i> 首页</a></li>
-					<li class="active">直播管理</li>
-				</ol>
-			</section>
-			<!-- Main content -->
-			<section class="content">
-				<div class="row">
-					<div class="col-xs-12">
-						<div class="box  box-warning">
-							<div class="box-header with-border"> 
-								<h3 class="box-title"></h3>
-								<div class="box-tools">
-									<div class="input-group">
-										<form role="form" action="../../live/search/1" method="get">
-											<div class="input-group">
-												<input type="text" name="search_user_id" id="search_user_id"
-													class="form-control input-sm" style="width: 150px;"
-													placeholder="用户id" /> <input type="text"
-													name="search_title" id="search_title"
-													class="form-control input-sm" style="width: 150px;"
-													placeholder="活动名称" />
-												<button type="submit" class="btn btn-sm btn-default">
-													<i class="fa fa-search"></i>搜索
-												</button>
-											</div>
-										</form>
-									</div>
-								</div>
-							</div>
-							<!-- /.box-header -->
-							<div class="box-body">
-								<table class="table table-bordered">
-									<tr>
-										<th>活动ID</th>
-										<th>stream_name</th>
-										<th>活动名称</th>
-										<th>开始时间</th>
-										<th>结束时间</th>
-										<th>状态</th>
-										<th>下线</th>
-									</tr>
-									<c:forEach var="item" items="${tLive.recordList}"
-										varStatus="stat">
-										<tr>
-											<td>${item.id}</td>
-											<td>${item.t_user_id}_${item.uuid}</td>
-											<td>${item.title}</td>
-											<td><fmt:formatDate value="${item.start_time}"
-													pattern="yyyy-MM-dd HH:mm" /></td>
-											<td>${item.end_time}</td>
-											<td><c:if test="${item.t_status_id==0}">
-													<span class="badge bg-green">未开始</span>
-												</c:if> <c:if test="${item.t_status_id==2}">
-													<span class="badge bg-green">正常结束</span>
-												</c:if> <c:if test="${item.t_status_id==1}">
-													<span class="badge bg-yellow">直播中</span>
-												</c:if> <c:if test="${item.t_status_id==-2}">
-													<span class="badge bg-red">异常结束</span>
-												</c:if>
-												
-												<c:if test="${item.t_status_id==-3}">
-													<span class="badge bg-yellow">已经下线</span>
-												</c:if>
-												
-												</td>
-
-											<td>
-												<%-- <button type="button" class="btn btn-xs btn-success" id="down" onclick="t_live_close('${item.id}','${item.uuid}');">
-												<i class="icon-upload"></i>下线
-											</button> --%>
-
-												<button class="btn  btn-danger btn-sm"
-													onclick="t_live_close('${item.id}','${item.uuid}');">
-													<i class="fa fa-close"></i>
-												</button>
-											</td>
-										</tr>
-									</c:forEach>
-								</table>
-							</div>
-							<!-- /.box-body -->
-							<div class="box-footer clearfix">
-								<center>
-									<tag:pager id="product_pager" pager="${tLive}" />
-								</center>
-							</div>
-						</div>
-					</div>
-				</div>
-			</section>
-		</div>
-		<%@ include file="/pages/common/bottom.jsp"%>
-	</div>
-	<%@ include file="/pages/common/js.jsp"%>
-</body>
-</html>
+<%@ page language="java" pageEncoding="UTF-8"%>
+<%@ include file="/pages/common/taglib.jsp"%>
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>直播管理 | <f:message key="common.title" /></title>
+<meta
+	content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no'
+	name='viewport'>
+<%@ include file="/pages/common/css.jsp"%>
+</head>
+<body class="skin-blue  fixed ">
+	<div class="wrapper">
+		<%@ include file="/pages/common/top.jsp"%>
+		<%@ include file="/pages/common/left.jsp"%>
+		<div class="content-wrapper">
+			<!-- Content Header (Page header) -->
+			<section class="content-header">
+				<h1>
+					直播管理<small class="label label-warning" style="display: none"
+						id="info_tab_span"><i class="fa fa-bell-o"></i></small>
+				</h1>
+
+				<ol class="breadcrumb">
+					<li><a><i class="fa fa-dashboard"></i> 首页</a></li>
+					<li class="active">直播管理</li>
+				</ol>
+			</section>
+			<!-- Main content -->
+			<section class="content">
+				<div class="row">
+					<div class="col-xs-12">
+						<div class="box  box-warning">
+							<div class="box-header with-border"> 
+								<h3 class="box-title"></h3>
+								<div class="box-tools">
+									<div class="input-group">
+										<form role="form" action="../../live/search/1" method="get">
+											<div class="input-group">
+												<input type="text" name="search_user_id" id="search_user_id"
+													class="form-control input-sm" style="width: 150px;"
+													placeholder="用户id" /> <input type="text"
+													name="search_title" id="search_title"
+													class="form-control input-sm" style="width: 150px;"
+													placeholder="活动名称" />
+												<button type="submit" class="btn btn-sm btn-default">
+													<i class="fa fa-search"></i>搜索
+												</button>
+											</div>
+										</form>
+									</div>
+								</div>
+							</div>
+							<!-- /.box-header -->
+							<div class="box-body">
+								<table class="table table-bordered">
+									<tr>
+										<th>活动ID</th>
+										<th>stream_name</th>
+										<th>活动名称</th>
+										<th>开始时间</th>
+										<th>结束时间</th>
+										<th>状态</th>
+										<th>下线</th>
+									</tr>
+									<c:forEach var="item" items="${tLive.recordList}"
+										varStatus="stat">
+										<tr>
+											<td>${item.id}</td>
+											<td>${item.t_user_id}_${item.uuid}</td>
+											<td>${item.title}</td>
+											<td><fmt:formatDate value="${item.start_time}"
+													pattern="yyyy-MM-dd HH:mm" /></td>
+											<td>${item.end_time}</td>
+											<td><c:if test="${item.t_status_id==0}">
+													<span class="badge bg-green">未开始</span>
+												</c:if> <c:if test="${item.t_status_id==2}">
+													<span class="badge bg-green">正常结束</span>
+												</c:if> <c:if test="${item.t_status_id==1}">
+													<span class="badge bg-yellow">直播中</span>
+												</c:if> <c:if test="${item.t_status_id==-2}">
+													<span class="badge bg-red">异常结束</span>
+												</c:if>
+												
+												<c:if test="${item.t_status_id==-3}">
+													<span class="badge bg-yellow">已经下线</span>
+												</c:if>
+												
+												</td>
+
+											<td>
+												<%-- <button type="button" class="btn btn-xs btn-success" id="down" onclick="t_live_close('${item.id}','${item.uuid}');">
+												<i class="icon-upload"></i>下线
+											</button> --%>
+
+												<button class="btn  btn-danger btn-sm"
+													onclick="t_live_close('${item.id}','${item.uuid}');">
+													<i class="fa fa-close"></i>
+												</button>
+											</td>
+										</tr>
+									</c:forEach>
+								</table>
+							</div>
+							<!-- /.box-body -->
+							<div class="box-footer clearfix">
+								<center>
+									<tag:pager id="product_pager" pager="${tLive}" />
+								</center>
+							</div>
+						</div>
+					</div>
+				</div>
+			</section>
+		</div>
+		<%@ include file="/pages/common/bottom.jsp"%>
+	</div>
+	<%@ include file="/pages/common/js.jsp"%>
+</body>
+</html>
-<%@ page language="java" pageEncoding="UTF-8"%>
-<%@ include file="/pages/common/taglib.jsp"%>
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="UTF-8">
-<title>新建活动 | <f:message key="common.title" /></title>
-<meta
-	content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no'
-	name='viewport'>
-<%@ include file="/pages/common/css.jsp"%>
-
-<style type="text/css">
-            span.error{
-                padding-left: 15px;
-                color: red;
-            }
-        </style>
-<link
-	href="http://www.bootcss.com/p/bootstrap-datetimepicker/bootstrap-datetimepicker/css/datetimepicker.css"
-	rel="stylesheet">
-	 <script type="text/javascript" charset="utf-8" src="${BASE}/static/assets/ueditor/ueditor.config.js"></script>
-    <script type="text/javascript" charset="utf-8" src="${BASE}/static/assets/ueditor/ueditor.all.min.js"> </script>
-    <script type="text/javascript" charset="utf-8" src="${BASE}/static/assets/ueditor/lang/zh-cn/zh-cn.js"></script>
-    
-</head>
-<body  class="skin-blue  fixed ">
-	<div class="wrapper">
-		<%@ include file="/pages/common/top.jsp"%>
-		<%@ include file="/pages/common/left.jsp"%>
-		<div class="content-wrapper">
-			<section class="content-header">
-				<h1>${empty tActivity.id ? '新建活动':'编辑活动'}
-					<small>${tActivity.name}</small> <small class="label label-warning"
-						style="display: none" id="info_tab_span"><i
-						class="fa fa-bell-o"></i>保存成功</small>
-				</h1>
-				<ol class="breadcrumb">
-					<li><a><i class="fa fa-dashboard"></i> 首页</a></li>
-					<li class="active">新增活动</li>
-				</ol>
-			</section>
-			<!-- Main content -->
-			<section class="content">
-
-				<form id="create_form" enctype="multipart/form-data" method="post" >
-
-					<div class="row">
-						<!-- right column -->
-						<div class="col-md-12">
-							<!-- general form elements disabled -->
-							<div class="box box-warning">
-								<div class="box-body">
-									<div class="form-group">
-										<label> 活动名称 </label>
-										<div class="input-group">
-											<span class="input-group-addon"><i class="fa  fa-font"></i>
-											</span> <input type="text" value="${tActivity.name }" name="name"
-												id="name" class="form-control">
-												<input type="text" id="activity_id" name="activity_id" value="${tActivity.id}" hidden="">
-										</div>
-									</div>
-									<div class="form-group">
-										<label> 直播时间 </label>
-										<div class="row">
-											<div class="col-lg-6">
-												<div class="input-group">
-													<span class="input-group-addon"> 开始时间 </span> <input
-														type="text" class="form-control form_datetime"
-														value="<fmt:formatDate value="${tActivity.start_time}" pattern="yyyy-MM-dd HH:mm"/>"
-														name="start_time" id="start_time"
-														data-inputmask="'alias': 'yyyy-MM-dd HH:mm'" data-mask="" />
-												</div>
-											</div>
-											<div class="col-lg-6">
-												<div class="input-group">
-													<span class="input-group-addon"> 结束时间</span> <input
-														type="text" class="form-control form_datetime"
-														value="<fmt:formatDate value="${tActivity.end_time}" pattern="yyyy-MM-dd HH:mm"/>"
-														name="end_time" id="end_time"
-														data-inputmask="'alias': 'yyyy-MM-dd HH:mm'" data-mask="">
-												</div>
-											</div>
-										</div>
-									</div>
-									<div class="form-group">
-
-										<label>封面海报 </label>
-										<div class="input-group">
-											<span class="input-group-addon"><i
-												class="fa fa-file-word-o"></i> </span> <input id="input-22"   type="file" name="input-22"  accept="image/*" class="file-loading">
-
-										</div>
-									</div>
-									<div class="form-group">
-										<label> 播出直播间 </label>
-										<div class="box box-warning">
-											<div class="box-body">
-												<div class="form-group">
-
-													<select class="form-control" name="t_default_video_id"
-														id="t_default_video_id">
-
-														<c:forEach var="item" items="${tRooms}"
-															varStatus="stat">
-															<option  id="t_room_id_${item.id}" ${item.id==tLive.t_room_id ? 'selected="selected"':''}   value="${item.id}">${item.name}</option>
-														</c:forEach>
-													</select>
-												</div>
-											</div>
-										</div>
-									</div>
-									
-									<div class="form-group">
-
-										<label>活动简述 </label>
-
-										<div class="input-group">
-											<span class="input-group-addon"><i
-												class="fa fa-file-word-o"></i> </span> <script id="editor" type="text/plain" style="width:1024px;height:500px;"></script>
-										</div>
-									</div>
-									<div class="box-footer">
-										<button type="submit" id="t_activity_save_btn"
-											name="t_activity_save_btn" class="btn  btn-success">
-											<i class="fa  fa-save "></i> 保存
-										</button>
-									</div>
-								</div>
-							</div>
-						</div>
-					</div>
-				</form>
-		</div>
-		</section>
-	</div>
- </div>
-	<%@ include file="/pages/common/bottom.jsp"%>
-</div>
-	 <!-- 信号选择结束 -->
-	<%@ include file="/pages/common/js.jsp"%>
- 
-	<script type="text/javascript">
-	 
-	
-      $(function () {
-        //Money Euro
-        $("[data-mask]").inputmask();
-      });
-		
-       $(function () {
-        $("#datemask").inputmask("dd/mm/yyyy", {"placeholder": "dd/mm/yyyy"});
-        //Datemask2 mm/dd/yyyy
-        $("#datemask2").inputmask("mm/dd/yyyy", {"placeholder": "mm/dd/yyyy"});
-        //Money Euro
-        $("[data-mask]").inputmask();
-
-        //Date range picker
-        $('#reservation').daterangepicker();
-        //Date range picker with time picker
-        $('#reservationtime').daterangepicker({timePicker: true, timePickerIncrement: 30, format: 'MM/DD/YYYY h:mm A'});
-        //Date range as a button
-        $('#daterange-btn').daterangepicker(
-                {
-                  ranges: {
-                    'Today': [moment(), moment()],
-                    'Yesterday': [moment().subtract('days', 1), moment().subtract('days', 1)],
-                    'Last 7 Days': [moment().subtract('days', 6), moment()],
-                    'Last 30 Days': [moment().subtract('days', 29), moment()],
-                    'This Month': [moment().startOf('month'), moment().endOf('month')],
-                    'Last Month': [moment().subtract('month', 1).startOf('month'), moment().subtract('month', 1).endOf('month')]
-                  },
-                  startDate: moment().subtract('days', 29),
-                  endDate: moment()
-                },
-        function (start, end) {
-          $('#reportrange span').html(start.format('MMMM D, YYYY') + ' - ' + end.format('MMMM D, YYYY'));
-        }
-        );
-      });
-    </script>
-
-
-	<!-- Le javascript
-  ================================================== -->
-	<script
-		src="http://www.bootcss.com/p/bootstrap-datetimepicker/bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js"></script>
-
-	<script type="text/javascript">
-    $(".form_datetime").datetimepicker({
-        //format: "dd MM yyyy - hh:ii",
-        format: "yyyy-mm-dd hh:ii",
-        autoclose: true,
-        todayBtn: true,
-        pickerPosition: "bottom-right"
-    });
-</script>
-	 
-<script type="text/javascript">
-
-    //实例化编辑器
-    //建议使用工厂方法getEditor创建和引用编辑器实例，如果在某个闭包下引用该编辑器，直接调用UE.getEditor('editor')就能拿到相关的实例
-    var ue = UE.getEditor('editor',{
-	         autoHeightEnabled: true,
-   	         autoFloatEnabled: true
-    });
-
-
-    function isFocus(e){
-        alert(UE.getEditor('editor').isFocus());
-        UE.dom.domUtils.preventDefault(e)
-    }
-    function setblur(e){
-        UE.getEditor('editor').blur();
-        UE.dom.domUtils.preventDefault(e)
-    }
-    function insertHtml() {
-        var value = prompt('插入html代码', '');
-        UE.getEditor('editor').execCommand('insertHtml', value)
-    }
-    function createEditor() {
-        enableBtn();
-        UE.getEditor('editor');
-    }
-    function getAllHtml() {
-        alert(UE.getEditor('editor').getAllHtml())
-    }
-    function getContent() {
-        var arr = [];
-        arr.push("使用editor.getContent()方法可以获得编辑器的内容");
-        arr.push("内容为：");
-        arr.push(UE.getEditor('editor').getContent());
-        alert(arr.join("\n"));
-    }
-    function getPlainTxt() {
-        var arr = [];
-        arr.push("使用editor.getPlainTxt()方法可以获得编辑器的带格式的纯文本内容");
-        arr.push("内容为：");
-        arr.push(UE.getEditor('editor').getPlainTxt());
-        alert(arr.join('\n'))
-    }
-    function setContent(isAppendTo) {
-        var arr = [];
-        arr.push("使用editor.setContent('欢迎使用ueditor')方法可以设置编辑器的内容");
-        UE.getEditor('editor').setContent('欢迎使用ueditor', isAppendTo);
-        alert(arr.join("\n"));
-    }
-    function setDisabled() {
-        UE.getEditor('editor').setDisabled('fullscreen');
-        disableBtn("enable");
-    }
-
-    function setEnabled() {
-        UE.getEditor('editor').setEnabled();
-        enableBtn();
-    }
-
-    function getText() {
-        //当你点击按钮时编辑区域已经失去了焦点，如果直接用getText将不会得到内容，所以要在选回来，然后取得内容
-        var range = UE.getEditor('editor').selection.getRange();
-        range.select();
-        var txt = UE.getEditor('editor').selection.getText();
-        alert(txt)
-    }
-
-    function getContentTxt() {
-        var arr = [];
-        arr.push("使用editor.getContentTxt()方法可以获得编辑器的纯文本内容");
-        arr.push("编辑器的纯文本内容为：");
-        arr.push(UE.getEditor('editor').getContentTxt());
-        alert(arr.join("\n"));
-    }
-    function hasContent() {
-        var arr = [];
-        arr.push("使用editor.hasContents()方法判断编辑器里是否有内容");
-        arr.push("判断结果为：");
-        arr.push(UE.getEditor('editor').hasContents());
-        alert(arr.join("\n"));
-    }
-    function setFocus() {
-        UE.getEditor('editor').focus();
-    }
-    function deleteEditor() {
-        disableBtn();
-        UE.getEditor('editor').destroy();
-    }
-    function disableBtn(str) {
-        var div = document.getElementById('btns');
-        var btns = UE.dom.domUtils.getElementsByTagName(div, "button");
-        for (var i = 0, btn; btn = btns[i++];) {
-            if (btn.id == str) {
-                UE.dom.domUtils.removeAttributes(btn, ["disabled"]);
-            } else {
-                btn.setAttribute("disabled", "true");
-            }
-        }
-    }
-    function enableBtn() {
-        var div = document.getElementById('btns');
-        var btns = UE.dom.domUtils.getElementsByTagName(div, "button");
-        for (var i = 0, btn; btn = btns[i++];) {
-            UE.dom.domUtils.removeAttributes(btn, ["disabled"]);
-        }
-    }
-
-    function getLocalData () {
-        alert(UE.getEditor('editor').execCommand( "getlocaldata" ));
-    }
-
-    function clearLocalData () {
-        UE.getEditor('editor').execCommand( "clearlocaldata" );
-        alert("已清空草稿箱")
-    }
-    
-    $(document).on('ready', function() {
-		$("#input-22").fileinput({
-			previewFileType : "image",
-			browseClass : "btn btn-success",
-			browseLabel : "Pick Image",
-			browseIcon : "<i class=\"glyphicon glyphicon-picture\"></i> ",
-			removeClass : "btn btn-danger",
-			removeLabel : "Delete",
-			removeIcon : "<i class=\"glyphicon glyphicon-trash\"></i> ",
-			uploadClass : "btn btn-info",
-			uploadLabel : "Upload",
-			uploadIcon : "<i class=\"glyphicon glyphicon-upload\"></i> "
-		});
-
-		$(function() {
-			$('#create_form').ajaxForm({
-				type : 'post',
-				url : '../live/save',
-				enctype : 'multipart/form-data',
-				beforeSubmit : function() {
-						return true;
-				},
-				error : function(XMLHttpRequest, textStatus, errorThrown) {
-					alert("错误");
-				},
-				success : function(result) {
-					location.href = '../live/list/1';
-				}
-			});
-		});
-	});
-    
-   /*  $(function() {
-		$('#create_form').ajaxForm({
-			type : 'post',
-			url : '../live/save',
-			enctype : 'multipart/form-data',
-			beforeSubmit : function() {
-				var cms_column_ref_id=$("#input-22").val();
-				if(cms_column_ref_id==''){
-					alert("请输入栏目名称，点击获取，然后选择！");
-					return false;
-			}
-			},
-			error : function(XMLHttpRequest, textStatus, errorThrown) {
-				alert("错误");
-			},
-			success : function(result) {
-				location.href = '../live/list/1';
-			}
-		});
-	});
-	 */
-    
-</script>
-</body>
-</html>
+<%@ page language="java" pageEncoding="UTF-8"%>
+<%@ include file="/pages/common/taglib.jsp"%>
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>新建活动 | <f:message key="common.title" /></title>
+<meta
+	content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no'
+	name='viewport'>
+<%@ include file="/pages/common/css.jsp"%>
+
+<style type="text/css">
+            span.error{
+                padding-left: 15px;
+                color: red;
+            }
+        </style>
+<link
+	href="http://www.bootcss.com/p/bootstrap-datetimepicker/bootstrap-datetimepicker/css/datetimepicker.css"
+	rel="stylesheet">
+	 <script type="text/javascript" charset="utf-8" src="${BASE}/static/assets/ueditor/ueditor.config.js"></script>
+    <script type="text/javascript" charset="utf-8" src="${BASE}/static/assets/ueditor/ueditor.all.min.js"> </script>
+    <script type="text/javascript" charset="utf-8" src="${BASE}/static/assets/ueditor/lang/zh-cn/zh-cn.js"></script>
+    
+</head>
+<body  class="skin-blue  fixed ">
+	<div class="wrapper">
+		<%@ include file="/pages/common/top.jsp"%>
+		<%@ include file="/pages/common/left.jsp"%>
+		<div class="content-wrapper">
+			<section class="content-header">
+				<h1>${empty tActivity.id ? '新建活动':'编辑活动'}
+					<small>${tActivity.name}</small> <small class="label label-warning"
+						style="display: none" id="info_tab_span"><i
+						class="fa fa-bell-o"></i>保存成功</small>
+				</h1>
+				<ol class="breadcrumb">
+					<li><a><i class="fa fa-dashboard"></i> 首页</a></li>
+					<li class="active">新增活动</li>
+				</ol>
+			</section>
+			<!-- Main content -->
+			<section class="content">
+
+				<form id="create_form" enctype="multipart/form-data" method="post" >
+
+					<div class="row">
+						<!-- right column -->
+						<div class="col-md-12">
+							<!-- general form elements disabled -->
+							<div class="box box-warning">
+								<div class="box-body">
+									<div class="form-group">
+										<label> 活动名称 </label>
+										<div class="input-group">
+											<span class="input-group-addon"><i class="fa  fa-font"></i>
+											</span> <input type="text" value="${tActivity.name }" name="name"
+												id="name" class="form-control">
+												<input type="text" id="activity_id" name="activity_id" value="${tActivity.id}" hidden="">
+										</div>
+									</div>
+									<div class="form-group">
+										<label> 直播时间 </label>
+										<div class="row">
+											<div class="col-lg-6">
+												<div class="input-group">
+													<span class="input-group-addon"> 开始时间 </span> <input
+														type="text" class="form-control form_datetime"
+														value="<fmt:formatDate value="${tActivity.start_time}" pattern="yyyy-MM-dd HH:mm"/>"
+														name="start_time" id="start_time"
+														data-inputmask="'alias': 'yyyy-MM-dd HH:mm'" data-mask="" />
+												</div>
+											</div>
+											<div class="col-lg-6">
+												<div class="input-group">
+													<span class="input-group-addon"> 结束时间</span> <input
+														type="text" class="form-control form_datetime"
+														value="<fmt:formatDate value="${tActivity.end_time}" pattern="yyyy-MM-dd HH:mm"/>"
+														name="end_time" id="end_time"
+														data-inputmask="'alias': 'yyyy-MM-dd HH:mm'" data-mask="">
+												</div>
+											</div>
+										</div>
+									</div>
+									<div class="form-group">
+
+										<label>封面海报 </label>
+										<div class="input-group">
+											<span class="input-group-addon"><i
+												class="fa fa-file-word-o"></i> </span> <input id="input-22"   type="file" name="input-22"  accept="image/*" class="file-loading">
+
+										</div>
+									</div>
+									<div class="form-group">
+										<label> 播出直播间 </label>
+										<div class="box box-warning">
+											<div class="box-body">
+												<div class="form-group">
+
+													<select class="form-control" name="t_default_video_id"
+														id="t_default_video_id">
+
+														<c:forEach var="item" items="${tRooms}"
+															varStatus="stat">
+															<option  id="t_room_id_${item.id}" ${item.id==tLive.t_room_id ? 'selected="selected"':''}   value="${item.id}">${item.name}</option>
+														</c:forEach>
+													</select>
+												</div>
+											</div>
+										</div>
+									</div>
+									
+									<div class="form-group">
+
+										<label>活动简述 </label>
+
+										<div class="input-group">
+											<span class="input-group-addon"><i
+												class="fa fa-file-word-o"></i> </span> <script id="editor" type="text/plain" style="width:1024px;height:500px;"></script>
+										</div>
+									</div>
+									<div class="box-footer">
+										<button type="submit" id="t_activity_save_btn"
+											name="t_activity_save_btn" class="btn  btn-success">
+											<i class="fa  fa-save "></i> 保存
+										</button>
+									</div>
+								</div>
+							</div>
+						</div>
+					</div>
+				</form>
+		</div>
+		</section>
+	</div>
+ </div>
+	<%@ include file="/pages/common/bottom.jsp"%>
+</div>
+	 <!-- 信号选择结束 -->
+	<%@ include file="/pages/common/js.jsp"%>
+ 
+	<script type="text/javascript">
+	 
+	
+      $(function () {
+        //Money Euro
+        $("[data-mask]").inputmask();
+      });
+		
+       $(function () {
+        $("#datemask").inputmask("dd/mm/yyyy", {"placeholder": "dd/mm/yyyy"});
+        //Datemask2 mm/dd/yyyy
+        $("#datemask2").inputmask("mm/dd/yyyy", {"placeholder": "mm/dd/yyyy"});
+        //Money Euro
+        $("[data-mask]").inputmask();
+
+        //Date range picker
+        $('#reservation').daterangepicker();
+        //Date range picker with time picker
+        $('#reservationtime').daterangepicker({timePicker: true, timePickerIncrement: 30, format: 'MM/DD/YYYY h:mm A'});
+        //Date range as a button
+        $('#daterange-btn').daterangepicker(
+                {
+                  ranges: {
+                    'Today': [moment(), moment()],
+                    'Yesterday': [moment().subtract('days', 1), moment().subtract('days', 1)],
+                    'Last 7 Days': [moment().subtract('days', 6), moment()],
+                    'Last 30 Days': [moment().subtract('days', 29), moment()],
+                    'This Month': [moment().startOf('month'), moment().endOf('month')],
+                    'Last Month': [moment().subtract('month', 1).startOf('month'), moment().subtract('month', 1).endOf('month')]
+                  },
+                  startDate: moment().subtract('days', 29),
+                  endDate: moment()
+                },
+        function (start, end) {
+          $('#reportrange span').html(start.format('MMMM D, YYYY') + ' - ' + end.format('MMMM D, YYYY'));
+        }
+        );
+      });
+    </script>
+
+
+	<!-- Le javascript
+  ================================================== -->
+	<script
+		src="http://www.bootcss.com/p/bootstrap-datetimepicker/bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js"></script>
+
+	<script type="text/javascript">
+    $(".form_datetime").datetimepicker({
+        //format: "dd MM yyyy - hh:ii",
+        format: "yyyy-mm-dd hh:ii",
+        autoclose: true,
+        todayBtn: true,
+        pickerPosition: "bottom-right"
+    });
+</script>
+	 
+<script type="text/javascript">
+
+    //实例化编辑器
+    //建议使用工厂方法getEditor创建和引用编辑器实例，如果在某个闭包下引用该编辑器，直接调用UE.getEditor('editor')就能拿到相关的实例
+    var ue = UE.getEditor('editor',{
+	         autoHeightEnabled: true,
+   	         autoFloatEnabled: true
+    });
+
+
+    function isFocus(e){
+        alert(UE.getEditor('editor').isFocus());
+        UE.dom.domUtils.preventDefault(e)
+    }
+    function setblur(e){
+        UE.getEditor('editor').blur();
+        UE.dom.domUtils.preventDefault(e)
+    }
+    function insertHtml() {
+        var value = prompt('插入html代码', '');
+        UE.getEditor('editor').execCommand('insertHtml', value)
+    }
+    function createEditor() {
+        enableBtn();
+        UE.getEditor('editor');
+    }
+    function getAllHtml() {
+        alert(UE.getEditor('editor').getAllHtml())
+    }
+    function getContent() {
+        var arr = [];
+        arr.push("使用editor.getContent()方法可以获得编辑器的内容");
+        arr.push("内容为：");
+        arr.push(UE.getEditor('editor').getContent());
+        alert(arr.join("\n"));
+    }
+    function getPlainTxt() {
+        var arr = [];
+        arr.push("使用editor.getPlainTxt()方法可以获得编辑器的带格式的纯文本内容");
+        arr.push("内容为：");
+        arr.push(UE.getEditor('editor').getPlainTxt());
+        alert(arr.join('\n'))
+    }
+    function setContent(isAppendTo) {
+        var arr = [];
+        arr.push("使用editor.setContent('欢迎使用ueditor')方法可以设置编辑器的内容");
+        UE.getEditor('editor').setContent('欢迎使用ueditor', isAppendTo);
+        alert(arr.join("\n"));
+    }
+    function setDisabled() {
+        UE.getEditor('editor').setDisabled('fullscreen');
+        disableBtn("enable");
+    }
+
+    function setEnabled() {
+        UE.getEditor('editor').setEnabled();
+        enableBtn();
+    }
+
+    function getText() {
+        //当你点击按钮时编辑区域已经失去了焦点，如果直接用getText将不会得到内容，所以要在选回来，然后取得内容
+        var range = UE.getEditor('editor').selection.getRange();
+        range.select();
+        var txt = UE.getEditor('editor').selection.getText();
+        alert(txt)
+    }
+
+    function getContentTxt() {
+        var arr = [];
+        arr.push("使用editor.getContentTxt()方法可以获得编辑器的纯文本内容");
+        arr.push("编辑器的纯文本内容为：");
+        arr.push(UE.getEditor('editor').getContentTxt());
+        alert(arr.join("\n"));
+    }
+    function hasContent() {
+        var arr = [];
+        arr.push("使用editor.hasContents()方法判断编辑器里是否有内容");
+        arr.push("判断结果为：");
+        arr.push(UE.getEditor('editor').hasContents());
+        alert(arr.join("\n"));
+    }
+    function setFocus() {
+        UE.getEditor('editor').focus();
+    }
+    function deleteEditor() {
+        disableBtn();
+        UE.getEditor('editor').destroy();
+    }
+    function disableBtn(str) {
+        var div = document.getElementById('btns');
+        var btns = UE.dom.domUtils.getElementsByTagName(div, "button");
+        for (var i = 0, btn; btn = btns[i++];) {
+            if (btn.id == str) {
+                UE.dom.domUtils.removeAttributes(btn, ["disabled"]);
+            } else {
+                btn.setAttribute("disabled", "true");
+            }
+        }
+    }
+    function enableBtn() {
+        var div = document.getElementById('btns');
+        var btns = UE.dom.domUtils.getElementsByTagName(div, "button");
+        for (var i = 0, btn; btn = btns[i++];) {
+            UE.dom.domUtils.removeAttributes(btn, ["disabled"]);
+        }
+    }
+
+    function getLocalData () {
+        alert(UE.getEditor('editor').execCommand( "getlocaldata" ));
+    }
+
+    function clearLocalData () {
+        UE.getEditor('editor').execCommand( "clearlocaldata" );
+        alert("已清空草稿箱")
+    }
+    
+    $(document).on('ready', function() {
+		$("#input-22").fileinput({
+			previewFileType : "image",
+			browseClass : "btn btn-success",
+			browseLabel : "Pick Image",
+			browseIcon : "<i class=\"glyphicon glyphicon-picture\"></i> ",
+			removeClass : "btn btn-danger",
+			removeLabel : "Delete",
+			removeIcon : "<i class=\"glyphicon glyphicon-trash\"></i> ",
+			uploadClass : "btn btn-info",
+			uploadLabel : "Upload",
+			uploadIcon : "<i class=\"glyphicon glyphicon-upload\"></i> "
+		});
+
+		$(function() {
+			$('#create_form').ajaxForm({
+				type : 'post',
+				url : '../live/save',
+				enctype : 'multipart/form-data',
+				beforeSubmit : function() {
+						return true;
+				},
+				error : function(XMLHttpRequest, textStatus, errorThrown) {
+					alert("错误");
+				},
+				success : function(result) {
+					location.href = '../live/list/1';
+				}
+			});
+		});
+	});
+    
+   /*  $(function() {
+		$('#create_form').ajaxForm({
+			type : 'post',
+			url : '../live/save',
+			enctype : 'multipart/form-data',
+			beforeSubmit : function() {
+				var cms_column_ref_id=$("#input-22").val();
+				if(cms_column_ref_id==''){
+					alert("请输入栏目名称，点击获取，然后选择！");
+					return false;
+			}
+			},
+			error : function(XMLHttpRequest, textStatus, errorThrown) {
+				alert("错误");
+			},
+			success : function(result) {
+				location.href = '../live/list/1';
+			}
+		});
+	});
+	 */
+    
+</script>
+</body>
+</html>