周伟鹏 / cnlive_shenhe · Commits

Commit c2ec9d755b28dfd4e3ae27423795ec4323f9b12b

Authored by 王言钊
2 parents 70b0abe2 489efa9e

Merge branch 'dev'

Inline Side-by-side
Showing 2 changed files with 2 additions and 3 deletions
src/main/java/com/cnlive/shenhe/controller/LiveController.java
  View file @c2ec9d7
... ... @@ -118,7 +118,6 @@ public class LiveController extends BaseController {
118 118 @GetMapping("/page")
119 119 public Object getListLives(Model model, LiveDTO liveDTO, HttpSession session) {
120 120 logger.info("列表请求参数:{}", JSON.toJSONString(liveDTO));
121   - System.out.println("进入直播内容页");
122 121 SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
123 122 Integer spid = sessionUser.getSpid();
124 123 String userId = sessionUser.getUserId();
... ...
src/main/java/com/cnlive/shenhe/serviceImpl/VideosServiceImpl.java
  View file @c2ec9d7
... ... @@ -350,7 +350,7 @@ public class VideosServiceImpl {
350 350 criteria.andEqualTo("video_user_id", videosDTO.getVideo_user_id());
351 351 }
352 352  
353   - if (videosDTO.getSource() != null) {
  353 + if (CommonUtils.isNotEmpty(videosDTO.getSource())) {
354 354 criteria.andEqualTo("source", videosDTO.getSource());
355 355 }
356 356  
... ... @@ -445,7 +445,7 @@ public class VideosServiceImpl {
445 445 public void updateDianboAndShenhe(ShyVideos video, int dianboState) {
446 446 //修改点播云的视频状态
447 447 JSONObject result = pass.auditPass(video.getVideo_id(), dianboState, video.getMsg(), video.getMsg(), video.getCallback());
448   - logger.error("点播回调result:{}", result);
  448 + logger.info("点播回调result:{}", result);
449 449 Integer code = result.getInteger("code");
450 450 String errorCode = result.getString("errorCode");
451 451 Integer shenheState = CommonConst.AUDIT_REFUSE;
... ...