给28改的一个版本，查询主贴的评论时，新增了两个输出字段：pageType 和 userType,用来区分 评论、转发、点赞

.idea/compiler.xml

@@ -16,6 +16,7 @@
       <module name="cl_search_api" target="1.8" />
       <module name="cl_stream_3" target="1.8" />
       <module name="cl_stream_3.1.1" target="1.8" />
+      <module name="cl_stream_3.2" target="1.8" />
     </bytecodeTargetLevel>
   </component>
 </project>

.idea/encodings.xml

@@ -8,5 +8,7 @@
     <file url="file://$PROJECT_DIR$/cl_search_api" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/cl_search_api/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/cl_search_api/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
   </component>
 </project>

.idea/libraries/Maven__mysql_mysql_connector_java_5_1_29.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: mysql:mysql-connector-java:5.1.29">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/mysql/mysql-connector-java/5.1.29/mysql-connector-java-5.1.29.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/mysql/mysql-connector-java/5.1.29/mysql-connector-java-5.1.29-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/mysql/mysql-connector-java/5.1.29/mysql-connector-java-5.1.29-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/misc.xml

@@ -7,7 +7,10 @@
       </list>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/classes" />
   </component>
+  <component name="ProjectType">
+    <option name="id" value="jpab" />
+  </component>
 </project>

.idea/modules.xml

@@ -5,6 +5,7 @@
       <module fileurl="file://$PROJECT_DIR$/cl_query_data_job/cl_query_data_job.iml" filepath="$PROJECT_DIR$/cl_query_data_job/cl_query_data_job.iml" />
       <module fileurl="file://$PROJECT_DIR$/cl_search_api/cl_search_api.iml" filepath="$PROJECT_DIR$/cl_search_api/cl_search_api.iml" />
       <module fileurl="file://$PROJECT_DIR$/cl_stream_3.iml" filepath="$PROJECT_DIR$/cl_stream_3.iml" />
+      <module fileurl="file://$PROJECT_DIR$/cl_stream_3.2.iml" filepath="$PROJECT_DIR$/cl_stream_3.2.iml" />
     </modules>
   </component>
 </project>

cl_query_data_job/src/main/java/com/bfd/mf/job/service/query/QueryService.java

@@ -7,16 +7,13 @@ import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.bfd.crawler.utils.JsonUtils;
 import com.bfd.mf.job.config.AppConfig;
 import com.bfd.mf.job.config.ESConstants;
-import com.bfd.mf.job.domain.entity.Subject;
 import com.bfd.mf.job.domain.entity.Task;
 import com.bfd.mf.job.domain.repository.SubjectRepository;
 import com.bfd.mf.job.domain.repository.TaskRepository;
 import com.bfd.mf.job.download.DownLoadFile;
-import com.bfd.mf.job.service.WriterTXTService;
 import com.bfd.mf.job.util.*;
 import com.google.common.collect.Maps;
 import com.google.common.util.concurrent.RateLimiter;
-import kafka.utils.Json;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.assertj.core.util.Lists;
 import org.elasticsearch.index.query.*;
@@ -26,15 +23,8 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import javax.annotation.PostConstruct;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.math.BigDecimal;
 import java.math.BigInteger;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLConnection;
 import java.sql.Timestamp;
 import java.util.*;
 import java.util.concurrent.BlockingQueue;

cl_search_api/cl_search_api.iml

@@ -162,7 +162,8 @@
     <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.06" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.1.22" level="project" />
     <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.16.20" level="project" />
-    <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.29" level="project" />
+    <orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.30" level="project" />
+    <orderEntry type="library" name="Maven: com.google.protobuf:protobuf-java:3.19.4" level="project" />
     <orderEntry type="library" name="Maven: org.jodd:jodd-core:3.4.8" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.2.1" level="project" />
     <orderEntry type="library" name="Maven: com.bfd.nlp:nlp_common_util:1.1" level="project" />

cl_search_api/pom.xml

@@ -13,7 +13,7 @@
     <name>cl_search_api</name>
     <description>Search V3.2 API</description>
     <artifactId>cl_search_api</artifactId>
-    <version>3.2-SNAPSHOT</version>
+    <version>3.2.4-SNAPSHOT</version>
 
 
 
@@ -138,7 +138,7 @@
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>5.1.29</version>
+            <version>8.0.30</version>
         </dependency>
 
         <dependency>

cl_search_api/src/main/java/com/bfd/mf/common/util/constants/ESConstant.java

@@ -807,7 +807,14 @@ public class ESConstant {
             ESConstant.VIDEOTIME, // 视频的时长
 
             ESConstant.OCRTEXT, // 图像识别结果
-            ESConstant.ASRTEXT // 语音识别结果
+            ESConstant.ASRTEXT, // 语音识别结果
+
+            // 判断评论数据的类型，评论/转发/点赞
+            // pageType = socialComment 评论
+            // pageType = socialFollow userType = 0
+            // pageType = socialFollow userType = 1
+            ESConstant.PAGETYPE,
+            ESConstant.USER_TYPE
     );
 
     // 总体分析要用的字段

cl_search_api/src/main/resources/application.yml

@@ -14,13 +14,13 @@ server:
 
 spring:
   datasource:
-    driver-class-name: com.mysql.jdbc.Driver
-#    username: root
-#    password: Bfd123!@#
-#    url: jdbc:mysql://172.18.1.134:3306/intelligent_crawl?useOldAliasMetadataBehavior=true&characterEncoding=UTF-8&zeroDateTimeBehavior=round
+    driver-class-name: com.mysql.cj.jdbc.Driver
     username: crawl
-    password: D5HLOvk553DUNV62qJI=
-    url: jdbc:mysql://172.18.1.134:3306/intelligent_crawl?useOldAliasMetadataBehavior=true&characterEncoding=UTF-8&zeroDateTimeBehavior=round
+    password: crawl123
+    url: jdbc:mysql://172.18.1.134:3306/intelligent_crawl?useSSL=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC
+#    username: root
+#    password: bfd123
+#    url: jdbc:mysql://172.26.11.113:3306/intelligent_crawl?useSSL=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC
     hikari:
       maximum-pool-size: 10
       minimum-idle: 1
@@ -47,8 +47,8 @@ bfd.api.mf:
   indexNamePre : cl_major_
 
   es-mini:
-    name: SQ_Mini
-    address: 172.18.1.147:9313
+    name: SQ_Mini_2
+    address: 172.18.1.81:9301
     upper: 2018-09-01
     standby: cl_major_*
   es-normal: