Commit 0b3f290cc541562e0dd75c9ebb9a28db8b48f9b5
Merge branch 'dev'
Showing
2 changed files
with
6 additions
and
5 deletions
src/main/java/com/cnlive/shenhe/job/YiDunUrlResultJob.java
| @@ -54,7 +54,7 @@ public class YiDunUrlResultJob { | @@ -54,7 +54,7 @@ public class YiDunUrlResultJob { | ||
| 54 | /** | 54 | /** |
| 55 | * 定时查询易盾网站检测结果接口 | 55 | * 定时查询易盾网站检测结果接口 |
| 56 | */ | 56 | */ |
| 57 | - @Scheduled(cron = "0 0/1 * * * ? ")//每分钟一次 | 57 | + //@Scheduled(cron = "0 0/1 * * * ? ")//每分钟一次 |
| 58 | public void YiDunUrl() { | 58 | public void YiDunUrl() { |
| 59 | try { | 59 | try { |
| 60 | Map<String, String> params = new HashMap<String, String>(5); | 60 | Map<String, String> params = new HashMap<String, String>(5); |
| @@ -101,11 +101,12 @@ public class YiDunUrlResultJob { | @@ -101,11 +101,12 @@ public class YiDunUrlResultJob { | ||
| 101 | int result = jsonObject.getIntValue("result"); | 101 | int result = jsonObject.getIntValue("result"); |
| 102 | newYiDunMsg.setResult_type(String.valueOf(result)); | 102 | newYiDunMsg.setResult_type(String.valueOf(result)); |
| 103 | if (result == 1) { | 103 | if (result == 1) { |
| 104 | - desc = "通过了"; | 104 | + desc = "易盾网站审核通过了"; |
| 105 | shyContent.setShenhe_msg(desc); | 105 | shyContent.setShenhe_msg(desc); |
| 106 | newYiDunMsg.setDesc_msg(desc); | 106 | newYiDunMsg.setDesc_msg(desc); |
| 107 | //修改图文状态 | 107 | //修改图文状态 |
| 108 | contentServiceImpl.callback(yiDunMsg.getContent_id(), desc, CommonConst.AUDIT_SUCCESS, "", "机审通过"); | 108 | contentServiceImpl.callback(yiDunMsg.getContent_id(), desc, CommonConst.AUDIT_SUCCESS, "", "机审通过"); |
| 109 | + desc=""; | ||
| 109 | } else { | 110 | } else { |
| 110 | JSONObject evidences = jsonObject.getJSONObject("evidences"); | 111 | JSONObject evidences = jsonObject.getJSONObject("evidences"); |
| 111 | JSONArray texts = evidences.getJSONArray("texts"); | 112 | JSONArray texts = evidences.getJSONArray("texts"); |
| @@ -131,11 +132,11 @@ public class YiDunUrlResultJob { | @@ -131,11 +132,11 @@ public class YiDunUrlResultJob { | ||
| 131 | //0：正常，1：不确定，2：确定 | 132 | //0：正常，1：不确定，2：确定 |
| 132 | int level = jsonObject1.getIntValue("level"); | 133 | int level = jsonObject1.getIntValue("level"); |
| 133 | if (level == 1) { | 134 | if (level == 1) { |
| 134 | - desc = desc + "第" + (i + 1) + "图片嫌疑"; | 135 | + desc = desc + "第" + (i + 1) + "张图片嫌疑"; |
| 135 | break; | 136 | break; |
| 136 | } | 137 | } |
| 137 | if (level == 2) { | 138 | if (level == 2) { |
| 138 | - desc = desc + "第" + (i + 1) + "图片违规"; | 139 | + desc = desc + "第" + (i + 1) + "张图片违规"; |
| 139 | break; | 140 | break; |
| 140 | } | 141 | } |
| 141 | } | 142 | } |
src/main/resources/templates/common/frame.html
| @@ -75,7 +75,7 @@ line-height: 2em; margin: 0 auto;font-size: 2em" th:text="${session.sessionUser. | @@ -75,7 +75,7 @@ line-height: 2em; margin: 0 auto;font-size: 2em" th:text="${session.sessionUser. | ||
| 75 | </a> | 75 | </a> |
| 76 | <ul class="treeview-menu"> | 76 | <ul class="treeview-menu"> |
| 77 | <li class="active"><a href="/videos/page?state=0&receive=0" id="/videos/page">点播审核</a></li> | 77 | <li class="active"><a href="/videos/page?state=0&receive=0" id="/videos/page">点播审核</a></li> |
| 78 | - <li><a href="/audio/page?shenhe_state=0" id="/audio/page"> 音频审核</a></li> | 78 | + <li><a href="/audio/page?state=0&receive=0" id="/audio/page"> 音频审核</a></li> |
| 79 | <li><a href="/live/page?shenhe_state=0" id="/live/page"> 直播审核</a></li> | 79 | <li><a href="/live/page?shenhe_state=0" id="/live/page"> 直播审核</a></li> |
| 80 | <li><a href="/comments/page?state=0&receive=0" id="/comments/page"> 评论审核</a></li> | 80 | <li><a href="/comments/page?state=0&receive=0" id="/comments/page"> 评论审核</a></li> |
| 81 | <li><a href="/content/page?receive_status=0" id="/content/page"> 图文审核</a></li> | 81 | <li><a href="/content/page?receive_status=0" id="/content/page"> 图文审核</a></li> |