Merge branch 'dev' into 'master'

modify

See merge request alpha/physical!55

search/views/tag.py

+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+from __future__ import unicode_literals, absolute_import, print_function
+from gm_rpcd.all import bind
+import logging
+import traceback
+import json
+from search.utils.topic import TopicUtils
+from libs.es import ESPerform
+from libs.cache import redis_client
+from search.utils.common import *
+
+@bind("physical/search/query_tag")
+def query_tag(query,offset,size):
+    try:
+        q = {
+            "query":{
+                "match":{
+                    "name":query
+                }
+            },
+            "_source":{
+                "include":["id","name"]
+            }
+        }
+
+        ret_list = list()
+
+        result_dict = ESPerform.get_search_results(ESPerform.get_cli(),sub_index_name="tag",query_body=q,offset=offset,size=size)
+        for hit_item in result_dict["hits"]:
+            ret_list.append(hit_item["_source"])
+
+        return {"tag_list": ret_list}
+    except:
+        logging.error("catch exception,err_msg:%s" % traceback.format_exc())
+        return {"tag_list": []}
+

trans2es/mapping/tag.json

@@ -3,6 +3,6 @@
   "properties": {
     "id":{"type":"long"},
     "suggest":{"type":"completion"},
-    "name":{"type":"text"}
+    "name":{"type":"text","analyzer":"gm_default_index","search_analyzer":"keyword"}
   }
 }
\ No newline at end of file