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 be78d072 2b1b94b2
Showing 11 changed files with 56 additions and 75 deletions
src/main/java/com/cnlive/mz/live/action/LiveAction.java
src/main/java/com/cnlive/mz/live/action/VideoAction.java
src/main/webapp/pages/common/left.jsp
src/main/webapp/pages/live/all_live_management.jsp
src/main/webapp/static/assets/ck/ckplayer/ckplayer.js
src/main/webapp/static/assets/ck/ckplayer/ckplayer.xml
src/main/webapp/static/assets/cnlive/js/all_live.js
src/main/webapp/static/assets/cnlive/js/common.js
src/main/webapp/static/assets/cnlive/js/global.js
src/main/webapp/static/assets/cnlive/js/live.js
target/m2e-wtp/web-resources/META-INF/maven/com.cnlive.mz.live.web/cnlive_live_web/pom.properties
@@ -124,8 +124,8 @@ public class LiveAction {
 		if (live_url.isEmpty()) {
 			return null;
 		} else {
-			int index = live_url.lastIndexOf("live");
-			String streamName = live_url.substring(index + 6);
+			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");
@@ -138,12 +138,12 @@ public class LiveAction {
 			// 断流。
 			try {
 				addBlackList(signature, accesskey, expire, streamName);
-				delBlackList(delsignature, accesskey, expire, streamName);
+				//delBlackList(delsignature, accesskey, expire, streamName);
 			} catch (UnsupportedEncodingException e) {
 				e.printStackTrace();
 			}
 			// 直播通知
-			// tLiveService.notify(video_uuid, "-1");
+			 //tLiveService.notify(video_uuid, -1);
 			boolean flag = tCheckService.closeLive(id);
 			return new Result(flag);
 		}
@@ -175,7 +175,6 @@ public class LiveAction {
 	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);
@@ -195,7 +194,6 @@ public class LiveAction {
 	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);
 		return jsonArrStr;
@@ -209,15 +207,23 @@ public class LiveAction {
 		return new View("live/all_live_management.jsp").data("tLive", tLive);
 	}
-	@Request.Post("/live/search/{page_number}")
+	@Request.Get("/live/search/{page_number}")
 	public View search(int page_number, Params params) {
 		int user_id = CastUtil.castInt(DataContext.getRequest().getSession().getAttribute(LiveUtils.SESSION_KEY_ID));
 		System.out.println(user_id);
 		System.out.println("...parmas..." + params);
 		String t_user_id = params.getString("search_user_id");
 		String title = params.getString("search_title");
+
+		try {
+			title = new String(title.trim().getBytes("ISO-8859-1"), "utf-8");
+			System.out.println("...title.."+title);
+		} catch (UnsupportedEncodingException e) {
+			e.printStackTrace();
+		}  
+
 		Pager<TLive> tLive = tLiveService.getTLiveAllPager(page_number, Constants.PAGE_SIZE, t_user_id, title);
-		System.out.println(tLive);
+		System.out.println("tLive====="+tLive);
 		return new View("live/all_live_management.jsp").data("tLive", tLive);
 	}
@@ -242,7 +242,7 @@ public class VideoAction {
 	@Request.Post("/video/unline")
 	public Result underLine(Params params) {
 		int id = params.getInt("id");
-		tVideoService.underLine(id);
-		return null;
+		boolean flag = tVideoService.underLine(id);
+		return new Result(flag);
 	}
 }
@@ -57,7 +57,7 @@
 					<a href="${BASE}/channel/list/1"><i class="fa fa-circle-o text-green"></i>频道管理</a>
 			    </li>
 			</c:if>
-				<c:if test="${sessionScope.roleId=='2'}">
+				<c:if test="true">
 				    <li class="header">UGC直播审查</li>
 				    <li>
 						<a href="${BASE}/user/list/1"><i class="fa fa-circle-o text-yellow"></i>主播管理</a>
@@ -32,11 +32,11 @@
 				<div class="row">
 					<div class="col-xs-12">
 						<div class="box  box-warning">
-							<div class="box-header with-border">
+							<div class="box-header with-border"> 
 								<h3 class="box-title"></h3>
 								<div class="box-tools">
 									<div class="input-group">
-										<form role = "form">
+										<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;"
@@ -44,10 +44,9 @@
 													name="search_title" id="search_title"
 													class="form-control input-sm" style="width: 150px;"
 													placeholder="活动名称" />
-											    <button id="t_activity_search_btn" onclick="search()"
-													class="btn btn-sm btn-default">
+												<button type="submit" class="btn btn-sm btn-default">
 													<i class="fa fa-search"></i>搜索
-												</button> 
+												</button>
 											</div>
 										</form>
 									</div>
@@ -74,8 +73,7 @@
 											<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}">
+											<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>
@@ -86,6 +84,10 @@
 												</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>
@@ -104,18 +106,10 @@
 						</div>
 					</div>
 				</div>
-	       </section>
+			</section>
 		</div>
 		<%@ include file="/pages/common/bottom.jsp"%>
 	</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>
@@ -295,19 +295,7 @@ function ckstyle() { //定义总的风格
 		以下内容定义自定义插件的相关配置，这里也可以自定义任何自己的插件需要配置的内容，当然，如果你某个插件不使用的话，也可以删除相关的配置
 		------------------------------------------------------------------------------------------------------------------
 		*/
-        cpt_lights: '1',
-		/*
-		该处定义是否使用开关灯，和right.swf插件配合作用,使用开灯效果时调用页面的js函数function closelights(){};
-		*/
-        cpt_share: 'ckplayer/share.xml',
-        /*
-		分享插件调用的配置文件地址
-		调用插件开始
-		*/
-        cpt_list: ckcpt()
-        /*
-		ckcpt()是本文件最上方的定义插件的函数
-		*/
+       
     }
     return ck;
 }
