fix code conflicts

api/topic.py

@@ -10,27 +10,90 @@ from utils.logger import error_logger
 
 class TopicListView(APIView):
     def get(self, request):
-        user_id = request.GET.get('user_id', '')
         pictorial_id = request.GET.get('pictorial_id', '')
-        offset = int(request.GET.get('page', 0))
+        user_id = request.GET.get('user_id', '')
+        page = int(request.GET.get('page', 1))
         limit = int(request.GET.get('limit', 10))
-        filter = self.handle_filter(request.GET.get('filter', ""))
-        sort_params = request.GET.getlist('sort[]')
+        filters = json.loads(request.GET.get('filter', "{}"))
+        sorts_by = list(map(lambda i: int(i), request.GET.getlist('sort_params[]', [3])))
         if user_id:
-            filter.update({'user_id': user_id})
+            filters.update({'user_id': user_id})
         if pictorial_id:
-            filter.update({'pictorial_id': pictorial_id})
+            filters.update({"pictorial_id": int(pictorial_id)})
+
+        res = self.rpc['physical/search/business/topic'](
+            offset=(page-1) * limit,
+            size=limit,
+            filters=filters,
+            sorts_by=sorts_by
+        ).unwrap()
+
+        topic_ids = res.get("topic_ids", [])
+        total_count = res.get("total_count", 0)
+
         try:
             data = self.rpc['venus/sun/topic/list'](
-                offset=(offset - 1) * limit,
-                limit=limit,
-                filters=filter,
-                sort_params=sort_params
+                topic_ids=topic_ids
             ).unwrap()
         except Exception as e:
             error_logger.error(u'获取帖子列表失败%s', e)
             raise
-        return data
+
+        result = {
+            "data": data.get("data", []),
+            "total": total_count,
+        }
+
+        return result
+
+
+class TopicImageListView(APIView):
+    def get(self, request):
+        pictorial_id = request.GET.get('pictorial_id', '')
+        page = int(request.GET.get('page', 1))
+        limit = int(request.GET.get('limit', 50))
+        filters = json.loads(request.GET.get('filter', "{}"))
+        sorts_by = list(map(lambda i: int(i), request.GET.getlist('sort_params[]', [3])))
+        filters.update({"has_image": True})
+        if pictorial_id:
+            filters.update({"pictorial_id": int(pictorial_id)})
+
+        res = self.rpc['physical/search/business/topic'](
+            offset=(page-1) * limit,
+            size=limit,
+            filters=filters,
+            sorts_by=sorts_by
+        ).unwrap()
+
+        topic_ids = res.get("topic_ids", [])
+        total_count = res.get("total_count", 0)
+
+        try:
+            data = self.rpc['venus/community/topic/images_info_dict'](
+                topic_ids=topic_ids
+            ).unwrap()
+        except Exception as e:
+            error_logger.error(u'获取帖子列表失败%s', e)
+            raise
+
+        result = []
+        for topic_id in topic_ids:
+
+            imgs_info = data.get(str(topic_id), [])
+            if not imgs_info:
+                continue
+
+            result.append({
+                "id": topic_id,
+                "img_url": imgs_info[0].get("url", "") + '-w'
+            })
+
+        result = {
+            "data": result,
+            "total": total_count,
+        }
+
+        return result
 
 
 class TopicUpdateOrCreateView(APIView):
@@ -49,7 +112,7 @@ class TopicUpdateOrCreateView(APIView):
         topic_images = list(map(lambda x: x[:-2], json.loads(request.POST.get('topic_images', []))))
         tag_ids = list(map(lambda x: x.split(':')[0], json.loads(request.POST.get('tags', '[]'))))
         collection_tag_ids = list(map(lambda x: x.split(':')[0], json.loads(request.POST.get('collection_tags', '[]'))))
-        
+
         data = {
             'topic_images': topic_images,
             'video_url': request.POST.get('video_url', ''),

api/urls.py

@@ -45,6 +45,7 @@ urlpatterns = [
 
     # topic相关
     url(r'^topic/list$', TopicListView.as_view()),
+    url(r'^topic/img/list$', TopicImageListView.as_view()),
     url(r'^topic/detail$', TopicUpdateOrCreateView.as_view()),
     url(r'^topic/create$', TopicUpdateOrCreateView.as_view()),
     url(r'^topic/batch_update$', TopicListBatchUpdate.as_view()),

sun/settings.py

@@ -159,8 +159,8 @@ OPERATOR_PASSWORD = 123456
 DOWNLOAD_IMAGE_PATH = u'/data/header-images/'
 
 # apk 七牛上传空间
-APK_SCOPE = 'download'
-APK_DOMAIN = 'http://dl.igengmei.com/'
+APK_SCOPE = 'alpha-s'
+APK_DOMAIN = 'http://alpha-s.iyanzhi.com/'
 DEFAULT_CHANNEL = 'benzhan'
 APK_RELEASE_DIR = 'test'
 APK_BUILD_DIR = 'testbuild'