xiugaick

张宗朋
2 parents 467aebb0 07792922
Showing 11 changed files with 73 additions and 59 deletions
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/resources/log4j.properties
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/live.js
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
@@ -143,7 +143,7 @@ public class LiveAction {
 				e.printStackTrace();
 			}
 			// 直播通知
-			// tLiveService.notify(video_uuid, "-1");
+			 tLiveService.notify(video_uuid, -1);
 			boolean flag = tCheckService.closeLive(id);
 			return new Result(flag);
 		}
@@ -209,7 +209,7 @@ 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);
@@ -35,9 +35,8 @@ public class UserAction {
 		return new View("user/user_live_list.jsp").data("userPage", userPage);
 	}
-	@Request.Get("/user/report/{userId}")
-	public Result getUserByReport(int userId) {
+	@Request.Get("/user/report/{userId}/{type}")
+	public Result getUserByReport(int userId,int type) {
 		return new Result(tUserService.addReport(userId));
 	}
-
 }
@@ -76,6 +76,7 @@ public class VideoAction {
 		String md5 = params.getString("md5");
 		String relation_id = params.getString("relation_id");
 		String uuid = "";
+		boolean success=true;
 		if (video_type.equals("2")) {
 			// 2：sdk上传录播文件
 			TVideo tVideo = new TVideo();
@@ -107,12 +108,17 @@ public class VideoAction {
 				tLive.setDirect(Integer.parseInt(direct));
 			}
 			tLive.setLive_url(Constants.KS_HOST_RTMP + tLive.getT_user_id() + "_" + uuid);
-			tLiveService.startLive(tLive);
+			success=tLiveService.startLive(tLive);
 		}
 		data.put("video_uuid", uuid);
 		ApiBean apiBean = new ApiBean();
-		apiBean.setCode(100);
-		apiBean.setMessage("请求成功");
+		if (success) {
+			apiBean.setCode(100);
+			apiBean.setMessage("请求成功");
+		}else{
+			apiBean.setCode(201);
+			apiBean.setMessage("发起直播失败");
+		}
 		apiBean.setData(data);
 		return apiBean;
 	}
-log4j.rootLogger=INFO,console,file
-log4j.logger.content=INFO,content
-log4j.logger.video=INFO,video
-log4j.logger.action=INFO,action
+log4j.rootLogger=INFO,console,file,action,content,video,httpreq
+
+#Console  
+log4j.appender.Threshold=INFO
+log4j.appender.console.Target=System.out 
 log4j.appender.console=org.apache.log4j.ConsoleAppender
-log4j.appender.console.Target=System.out
 log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.ConversionPattern=%m%n
+log4j.appender.console.layout.ConversionPattern=%d %-5p [%c] (%t:%x) %m%n
+
 log4j.appender.file=org.apache.log4j.DailyRollingFileAppender
 log4j.appender.file.File=${catalina.base}/logs/cnlive_live_web/log
@@ -45,6 +46,16 @@ log4j.appender.video.DatePattern=&#39;.&#39;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
@@ -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>
@@ -36,7 +36,7 @@
 								<h3 class="box-title"></h3>
 								<div class="box-tools">
 									<div class="input-group">
-										<form role = "form">
+										<form role = "form" id="formid"  name= "myform" 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,7 +44,7 @@
 													name="search_title" id="search_title"
 													class="form-control input-sm" style="width: 150px;"
 													placeholder="活动名称" />
-											    <button id="t_activity_search_btn" onclick="search()"
+											    <button id="t_activity_search_btn" type="submit"
 													class="btn btn-sm btn-default">
 													<i class="fa fa-search"></i>搜索
 												</button> 
@@ -110,12 +110,4 @@
 	</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
@@ -491,4 +491,23 @@ function t_live_underLine(id){
 		}
 	});
 }
+function checkUser(){
+	 var search_user_id = $("#search_user_id").val();
+	 var search_title = $("#search_title").val();
+	 //var href ="../search/1?search_user_id="+search_user_id+"&search_title="+search_title ;
+	 //window.open(href);
+	 //window.location.href ="../../live/search/1?search_user_id="+search_user_id+"&search_title="+search_title ;
+	 $.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("下线成功");
+			}
+		});
+}
 Manifest-Version: 1.0
-Build-Jdk: 1.7.0_13
-Built-By: Administrator
+Build-Jdk: 1.7.0_79
+Built-By: adm
 Created-By: Maven Integration for Eclipse
 #Generated by Maven Integration for Eclipse
-#Thu Jun 23 09:05:43 CST 2016
+#Thu Jun 23 09:20:00 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
+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