mm

张宗朋
1 parent d528314d
Showing 3 changed files with 17 additions and 11 deletions
src/main/java/com/cnlive/mz/live/action/LiveAction.java
src/main/webapp/pages/live/all_live_management.jsp
target/m2e-wtp/web-resources/META-INF/maven/com.cnlive.mz.live.web/cnlive_live_web/pom.properties
@@ -123,26 +123,26 @@ 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");
 		String add = "add";
-		String signature = BaseUtil.signature(add,streamName);
+		String addsignature = 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);
+			addBlackList(addsignature,accesskey,expire,streamName);
 			delBlackList(delsignature,accesskey,expire,streamName);
 		} catch (UnsupportedEncodingException e) {
 			e.printStackTrace();
 		}
 		// 直播通知
-	   // tLiveService.notify(video_uuid, "-1",-2);
+	    tLiveService.notify(video_uuid, -2);
 		boolean flag = tCheckService.closeLive(id);
 		return new Result(flag);
 	}
@@ -218,7 +218,7 @@ public class LiveAction {
 		Pager<TLive> tLive = tLiveService.getTLivePager(page_number, Constants.PAGE_SIZE);
 		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);
@@ -35,7 +35,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;"
@@ -43,7 +43,7 @@
 												<input type="text" 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>
 #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
+#Tue Jun 21 09:00:02 CST 2016
 version=0.0.1-SNAPSHOT
 groupId=com.cnlive.mz.live.web
 m2e.projectName=cnlive_live_web