Merge branch 'dev'

liwei2917
2 parents 9b5ba621 ede69b2b
Showing 8 changed files with 62 additions and 6 deletions
src/main/java/com/cnlive/shenhe/api/ContentControllerApi.java
src/main/java/com/cnlive/shenhe/entity/ShyContent.java
src/main/java/com/cnlive/shenhe/job/ContentJob.java
src/main/java/com/cnlive/shenhe/serviceImpl/ContentServiceImpl.java
src/main/java/com/cnlive/shenhe/utils/AntiFraudUtil.java
src/main/resources/application.properties
src/main/resources/mapper/ShyContentMapper.xml
src/main/resources/templates/html/contentPage.html
@@ -14,6 +14,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -22,6 +25,8 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import java.util.Date;
 import java.util.List;
  
+import javax.servlet.http.HttpSession;
+
 @Controller
 @RequestMapping("/api/content")
 public class ContentControllerApi {
@@ -60,6 +65,7 @@ public class ContentControllerApi {
             shyContent1.setContent_status(json.getInteger("contentStatus"));//当前图文的审核状态
             shyContent1.setSource(json.getString("source"));//来源
             shyContent1.setAuthor(json.getString("author"));//作者
+            shyContent1.setContent_text(json.getString("content_text"));//图文内容
             String contentTime = json.getString("contentTime");//图文创建时间
             if (CommonUtils.isNotEmpty(contentTime)) {
                 Date timestamp = CommonUtils.getTimestamp(contentTime, "yyyy-MM-dd HH:mm:ss");
@@ -91,6 +97,7 @@ public class ContentControllerApi {
         shyContent.setContent_status(json.getInteger("contentStatus"));//当前图文的审核状态
         shyContent.setSource(json.getString("source"));//来源
         shyContent.setAuthor(json.getString("author"));//作者
+        shyContent.setContent_text(json.getString("content_text"));//图文内容
         String contentTime = json.getString("contentTime");//创建时间
         if (CommonUtils.isNotEmpty(contentTime)) {
             Date timestamp = CommonUtils.getTimestamp(contentTime, "yyyy-MM-dd HH:mm:ss");
@@ -189,5 +196,14 @@ public class ContentControllerApi {
     		return new ResponseBean(ErrorEnum.ERROR);
     	}
     }
+    
+    @GetMapping("/detail/{id}.html")
+	public Object getContentDetail(Model model, @PathVariable Integer id) {
+		System.out.println("1111");
+		ShyContent content = contentService.selectByPrimaryKey(id);
+		model.addAttribute("content", content.getContent_text());
+		return "html/contentPage.html";
+	}
+    
  
 }
@@ -107,14 +107,17 @@ public class ShyContent {
      * 内容标题
      */
     private String title;
-    
+
     /**
      * sp名称
      */
     @Transient
     private String sp_desc;
  
-   
+    /**
+     * 图文文本内容
+     */
+    private String content_text;
  
     /**
      * @return id
@@ -496,4 +499,22 @@ public class ShyContent {
     public void setTitle(String title) {
         this.title = title;
     }
+
+    /**
+     * 获取图文文本内容
+     *
+     * @return content_text - 图文文本内容
+     */
+    public String getContent_text() {
+        return content_text;
+    }
+
+    /**
+     * 设置图文文本内容
+     *
+     * @param content_text 图文文本内容
+     */
+    public void setContent_text(String content_text) {
+        this.content_text = content_text;
+    }
 }
 \ No newline at end of file
@@ -58,7 +58,7 @@ public class ContentJob {
     /**
      * 定时发送数美检测视频
      */
-//   @Scheduled(cron="0 0/1 10-23 * * ? ")//每天10点到23点执行，每分钟一次
+   @Scheduled(cron="0 0/1 10-23 * * ? ")//每天10点到23点执行，每分钟一次
     public void videofilter() {
     	 ShyContent shyContent = new ShyContent();
     	 shyContent.setShenhe_type(CommonConst.AUDIT_TYPE_MACHANE);//审核类型为机审
@@ -67,7 +67,7 @@ public class ContentJob {
          if (shyContentList.size() > 0) {
              for (ShyContent content : shyContentList) {
             	 logger.info("定时发送数美检测的content_id："+content.getId());
-              //数美图片过滤
+              //数美图文过滤
              contentService.contentFilter(content,"DEFAULT_LOGO");
              }
          }
@@ -23,6 +23,7 @@ import org.apache.ibatis.session.RowBounds;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import tk.mybatis.mapper.entity.Example;
  
@@ -60,6 +61,9 @@ public class ContentServiceImpl {
     VideosServiceImpl videosService;
     @Autowired
     VideofilterServiceImpl videofilterServiceImpl;
+    
+    @Value("${spring.localhost.url}")
+    String localhost_url;
  
     public ShyContent getShyContent(ShyContent shyContent) {
         List<ShyContent> shyContentList = shyContentMapper.select(shyContent);
@@ -367,9 +371,10 @@ public class ContentServiceImpl {
               String type="";//数美返回结果的类型
               String desc="";//数美失败结果的详情
               String Token_id=UUID.randomUUID().toString();
+              String contentUrl=localhost_url+"/api/content/detail/"+shyContent.getContent_id()+".html";
               try{
             	  //调用数美接口
-            	   result =  AntiFraudUtil.filterArticle(Token_id,shyContent.getContent_url(),channel);
+            	   result =  AntiFraudUtil.filterArticle(Token_id,contentUrl,channel);
             	   type=result.getString("riskLevel");
             	   desc=result.getString("desc");//数美失败结果的详情
               }catch(Exception e){
@@ -42,7 +42,7 @@ public class AntiFraudUtil {
 //        String btId = uuid.toString();
  
 //        System.out.println("文本："+AntiFraudUtil.filterText("0000001", "王八蛋", "DYNAMIC_USER") + "---");
-//        System.out.println(AntiFraudUtil.filterArticle("000111","http://shineup.china.com.cn/WJJ/detail2_2019_08/13/1365957.html",null));
+//        System.out.println(AntiFraudUtil.filterArticle("000111","http://ffyl.cnlive.com/tgtw/detail2_2019_08/29/1400477.html",null));
         //System.out.println("图片："+AntiFraudUtil.filterImg("0000001", jsonArray,"DYNAMIC_BUSINESS") + "---");
         //System.out.println("视频："+AntiFraudUtil.filterVideo("http://wjj.ys1.cnliveimg.com/testVideo/test1.mp4",btId,null) + "---");
         //queryVideoResult("02b649b7-3451-403e-abd0-592302cec2a0");
@@ -49,6 +49,9 @@ url=http://mam.innerapi.cnlive.com/v1/inner/ShenHeInfo/shenheNotify
 platformKey =AUDIT
 platformValue=10011438
  
+#\u672c\u673a\u5730\u5740
+spring.localhost.url=http://test.shen.cnlive.com
+
 #\u62bd\u5e27\u5e38\u91cf
 avsmple_appKey=1eac30dfbee311e7a2f0fa163e771cf9
 avsmple_appSecret=28ce1e1fbee311e7a2f0fa163e771cf92ea58ebfbee311e7a2f0fa163e771cf9
@@ -26,5 +26,6 @@
     <result column="updater" jdbcType="VARCHAR" property="updater" />
     <result column="shenhe_msg" jdbcType="VARCHAR" property="shenhe_msg" />
     <result column="title" jdbcType="LONGVARCHAR" property="title" />
+    <result column="content_text" jdbcType="LONGVARCHAR" property="content_text" />
   </resultMap>
 </mapper>
 \ No newline at end of file
+<!DOCTYPE HTML>
+<html xmlns:th="http://www.thymeleaf.org">
+<head>
+    <title>图文内容</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+</head>
+<body>
+    <div th:utext=" ${content}">3333</div>
+</body>
+</html>
 \ No newline at end of file