add

trans2es/management/commands/trans2es_mapping2es.py

@@ -37,7 +37,6 @@ class Command(BaseCommand):
             for type_name in type_name_list:
 
                 if len(options["type"]):
-<<<<<<< HEAD
                     if options["type"] == "all" or type_name == options["type"]:
                         official_index_name = ESPerform.get_official_index_name(type_name)
                         index_exists = es_cli.indices.exists(official_index_name)
@@ -47,20 +46,7 @@ class Command(BaseCommand):
                             ESPerform.put_index_mapping(es_cli, type_name)
                         else:
                             logging.warning("index:[%s] has already existing!" % type_name)
-=======
-                    if type_name==options["type"]:
 
-                        # ESPerform.put_index_mapping(es_cli, type_name, force_sync=True)
-
-                        official_index_name = ESPerform.get_official_index_name(type_name)
-                        index_exists = es_cli.indices.exists(official_index_name)
-                        if not index_exists:
-                            logging.info("begin create [%s] index!" % type_name)
-                            ESPerform.create_index(es_cli,type_name)
-
-                        logging.info("begin create [%s] mapping!" % type_name)
-                        ESPerform.put_index_mapping(es_cli,type_name,force_sync=True)
->>>>>>> homeq
 
             if len(options["indices_template"]):
                 template_file_name = options["indices_template"]

trans2es/models/face_user_contrast_similar.py

@@ -27,8 +27,6 @@ class FaceUserContrastSimilar(models.Model):
     create_time = models.DateTimeField(verbose_name=u'创建时间', default=datetime.datetime.fromtimestamp(0))
     update_time = models.DateTimeField(verbose_name=u'更新时间', default=datetime.datetime.fromtimestamp(0))
     contrast_user_id = models.IntegerField(verbose_name=u'对照者用户ID')
-<<<<<<< HEAD
-=======
 
 
 class UserSimilarScore(models.Model):
@@ -45,4 +43,3 @@ class UserSimilarScore(models.Model):
     update_time = models.DateTimeField(verbose_name=u'更新时间', default=datetime.datetime.fromtimestamp(0))
 
 
->>>>>>> homeq