回调修改

周伟鹏
1 parent ba62db80
Showing 5 changed files with 110 additions and 21 deletions
src/main/java/com/cnlive/shenhe/api/CommentsControllerApi.java
src/main/java/com/cnlive/shenhe/api/VideosControllerApi.java
src/main/java/com/cnlive/shenhe/serviceImpl/CommentsServiceImpl.java
src/main/java/com/cnlive/shenhe/utils/AuditPass.java
src/main/java/com/cnlive/shenhe/utils/HttpUtil.java
@@ -14,7 +14,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
@@ -38,7 +37,7 @@ public class CommentsControllerApi {
     @PostMapping("/import")
     @ResponseBody
     public ResponseBean impotComment(String param) {
-        logger.info("评论入库，param====="+param);
+        logger.info("评论入库，param=====" + param);
         JSONObject json = JSONObject.parseObject(param);
         ShyComments shyComments = new ShyComments();
         ShySites shySites = new ShySites();
@@ -61,13 +60,15 @@ public class CommentsControllerApi {
                     json1.put("attr_tags", "");
                     json1.put("msg", "");
                     JSONObject result = new JSONObject();
-                    try{
-                        result = Pass.commentPass(json1,callback);
-                    }catch (Exception e){
+                    try {
+                        result = Pass.commentPass(json1, callback);
+                    } catch (Exception e) {
+                        logger.error("评论回调失败，activity_id:{}", json.getString("activityId"));
                         return new ResponseBean(ErrorEnum.BACK_ERROR);
                     }
                     Integer code = result.getInteger("errorCode");
                     if (code != 0) {
+                        logger.error("评论回调错误，activity_id:{},code:{},errorMessage:{}", json.getString("activityId"), code, result.getString("errorMessage"));
                         return new ResponseBean(code, result.getString("errorMessage"));
                     }
                     shyComments.setState(CommonConst.AUDIT_SUCCESS);
@@ -40,7 +40,7 @@ public class VideosControllerApi {
     @PostMapping("/import")
     @ResponseBody
     public ResponseBean impotVideo(String param) {
-        logger.info("点播入库，param====="+param);
+        logger.info("点播入库，param=====" + param);
         JSONObject json = JSONObject.parseObject(param);
         ShySites shySites = new ShySites();
         ShyVideos shyVideos = new ShyVideos();
@@ -56,15 +56,17 @@ public class VideosControllerApi {
                 String[] business = write_business.split(",");
                 List<String> asList = Arrays.asList(business);
                 if (asList.contains(CommonConst.BUSINESS_VIDEO + "")) {
-                    logger.info("白名单回调通过:videoId==="+videoId);
+                    logger.info("白名单回调通过:videoId===" + videoId);
                     JSONObject result = new JSONObject();
-                    try{
-                        result = Pass.auditPass(videoId, 3, "", "",callback);
-                    }catch (Exception e){
+                    try {
+                        result = Pass.auditPass(videoId, 3, "", "", callback);
+                    } catch (Exception e) {
+                        logger.error("点播回调失败，videoId:{}", videoId);
                         return new ResponseBean(ErrorEnum.BACK_ERROR);
                     }
                     Integer code = result.getInteger("code");
                     if (code != 0) {
+                        logger.error("点播回调错误，videoId:{},code:{},msg:{}", videoId, code, result.getString("msg"));
                         return new ResponseBean(code, result.getString("msg"));
                     }
                     shyVideos.setState(CommonConst.AUDIT_SUCCESS);
@@ -77,7 +79,7 @@ public class VideosControllerApi {
         shyVideos.setVideo_url(json.getString("videoUrl"));
         String videoCoverUrl = json.getString("videoCoverUrl");
         shyVideos.setVideo_imgs(videoCoverUrl);
-        if(CommonUtils.isNotEmpty(videoCoverUrl)){
+        if (CommonUtils.isNotEmpty(videoCoverUrl)) {
             String poster = json.getJSONObject("videoCoverUrl").getString("224*126");
             shyVideos.setVideo_poster(poster);
         }
@@ -131,7 +131,7 @@ public class CommentsServiceImpl {
             }
             Integer code = result.getInteger("errorCode");
             if (code != 0) {
-                logger.error("评论回调失败，activity_id:{}，errorCode:{},errorMessage:{}", comment.getActivity_id(), code, result.getString("errorMessage"));
+                logger.error("评论回调错误，activity_id:{}，errorCode:{},errorMessage:{}", comment.getActivity_id(), code, result.getString("errorMessage"));
                 success = false;
                 break;
             }
@@ -6,6 +6,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
+import java.util.HashMap;
 import java.util.Map;
 /**
@@ -38,7 +39,6 @@ public class AuditPass {
         params.put("attr_tags",attr_tags);
         params.put("msg",msg);
         HttpUtil httpUtil = HttpUtil.init();
-        httpUtil.setHeader("Content-Type","x-www-form-urlencoded;charset=UTF-8");
         httpUtil.setParam("param",params.toJSONString());
         String URL =callBack+"?platform="+platformKey+"&token="+token;
         Map<String, String> post = httpUtil.post(URL);
@@ -46,10 +46,9 @@ public class AuditPass {
     }
     public JSONObject commentPass(JSONObject json,String callBack){
-        HttpUtil httpUtil = HttpUtil.init();
-        httpUtil.setHeader("Content-Type","x-www-form-urlencoded;charset=UTF-8");
-        httpUtil.setParam("param",json.toJSONString());
-        Map<String, String> post = httpUtil.post(callBack);
-        return JSONObject.parseObject(post.get("result"));
+        Map<String, String> map = new HashMap<>();
+        map.put("param",json.toJSONString());
+        String result = HttpUtil.form(callBack, map);
+        return JSONObject.parseObject(result);
     }
 }
 package com.cnlive.shenhe.utils;
+import com.alibaba.fastjson.JSONObject;
 import org.apache.http.Header;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpStatus;
@@ -31,11 +32,11 @@ import org.slf4j.LoggerFactory;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
-import java.io.File;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
+import java.io.*;
+import java.net.HttpURLConnection;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.net.URL;
 import java.nio.charset.UnsupportedCharsetException;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -398,4 +399,90 @@ public class HttpUtil {
         }
         return uri;
     }
+
+
+    /**
+     * from请求
+     * @param url
+     * @param params
+     * @return
+     */
+    public static String form(String url, Map<String, String> params) {
+        URL u = null;
+        HttpURLConnection con = null;
+        // 构建请求参数
+        StringBuffer sb = new StringBuffer();
+        if (params != null) {
+            for (Entry<String, String> e : params.entrySet()) {
+                sb.append(e.getKey());
+                sb.append("=");
+                sb.append(e.getValue());
+                sb.append("&");
+            }
+            sb.substring(0, sb.length() - 1);
+        }
+        // 尝试发送请求
+        try {
+            u = new URL(url);
+            con = (HttpURLConnection) u.openConnection();
+            //// POST 只能为大写，严格限制，post会不识别
+            con.setRequestMethod("POST");
+            con.setDoOutput(true);
+            con.setDoInput(true);
+            con.setUseCaches(false);
+            con.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
+            OutputStreamWriter osw = new OutputStreamWriter(con.getOutputStream(), "UTF-8");
+            osw.write(sb.toString());
+            osw.flush();
+            osw.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            if (con != null) {
+                con.disconnect();
+            }
+        }
+
+        // 读取返回内容
+        StringBuffer buffer = new StringBuffer();
+        try {
+            //一定要有返回值，否则无法把请求发送给server端。
+            BufferedReader br = new BufferedReader(new InputStreamReader(con.getInputStream(), "UTF-8"));
+            String temp;
+            while ((temp = br.readLine()) != null) {
+                buffer.append(temp);
+                buffer.append("\n");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return buffer.toString();
+    }
+
+
+    public static void main(String[] args) {
+        /*Map<String, String> map = new HashMap<>();
+        JSONObject param = new JSONObject();
+        param.put("activity_id","60:video:comets:10011#2");
+        param.put("state",3);
+        param.put("attr_tags","");
+        param.put("msg","");
+
+        map.put("param",param.toJSONString());
+        String form = form("http://yp5ntd.natappfree.cc/CnInteraction/services/commentForHd/auditCallBackNew", map);
+        System.out.println(form);*/
+
+
+        JSONObject params = new JSONObject();
+        params.put("video_id","60_8be004799c424688949704814ea0d16d");
+        params.put("state",3+"");
+        params.put("attr_tags","");
+        params.put("msg","");
+        HttpUtil httpUtil = HttpUtil.init();
+        httpUtil.setParam("param",params.toJSONString());
+        String URL ="http://mam.innerapi.cnlive.com/v1/inner/ShenHeInfo/shenheNotify?platform=AUDIT&token=2718c88930175686e40398994cead75c";
+        Map<String, String> post = httpUtil.post(URL);
+        System.out.println(post.get("result"));
+    }
 }