网页内容送审易盾审核

郑超
1 parent c3927772
Showing 12 changed files with 211 additions and 134 deletions
src/main/java/com/cnlive/shenhe/api/AudioControllerApi.java
src/main/java/com/cnlive/shenhe/api/ContentControllerApi.java
src/main/java/com/cnlive/shenhe/api/YiDunControllerApi.java
src/main/java/com/cnlive/shenhe/entity/ShyYidun.java
src/main/java/com/cnlive/shenhe/job/AudioJob.java
src/main/java/com/cnlive/shenhe/job/ContentJob.java
src/main/java/com/cnlive/shenhe/job/VideosJob.java
src/main/java/com/cnlive/shenhe/job/YiDunUrlResultJob.java
src/main/java/com/cnlive/shenhe/serviceImpl/AudioServiceImpl.java
src/main/java/com/cnlive/shenhe/serviceImpl/ContentServiceImpl.java
src/main/java/com/cnlive/shenhe/serviceImpl/VideosServiceImpl.java
src/main/java/com/cnlive/shenhe/utils/YiDunAntiFraudUtil.java
@@ -5,7 +5,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.cnlive.shenhe.bean.ErrorEnum;
 import com.cnlive.shenhe.bean.ResponseBean;
 import com.cnlive.shenhe.entity.ShyAudio;
-import com.cnlive.shenhe.entity.ShyContent;
 import com.cnlive.shenhe.entity.ShyYidun;
 import com.cnlive.shenhe.enums.TextLabels;
 import com.cnlive.shenhe.serviceImpl.AudioServiceImpl;
@@ -14,20 +13,15 @@ import com.cnlive.shenhe.utils.AuditPass;
 import com.cnlive.shenhe.utils.CommonConst;
 import com.cnlive.shenhe.utils.YiDunAntiFraudUtil;
 import com.google.common.collect.EvictingQueue;
-import com.google.common.collect.Maps;
-import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 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;
 import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
 /**
  * @Author: xujincheng
@@ -143,6 +137,7 @@ public class AudioControllerApi {
                             newshyAudio.setId(shyAudio.getId());
                             if (action == 0 && asrStatus == 3) {
                                 newYiDunMsg.setDesc_msg("易盾点播音频审核通过了");
+                                newYiDunMsg.setCheck_status(0);
                                 newshyAudio.setMsg("易盾点播音频审核通过了");
                                 newshyAudio.setUploader("机审通过");
                                 newshyAudio.setState(1);
@@ -176,6 +171,8 @@ public class AudioControllerApi {
                                 newshyAudio.setState(0);
                                 newshyAudio.setShenhe_type(CommonConst.AUDIT_TYPE_USER);
                                 newshyAudio.setReceive(CommonConst.RECEIVE_BEFORE);
+                                //审核失败
+                                newYiDunMsg.setCheck_status(2);
                             }
                             newYiDunMsg.setResult_type(String.valueOf(action));
                         } catch (NumberFormatException e) {
@@ -101,7 +101,7 @@ public class ContentControllerApi {
                 return new ResponseBean(ErrorEnum.ERROR);
             }
         }
-        return saveContent(json, shyContent, shenheType, newContentTag);
+        return saveContent(json, shyContent, shenheType);
     }
     /**
@@ -112,7 +112,7 @@ public class ContentControllerApi {
      * @param shenheType
      * @return
      */
