Merge branch 'dev' of 47.100.44.39:tp-backend/tanpu-community into dev

community-service/src/main/java/com/tanpu/community/service/base/ESService.java

@@ -8,6 +8,7 @@ import com.tanpu.community.api.beans.qo.ThemeQo;
 import com.tanpu.community.dao.entity.community.ThemeEntity;
 import com.tanpu.community.model.ESWrapper;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
 import org.elasticsearch.index.query.MatchQueryBuilder;
@@ -45,12 +46,17 @@ public class ESService {
         SearchSourceBuilder search = new SearchSourceBuilder();
 
         BoolQueryBuilder boolQb = QueryBuilders.boolQuery();
-        MatchPhraseQueryBuilder contentQb = QueryBuilders.matchPhraseQuery("textContent", keyword);
-        MatchPhraseQueryBuilder titleQb = QueryBuilders.matchPhraseQuery("title", keyword);
+
+        // 如果关键词带空格，则拆分
+        String[] ks = StringUtils.split(keyword, ' ');
+        for (String k : ks) {
+            MatchPhraseQueryBuilder contentQb = QueryBuilders.matchPhraseQuery("textContent", k);
+            MatchPhraseQueryBuilder titleQb = QueryBuilders.matchPhraseQuery("title", k);
             boolQb.should(contentQb);
             boolQb.should(titleQb);
+        }
 
-        String[] includes = new String[]{"id", "themeId", "createTime"};
+        String[] includes = new String[]{"id", "themeId", "createTime", "_score"};
         String[] excludes = new String[]{};
         search.query(boolQb).fetchSource(includes, excludes).sort("createTime", SortOrder.DESC).from(from).size(size);
         search.query(boolQb).sort("createTime", SortOrder.DESC).from(from).size(size);

community-service/src/main/resources/application-dev.yml

@@ -79,7 +79,7 @@ es:
   port: 9200
   userName: 1
   userPasswd: 2
-  index: dev
+  index: new-community
 
 tencent:
   cloud: