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

# Conflicts: # 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 into v532
# Conflicts: # target/m2e-wtp/web-resources/META-INF/maven/com.cnlive.mz.live.web/cnlive_live_web/pom.properties
刘基城
2 parents b08f7020 c5506590
Showing 10 changed files with 80 additions and 38 deletions
.settings/org.eclipse.wst.common.component
src/main/java/com/cnlive/mz/live/action/LiveAction.java
src/main/java/com/cnlive/mz/live/action/VideoAction.java
src/main/java/com/cnlive/mz/live/rest/BaseUtil.java
src/main/webapp/pages/live/all_live_management.jsp
src/main/webapp/pages/live/video_management.jsp
src/main/webapp/static/assets/cnlive/js/live.js
src/main/webapp/static/assets/cnlive/js/video.js
src/test/java/com/cnlive/test/Test.java
target/m2e-wtp/web-resources/META-INF/maven/com.cnlive.mz.live.web/cnlive_live_web/pom.properties
@@ -8,15 +8,6 @@
         <dependent-module archiveName="cnlive_live_model-0.0.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/cnlive_live_model/cnlive_live_model">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-        <dependent-module archiveName="cnlive_ks3-1.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/cnlive_ks3/cnlive_ks3">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="smart-framework-4.0.1.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/smart-framework/smart-framework">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="smart-plugin-job-1.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/smart-plugin-job/smart-plugin-job">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
         <dependent-module archiveName="smart-plugin-dbcp-1.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/smart-plugin-dbcp/smart-plugin-dbcp">
             <dependency-type>uses</dependency-type>
         </dependent-module>
@@ -221,9 +221,4 @@ public class LiveAction {
 		return new View("live/all_live_management.jsp").data("tLive", tLive);
 	}
-	@Request.Get("/live/searchg/{page_number}")
-	public Result searchq(int page_number) {
-
-		return new Result(true);
-	}
 }
 \ No newline at end of file
@@ -231,4 +231,10 @@ public class VideoAction {
 		}
 		log.info(sb.toString());
 	}
+	@Request.Post("/video/unline")
+	public Result underLine(Params params){
+		int id = params.getInt("id");
+		tVideoService.underLine(id);
+		return null;
+	}
 }
