Merge branch 'test' into 'master'

Alpha 1.5

See merge request !142

api/group.py

-#! /usr/bin/env python
-# -*- coding: utf-8 -*-
-# __author__ = "chenwei"
-# Date: 2018/11/15
-
-import json
-from utils.base import APIView
-from utils.logger import error_logger
-
-
-class GroupListView(APIView):
-    def get(self, request):
-        star_id = request.GET.get('star_id')
-        user_id = request.GET.get('user_id')
-        offset = int(request.GET.get('page', 0))
-        limit = int(request.GET.get('limit', 10))
-        filters = self.handle_filter(request.GET.get('filter', ""))
-        if star_id:
-            filters.update({'star_id': star_id})
-        if user_id:
-            filters.update({'user_id': user_id})
-        try:
-            data = self.rpc['venus/sun/group/list'](filters=filters, offset=(offset-1)*limit, limit=limit).unwrap()
-        except Exception as e:
-            error_logger.error(u'获取小组列表失败%s' , e)
-            raise
-        return data
-
-    def post(self, request):
-        ids = json.loads(request.POST.get('ids', '[]'))
-        updates = json.loads(request.POST.get('updates', '{}'))
-        try:
-            self.rpc['venus/sun/group/batch/update'](updates=updates, ids=ids).unwrap()
-        except Exception as e:
-            error_logger.error(u'批量更新失败%s', e)
-            raise
-        return {
-            "message": "更新成功"
-        }
-
-
-class GroupUpdateOrCreate(APIView):
-    def get(self, request):
-        id = request.GET.get('id').split(':')[0]
-        try:
-            data = self.rpc['venus/sun/group/get'](id=id).unwrap()
-        except Exception as e:
-            error_logger.error(u'获取%s用户信息失败%s'%(id, e))
-            raise
-        return data
-
-    def post(self, request):
-        id = request.POST.get('id')
-        star_ids = list(map(lambda x: x.split(":")[0], json.loads(request.POST.get('star', '[]'))))
-        group_user_ids = list(map(lambda x: x.split(":")[0], json.loads(request.POST.get('group_users', '[]'))))
-        data = {
-            'name': request.POST.get('name', ''),
-            'description': request.POST.get('description', ''),
-            'creator_id': request.POST.get('user', '').split(':')[0],
-            'celebrity_ids': star_ids,
-            'is_online': int(request.POST.get('is_online', 0)),
-            'is_recommend': int(request.POST.get('is_recommend', 0)),
-            'group_user_ids':group_user_ids,
-            'icon': request.POST.get('icon', '')[:-2]
-        }
-        try:
-            self.rpc['venus/sun/group/edit'](id=id, data=data).unwrap()
-        except Exception as e:
-            error_logger.error(u'编辑%s用户信息失败%s' % (id, e))
-            raise
-        return {
-            'message': '更新成功'
-        }
-
-
-class GroupRelatedUser(APIView):
-    def get(self, request):
-        id = request.GET.get('id')
-        offset = int(request.GET.get('page', 0))
-        count = int(request.GET.get('limit', 10))
-        filters = {'group_id': id}
-        try:
-            data = self.rpc['venus/sun/group/user/list'](filters=filters, offset=(offset - 1) * count, limit=count).unwrap()
-        except Exception as e:
-            error_logger.error(u'获取小组用户信息失败%s' , e)
-            raise
-        return data
-
-
-class GroupRelatedUserGET(APIView):
-    def get(self, request):
-        id = request.GET.get('id', '').split(':')[0]
-        try:
-            data = self.rpc['venus/sun/group/user/get'](id=id).unwrap()
-        except Exception as e:
-            error_logger.error(u'获取小组用户信息失败%s', e)
-            raise
-        return [data, ]
-
-    def post(self, request):
-        group_id = request.POST.get('group_id')
-        user_id = request.POST.get('user_id')
-        data = {
-            'role_id': request.POST.get('original_group_identify'),
-        }
-        try:
-            self.rpc['venus/sun/group/user/edit'](id=group_id, user_id=user_id, data=data).unwrap()
-        except Exception as e:
-            error_logger.error(u'编辑小组用户%s信息失败%s'%(user_id, e))
-            raise
-        return
\ No newline at end of file

api/pick.py

@@ -46,7 +46,7 @@ class UpdateOrCreateView(APIView):
 
     def post(self, request):
         id = request.POST.get('id', '')
-        pick_group_ids = list(set(map(lambda x: x.split(":")[0], json.loads(request.POST.get('pick_group', '[]')))))
+        pick_pictorial_ids = list(set(map(lambda x: x.split(":")[0], json.loads(request.POST.get('pick_pictorial', '[]')))))
         country_ids = list(set(map(lambda x: x.split(':')[0], json.loads(request.POST.get('country', '[]')))))
         position = request.POST.get('position')
         gender = request.POST.get('gender')
@@ -79,7 +79,7 @@ class UpdateOrCreateView(APIView):
             'gender': data_dict['gender'] if id else gender,
             'country_ids': country_ids,
             'pick_type': data_dict['pick_type'] if id else pick_type,
-            'pick_group': pick_group_ids,
+            'pick_pictorial': pick_pictorial_ids,
             'is_online': int(request.POST.get('is_online')),
         }
         if position:

api/pictorial.py

@@ -40,7 +40,7 @@ class PictorialUpdateOrCreate(APIView):
         try:
             data = self.rpc['venus/sun/pictorial/get'](id=id).unwrap()
         except Exception as e:
-            error_logger.error(u'获取%s用户信息失败%s'%(id, e))
+            error_logger.error(u'获取%s画报信息失败%s'%(id, e))
             raise
         return data
 
@@ -54,7 +54,7 @@ class PictorialUpdateOrCreate(APIView):
             'description': request.POST.get('description', ''),
             'creator_id': request.POST.get('creator_id', ''),
             'celebrity_ids': star_ids,
-            'is_online': int(request.POST.get('is_online', 0)),
+            'is_online': int(request.POST.get('is_online', 1)),
             'is_recommend': int(request.POST.get('is_recommend', 0)),
             'pictorial_user_ids': pictorial_user_ids,
             'icon': request.POST.get('icon', ''),

api/push.py

@@ -33,7 +33,7 @@ class PushUpdateOrCreateView(APIView):
     def post(self, request):
         id = request.POST.get('id', '')
         creator_id = request.POST.get('creator_id')
-        group_topic_id = request.POST.get('group_topic_id', '')
+        pictorial_topic_id = request.POST.get('pictorial_topic_id', '')
         icon = request.POST.get('icon', '')
         if icon.endswith('-w'):
             icon = request.POST.get('icon', '')[:-2]
@@ -42,8 +42,8 @@ class PushUpdateOrCreateView(APIView):
         if url == '推送帖子':
             url = 'alpha://topic_detail?topic_id='
         elif url == '推送小组':
-            url = 'alpha://group_detail?group_id='
-        full_url = url + group_topic_id
+            url = 'alpha://pictorial_detail?pictorial_id='
+        full_url = url + pictorial_topic_id
 
         data = {
             'url': full_url,

api/search.py

@@ -6,19 +6,6 @@
 from utils.base import APIView, get_offset_count
 
 
-class GroupSearchView(APIView):
-    def get(self, request):
-        name = request.GET.get('name')
-        try:
-            data = self.rpc['venus/sun/group/search'](name=name).unwrap()
-        except Exception as e:
-            raise e
-
-        return {
-            'data': ['{id}:{name}'.format(id=search_data['id'], name=search_data['name']) for search_data in data]
-        }
-
-
 class CountrySearchView(APIView):
     def get(self, request):
         name = request.GET.get('name')
@@ -34,8 +21,9 @@ class CountrySearchView(APIView):
 class UserSearchView(APIView):
     def get(self, request):
         name = request.GET.get('name')
+        offset, count = get_offset_count(request)
         try:
-            data = self.rpc['venus/sun/user/search'](name=name).unwrap()
+            data = self.rpc['venus/sun/user/search'](name=name, offset=offset, count=count).unwrap()
         except Exception as e:
             raise e
         return {

api/star.py

@@ -47,7 +47,7 @@ class CelebrityUpdateOrCreate(APIView):
     def post(self, request):
         id = request.POST.get('id', '')
         gender = request.POST.get('gender')
-        group_ids = list(set(map(lambda x: x.split(":")[0], json.loads(request.POST.get('groups', '[]')))))
+        pictorial_ids = list(set(map(lambda x: x.split(":")[0], json.loads(request.POST.get('pictorials', '[]')))))
         updates = {
             'gender': ''
         }
@@ -66,7 +66,7 @@ class CelebrityUpdateOrCreate(APIView):
             'is_online': int(request.POST.get('is_online')),
             'desc': request.POST.get('description'),
             'portrait': request.POST.get('avatar')[:-2],
-            'group_ids': group_ids,
+            'pictorial_ids': pictorial_ids,
         }
         try:
             self.rpc['venus/sun/celebrity/edit'](id=id, data=data).unwrap()
@@ -79,15 +79,15 @@ class CelebrityUpdateOrCreate(APIView):
         }
 
 
-class CelebrityRelatedGroup(APIView):
+class CelebrityRelatedPictorial(APIView):
     def get(self, request):
         id = request.GET.get('id')
         offset = int(request.GET.get('page', 0))
         count = int(request.GET.get('limit', 10))
         filters = {'star_id': id, 'is_online': True}
         try:
-            data = self.rpc['venus/sun/group/list'](filters=filters, offset=(offset-1) * count, limit=count).unwrap()
+            data = self.rpc['venus/sun/pictorial/list'](filters=filters, offset=(offset-1) * count, limit=count).unwrap()
         except Exception as e:
-            error_logger.error(u'获取%d明星小组信息失败%s' % (id, e))
+            error_logger.error(u'获取%d明星画报信息失败%s' % (id, e))
             raise
         return data

api/tag.py

@@ -61,7 +61,8 @@ class TagUpdateOrCreateView(APIView):
             'icon_url': request.POST.get('icon_url', '')[:-2],
             'platform': request.POST.get('platform'),
             'collection': request.POST.get('collection'),
-            'alias': request.POST.get('alias')
+            'alias': request.POST.get('alias'),
+            'is_show_in_register': request.POST.get('is_show_in_register')
         }
         try:
             data = self.rpc['venus/sun/tag/edit'](id=id, data=data).unwrap()
@@ -122,3 +123,24 @@ class TagTypeUpdateOrCreateView(APIView):
             error_logger.error(u'创建/编辑标签类型%d信息失败%s' % (id, e))
             raise
         return data
+
+
+class TagRegisterUpdateView(APIView):
+
+    def get(self, request):
+        data = {}
+        try:
+            data = self.rpc['venus/sun/tag/register_tag/get']().unwrap()
+        except Exception as e:
+            error_logger.error(u'拉取信息失败')
+            raise
+        return data
+
+    def post(self, request):
+        ids = request.POST.get('tag_ids')
+        try:
+            self.rpc['venus/sun/tag/register_tag/update'](ids=ids).unwrap()
+        except Exception as e:
+            error_logger.error(u'配置失败')
+            raise
+        return {'msg': '更改成功'}

api/topic.py

@@ -4,7 +4,7 @@
 # Date: 2018/11/15
 
 import json
-from utils.base import APIView
+from utils.base import APIView, get_offset_count
 from utils.logger import error_logger
 
 
@@ -13,7 +13,7 @@ class TopicListView(APIView):
         pictorial_id = request.GET.get('pictorial_id', '')
         user_id = request.GET.get('user_id', '')
         page = int(request.GET.get('page', 1))
-        limit = int(request.GET.get('limit', 10))
+        limit = int(request.GET.get('size', 10))
         filters = json.loads(request.GET.get('filter', "{}"))
         sorts_by = list(map(lambda i: int(i), request.GET.getlist('sort_params[]', [3])))
         if user_id:
@@ -112,6 +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', '[]'))))
+        pictorial_ids = list(json.loads(request.POST.get('pictorial_ids', '[]')))
 
         data = {
             'topic_images': topic_images,
@@ -119,7 +120,7 @@ class TopicUpdateOrCreateView(APIView):
             'posting_time': request.POST.get('posting_time'),
             'content': request.POST.get('content', ''),
             'content_level': request.POST.get('content_level', ''),
-            'group_id': request.POST.get('group', '').split(':')[0],
+            'pictorial_ids': pictorial_ids,
             'user_id': request.POST.get('user', '').split(':')[0],
             'star_id': request.POST.get('star', '').split(':')[0],
             'tag_ids': tag_ids,
@@ -197,3 +198,16 @@ class TopicListBatchUpdate(APIView):
         return {
             "message": "更新成功"
         }
+
+
+class TopicRelatePictorialInfo(APIView):
+
+    def get(self, request):
+        id_ = request.GET.get('id')
+        offset, count = get_offset_count(request)
+        try:
+            data = self.rpc['venus/sun/topic/relate_pictorial_info'](id_=id_, offset=offset, count=count).unwrap()
+        except Exception as e:
+            error_logger.error(u'获取帖子画报列表失败%s', e)
+            raise
+        return {'data': data}

api/urls.py

@@ -8,7 +8,6 @@ from django.conf.urls import url
 
 from .pick import *
 from .push import *
-from .group import *
 from .user import *
 from .topic import *
 from .star import *
@@ -34,24 +33,15 @@ urlpatterns = [
     url(r'^account/list/update$', AccountList.as_view()),
     url(r'^account/detail$', AccountUpdateOrCreateView.as_view()),
     url(r'^account/create$', AccountUpdateOrCreateView.as_view()),
+
     # user相关
     url(r'^user/list$', UserListView.as_view()),
     url(r'^user/list/update$', UserListView.as_view()),
     url(r'^user/get$', UserUpdateOrCreate.as_view()),
     url(r'^user/create$', UserUpdateOrCreate.as_view()),
-    url(r'^user/group/list$', UserGroupView.as_view()),
     url(r'^user/images/get$', UserImage.as_view()),
     url(r'^user/images/create$', UserImage.as_view()),
 
-    # group相关
-    url(r'^group/list$', GroupListView.as_view()),
-    url(r'^group/list/update$', GroupListView.as_view()),
-    url(r'^group/get$', GroupUpdateOrCreate.as_view()),
-    url(r'^group/create$', GroupUpdateOrCreate.as_view()),
-    url(r'^group/user/list$', GroupRelatedUser.as_view()),
-    url(r'^group/user/get$', GroupRelatedUserGET.as_view()),
-    url(r'^group/user/edit_group_identify', GroupRelatedUserGET.as_view()),
-
     # topic相关
     url(r'^topic/list$', TopicListView.as_view()),
     url(r'^topic/img/list$', TopicImageListView.as_view()),
@@ -61,13 +51,14 @@ urlpatterns = [
     url(r'^topic/reply/list$', ReplyUpdateOrCreateView.as_view()),
     url(r'^topic/reply/batch_delete$', ReplyUpdateOrCreateView.as_view()),
     url(r'^topic/reply/create$', ReplyCreate.as_view()),
+    url(r'^topic/related_pictorial_info$', TopicRelatePictorialInfo.as_view()),
 
     # star相关
     url(r'^celebrity/list$', CelebrityListView.as_view()),
     url(r'^celebrity/list/update$', CelebrityListView.as_view()),
     url(r'^celebrity/create$', CelebrityUpdateOrCreate.as_view()),
     url(r'^celebrity/detail$', CelebrityUpdateOrCreate.as_view()),
-    url(r'^celebrity/celebrity_related_group_info', CelebrityRelatedGroup.as_view()),
+    url(r'^celebrity/celebrity_related_pictorial_info', CelebrityRelatedPictorial.as_view()),
 
     # push相关
     url(r'^push/list$', PushListView.as_view()),
@@ -93,6 +84,7 @@ urlpatterns = [
     url(r'^tag/list/update$', TagListView.as_view()),
     url(r'^tag/create$', TagUpdateOrCreateView.as_view()),
     url(r'^tag/detail$', TagUpdateOrCreateView.as_view()),
+    url(r'^tag/register_show/update$', TagRegisterUpdateView.as_view()),
 
     # 标签类型相关
     url(r'^tag/tagtype/list$', TagTypeListView.as_view()),
@@ -137,10 +129,10 @@ urlpatterns = [
     url(r'^pictorial/get$', PictorialUpdateOrCreate.as_view()),
     url(r'^pictorial/create$', PictorialUpdateOrCreate.as_view()),
     url(r'^pictorial/topics$', PictorialTopics.as_view()),
+    url(r'^pictorial/user/list$', PictorialUserList.as_view()),
 ]
 
 search_urlpatterns = [
-    url(r'search/group$', GroupSearchView.as_view()),
     url(r'search/country$', CountrySearchView.as_view()),
     url(r'search/user$', UserSearchView.as_view()),
     url(r'search/tag$', TagSearchView.as_view()),

api/user.py

@@ -18,12 +18,12 @@ from utils.pic_tools import tailor_image
 
 class UserListView(APIView):
     def get(self, request):
-        group_id = request.GET.get('group_id', '')
+        pictorial_id = request.GET.get('pictorial_id', '')
         page = int(request.GET.get('page', 1))
         limit = int(request.GET.get('limit', 10))
-        filter = self.handle_filter(request.GET.get('filter', ""))
-        if group_id:
-            filter.update({'group_id': group_id})
+        filter = self.handle_filter(request.GET.get('filter', '{}'))
+        if pictorial_id:
+            filter.update({'pictorial_id': pictorial_id})
         try:
             data = self.rpc['venus/sun/user/list'](offset=(page-1)*limit, limit=limit, filters=filter).unwrap()
         except Exception as e:
@@ -85,16 +85,16 @@ class UserUpdateOrCreate(APIView):
         }
 
 
-class UserGroupView(APIView):
+class PictorialUserList(APIView):
     def get(self, request):
-        user_id = request.GET.get('id')
+        id_ = request.GET.get('id')
         offset = int(request.GET.get('page', 0))
         count = int(request.GET.get('limit', 10))
-        filters = {'user_id': user_id}
+        filters = {'pictorial_id': id_}
         try:
-            data = self.rpc['venus/sun/group/user/list'](filters=filters, offset=(offset - 1) * count, limit=count).unwrap()
+            data = self.rpc['venus/sun/pictorial/user/list'](filters=filters, offset=(offset - 1) * count, count=count).unwrap()
         except Exception as e:
-            error_logger.error(u'获取小组用户详情失败%s' , e)
+            error_logger.error(u'获取画报用户列表失败%s' , e)
             raise
         return data
 

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'