Merge remote-tracking branch 'origin/master'

src/main/java/com/zzsn/knowbase/kafka/message/KnowledgeMessage.java

@@ -43,6 +43,7 @@ public class KnowledgeMessage {
      * 知识库id
      */
     private String knowledgeProjectId;
+    private String kbKnowledgeId;
     /**
      * 类型
      */

src/main/java/com/zzsn/knowbase/service/impl/KnowledgeServiceImpl.java

@@ -60,11 +60,13 @@ class KnowledgeServiceImpl implements IKnowledgeService {
     private ProduceInfo produceInfo;
     @Value("${python.searchUrl:}")
     private String searchUrl;
-    @Value("${python.delete:}")
+    @Value("${python.deleteUrl:}")
     private String deleteUrl;
 
     @Autowired
     private RedisUtil redisUtil;
+    @Value("${files.storage}")
+    String filesStorage;
 
 
     @Override
@@ -75,9 +77,6 @@ class KnowledgeServiceImpl implements IKnowledgeService {
         if (null == knowledge.getVerifyStatus()) {
             knowledge.setVerifyStatus(0);
         }
-        if (null == knowledge.getType()) {
-            knowledge.setType(KnowTypeEnum.getByType(knowledge.getTypeId()).getDes());
-        }
 
 
         knowledge.setCreateTime(cn.hutool.core.date.DateUtil.formatDateTime(new Date()).replace(" ", "T"));
@@ -89,7 +88,7 @@ class KnowledgeServiceImpl implements IKnowledgeService {
         List<String> contentStringList = new ArrayList<>();
         String html = null;
         try {
-            html = DocUtil.docParseHtml(knowledge.getFiles().get(0).getFilePath());
+            html = DocUtil.docParseHtml(filesStorage+knowledge.getFiles().get(0).getFilePath());
             String htmlWithTable = html.replace("<p>", "");
             contentStringList = Arrays.asList(htmlWithTable.split("</p>"));
         } catch (IOException e) {

src/main/resources/application.yml

@@ -42,7 +42,7 @@ mybatis-plus:
     map-underscore-to-camel-case: true
 python:
   intelligentQaUrl: http://116.63.179.212:7862/platform/chat
-  searchUrl: http://114.115.172.99:10013/platform/search
+  searchUrl: http://116.63.179.212:7862/platform/searchInfo
   deleteUrl: http://114.115.172.99:10013/platform/delete
 
 know: