merge master

trans2es/management/commands/trans2es_mapping2es.py

@@ -39,7 +39,7 @@ class Command(BaseCommand):
             type_name = "suggest"
 
             if len(options["type"]):
-                if options["type"] == "all" or type_name == options["type"] or type_name1 == options["type"] or type_name2 == options['type']:
+                if options["type"] == "all" or type_name == options["type"] or type_name1 == options["type"]:
                     type_name = options["type"]
                     official_index_name = ESPerform.get_official_index_name(type_name)
                     index_exists = es_cli.indices.exists(official_index_name)

trans2es/mapping/suggest-v2.json

-{
-  "dynamic":"strict",
-  "properties": {
-    "id":{"type":"text"},
-    "suggest":{
-      "analyzer":"keyword",
-      "search_analyzer":"keyword",
-      "type":"completion",
-      "contexts":[
-        {
-          "name":"is_online",
-          "type": "category"
-        }
-      ]
-    },
-    "suggest_type":{"type":"long"},//0-汉字,1-汉字全拼,2-拼音,3-拼音全拼,4-拼音简写,5-拼音简写全拼
-    "tips_name_type":{"type":"long"},//tips数据所属类型,0-tag,1-hospital,2-doctor,3-wiki
-    "ori_name":{"type":"keyword"},//原名称
-    "order_weight":{"type":"double"},//订单权重
-    "offline_score":{"type":"double"},//离线分
-    "results_num":{"type":"integer"},//结果数量
-    "type_flag":{"type":"keyword"},
-    "is_online":{"type":"boolean"}//上线
-  }
-}