@@ -30,8 +30,8 @@ public class BaseUtil {
 	private static final String ENCODING = "UTF-8";
 	// AccessKey、SecretKey
-	private static final String SECRET_KEY = "iqljE4WxQaSMeSd1QP+PPYSpvtK0uWyH0/r6tgi7";
-	private static final String ACCESS_KEY = "I3TC8a4xboN9kSJnUIQh";
+	private static final String SECRET_KEY = "UIWPYVeaV8kq2vWImDkLBvWs/pwmTJVF9MCNHDsC";
+	private static final String ACCESS_KEY = "fWUN8KDtJZJGo0ArQ4qo";
 	/*
 	 * 计算MD5+BASE64
@@ -74,7 +74,7 @@ public class BaseUtil {
 	}
 	/**
-	 * 获取当前时间戳
+	 * 获取当前前一天的时间戳
 	 * 
 	 * @return
 	 */
@@ -131,8 +131,6 @@ public class BaseUtil {
 		String method = "GET";
 		String expire = BaseUtil.getTimestamp();
 		String app = "live";
-		// String methodadd = methodNname;
-		// String name = streamName;
 		app = java.net.URLEncoder.encode(app, "utf-8");
 		methodName = java.net.URLEncoder.encode(methodName, "utf-8");
 		streamName = java.net.URLEncoder.encode(streamName, "utf-8");
@@ -36,7 +36,7 @@
 								<h3 class="box-title"></h3>
 								<div class="box-tools">
 									<div class="input-group">
-										<form role = "form" action="../search/1" method="get">
+										<form role = "form">
 											<div class="input-group">
 												<input type="text" name="search_user_id" id="search_user_id"
 													class="form-control input-sm" style="width: 150px;"
@@ -44,7 +44,7 @@
 													name="search_title" id="search_title"
 													class="form-control input-sm" style="width: 150px;"
 													placeholder="活动名称" />
-											    <button id="t_activity_search_btn" type="submit"
+											    <button id="t_activity_search_btn" onclick="search()"
 													class="btn btn-sm btn-default">
 													<i class="fa fa-search"></i>搜索
 												</button> 
@@ -110,4 +110,12 @@
 	</div>
 	<%@ include file="/pages/common/js.jsp"%>
 </body>
+<script type="text/javascript">
+ function search(){
+	 var search_user_id = $("#search_user_id").val();
+	 var search_title = $("#search_title").val();
+	 window.location.href ="../search/1?search_user_id="+search_user_id+"&search_title="+search_title ;
+	 alert(window.location.href);
+ }
+</script>
 </html>
@@ -36,10 +36,10 @@
 							<div class="box-body">
 								<table class="table table-bordered">
 									<tr>
-										<th>名称</th>
-										<th>状态</th>
-										<th>描述</th>
-										<th>操作</th>
+										<th width ="30%">名称</th>
+										<th width ="10%">状态</th>
+										<th width ="40%">描述</th>
+										<th width ="10%">操作</th>
 									</tr>
 									<c:forEach var="item" items="${videos.recordList}"
 										varStatus="stat">
@@ -57,9 +57,12 @@
 												<td>${item.description}
 											</td>
 											<td>
-												<button class="btn btn-minier label-success"
+												<button class="btn btn-minier btn-sm"
 													onclick="t_live_xq(${item.id});">详细
 												</button>
+												<button class="btn  btn-danger btn-sm"
+													onclick="t_live_underLine(${item.id});">下线
+												</button>
 											</td>
 										</tr>
@@ -436,8 +436,6 @@ function  do_publishreview(id){
 }
 //断流处理
 function play_close(id,live_url,uuid){
-	var id_live_url = $("hidId").val();
-	alert(id_live_url);
 	$.ajax({
 		url : '../../check/cut/' + id,
 		type : 'post',
@@ -459,12 +457,10 @@ function play_close(id,live_url,uuid){
 function changePlay(id,live_url,userId,title,time){
 	$("input").attr("id","play_url_"+id);
 	$("input").attr("name","play_url_"+id);
-	//$("#play_url_"+id).val(live_url);
 	$("#hidId").val(live_url);
 	$("li[id='userId']").html("<a><i class='fa fa-file-text-o'></i>用户ID: "+userId+"</a>");
 	$("li[id='title']").html("<a><i class='fa fa-file-text-o'></i>TITLE: "+title+"</a>");
 	$("li[id='startTime']").html("<a><i class='fa fa-file-text-o'></i>开播时间: "+time+"</a>");
-	//$("#playId").html("<input type='hidden' name='play_url_"+id+"'id='play_url_"+id+"' value='"+live_url+"'/><span class='mailbox-attachment-icon has-img' id='player_span_"+id+"'><img src='../../static/assets/dist/img/photo2.png' alt='Attachment'></span>");
 	jwplayer("playId").setup({ 
 		    file: live_url, 
 		    height: 260, 
@@ -480,4 +476,19 @@ function changePlay(id,live_url,userId,title,time){
 function t_live_xq(id){
 	window.location.href="../../video/view/"+id;
 }
+function t_live_underLine(id){
+	$.ajax({
+		url:'../../video/unline',
+		type:'post',
+		datatype : 'json',
+		data:{"id":id},
+		error : function() {
+			alert('下线时发生错误!');
+		},
+		success : function(data) {
+			location.href = '../../video/check/1';
+			alert("下线成功");
+		}
+	});
+}
 function t_live_xq(id){
-	$,ajax({
+	$.ajax({
 		url:'../../video/detail',
 		type:'post',
 		datatype : 'json',
 		data:{"id":id},
 	});
+}
+function t_live_underLine(id){
+	alert(id);
+	$.ajax({
+		url:'../../video/unline',
+		type:'post',
+		datatype : 'json',
+		data:{"id":id},
+	});
 }
 \ No newline at end of file
@@ -13,13 +13,18 @@ import com.cnlive.mz.commons.net.HttpReq;
 public class Test {
 	public static void main(String[] args) {
-		String mediaId="123";
-		String title="hha";
-		String sid="234";
-		//String url = "https://mobile.cnlive.com/CnliveMobile/hd/applyChatRoomId.action?mediaId="+mediaId+"&title="+title+"&sid=?"+sid;
-		String url = "https://mobile.cnlive.com/CnliveMobile/hd/applyChatRoomId.action";
-	    //String chat_room_id = HttpReq.getRequestWidthResult(url);
-	    System.out.println(sendGet(url));
+//		String mediaId="123";
+//		String title="hha";
+//		String sid="234";
+//		//String url = "https://mobile.cnlive.com/CnliveMobile/hd/applyChatRoomId.action?mediaId="+mediaId+"&title="+title+"&sid=?"+sid;
+//		String url = "https://mobile.cnlive.com/CnliveMobile/hd/applyChatRoomId.action";
+//	    //String chat_room_id = HttpReq.getRequestWidthResult(url);
+//	    System.out.println(sendGet(url));
+		String live = "rtmp://cnlive01.rtmplive.ks-cdn.com/live/498122_a9fdb367c6054edc9d2035dc237d28aa";
+		int index = live.lastIndexOf("/");
+		System.out.println(index);
+		String live_url = live.substring(index+1);
+		System.out.println(live_url);
 	}
 	public static String toGMTString(Date date) {
@@ -5,3 +5,19 @@ groupId=com.cnlive.mz.live.web
 m2e.projectName=cnlive_live_web
 m2e.projectLocation=D\:\\1_CNLIVE_JAVA_CODE\\cnlive_live_web
 artifactId=cnlive_live_web
+#Generated by Maven Integration for Eclipse
+#Tue Jun 21 13:17:57 CST 2016
+version=0.0.1-SNAPSHOT
+groupId=com.cnlive.mz.live.web
+m2e.projectName=cnlive_live_web
+m2e.projectLocation=D\:\\1_CNLIVE_JAVA_CODE\\cnlive_live_web
+artifactId=cnlive_live_web
+#Generated by Maven Integration for Eclipse
+#Mon Jun 20 09:31:18 CST 2016
+#Mon Jun 20 10:10:00 CST 2016
+#Fri Jun 17 09:20:43 CST 2016
+version=0.0.1-SNAPSHOT
+groupId=com.cnlive.mz.live.web
+m2e.projectName=cnlive_live_web
+m2e.projectLocation=C\:\\Users\\Administrator\\git\\cnlive_live_web
+artifactId=cnlive_live_web
 \ No newline at end of file