Merge branch 'master' of git.wanmeizhensuo.com:alpha/physical

search/utils/group.py

@@ -269,13 +269,6 @@ class GroupUtils(object):
                 }
             ]
 
-            q = {}
-            q["query"] = {
-                "term": {
-                    "is_online": True
-                }
-            }
-            logging.info("get qqqqqqqq:%s" % q)
             es_cli_obj = ESPerform.get_cli()
             result_dict = ESPerform.get_search_results(es_cli_obj, "pictorial", q, offset, size)
             logging.info("get result_dict:%s" % result_dict)

trans2es/mapping/topic-star.json

@@ -14,7 +14,7 @@
     "content_level":{"type":"text"},
     "user_id":{"type":"long"},
     "user_nick_name":{"type":"text","analyzer":"gm_default_index","search_analyzer":"gm_default_index"},//帖子用户名
-    "user_nick_name_pre": {"type":"text","index":"not_analyzed"}, //不切词的用户名
+    "user_nick_name_pre": {"type":"text","analyzer":"keyword"}, //不切词的用户名
     "group_id":{"type":"long"}, //所在组ID
     "tag_list":{"type":"long"},//标签属性
     "edit_tag_list":{"type":"long"},//编辑标签

trans2es/mapping/user.json

@@ -4,7 +4,8 @@
     "id":{"type":"long"},
     "user_id":{"type":"long"},
     "nick_name":{"type":"text","analyzer":"gm_default_index","search_analyzer":"gm_default_index"}, //昵称
-    "nick_name_pre":{"type":"text","analyzer":"not_analyzed"}, //昵称
+    "nick_pre":{"type":"text","analyzer":"keyword"}, //昵称
+    "nick_name_pre":{"type":"text"}, //昵称
     "profile_pic":{"type":"text"}, //头像
     "gender":{"type":"integer"},
     "is_online":{"type":"boolean"},//是否上线

trans2es/utils/user_transfer.py

@@ -42,6 +42,7 @@ class UserTransfer(object):
             res["user_id"] = instance.user_id
             res["nick_name"] = instance.nick_name
             res["nick_name_pre"] = instance.nick_name
+            res["nick_pre"] = instance.nick_name
             res["profile_pic"] = instance.profile_pic
             res["gender"] = instance.gender
             res["city_id"] = instance.city_id