@@ -259,22 +259,5 @@
 		跳过广告和播放结束时调用的js函数
 		-->
 		<myweb></myweb>
-		
-		<!--
-		以下内容部份是和插件相关的配置，请注意，自定义插件以及其配置的命名方式要注意，不要和系统的相重复，不然就会替换掉系统的相关设置，删除相关插件的话也可以同时删除相关的配置
-		以下内容定义自定义插件的相关配置，这里也可以自定义任何自己的插件需要配置的内容，当然，如果你某个插件不使用的话，也可以删除相关的配置
-		-->
-		<cpt_lights>0</cpt_lights>
-		<!--
-		该处定义是否使用开关灯，和right.swf插件配合作用,使用开灯效果时调用页面的js函数function closelights(){};
-		-->
-		<cpt_share>/ckplayer/share.xml</cpt_share>
-		<!--
-		分享插件调用的配置文件地址
-		调用插件开始
-		-->
-		<!-- <cpt>right.swf,2,1,0,0,2,0</cpt>右边开关灯，调整，分享按钮的插件
-		<cpt>share.swf,1,1,-180,-100,3,0</cpt>分享插件
-		<cpt>adjustment.swf,1,1,-180,-100,3,0</cpt>调整大小和颜色的插件 -->
 	</style>
 </ckplayer>
 \ No newline at end of file
@@ -7,7 +7,6 @@ function t_live_close(id, uuid) {
 			alert('获取错误！');
 		},
 		success : function(data) {
-			alert(data);
 			location.href = "../../live/alllive/1";
 		}
 	});
@@ -6,20 +6,6 @@
 function next_page(pageNum) {
 	window.location.href = "" + pageNum;
 }
-function next_pager(pageNum) {
-	$.ajax({
-		url : '../../live/searchg/' + pageNum,
-		type : 'post',
-		datatype : "json",
-		async : true,
-		error : function() {
-		},
-		success : function(data) {
-			location.href = '../../live/search/'+pageNum;
-		}
-	});
-
-}
 // 提示
 function showTip(succ) {
 var BASE; // Context Path（在 script.jsp 中初始化）
-
+function next_page(pageNum){
+	window.location.href = "" + pageNum+window.location.search;
+	alert(window.location.search);
+}
 var Smart = {
     /* -------------------------------------------------- 函数 -------------------------------------------------- */
     Validator: {
@@ -146,7 +149,7 @@ $(function() {
     });
     // 设置 form 默认为 post 类型
-    $('form').attr('method', 'post');
+   // $('form').attr('method', 'post');
     // 全局 AJAX 设置
     $.ajaxSetup({
@@ -491,4 +491,19 @@ function t_live_underLine(id){
 		}
 	});
 }
-
+function checkUser(){
+	 var search_user_id = $("#search_user_id").val();
+	 var search_title = $("#search_title").val();
+	 $.ajax({
+			url:'../../live/search/1',
+			type:'post',
+			datatype : 'json',
+			error : function() {
+				alert('下线时发生错误!');
+			},
+			success : function(data) {
+				//location.href = "../../live/search/1?search_user_id="+search_user_id+"&search_title="+search_title;
+				//alert(location.href);
+			}
+		});
+}
@@ -5,3 +5,10 @@ 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
+#Fri Jun 24 09:13:59 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