Merge remote-tracking branch 'origin/master'

pom.xml

@@ -172,6 +172,12 @@
             <version>1.1</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.jsoup</groupId>
+            <artifactId>jsoup</artifactId>
+            <version>1.14.3</version>
+        </dependency>
+
     </dependencies>
 
     <build>

src/main/java/com/zzsn/knowbase/controller/KnowledgeController.java

@@ -95,7 +95,6 @@ public class KnowledgeController {
     @PostMapping(value = "/uploadKnowledge")
     public Result<?> uploadKnowledge(HttpServletRequest request, Knowledge knowledge) {
         MultipartHttpServletRequest multipartRequest = WebUtils.getNativeRequest(request, MultipartHttpServletRequest.class);
-
         Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
         List<Result<KnowFile>> resultList = localFileService.upload(fileMap);
         if (null == resultList || resultList.isEmpty()) {
@@ -148,7 +147,7 @@ public class KnowledgeController {
      * @return
      */
     @PostMapping(value = "/IntelligentQa")
-    public Result<?> intelligentQa(IntelligentQaParam intelligentQaParam) throws IOException {
+    public Result<?> intelligentQa(@RequestBody IntelligentQaParam intelligentQaParam) throws IOException {
         JSONObject params = new JSONObject();
         params.put("question", intelligentQaParam.getQuestion());
         params.put("knowledge_base_id", intelligentQaParam.getKbKnowledgeIds().split(","));

src/main/java/com/zzsn/knowbase/entity/Knowledge.java

@@ -73,7 +73,7 @@ public class Knowledge implements Serializable {
     /**
      * 作者
      */
-    private Integer author;
+    private String author;
     /**
      * 发布时间
      */

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

@@ -172,7 +172,7 @@ public class KbKnowledgeProjectServiceImpl extends ServiceImpl<KbKnowledgeProjec
     @Override
     public List<KbKnowledgeProject> getTreeListBy(String id) {
         return baseMapper.selectList(new LambdaQueryWrapper<KbKnowledgeProject>()
-                .like(KbKnowledgeProject::getFullPath, id)
+                .like(!"0".equals(id),KbKnowledgeProject::getFullPath, id)
         );
     }
 

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

@@ -30,6 +30,7 @@ import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.search.SearchHit;
 import org.elasticsearch.search.builder.SearchSourceBuilder;
 import org.elasticsearch.search.sort.SortOrder;
+import org.jsoup.Jsoup;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -70,6 +71,8 @@ class KnowledgeServiceImpl implements IKnowledgeService {
 
     @Override
     public void addKnowledge(KnowFile knowFile, Knowledge knowledge) {
+        KbAuthorizedUser userInfo = SpringContextUtils.getUserInfo();
+        knowledge.setAuthor(userInfo.getName());
         if (null == knowledge.getId()) {
             knowledge.setId(codeGenerateUtil.geneIdNo(Constants.FINANCE, 8));
         }
@@ -123,7 +126,7 @@ class KnowledgeServiceImpl implements IKnowledgeService {
                 .filter(item -> !item.getContent().contains("<td>"))
                 .filter(item -> !item.getContent().contains("</td>"))
                 .collect(Collectors.toList());
-        messageContentList.forEach(item->item.setContent(item.getContent().replaceAll("<[^>]`>", "")));
+        messageContentList.forEach(item->item.setContent(Jsoup.parse(item.getContent()).text()));
         knowledgeMessage.setContents(messageContentList);
         produceInfo.sendKnowledgeContents(knowledgeMessage);
     }
@@ -156,11 +159,15 @@ class KnowledgeServiceImpl implements IKnowledgeService {
 
     @Override
     public IPage<KnowledgeVO> queryPageList(KnowledgeParam knowledgeParam, Integer pageNo, Integer pageSize, String column, String order) {
+
+        List<String> permitKnowList=new ArrayList<>();
+        List<String> catList;
         List<String> treeList = knowledgeProjectService.getTreeListBy(knowledgeParam.getKnowledgeProjectId())
                 .stream().map(KbKnowledgeProject::getId).collect(Collectors.toList());
-        //获取用户拥有的分类
+       if(false){
+
+       //获取用户拥有的分类
         KbAuthorizedUser userInfo = SpringContextUtils.getUserInfo();
-        userInfo.setId("chenshiqiang");
         if(null==userInfo){
             return null;
         }
@@ -175,9 +182,15 @@ class KnowledgeServiceImpl implements IKnowledgeService {
                 .filter(item->item.getSign()==1)
                 .map(KbAuthuserKnowledgeprojectMap::getKnowledgeProjectId)
                 .collect(Collectors.toList());
-        List<String> permitKnowList=knowledgeProjectService.getKnowledgeListByUserId(userInfo.getId(),knowPermitList);
-        Collection<Serializable> catList = CollectionUtils.intersection(treeList, allPermitList);
 
+        if(!knowPermitList.isEmpty()){
+            permitKnowList=knowledgeProjectService.getKnowledgeListByUserId(userInfo.getId(),knowPermitList);
+        }
+
+         catList = (List<String>) CollectionUtils.intersection(treeList, allPermitList);
+       }else {
+           catList=treeList;
+       }
 
         SearchRequest searchRequest = new SearchRequest(Constants.ES_DATA_FOR_KNOWLEDGE);
         SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
@@ -282,11 +295,8 @@ class KnowledgeServiceImpl implements IKnowledgeService {
         }
         if (StringUtils.isNotBlank(knowledgeParam.getEndTime())) {
             boolQuery.filter(QueryBuilders.rangeQuery("publishDate").lte(EsDateUtil.esFieldDateFormat(knowledgeParam.getEndTime())));
-        } else {
-            boolQuery.filter(QueryBuilders.rangeQuery("publishDate").lte(EsDateUtil.esFieldDateFormat(DateUtil.dateToString(new Date()))));
         }
 
-
         searchSourceBuilder.query(boolQuery);
         searchRequest.source(searchSourceBuilder);
         SearchResponse searchResponse = null;
@@ -318,9 +328,11 @@ class KnowledgeServiceImpl implements IKnowledgeService {
         if (true) {
             List<String> treeList = knowledgeProjectService.getTreeListBy(knowledgeParam.getKnowledgeProjectId())
                     .stream().map(KbKnowledgeProject::getId).collect(Collectors.toList());
+            List<String> permitKnowList=new ArrayList<>();
+            List<String> catList=new ArrayList<>();
+           if(false){
             //获取用户拥有的分类
             KbAuthorizedUser userInfo = SpringContextUtils.getUserInfo();
-            userInfo.setId("chenshiqiang");
             if(null==userInfo){
                 return null;
             }
@@ -335,8 +347,11 @@ class KnowledgeServiceImpl implements IKnowledgeService {
                     .filter(item->item.getSign()==1)
                     .map(KbAuthuserKnowledgeprojectMap::getKnowledgeProjectId)
                     .collect(Collectors.toList());
-            List<String> permitKnowList=knowledgeProjectService.getKnowledgeListByUserId(userInfo.getId(),knowPermitList);
-            Collection<Serializable> catList = CollectionUtils.intersection(treeList, allPermitList);
+            permitKnowList=knowledgeProjectService.getKnowledgeListByUserId(userInfo.getId(),knowPermitList);
+           catList = (List<String>) CollectionUtils.intersection(treeList, allPermitList);
+           }else {
+               catList=treeList;
+           }
             StringBuilder typeNames = new StringBuilder();
             if (null != knowledgeParam.getTypeIds()) {
                 for (String type : knowledgeParam.getTypeIds().split(",")) {

src/main/java/com/zzsn/knowbase/vo/KnowledgeVO.java

@@ -29,6 +29,7 @@ public class KnowledgeVO {
     private String kbKnowledgeId;
     private String type;
     private String verifierName;
+    private String author;
     private Integer score;
     private Integer verifyStatus;
     private List<Content> contents;

src/main/resources/application.yml

@@ -47,8 +47,8 @@ python:
 
 know:
   thirdpartyurl:
-    checkuserurl: http://127.0.0.1:9988/sys/checkToken
-    getusersurl: http://127.0.0.1:9988/sys/user/thirdparty
+    checkuserurl: http://192.168.1.146:9988/sys/checkToken
+    getusersurl: http://192.168.1.146:9988/sys/user/thirdparty
 
 document:
   server:

src/test/java/com/zzsn/knowbase/KnowBaseApplicationTests.java

@@ -3,6 +3,7 @@ package com.zzsn.knowbase;
 import com.zzsn.knowbase.constant.Constants;
 import com.zzsn.knowbase.service.ILocalFileService;
 import com.zzsn.knowbase.util.CodeGenerateUtil;
+import org.jsoup.Jsoup;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -29,4 +30,11 @@ class KnowBaseApplicationTests {
 
     }
 
+    @Test
+    void format() {
+
+        String source = "<a id=\\\"_Toc7881\\\"></a><a id=\\\"_Toc20510\\\"></a><a id=\\\"_Toc1184\\\"></a>引言";
+        System.out.println();
+    }
+
 }