周伟鹏 / cnlive_shenhe · Commits

Commit c25ccc5443e0c849e73d67f335e56982d1f203c6

Authored by 王言钊
2 parents 37a98b39 0a5be002

Merge branch 'dev' 

# Conflicts:
#	src/main/java/com/cnlive/shenhe/serviceImpl/CommentsServiceImpl.java
Inline Side-by-side
Showing 3 changed files with 5 additions and 4 deletions
src/main/java/com/cnlive/shenhe/job/ContentJob.java
  View file @c25ccc5
... ... @@ -48,7 +48,7 @@ public class ContentJob {
48 48 * 定时向易盾提交网站地址
49 49 * //每分钟一次
50 50 */
51   - @Scheduled(cron = "0 0/1 * * * ? ")
  51 + @Scheduled(cron = "0 0/5 * * * ? ")
52 52 public void videofilter() {
53 53 logger.info("审核云提交网页审核到易盾...........");
54 54 List<ShyContent> shyContentList = contentService.findShyContentWithWebPage();
... ...
src/main/java/com/cnlive/shenhe/serviceImpl/CommentsServiceImpl.java
  View file @c25ccc5
... ... @@ -78,7 +78,7 @@ public class CommentsServiceImpl {
78 78 }
79 79  
80 80 public PageInfo<ShyComments> getPage(CommentsDTO commentsDTO) {
81   - logger.info("接受参数对象为，CommentsDTO:{}",JSONObject.toJSON(commentsDTO));
  81 + logger.info("接受参数对象为，CommentsDTO:{}", JSONObject.toJSON(commentsDTO));
82 82 Example example = new Example(ShyComments.class);
83 83 Example.Criteria criteria = example.createCriteria();
84 84 if (CommonUtils.isNotEmpty(commentsDTO.getOrderByClause())) {
... ... @@ -120,7 +120,6 @@ public class CommentsServiceImpl {
120 120 }
121 121 }
122 122  
123   -
124 123 if (CommonUtils.isNotNull(commentsDTO.getState()) && commentsDTO.getState() != 3) {
125 124 criteria.andEqualTo("state", commentsDTO.getState());
126 125 } else if (CommonUtils.isNotNull(commentsDTO.getState()) && commentsDTO.getState() == 3) {
... ...
src/main/java/com/cnlive/shenhe/serviceImpl/ContentServiceImpl.java
  View file @c25ccc5
... ... @@ -364,8 +364,10 @@ public class ContentServiceImpl {
364 364 //免审
365 365 shenheType = 1;
366 366 } else {
367   - if ("content".equals(ContentTag) || ContentTag.startsWith("cms_") || ContentTag.startsWith("edu_")) {
  367 + if ("content".equals(ContentTag)) {
368 368 //机审
  369 + shenheType = 1;
  370 + } else if (ContentTag.startsWith("cms_") || ContentTag.startsWith("edu_")) {
369 371 shenheType = 2;
370 372 } else {
371 373 //人工审
... ...