刘基城 / cnlive_live_web · Commits

Commit 8534cbd8dd4723c2e65a0cdadb64125d8285900a

Authored by 刘基城
1 parent d3fa2d3c

no message

Inline Side-by-side
Showing 3 changed files with 2 additions and 3 deletions
.settings/org.eclipse.core.resources.prefs
  View file @8534cbd
1 eclipse.preferences.version=1 1 eclipse.preferences.version=1
2 encoding//src/main/java=UTF-8 2 encoding//src/main/java=UTF-8
3 encoding//src/main/resources=UTF-8 3 encoding//src/main/resources=UTF-8
4 -encoding//src/test/java=UTF-8  
5 encoding/<project>=UTF-8 4 encoding/<project>=UTF-8
src/main/java/com/cnlive/mz/live/action/VideoAction.java
  View file @8534cbd
@@ -107,7 +107,7 @@ public class VideoAction { @@ -107,7 +107,7 @@ public class VideoAction {
107 tLive.setDescription(description); 107 tLive.setDescription(description);
108 tLive.setStart_time(new Date()); 108 tLive.setStart_time(new Date());
109 tLive.setUser_uuid(params.getString("name")); 109 tLive.setUser_uuid(params.getString("name"));
110 - tLive.setRelation_id(Integer.parseInt(relation_id)); 110 + tLive.setRelation_id(relation_id);
111 tLive.setCustom_args(custom_args); 111 tLive.setCustom_args(custom_args);
112 uuid = tLive.getUuid(); 112 uuid = tLive.getUuid();
113 if (StringUtils.isEmpty(direct)) { 113 if (StringUtils.isEmpty(direct)) {
target/m2e-wtp/web-resources/META-INF/maven/com.cnlive.mz.live.web/cnlive_live_web/pom.properties
  View file @8534cbd
1 #Generated by Maven Integration for Eclipse 1 #Generated by Maven Integration for Eclipse
2 -#Thu Aug 11 14:49:21 CST 2016 2 +#Fri Aug 12 13:57:45 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