刘基城 / cnlive_live_web · Commits

Commit 52b8ae53156e79d96546e224ec07762dc333ced9

Authored by 刘基城
1 parent 5688c57e

no message

Inline Side-by-side
Showing 5 changed files with 15 additions and 5 deletions
src/main/java/com/cnlive/mz/live/action/HttpPostArgumentTest2.java
  View file @52b8ae5
@@ -64,7 +64,7 @@ public class HttpPostArgumentTest2 { @@ -64,7 +64,7 @@ public class HttpPostArgumentTest2 {
64 } 64 }
65 65
66 public static void redirect() { 66 public static void redirect() {
67 - NameValuePair[] param = { new NameValuePair("relation_id", "282512"), new NameValuePair("video_type", "3"), 67 + NameValuePair[] param = { new NameValuePair("relation_id", "283645"), new NameValuePair("video_type", "3"),
68 new NameValuePair("user_access_key", user_access_key), 68 new NameValuePair("user_access_key", user_access_key),
69 new NameValuePair("app_access_key", app_access_key) }; 69 new NameValuePair("app_access_key", app_access_key) };
70 String c = HttpReq.postRequestWidthResult("http://bc.cnlive.com/api/video/redirect", param); 70 String c = HttpReq.postRequestWidthResult("http://bc.cnlive.com/api/video/redirect", param);
src/main/java/com/cnlive/mz/live/action/VideoAction.java
  View file @52b8ae5
@@ -85,8 +85,8 @@ public class VideoAction { @@ -85,8 +85,8 @@ public class VideoAction {
85 tVideo.setDescription(description); 85 tVideo.setDescription(description);
86 tVideoService.saveSdkVideo(tVideo, server_access_key, user_access_key, app_access_key); 86 tVideoService.saveSdkVideo(tVideo, server_access_key, user_access_key, app_access_key);
87 } else if (video_type.equals("3")) { 87 } else if (video_type.equals("3")) {
88 - // 3： sdk直播上传文件  
89 TLive tLive = tLiveService.getTLiveByUUId(active_id); 88 TLive tLive = tLiveService.getTLiveByUUId(active_id);
  89 + tLive.setT_status_id(1);
90 tLive.setTitle(title); 90 tLive.setTitle(title);
91 tLive.setDescription(description); 91 tLive.setDescription(description);
92 tLive.setStart_time(new Date()); 92 tLive.setStart_time(new Date());
@@ -185,6 +185,16 @@ public class VideoAction { @@ -185,6 +185,16 @@ public class VideoAction {
185 return apiBean; 185 return apiBean;
186 } 186 }
187 187
  188 + @Request.Get("/api/video/error/{video_uuid}")
  189 + public ApiBean beat(String video_uuid) {
  190 + // 直播通知
  191 + tLiveService.notify(video_uuid);
  192 + ApiBean apiBean = new ApiBean();
  193 + apiBean.setCode(100);
  194 + apiBean.setMessage("请求成功");
  195 + return apiBean;
  196 + }
  197 +
188 @Request.Post("/api/video/delete") 198 @Request.Post("/api/video/delete")
189 public ApiBean delete(Params params) { 199 public ApiBean delete(Params params) {
190 String user_access_key = params.getString("user_access_key"); 200 String user_access_key = params.getString("user_access_key");
src/main/resources/log4j.properties
  View file @52b8ae5
@@ -12,7 +12,7 @@ log4j.appender.file.encoding=UTF-8 @@ -12,7 +12,7 @@ log4j.appender.file.encoding=UTF-8
12 log4j.appender.file.layout=org.apache.log4j.PatternLayout 12 log4j.appender.file.layout=org.apache.log4j.PatternLayout
13 log4j.appender.file.layout.ConversionPattern=%d{HH:mm:ss,SSS} %p %c (%L) - %m%n 13 log4j.appender.file.layout.ConversionPattern=%d{HH:mm:ss,SSS} %p %c (%L) - %m%n
14 14
15 -log4j.logger.org.apache=ERROR 15 +#log4j.logger.org.apache=ERROR
16 log4j.logger.org.smart4j=DEBUG 16 log4j.logger.org.smart4j=DEBUG
17 17
18 18
target/classes/log4j.properties
  View file @52b8ae5
@@ -12,7 +12,7 @@ log4j.appender.file.encoding=UTF-8 @@ -12,7 +12,7 @@ log4j.appender.file.encoding=UTF-8
12 log4j.appender.file.layout=org.apache.log4j.PatternLayout 12 log4j.appender.file.layout=org.apache.log4j.PatternLayout
13 log4j.appender.file.layout.ConversionPattern=%d{HH:mm:ss,SSS} %p %c (%L) - %m%n 13 log4j.appender.file.layout.ConversionPattern=%d{HH:mm:ss,SSS} %p %c (%L) - %m%n
14 14
15 -log4j.logger.org.apache=ERROR 15 +#log4j.logger.org.apache=ERROR
16 log4j.logger.org.smart4j=DEBUG 16 log4j.logger.org.smart4j=DEBUG
17 17
18 18
target/m2e-wtp/web-resources/META-INF/maven/com.cnlive.mz.live.web/cnlive_live_web/pom.properties
  View file @52b8ae5
1 #Generated by Maven Integration for Eclipse 1 #Generated by Maven Integration for Eclipse
2 -#Sun Jun 12 09:49:28 CST 2016 2 +#Tue Jun 14 14:04:42 CST 2016
3 version=0.0.1-SNAPSHOT 3 version=0.0.1-SNAPSHOT
4 groupId=com.cnlive.mz.live.web 4 groupId=com.cnlive.mz.live.web
5 m2e.projectName=cnlive_live_web 5 m2e.projectName=cnlive_live_web