fix: 添加standard搜索

Author: ZnPdCo

api/main.js

@@ -24,11 +24,6 @@ app.get('/status', function(req, res) {
 });
 
 app.get('/', function(req, res) {
-  // if (!req.headers.referer || req.headers.referer.indexOf('oi-wiki.org') < 0) {
-  //  res.send([]);
-    //return;
-  //}
-  // console.log(req.headers);
   if (!req.query.s) {
     res.send([]);
     return;
@@ -37,7 +32,6 @@ app.get('/', function(req, res) {
   console.log(keyword);
   client.search({
     index: "oiwiki",
-    type: "article",
     from: 0,
     size: 12,
     body: {
@@ -79,6 +73,15 @@ app.get('/', function(req, res) {
                   boost: 3
                 }
               }
+            },
+            {
+              match: {
+                standard_content: {
+                  query: keyword,
+                  minimum_should_match: "75%",
+                  boost: 2
+                }
+              }
             }
           ],
           tie_breaker: 0.3

build.sh

@@ -4,21 +4,47 @@ curl -H'Content-Type: application/json' -XPUT "http://localhost:9200/oiwiki" -d'
 	"settings": {
 		"analysis": {
 			"analyzer": {
-				"default": {
+				"pinyin_analyzer": {
 					"tokenizer": "ik_max_word",
-					"filter": "custom_pinyin"
+					"filter": "pinyin_filter"
 				},
-				"default_search": {
+				"pinyin_search_analyzer": {
 					"tokenizer": "ik_max_word"
 				}
 			},
 			"filter": {
-				"custom_pinyin": {
+				"pinyin_filter": {
 					"type": "pinyin",
 					"keep_original": true,
-					"limit_first_letter_length": 16
+					"limit_first_letter_length": 16,
+					"keep_joined_full_pinyin": true
 				}
 			}
 		}
+	},
+	"mappings": {
+		"properties": {
+			"content": {
+				"type": "text",
+				"analyzer": "pinyin_analyzer",
+				"search_analyzer": "pinyin_search_analyzer"
+			},
+			"h2": {
+				"type": "text",
+				"analyzer": "pinyin_analyzer",
+				"search_analyzer": "pinyin_search_analyzer"
+			},
+			"title": {
+				"type": "text",
+				"analyzer": "pinyin_analyzer",
+				"search_analyzer": "pinyin_search_analyzer"
+			},
+			"url": {
+				"type": "text"
+			},
+			"standard_content": {
+				"type": "text"
+			}
+		}
 	}
 }'

webhook/index.js

@@ -90,17 +90,18 @@ function updateContent(modified, removed) {
   const data = YAML.parse(file.replaceAll('!!python/name:', ''));
   let ops = [];
   modified.forEach((filename) => {
-    ops.push({ index: { _index: 'oiwiki', _type: 'article', _id: filename } });
+    ops.push({ index: { _index: 'oiwiki', _id: filename } });
     let [title, article, h2] = getContent(filename, data);
     ops.push({
       title: title,
       content: article,
       url: '/' + filename.replace('/index.md', '/').replace('.md', '/'),
       h2: h2,
+      standard_content: article,
     });
   });
   removed.forEach((filename) => {
-    ops.push({ delete: { _index: 'oiwiki', _type: 'article', _id: filename } });
+    ops.push({ delete: { _index: 'oiwiki', _id: filename } });
   });
   client.bulk({ body: ops, refresh: 'true' }, function (err, res) {
     if (err) {

webhook/test.js

@@ -6,7 +6,6 @@ var client = new elasticsearch.Client({
 let keyword = "线段";
 const response = client.search({
   index: "oiwiki",
-  type: "article",
   from: 0,
   size: 10,
   body: {
@@ -48,6 +47,15 @@ const response = client.search({
                 boost: 3
               }
             }
+          },
+          {
+            match: {
+              standard_content: {
+                query: keyword,
+                minimum_should_match: "75%",
+                boost: 2
+              }
+            }
           }
         ],
         tie_breaker: 0.3