Merge branch 'master' into 'add_reply_time'

# Conflicts:
#   trans2es/models/topic.py

.idea/codeStyles/Project.xml

@@ -24,5 +24,29 @@
         <option name="ITERATION_ELEMENTS_WRAPPING" value="chop_down_if_not_single" />
       </formatting-settings>
     </DBN-SQL>
+    <DBN-PSQL>
+      <case-options enabled="false">
+        <option name="KEYWORD_CASE" value="lower" />
+        <option name="FUNCTION_CASE" value="lower" />
+        <option name="PARAMETER_CASE" value="lower" />
+        <option name="DATATYPE_CASE" value="lower" />
+        <option name="OBJECT_CASE" value="preserve" />
+      </case-options>
+      <formatting-settings enabled="false" />
+    </DBN-PSQL>
+    <DBN-SQL>
+      <case-options enabled="false">
+        <option name="KEYWORD_CASE" value="lower" />
+        <option name="FUNCTION_CASE" value="lower" />
+        <option name="PARAMETER_CASE" value="lower" />
+        <option name="DATATYPE_CASE" value="lower" />
+        <option name="OBJECT_CASE" value="preserve" />
+      </case-options>
+      <formatting-settings enabled="false">
+        <option name="STATEMENT_SPACING" value="one_line" />
+        <option name="CLAUSE_CHOP_DOWN" value="chop_down_if_statement_long" />
+        <option name="ITERATION_ELEMENTS_WRAPPING" value="chop_down_if_not_single" />
+      </formatting-settings>
+    </DBN-SQL>
   </code_scheme>
 </component>
\ No newline at end of file

trans2es/mapping/topic-high-star.json

@@ -31,7 +31,7 @@
     "create_time_val":{"type":"long"},
     "update_time_val":{"type":"long"},
     "language_type":{"type":"long"},
-    "latest_reply_time":{"type":"date", "format":"date_time_no_millis"},
+
     "is_shadow": {"type": "boolean"},
     "is_recommend": {"type": "boolean"},
     "is_complaint": {"type": "boolean"},  // 是否被举报

trans2es/mapping/topic-star-routing.json

@@ -18,7 +18,6 @@
     "group_id":{"type":"long"}, //所在组ID
     "tag_list":{"type":"long"},//标签属性
     "useful_tag_list":{"type":"long"},//有用标签属性
-    "latest_reply_time":{"type":"date", "format":"date_time_no_millis"},
     "edit_tag_list":{"type":"long"},//编辑标签
     "tag_name_list":{"type":"text","analyzer":"gm_default_index","search_analyzer":"gm_default_index"},
     "share_num":{"type":"long"},

trans2es/mapping/topic-star.json

@@ -18,7 +18,6 @@
     "group_id":{"type":"long"}, //所在组ID
     "tag_list":{"type":"long"},//标签属性
     "useful_tag_list":{"type":"long"},//有用标签属性
-    "latest_reply_time":{"type":"date", "format":"date_time_no_millis"},
     "edit_tag_list":{"type":"long"},//编辑标签
     "tag_name_list":{"type":"text","analyzer":"gm_default_index","search_analyzer":"gm_default_index"},
     "share_num":{"type":"long"},

trans2es/mapping/topic.json

@@ -18,7 +18,6 @@
     "group_id":{"type":"long"}, //所在组ID
     "tag_list":{"type":"long"},//标签属性
     "useful_tag_list":{"type":"long"},//有用标签属性
-    "latest_reply_time":{"type":"date", "format":"date_time_no_millis"},
     "edit_tag_list":{"type":"long"},//编辑标签
     "tag_name_list":{"type":"text","analyzer":"gm_default_index","search_analyzer":"gm_default_index"},
     "share_num":{"type":"long"},

trans2es/models/topic.py

@@ -404,17 +404,4 @@ class TopicBillBoard(models.Model):
     topic_id = models.IntegerField(verbose_name=u"帖子ID")
     pictorial_id = models.IntegerField(verbose_name=u"榜单ID")
     real_vote_cnt = models.IntegerField(verbose_name=u"真实赞")
-    virt_vote_cnt = models.IntegerField(verbose_name=u"虚拟赞")
-
-
-class Reply(models.Model):
-    """帖子回复"""
-    class Meta:
-        verbose_name = "帖子回复"
-        db_table = "reply"
-
-    topic_id = models.IntegerField(verbose_name=u"帖子ID")
-    user_id = models.IntegerField(verbose_name=u'用户ID')
-    create_time = models.DateTimeField(verbose_name=u'创建时间')
-    is_deleted = models.BooleanField(verbose_name=u'是否删除')
-    is_online = models.BooleanField(verbose_name=u'是否上线')
\ No newline at end of file
+    virt_vote_cnt = models.IntegerField(verbose_name=u"虚拟赞")
\ No newline at end of file

trans2es/utils/topic_transfer.py

@@ -78,9 +78,6 @@ class TopicTransfer(object):
             # begin = time.time()
             topic_useful_tag_id_list = instance.get_topic_useful_tag_id_list()
             res["useful_tag_list"] = topic_useful_tag_id_list
-            latest_reply_time = instance.get_latest_reply_date()
-            res["latest_reply_time"] = latest_reply_time
-
             # end = time.time()
             # time5 = (end - begin)
             # # 片假名