Commit 12df291d04fccae002ab8a12a8c59a89a2284bf8

Authored by 徐近程
2 parents e44a50da 525b5338

Merge branch 'dev'

src/main/java/com/cnlive/shenhe/controller/VideosController.java
@@ -72,6 +72,7 @@ public class VideosController extends BaseController { @@ -72,6 +72,7 @@ public class VideosController extends BaseController {
72 @PostMapping("/shenheVideo") 72 @PostMapping("/shenheVideo")
73 @ResponseBody 73 @ResponseBody
74 public ResponseBean shenheInfo(Integer id, String activity_id, Integer state, String attr_tags, String msg, String callback, HttpSession session) { 74 public ResponseBean shenheInfo(Integer id, String activity_id, Integer state, String attr_tags, String msg, String callback, HttpSession session) {
  75 + logger.info("id:{},activity_id:{},state:{},attr_tags:{},msg:{},callback:{}",id,activity_id,state,attr_tags,msg,callback);
75 SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey()); 76 SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
76 String userId = sessionUser.getUserId(); 77 String userId = sessionUser.getUserId();
77 // ShyVideos shyVideos = videosService.selectByPrimaryKey(id); 78 // ShyVideos shyVideos = videosService.selectByPrimaryKey(id);
@@ -473,6 +474,7 @@ public class VideosController extends BaseController { @@ -473,6 +474,7 @@ public class VideosController extends BaseController {
473 @PostMapping("/repulse") 474 @PostMapping("/repulse")
474 @ResponseBody 475 @ResponseBody
475 public ResponseBean repulse(String ids, String msg, HttpSession session) { 476 public ResponseBean repulse(String ids, String msg, HttpSession session) {
  477 + logger.info("ids:{},msg:{}",ids,msg);
476 SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey()); 478 SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
477 String userId = sessionUser.getUserId(); 479 String userId = sessionUser.getUserId();
478 ResponseBean responseBean = new ResponseBean(); 480 ResponseBean responseBean = new ResponseBean();
src/main/java/com/cnlive/shenhe/utils/AuditPass.java
@@ -75,6 +75,7 @@ public class AuditPass { @@ -75,6 +75,7 @@ public class AuditPass {
75 } 75 }
76 String URL = callBack + "?platform=" + platformKey + "&token=" + token; 76 String URL = callBack + "?platform=" + platformKey + "&token=" + token;
77 Map<String, String> post = httpUtil.post(URL); 77 Map<String, String> post = httpUtil.post(URL);
  78 + logger.info("点播回调结果:{}",post.get("result"));
78 return JSONObject.parseObject(post.get("result")); 79 return JSONObject.parseObject(post.get("result"));
79 } 80 }
80 /** 81 /**