Commit e4961fab92cb2fc1c7df98084e9f3e747294af1e

Authored by 张宗朋
1 parent cb801165

live

src/main/java/com/cnlive/mz/live/action/LiveAction.java
... ... @@ -201,16 +201,16 @@ public class LiveAction {
201 201 return rb;
202 202 } else {
203 203 boolean flag = tLiveService.addAcitvity(params);
  204 + TLive tlive = tLiveService.selectByParams(appId, activityId);
204 205 if (flag) {
205 206 Map<String, Object> map = new HashMap<String, Object>();
206   - map.put("location",
207   - com.cnlive.mz.live.common.Constants.KS_HOST_UP_RTMP + channelID + "?vdoid=" + activityId);
  207 + map.put("location",com.cnlive.mz.live.common.Constants.KS_HOST_UP_RTMP + channelID + "?vdoid=" + activityId);
208 208 rb.setData(map);
209 209 rb.setErrorCode("0");
210 210 rb.setErrorMessage("创建活动成功");
211 211 log.info("创建活动成功");
212 212 // 通知cms直播
213   - // boolean success = tLiveService.startLive(tLive);
  213 + boolean success = tLiveService.startLive(tlive);
214 214 return rb;
215 215 } else {
216 216 Map<String, Object> map = new HashMap<String, Object>();
... ...
target/m2e-wtp/web-resources/META-INF/maven/com.cnlive.mz.live.web/cnlive_live_web/pom.properties
1 1 #Generated by Maven Integration for Eclipse
2   -#Fri Aug 19 14:05:33 CST 2016
  2 +#Sat Aug 20 09:25:14 CST 2016
3 3 version=0.0.1-SNAPSHOT
4 4 groupId=com.cnlive.mz.live.web
5 5 m2e.projectName=cnlive_live_web
... ...