-    private ResponseBean saveContent(JSONObject json, ShyContent shyContent, Integer shenheType, String contentTag) {
+    private ResponseBean saveContent(JSONObject json, ShyContent shyContent, Integer shenheType) {
         //如果不存在直接插入
         //标题
         shyContent.setTitle(json.getString("title"));
@@ -135,7 +135,8 @@ public class ContentControllerApi {
             shyContent.setContent_time(timestamp);
         }
-        shyContent.setContent_tag(contentTag);
+        String contentTag = json.getString("content_tag");
+        shyContent.setContent_tag(StringUtils.isEmpty(contentTag) ? "content" : contentTag);
         shyContent.setCreate_date(CommonUtils.getCurrentTime());
         //回调地址
@@ -72,7 +72,6 @@ public class YiDunControllerApi {
         params.put("signature", signature);
         // 4.发送HTTP请求
-        //String response = HttpClient4Utils.sendPost(httpClient, API_URL, params, Consts.UTF_8);
         String s = HttpClientUtils.post_str(URL_SUBMIT, params);
         logger.info("向易盾提交网站检测地址返回的结果:{}", s);
         JSONObject jsonObject = JSONObject.parseObject(s);
@@ -81,8 +80,13 @@ public class YiDunControllerApi {
         if (code == 200 && "ok".equals(msg)) {
             JSONObject result = jsonObject.getJSONObject("result");
             String dataId = result.getString("dataId");
+            String taskId = result.getString("taskId");
             ShyYidun shyYidun = new ShyYidun();
             shyYidun.setId(dataId);
+            shyYidun.setTask_id(taskId);
+            shyYidun.setData_id(dataId);
+            //网页
+            shyYidun.setCheck_type(3);
             shyYidun.setCreate_time(new Date());
             yiDunServiceImpl.addYiDunMsg(shyYidun);
         }
 package com.cnlive.shenhe.entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
 import java.util.Date;
-import javax.persistence.*;
 @Table(name = "shy_yidun")
 public class ShyYidun {
@@ -191,17 +192,59 @@ public class ShyYidun {
         this.update_time = update_time;
     }
-    public ShyYidun() {
+    private String task_id;
+    private String data_id;
+    private Integer check_type;
+    private Integer check_status;
+
+    public String getTask_id() {
+        return task_id;
     }
-    public ShyYidun(String id, String content_id, String url, String result_type, String desc_msg, Integer duration, Date create_time, Date update_time) {
-        this.id = id;
-        this.content_id = content_id;
-        this.url = url;
-        this.result_type = result_type;
-        this.desc_msg = desc_msg;
-        this.duration = duration;
-        this.create_time = create_time;
-        this.update_time = update_time;
+    public void setTask_id(String task_id) {
+        this.task_id = task_id;
+    }
+
+    public Integer getCheck_type() {
+        return check_type;
+    }
+
+    public void setCheck_type(Integer check_type) {
+        this.check_type = check_type;
     }
+
+    public Integer getCheck_status() {
+        return check_status;
+    }
+
+    public void setCheck_status(Integer check_status) {
+        this.check_status = check_status;
+    }
+
+    public String getData_id() {
+        return data_id;
+    }
+
+    public void setData_id(String data_id) {
+        this.data_id = data_id;
+    }
+
+
+    public ShyYidun() {
+    }
+
+//    public ShyYidun(String id, String content_id, String url, String result_type, String desc_msg, Integer duration, Date create_time, Date update_time
+//            , Integer check_type, String task_id) {
+//        this.id = id;
+//        this.content_id = content_id;
+//        this.url = url;
+//        this.result_type = result_type;
+//        this.desc_msg = desc_msg;
+//        this.duration = duration;
+//        this.create_time = create_time;
+//        this.update_time = update_time;
+//        this.check_type = check_type;
+//        this.task_id = task_id;
+//    }
+
 }
 \ No newline at end of file
@@ -63,13 +63,15 @@ public class AudioJob {
         List<ShyAudio> shyAudioList = audioService.findshyAudio(shyAudio);
         if (shyAudioList != null && shyAudioList.size() > 0) {
             for (ShyAudio audio : shyAudioList) {
-                ShyYidun shyYidun = new ShyYidun();
-                shyYidun.setContent_id(audio.getId().toString());
-                ShyYidun shyYidun1 = yiDunServiceImpl.getidunMsgByContentId(shyYidun);
-                if (shyYidun1 == null) {
-                    logger.info("定时向易盾发送点播音频检测视频的audioId：" + audio.getAudioId());
-                    audioService.audioFilter(audio);
-                }
+//                ShyYidun shyYidun = new ShyYidun();
+//                shyYidun.setContent_id(audio.getId().toString());
+//                //点播视频
+//                shyYidun.setCheck_type(4);
+//                ShyYidun shyYidun1 = yiDunServiceImpl.getidunMsgByContentId(shyYidun);
+//                if (shyYidun1 == null) {
+                logger.info("定时向易盾发送点播音频检测视频的audioId：" + audio.getAudioId());
+                audioService.audioFilter(audio);
+//                }
             }
         }
     }
 package com.cnlive.shenhe.job;
 import com.cnlive.shenhe.entity.ShyContent;
-import com.cnlive.shenhe.entity.ShyYidun;
 import com.cnlive.shenhe.serviceImpl.ContentServiceImpl;
 import com.cnlive.shenhe.serviceImpl.YiDunServiceImpl;
 import com.cnlive.shenhe.utils.CommonConst;
@@ -23,9 +22,6 @@ public class ContentJob {
     private static Logger logger = LoggerFactory.getLogger(ContentJob.class);
     @Autowired
     ContentServiceImpl contentService;
-    @Autowired
-    YiDunServiceImpl yiDunServiceImpl;
-
     /**
      * 白名单sp图文通过
@@ -52,25 +48,23 @@ public class ContentJob {
      * 定时向易盾提交网站地址
      * //每分钟一次
      */
-    @Scheduled(cron = "0 0/1 * * * ? ")
+    @Scheduled(cron = "0 0/5 * * * ? ")
     public void videofilter() {
-        logger.info("提交网页审核到易盾...........");
-        ShyContent shyContent = new ShyContent();
-        //机审
-        shyContent.setShenhe_type(CommonConst.AUDIT_TYPE_MACHANE);
-        //待审
-        shyContent.setReceive_status(CommonConst.RECEIVE_BEFORE);
-
-        List<ShyContent> shyContentList = contentService.findshyContent(shyContent);
+        logger.info("审核云提交网页审核到易盾...........");
+        List<ShyContent> shyContentList = contentService.findShyContentWithWebPage();
         if (shyContentList != null && shyContentList.size() > 0) {
+            logger.info("审核云提交网页审核到易盾数据个数:{}", shyContentList.size());
             for (ShyContent content : shyContentList) {
                 //易盾网站过滤
-                ShyYidun shyYidun = new ShyYidun();
-                shyYidun.setContent_id(content.getId().toString());
-                ShyYidun shyYidun1 = yiDunServiceImpl.getidunMsgByContentId(shyYidun);
-                if (shyYidun1 == null) {
-                    contentService.contentFilter(content);
-                }
+//                ShyYidun shyYidun = new ShyYidun();
+//                shyYidun.setContent_id(content.getId().toString());
+//                //网页类型
+//                shyYidun.setCheck_type(3);
+//                ShyYidun shyYidun1 = yiDunServiceImpl.getidunMsgByContentId(shyYidun);
+//                logger.info("审核云ShyYidun表里不为空提交网页审核到易盾单条数据:{}", JSON.toJSONString(content));
+//                if (shyYidun1 == null) {
+                contentService.contentFilter(content);
+//                }
             }
         }
     }
 package com.cnlive.shenhe.job;
 import com.cnlive.shenhe.entity.ShyVideos;
+import com.cnlive.shenhe.entity.ShyYidun;
 import com.cnlive.shenhe.serviceImpl.VideosServiceImpl;
+import com.cnlive.shenhe.serviceImpl.YiDunServiceImpl;
 import com.cnlive.shenhe.utils.CommonConst;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -17,6 +19,9 @@ public class VideosJob {
     @Autowired
     VideosServiceImpl videosService;
+    @Autowired
+    YiDunServiceImpl yiDunServiceImpl;
+
     /**
      * 白名单sp视频通过
      */
@@ -37,21 +42,32 @@ public class VideosJob {
     }
     /**
-     * 定时向易盾发送视频进行检测
+     * 定时向易盾发送视频抽帧图片进行检测
      */
     @Scheduled(cron = "0 0/1 10-23 * * ? ")//每天10点到23点执行，每分钟一次
     public void videofilter() {
         ShyVideos shyVideos = new ShyVideos();
-        shyVideos.setShenhe_type(CommonConst.AUDIT_TYPE_MACHANE);//审核类型为机审
-        shyVideos.setState(CommonConst.AUDIT_INTT);//待审核状态
-        shyVideos.setAvsample(CommonConst.AVSAMPLE_SUCCESS);//抽帧完成
+        //审核类型为机审
+        shyVideos.setShenhe_type(CommonConst.AUDIT_TYPE_MACHANE);
+        //待审核状态
+        shyVideos.setState(CommonConst.AUDIT_INTT);
+        //抽帧完成
+        shyVideos.setAvsample(CommonConst.AVSAMPLE_SUCCESS);
         List<ShyVideos> shyVideosList = videosService.findshyVideo(shyVideos);
         if (shyVideosList != null && shyVideosList.size() > 0) {
             for (ShyVideos video : shyVideosList) {
-                logger.info("定时向易盾发送检测视频的videos_id：" + video.getId());
+                logger.info("定时向易盾发送检测视频的videos_id：{}", video.getId());
                 //易盾图片过滤
+//                ShyYidun shyYidun = new ShyYidun();
+//                //点播视频
+//                shyYidun.setContent_id(video.getId().toString());
+//                //图片类型
+//                shyYidun.setCheck_type(2);
+//                ShyYidun shyYidun1 = yiDunServiceImpl.getidunMsgByContentId(shyYidun);
+//                if (shyYidun1 == null) {
+                logger.info("审核云定时向易盾发送视频抽帧图片检测：{}", video.getVideo_id());
                 videosService.videoFilter(video.getId());
-
+//                }
             }
         }
     }
@@ -64,13 +80,16 @@ public class VideosJob {
     public void autoRetReceive() {
         logger.info("点播自动退领的进入.....");
         ShyVideos shyVideos = new ShyVideos();
-        shyVideos.setState(CommonConst.AUDIT_INTT);//审核状态：未审核
-        shyVideos.setReceive(CommonConst.RECEIVE_AFTER);//已领取
+        //审核状态：未审核
+        shyVideos.setState(CommonConst.AUDIT_INTT);
+        //已领取
+        shyVideos.setReceive(CommonConst.RECEIVE_AFTER);
         List<ShyVideos> shyVideosList = videosService.findshyVideo(shyVideos);
         if (shyVideosList.size() > 0) {
             for (ShyVideos shyVideos2 : shyVideosList) {
                 logger.info("自动退领的videos_id：" + shyVideos2.getId());
-                shyVideos2.setReceive(CommonConst.RECEIVE_BEFORE);//未领取
+                //未领取
+                shyVideos2.setReceive(CommonConst.RECEIVE_BEFORE);
                 shyVideos2.setReceive_user_id(null);
                 videosService.updateshyVideos(shyVideos2);
             }
@@ -23,7 +23,7 @@ import java.util.Map;
 import java.util.Random;
 /**
- * 易盾网站检测
+ * 易盾网站检测定时拉取检测结果
  *
  * @Author: xujincheng
  * @Date: 2020/3/23 15:16
@@ -56,10 +56,10 @@ public class YiDunUrlResultJob {
     /**
      * 定时查询易盾网站检测结果接口
      */
-    @Scheduled(cron = "0 0/5 * * * ? ")//每5分钟一次
+    @Scheduled(cron = "0 0/1 * * * ? ")//每分钟一次
     public void YiDunUrl() {
         try {
-            Map<String, String> params = new HashMap<String, String>(5);
+            Map<String, String> params = new HashMap<>(5);
             // 1.设置公共参数
             params.put("secretId", SECRETID);
             params.put("version", "v1.0");
@@ -72,7 +72,7 @@ public class YiDunUrlResultJob {
             // 3.发送HTTP请求
             String s1 = HttpClientUtils.post_str(URL_RESULT, params);
-            logger.info("查询易盾网站检测结果:{}", s1);
+            logger.info("审核云查询易盾网站检测结果:{}", s1);
             // 4.解析接口返回值
             JSONObject resultObject = JSONObject.parseObject(s1);
@@ -104,8 +104,10 @@ public class YiDunUrlResultJob {
                                 shyContent.setReceive_status(2);
                                 shyContent.setShenhe_msg(desc);
                                 newYiDunMsg.setDesc_msg(desc);
+                                newYiDunMsg.setCheck_status(0);
                                 //修改图文状态
                                 contentServiceImpl.callback(yiDunMsg.getContent_id(), desc, CommonConst.AUDIT_SUCCESS, "", "机审通过");
+                                logger.info("审核云结果回调业务对接方:dataId={}", dataId);
                             } else {
                                 JSONObject evidences = jsonObject.getJSONObject("evidences");
                                 JSONArray texts = evidences.getJSONArray("texts");
@@ -177,6 +179,7 @@ public class YiDunUrlResultJob {
                                 shyContent.setReceive_status(3);
                                 shyContent.setShenhe_msg(desc);
                                 newYiDunMsg.setDesc_msg(desc);
+                                newYiDunMsg.setCheck_status(2);
                             }
                         } catch (NumberFormatException e) {
                             e.printStackTrace();
@@ -351,7 +351,7 @@ public class AudioServiceImpl {
      * 易盾点播音频过滤
      *
      * @param shyAudio
-     * @return
+     * @return 1:文本 2:图片 3.网页 4:点播音频
      */
     public void audioFilter(ShyAudio shyAudio) {
         //调用易盾点播音频检测接口
@@ -359,11 +359,15 @@ public class AudioServiceImpl {
         if (jsonObject != null) {
             JSONObject result = jsonObject.getJSONObject("result");
             String taskId = result.getString("taskId");
+            String dataId = result.getString("dataId");
             ShyYidun shyYidun = new ShyYidun();
             shyYidun.setId(taskId);
             shyYidun.setUrl(shyAudio.getAudioUrl());
             shyYidun.setContent_id(shyAudio.getId().toString());
             shyYidun.setCreate_time(new Date());
+            shyYidun.setTask_id(taskId);
+            shyYidun.setData_id(dataId);
+            shyYidun.setCheck_type(4);
             yiDunServiceImpl.addYiDunMsg(shyYidun);
         }
     }
 package com.cnlive.shenhe.serviceImpl;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.cnlive.shenhe.dto.ContentDTO;
 import com.cnlive.shenhe.entity.*;
 import com.cnlive.shenhe.mapper.ShyCommentsMapper;
 import com.cnlive.shenhe.mapper.ShyContentMapper;
-import com.cnlive.shenhe.mapper.ShySitesMapper;
 import com.cnlive.shenhe.mapper.ShyUsersMapper;
 import com.cnlive.shenhe.utils.AuditPass;
 import com.cnlive.shenhe.utils.CommonConst;
@@ -21,6 +21,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import tk.mybatis.mapper.entity.Example;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -38,8 +39,6 @@ public class ContentServiceImpl {
     @Autowired
     ShyContentMapper shyContentMapper;
     @Autowired
-    ShySitesMapper shySitesMapper;
-    @Autowired
     ShyUsersMapper shyUsersMapper;
     @Autowired
     AuditPass Pass;
@@ -48,8 +47,6 @@ public class ContentServiceImpl {
     @Autowired
     VideosServiceImpl videosService;
     @Autowired
-    VideofilterServiceImpl videofilterServiceImpl;
-    @Autowired
     YiDunServiceImpl yiDunServiceImpl;
     @Value("${spring.localhost.url}")
@@ -64,9 +61,20 @@ public class ContentServiceImpl {
     }
     //**************************************
+
     public List<ShyContent> findshyContent(ShyContent shyContent) {
+        return shyContentMapper.selectByRowBounds(shyContent, new RowBounds(0, 100));
+    }
-        return shyContentMapper.selectByRowBounds(shyContent, new RowBounds(0, 50));
+    public List<ShyContent> findShyContentWithWebPage() {
+        List checkParamList = new ArrayList();
+        checkParamList.add("content");
+        Example example = new Example(ShyContent.class);
+        Example.Criteria criteria = example.createCriteria();
+        criteria.andNotIn("content_tag", checkParamList);
+        criteria.andEqualTo("shenhe_type", CommonConst.AUDIT_TYPE_MACHANE);
+        criteria.andEqualTo("receive_status", CommonConst.RECEIVE_BEFORE);
+        return shyContentMapper.selectByExampleAndRowBounds(example, new RowBounds(0, 100));
     }
     //***************************
@@ -375,22 +383,26 @@ public class ContentServiceImpl {
      * 易盾网站过滤
      *
      * @param shyContent
-     * @return
+     * @return 1:文本 2:图片 3.网页 4:点播音频
      */
     public void contentFilter(ShyContent shyContent) {
         String contentUrl = shyContent.getContent_url();
-        logger.info("向易盾网站检测接口提交的url:" + contentUrl);
+        logger.info("审核云向易盾网站检测接口提交的url:{}", contentUrl);
         //调用易盾网站检测接口
         JSONObject jsonObject = YiDunAntiFraudUtil.submitYiDunUrl(contentUrl);
         if (jsonObject != null) {
             JSONObject result = jsonObject.getJSONObject("result");
             String dataId = result.getString("dataId");
+            String taskId = result.getString("taskId");
             ShyYidun shyYidun = new ShyYidun();
             shyYidun.setId(dataId);
             shyYidun.setUrl(contentUrl);
-
+            shyYidun.setTask_id(taskId);
+            shyYidun.setData_id(dataId);
+            shyYidun.setCheck_type(3);
             shyYidun.setContent_id(shyContent.getId().toString());
             shyYidun.setCreate_time(new Date());
+            logger.info("审核云保存到ShyYidun表里数据:{}", JSON.toJSONString(shyYidun));
             yiDunServiceImpl.addYiDunMsg(shyYidun);
         }
     }
@@ -324,7 +324,6 @@ public class VideosServiceImpl {
             }
         }
         //默认按上传时间倒序排序
-        //example.setOrderByClause("video_upload_time desc");
         List<ShyVideos> shyVideosList = shyVideosMapper.selectByExample(example);
         return shyVideosList;
     }
@@ -333,7 +332,7 @@ public class VideosServiceImpl {
      * 易盾视频（图片）过滤
      *
      * @param cid 审核云中视频的id
-     * @return
+     * @return 1:文本 2:图片 3.网页 4:点播音频
      */
     public int videoFilter(Integer cid) {
         ShyVideos shyVideos = shyVideosMapper.selectByPrimaryKey(cid);
@@ -375,7 +374,6 @@ public class VideosServiceImpl {
             //拒绝原因
             shyVideos.setMsg(desc);
             videosService.updateshyVideos(shyVideos);
-            //videosService.updateDianboAndShenhe(shyVideos,4);
         }
         try {
             ShyYidun shyYidun = new ShyYidun();
@@ -383,8 +381,11 @@ public class VideosServiceImpl {
             shyYidun.setContent_id(cid.toString());
             shyYidun.setUrl(url);
             shyYidun.setDesc_msg(desc);
+            //校验图片类型
+            shyYidun.setCheck_type(2);
             shyYidun.setDuration(shyVideos.getDuration());
             shyYidun.setCreate_time(new Date());
+
             yiDunServiceImpl.addYiDunMsg(shyYidun);
         } catch (Exception e) {
@@ -4,11 +4,9 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.cnlive.shenhe.enums.ImageLabels;
 import com.cnlive.shenhe.enums.TextLabels;
-import com.cnlive.shenhe.serviceImpl.YiDunServiceImpl;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.StringUtils;
 import java.io.UnsupportedEncodingException;
@@ -24,9 +22,6 @@ public class YiDunAntiFraudUtil {
     private static Logger logger = LoggerFactory.getLogger(YiDunAntiFraudUtil.class);
-    @Autowired
-    YiDunServiceImpl yiDunServiceImpl;
-
     /**
      * 网站地址URL产品密钥ID，产品标识
      */
@@ -35,24 +30,12 @@ public class YiDunAntiFraudUtil {
      * 网站地址URL产品私有密钥，服务端生成签名信息使用，请严格保管，避免泄露
      */
     private final static String SECRETKEY = "833222b4951a67a9bc63b5ed0c24d07d";
-    /**
-     * 网站地址URL提交接口地址
-     */
-    private final static String URL_SUBMIT = "https://as.dun.163yun.com/v1/crawler/submit";
-    /**
-     * 需检测的网站地址URL
-     */
-    private final static String FILE_URL = "http://shen.cnlive.com/api/content/detail/135058.html";
-    /**
-     * 网站地址URL检测结果获取接口地址
-     */
-    private final static String URL_RESULT = "https://as.dun.163yun.com/v1/crawler/callback/results";
-
     /**
      * 文本识别 图片识别 点播音频识别产品密钥ID，产品标识
      */
     private final static String TEXTANDIMAGESECRETID = "11c62726ba11f03f3f7d87acbe2d4f03";
+
     /**
      * 文本识别 图片识别 点播音频识别产品私有密钥，服务端生成签名信息使用，请严格保管，避免泄露
      */
@@ -61,64 +44,79 @@ public class YiDunAntiFraudUtil {
      * 业务ID，易盾根据产品业务特点分配(文本)
      */
     private final static String TEXTBUSINESSID = "719926f98dc5b9bb9857e1b799ea3f5f";
-    /**
-     * 易盾内容安全文本在线检测接口地址
-     */
-    private final static String TEXT_RESULT = "https://as.dun.163yun.com/v3/text/check";
+
     /**
      * 业务ID，易盾根据产品业务特点分配(图片)
      */
     private final static String IMAGEBUSINESSID = "f84d6ee9f62274243825d3e969ca4c5a";
-    /**
-     * 易盾内容安全服务图片在线检测接口地址
-     */
-    private final static String IMAGE_RESULT = "https://as.dun.163yun.com/v4/image/check";
+
     /**
      * 业务ID，易盾根据产品业务特点分配(点播音频)
      */
     private final static String AUDIOONDEMANDBUSINESSID = "1b77454593bf55607e3e7120d02c6389";
     /**
+     * 网站地址URL提交接口地址
+     * http://as.dun.163.com/v2/crawler/submit
+     */
+    private final static String URL_SUBMIT = "https://as.dun.163yun.com/v1/crawler/submit";
+
+    /**
      * 点播音频地址URL提交接口地址
      */
     private final static String AUDIOONDEMAND_URL_SUBMIT = "http://as.dun.163.com/v3/audio/submit";
-    public static void main(String[] args) {
-        Map<String, String> params = new HashMap<String, String>(5);
-        // 1.设置公共参数
-        params.put("secretId", SECRETID);
-        params.put("version", "v1.0");
-        params.put("timestamp", String.valueOf(System.currentTimeMillis()));
-        params.put("nonce", String.valueOf(new Random().nextInt()));
+    /**
+     * 易盾内容安全文本在线检测接口地址
+     */
+    private final static String TEXT_RESULT = "https://as.dun.163yun.com/v3/text/check";
-        // 2.生成签名信息
-        String signature1 = YiDunAntiFraudUtil.genSignature(SECRETKEY, params);
-        params.put("signature", signature1);
-        String s1 = HttpClientUtils.post_str(URL_RESULT, params);
-        logger.info("查询易盾网站检测结果:{}", s1);
+    /**
+     * 易盾内容安全服务图片在线检测接口地址
+     */
+    private final static String IMAGE_RESULT = "https://as.dun.163yun.com/v4/image/check";
+
+    /**
+     * 网站地址URL检测结果获取接口地址
+     */
+    private final static String URL_RESULT = "https://as.dun.163yun.com/v1/crawler/callback/results";
+
+    public static void main(String[] args) {
+//        Map<String, String> params = new HashMap<String, String>(5);
+//        // 1.设置公共参数
+//        params.put("secretId", SECRETID);
+//        params.put("version", "v1.0");
+//        params.put("timestamp", String.valueOf(System.currentTimeMillis()));
+//        params.put("nonce", String.valueOf(new Random().nextInt()));
+//
+//        // 2.生成签名信息
+//        String signature1 = YiDunAntiFraudUtil.genSignature(SECRETKEY, params);
+//        params.put("signature", signature1);
+//        String s1 = HttpClientUtils.post_str(URL_RESULT, params);
+//        logger.info("查询易盾网站检测结果:{}", s1);
         //智能文本识别审核测试
         //getTextFilter("王八蛋");
         //智能图片识别审核测试
-//        JSONArray jsonArray = new JSONArray();
-//        JSONObject image1 = new JSONObject();
-//        image1.put("name", UUID.randomUUID());
-//        image1.put("type", 1);
-//        image1.put("data", "http://article-bj.bj.bcebos.com//20200326/7f3d23bbb28421e6e2a6f131273554fb_15.jpg?authorization=bce-auth-v1%2F1eda661c3697440eaaca912ccb6f959c%2F2020-03-30T05%3A42%3A21Z%2F604800%2F%2F39f195e2327ef87270bd095fa64dfdcadad6f01a0d6dc6a4313306f164591cc5");
-//        jsonArray.add(image1);
-//        JSONObject image2 = new JSONObject();
-//        image2.put("name", UUID.randomUUID());
-//        image2.put("type", 1);
-//        image2.put("data", "http://test.qnvod.cnlive.com/shen/802/2020/03/01/8a8a878c6dce5cfe017096cd07940c84/000002.jpg");
-//        jsonArray.add(image2);
-//        JSONObject image3 = new JSONObject();
-//        image3.put("name", UUID.randomUUID());
-//        image3.put("type", 1);
-//        image3.put("data", "https://wjj.ys2.cnliveimg.com/769/img/0/2020/03/21/158474856886077030277.jpg");
-//        jsonArray.add(image3);
-//        System.out.println(jsonArray);
-//        JSONObject imagesFilter = getImagesFilter(jsonArray.toString());
-////        System.out.println(image1);
-//        System.out.println(imagesFilter);
+        JSONArray jsonArray = new JSONArray();
+        JSONObject image1 = new JSONObject();
+        image1.put("name", UUID.randomUUID());
+        image1.put("type", 1);
+        image1.put("data", "http://article-bj.bj.bcebos.com//20200326/7f3d23bbb28421e6e2a6f131273554fb_15.jpg?authorization=bce-auth-v1%2F1eda661c3697440eaaca912ccb6f959c%2F2020-03-30T05%3A42%3A21Z%2F604800%2F%2F39f195e2327ef87270bd095fa64dfdcadad6f01a0d6dc6a4313306f164591cc5");
+        jsonArray.add(image1);
+        JSONObject image2 = new JSONObject();
+        image2.put("name", UUID.randomUUID());
+        image2.put("type", 1);
+        image2.put("data", "http://test.qnvod.cnlive.com/shen/802/2020/03/01/8a8a878c6dce5cfe017096cd07940c84/000002.jpg");
+        jsonArray.add(image2);
+        JSONObject image3 = new JSONObject();
+        image3.put("name", UUID.randomUUID());
+        image3.put("type", 1);
+        image3.put("data", "https://wjj.ys2.cnliveimg.com/769/img/0/2020/03/21/158474856886077030277.jpg");
+        jsonArray.add(image3);
+        System.out.println(jsonArray);
+        JSONObject imagesFilter = getImagesFilter(jsonArray.toString());
+//        System.out.println(image1);
+        System.out.println(imagesFilter);
         //智能网页识别审核测试
@@ -398,7 +396,6 @@ public class YiDunAntiFraudUtil {
         params.put("signature", signature);
         // 4.发送HTTP请求
-        //String response = HttpClient4Utils.sendPost(httpClient, API_URL, params, Consts.UTF_8);
         String s = HttpClientUtils.post_str(URL_SUBMIT, params);
         System.out.println("图文检测提交url结果" + s);
@@ -431,7 +428,7 @@ public class YiDunAntiFraudUtil {
      */
     public static JSONObject submitYiDunUrl(String url) {
         try {
-            logger.info("向易盾网站检测接口提交的url.....................");
+            logger.info("审核云向易盾网站检测接口提交的url.....................");
             Map<String, String> params = new HashMap<String, String>();
             // 1.设置公共参数
@@ -456,7 +453,7 @@ public class YiDunAntiFraudUtil {
             // 4.发送HTTP请求
             String s = HttpClientUtils.post_str(URL_SUBMIT, params);
-            logger.info("向易盾提交网站检测地址返回的结果:{}", s);
+            logger.info("审核云向易盾提交网站检测地址返回的结果:{}", s);
             JSONObject jsonObject = JSONObject.parseObject(s);
             int code = jsonObject.getIntValue("code");
             String msg = jsonObject.getString("msg");