Merge branch 'dev' into 'master'

modify

See merge request alpha/physical!63

requirements.txt

@@ -3,8 +3,9 @@ kafka-python>=1.2.1,<1.4
 elasticsearch==6.3.1
 
 redis==2.10.6
-celery==4.2.0
+celery==4.2.1
 redlock==1.2.0
+kombu==4.2.2
 
 PyMySQL==0.9.2
 
@@ -19,4 +20,4 @@ git+ssh://git@git.wanmeizhensuo.com/backend/gm-protocol.git@master
 git+ssh://git@git.wanmeizhensuo.com/backend/gm-upload.git@master
 git+ssh://git@git.wanmeizhensuo.com/system/gm-tracer.git@v0.1.2
 git+ssh://git@git.wanmeizhensuo.com/alpha/alpha-types.git@dev
-git+ssh://git@git.wanmeizhensuo.com/backend/gm-types.git@master
\ No newline at end of file
+git+ssh://git@git.wanmeizhensuo.com/backend/gm-types.git@master

trans2es/models/topic.py

@@ -39,7 +39,7 @@ class Topic(models.Model):
     group = models.ForeignKey(
         Group, verbose_name=u"关联的小组", related_name=u"group_topics",null=True, blank=True, default=None, on_delete=models.CASCADE)
     user_id = models.IntegerField(verbose_name='用户ID')
-    #drop_score = models.IntegerField(verbose_name=u'人工赋分',default=0)
+    drop_score = models.IntegerField(verbose_name=u'人工赋分',default=0)
     description = models.CharField(verbose_name='日记本描述',max_length=200)
     content = models.CharField(verbose_name='日记本内容',max_length=1000)
     share_num = models.IntegerField(verbose_name='')

trans2es/utils/topic_transfer.py

@@ -37,8 +37,7 @@ class TopicTransfer(object):
             res["tag_name_list"] = instance.get_tag_name_list(res["tag_list"])
 
             res["offline_score"] = instance.get_topic_offline_score()
-            #res["manual_score"] = instance.drop_score
-            res["manual_score"] = 0
+            res["manual_score"] = instance.drop_score
 
             create_time = instance.create_time
             tzlc_create_time = tzlc(create_time)