no message

刘基城
1 parent 51428512
Showing 6 changed files with 29 additions and 6 deletions
.settings/org.eclipse.wst.common.component
src/main/java/com/cnlive/mz/live/action/VideoAction.java
src/main/resources/log4j.properties
target/classes/log4j.properties
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
@@ -8,6 +8,9 @@
         <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>
@@ -177,13 +177,13 @@ public class VideoAction {
 		String video_type = params.getString("video_type");
 		String state = params.getString("state");
 		String duration = params.getString("duration");
-		xLog("uploadNotify", "duration", duration, video_type, video_type,state);
+		xLog("uploadNotify", "duration", duration, video_type, video_type, state);
 		if (video_type.equals("2")) {
 			// 点播通知
 			tVideoService.notify(video_uuid);
 		} else if (video_type.equals("3")) {
 			// 直播正常结束
-			tLiveService.notify(video_uuid, duration, 2);
+			tLiveService.notify(video_uuid, 2);
 		}
 		ApiBean apiBean = new ApiBean();
 		apiBean.setCode(100);
@@ -194,7 +194,7 @@ public class VideoAction {
 	@Request.Get("/api/video/error/{video_uuid}")
 	public ApiBean error(String video_uuid) {
 		// 直播异常结束
-		tLiveService.notify(video_uuid, "-1", -2);
+		tLiveService.notify(video_uuid, -2);
 		ApiBean apiBean = new ApiBean();
 		apiBean.setCode(100);
 		apiBean.setMessage("请求成功");
@@ -217,7 +217,7 @@ public class VideoAction {
 	private void xLog(String... str) {
 		StringBuffer sb = new StringBuffer();
 		for (int i = 0; i < str.length; i++) {
-			sb.append(str);
+			sb.append(str[i]);
 			sb.append("|");
 		}
 		log.info(sb.toString());
 log4j.rootLogger=INFO,console,file
 log4j.logger.content=INFO,content
 log4j.logger.video=INFO,video
+log4j.logger.action=INFO,action
 log4j.appender.console=org.apache.log4j.ConsoleAppender
 log4j.appender.console.Target=System.out
 log4j.appender.console.layout=org.apache.log4j.PatternLayout
@@ -17,6 +18,14 @@ log4j.appender.file.layout.ConversionPattern=%d{HH:mm:ss,SSS} %p %c (%L) - %m%n
 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
@@ -26,6 +35,7 @@ log4j.appender.content.DatePattern=&#39;.&#39;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.rootLogger=INFO,console,file
 log4j.logger.content=INFO,content
 log4j.logger.video=INFO,video
+log4j.logger.action=INFO,action
 log4j.appender.console=org.apache.log4j.ConsoleAppender
 log4j.appender.console.Target=System.out
 log4j.appender.console.layout=org.apache.log4j.PatternLayout
@@ -17,6 +18,14 @@ log4j.appender.file.layout.ConversionPattern=%d{HH:mm:ss,SSS} %p %c (%L) - %m%n
 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
@@ -26,6 +35,7 @@ log4j.appender.content.DatePattern=&#39;.&#39;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
 Manifest-Version: 1.0
 Build-Jdk: 1.7.0_79
-Built-By: liujicheng
+Built-By: adm
 Created-By: Maven Integration for Eclipse
 #Generated by Maven Integration for Eclipse
-#Thu Jun 16 09:01:40 CST 2016
+#Mon Jun 20 10:10:00 CST 2016
 version=0.0.1-SNAPSHOT
 groupId=com.cnlive.mz.live.web
 m2e.projectName=cnlive_live_web