@@ -424,6 +503,7 @@ def flyimg_upload_api(request):

             settings.THUMBNAIL_MAX_WIDTH

         )

+        # 群组照片记录创建

         group_photo = GroupPhotoInfo.objects.create(

             group_id=group_id,

             user_id=user_id,

@@ -437,6 +517,10 @@ def flyimg_upload_api(request):

             photo_thumbnail_h=photo_thumbnail_h,

         )

+        # 设置群组最后一张照片PK

+        r.set(GROUP_LAST_PHOTO_PK % group_id, group_photo.pk)

+

+    # 获取从 current_id 到 now 的群组照片列表

     group_photos = GroupPhotoInfo.objects.filter(

         group_id=group_id,

         status=True,

@@ -455,27 +539,30 @@ def flyimg_upload_api(request):

 def comment_submit_api(request):

+    """

+    飞图评论提交／飞图评论列表

+    :param request:

+    :return:

+    """

     group_id = request.POST.get('group_id', '')

     user_id = request.POST.get('user_id', '')

     photo_id = request.POST.get('photo_id', '')

     comment = request.POST.get('comment', '')

-    try:

-        group = GroupInfo.objects.get(group_id=group_id)

-    except GroupInfo.DoesNotExist:

-        return response(GroupStatusCode.GROUP_NOT_FOUND)

-

+    # 群组用户校验

     try:

         group_user = GroupUserInfo.objects.get(group_id=group_id, user_id=user_id, user_status=GroupUserInfo.PASSED)

     except GroupUserInfo.DoesNotExist:

-        return response(GroupStatusCode.GROUP_USER_NOT_FOUND)

+        return response(GroupUserStatusCode.GROUP_USER_NOT_FOUND)

+    # 群组照片校验

     try:

         group_photo = GroupPhotoInfo.objects.get(pk=photo_id)

     except GroupPhotoInfo.DoesNotExist:

-        return response(GroupPhotoStatusCode.MESSAGE_NOT_FOUND)

+        return response(GroupPhotoStatusCode.GROUP_PHOTO_NOT_FOUND)

     if comment:

+        # 群组照片评论记录创建

         PhotoCommentInfo.objects.create(

             photo_id=photo_id,

             user_id=user_id,

@@ -484,21 +571,25 @@ def comment_submit_api(request):

             comment=comment,

         )

+        # 群组照片评论数更新

         group_photo.comment_num += 1

         group_photo.save()

-        UserMessageInfo.objects.create(

-            from_uid=user_id,

-            from_nickname=group_user.nickname,

-            from_avatar=group_user.avatar,

-            to_uid=group_photo.user_id,

-            group_id=group_photo.group_id,

-            photo_id=group_photo.pk,

-            msg_type=UserMessageInfo.COMMENT,

-            msg_title=u'评论',

-            msg_content=comment,

-        )

-

+        # 判断群组照片发布者是否已经被管理员移除，如若移除，则不给发布者提醒

+        if r.sismember(GROUP_USERS_PASSED_SET % group_photo.group_id, group_photo.user_id):

+            UserMessageInfo.objects.create(

+                from_uid=user_id,

+                from_nickname=group_user.nickname,

+                from_avatar=group_user.avatar,

+                to_uid=group_photo.user_id,

+                group_id=group_photo.group_id,

+                photo_id=group_photo.pk,

+                msg_type=UserMessageInfo.COMMENT,

+                msg_title=u'评论',

+                msg_content=comment,

+            )

+

+    # 群组照片评论列表

     photo_comments = PhotoCommentInfo.objects.filter(

         photo_id=photo_id,

     )

@@ -513,25 +604,28 @@ def comment_submit_api(request):

 def thumbup_submit_api(request):

+    """

+    飞图点赞提交

+    :param request:

+    :return:

+    """

     group_id = request.POST.get('group_id', '')

     user_id = request.POST.get('user_id', '')

     photo_id = request.POST.get('photo_id', '')

-    try:

-        group = GroupInfo.objects.get(group_id=group_id)

-    except GroupInfo.DoesNotExist:

-        return response(GroupStatusCode.GROUP_NOT_FOUND)

-

+    # 群组用户校验

     try:

         group_user = GroupUserInfo.objects.get(group_id=group_id, user_id=user_id, user_status=GroupUserInfo.PASSED)

     except GroupUserInfo.DoesNotExist:

-        return response(GroupStatusCode.GROUP_USER_NOT_FOUND)

+        return response(GroupUserStatusCode.GROUP_USER_NOT_FOUND)

+    # 群组照片校验

     try:

         group_photo = GroupPhotoInfo.objects.get(pk=photo_id)

     except GroupPhotoInfo.DoesNotExist:

-        return response(GroupPhotoStatusCode.MESSAGE_NOT_FOUND)

+        return response(GroupPhotoStatusCode.GROUP_PHOTO_NOT_FOUND)

+    # 群组照片点赞记录创建／更新

     photo_thumbup, created = PhotoThumbUpInfo.objects.get_or_create(

         photo_id=photo_id,

         user_id=user_id,

@@ -541,21 +635,25 @@ def thumbup_submit_api(request):

     photo_thumbup.thumbup = True

     photo_thumbup.save()

+    # 群组照片点赞数更新

     group_photo.thumbup_num += 1

     group_photo.save()

-    UserMessageInfo.objects.create(

-        from_uid=user_id,

-        from_nickname=group_user.nickname,

-        from_avatar=group_user.avatar,

-        to_uid=group_photo.user_id,

-        group_id=group_photo.group_id,

-        photo_id=group_photo.pk,

-        msg_type=UserMessageInfo.THUMBUP,

-        msg_title=u'点赞',

-        msg_content=u'点赞',

-    )

+    # 判断群组照片发布者是否已经被管理员移除，如若移除，则不给发布者提醒

+    if r.sismember(GROUP_USERS_PASSED_SET % group_photo.group_id, group_photo.user_id):

+        UserMessageInfo.objects.create(

+            from_uid=user_id,

+            from_nickname=group_user.nickname,

+            from_avatar=group_user.avatar,

+            to_uid=group_photo.user_id,

+            group_id=group_photo.group_id,

+            photo_id=group_photo.pk,

+            msg_type=UserMessageInfo.THUMBUP,

+            msg_title=u'点赞',

+            msg_content=u'点赞',

+        )

+    # 群组照片点赞列表

     photo_thumbups = PhotoThumbUpInfo.objects.filter(

         photo_id=photo_id,

         thumbup=True,

@@ -572,33 +670,22 @@ def thumbup_submit_api(request):

 def thumbup_list_api(request):

+    """

+    飞图点赞列表

+    :param request:

+    :return:

+    """

     group_id = request.POST.get('group_id', '')

     user_id = request.POST.get('user_id', '')

     photo_id = request.POST.get('photo_id', '')

-    try:

-        group = GroupInfo.objects.get(group_id=group_id)

-    except GroupInfo.DoesNotExist:

-        return response(GroupStatusCode.GROUP_NOT_FOUND)

-

-    try:

-        group_user = GroupUserInfo.objects.get(group_id=group_id, user_id=user_id, user_status=GroupUserInfo.PASSED)

-    except GroupUserInfo.DoesNotExist:

-        return response(GroupStatusCode.GROUP_USER_NOT_FOUND)

-

-    try:

-        group_photo = GroupPhotoInfo.objects.get(pk=photo_id)

-    except GroupPhotoInfo.DoesNotExist:

-        return response(GroupPhotoStatusCode.MESSAGE_NOT_FOUND)

-

-    try:

-        thumbup = PhotoThumbUpInfo.objects.get(

-            photo_id=photo_id,

-            user_id=user_id,

-        ).thumbup

-    except PhotoThumbUpInfo.DoesNotExist:

-        thumbup = False

+    # user_id 是否点赞 photo_id

+    thumbup = PhotoThumbUpInfo.objects.filter(

+        photo_id=photo_id,

+        user_id=user_id,

+    ).exists()

+    # 群组照片点赞列表

     photo_thumbups = PhotoThumbUpInfo.objects.filter(

         photo_id=photo_id,

         thumbup=True,

@@ -615,25 +702,28 @@ def thumbup_list_api(request):

 def thumbup_cancel_api(request):

+    """

+    飞图点赞取消

+    :param request:

+    :return:

+    """

     group_id = request.POST.get('group_id', '')

     user_id = request.POST.get('user_id', '')

     photo_id = request.POST.get('photo_id', '')

-    try:

-        group = GroupInfo.objects.get(group_id=group_id)

-    except GroupInfo.DoesNotExist:

-        return response(GroupStatusCode.GROUP_NOT_FOUND)

-

+    # 群组用户校验

     try:

         group_user = GroupUserInfo.objects.get(group_id=group_id, user_id=user_id, user_status=GroupUserInfo.PASSED)

     except GroupUserInfo.DoesNotExist:

-        return response(GroupStatusCode.GROUP_USER_NOT_FOUND)

+        return response(GroupUserStatusCode.GROUP_USER_NOT_FOUND)

+    # 群组照片校验

     try:

         group_photo = GroupPhotoInfo.objects.get(pk=photo_id)

     except GroupPhotoInfo.DoesNotExist:

-        return response(GroupPhotoStatusCode.MESSAGE_NOT_FOUND)

+        return response(GroupPhotoStatusCode.GROUP_PHOTO_NOT_FOUND)

+    # 群组照片点赞取消

     photo_thumbup, created = PhotoThumbUpInfo.objects.get_or_create(

         photo_id=photo_id,

         user_id=user_id,

@@ -641,21 +731,25 @@ def thumbup_cancel_api(request):

     photo_thumbup.thumbup = False

     photo_thumbup.save()

+    # 群组照片点赞数更新

     group_photo.thumbup_num -= 1

     group_photo.save()

-    UserMessageInfo.objects.create(

-        from_uid=user_id,

-        from_nickname=group_user.nickname,

-        from_avatar=group_user.avatar,

-        to_uid=group_photo.user_id,

-        group_id=group_photo.group_id,

-        photo_id=group_photo.pk,

-        msg_type=UserMessageInfo.THUMBUP,

-        msg_title=u'取消点赞',

-        msg_content=u'取消点赞',

-    )

+    # 判断群组照片发布者是否已经被管理员移除，如若移除，则不给发布者提醒

+    if r.sismember(GROUP_USERS_PASSED_SET % group_photo.group_id, group_photo.user_id):

+        UserMessageInfo.objects.create(

+            from_uid=user_id,

+            from_nickname=group_user.nickname,

+            from_avatar=group_user.avatar,

+            to_uid=group_photo.user_id,

+            group_id=group_photo.group_id,

+            photo_id=group_photo.pk,

+            msg_type=UserMessageInfo.THUMBUP,

+            msg_title=u'取消点赞',

+            msg_content=u'取消点赞',

+        )

+    # 群组照片点赞列表

     photo_thumbups = PhotoThumbUpInfo.objects.filter(

         photo_id=photo_id,

         thumbup=True,

@@ -672,10 +766,16 @@ def thumbup_cancel_api(request):

 def pai2_home_api(request):

+    """

+    首页信息

+    :param request:

+    :return:

+    """

     user_id = request.POST.get('user_id', '')

     page = int(request.POST.get('page', 1))

     num = int(request.POST.get('num', settings.PAI2_HOME_PER_PAGE))

+    # 执行原生 SQL 语句，获取首页照片列表

     cursor = connection.cursor()

     cursor.execute(PAI2_HOME_API.format(

         user_id=user_id,

@@ -684,8 +784,10 @@ def pai2_home_api(request):

     ))

     rows = cursor.fetchall()

+    # 首页照片分页

     rows, left = pagination(rows, page, num)

+    # 首页照片信息

     rows = [{

         'group_id': row[0],

         'group_name': row[1],

@@ -12,6 +12,11 @@ from utils.error.response_utils import response

 def message_list_api(request):

+    """

+    消息列表

+    :param request:

+    :return:

+    """

     user_id = request.POST.get('user_id', '') or request.GET.get('user_id', '')

     messages = UserMessageInfo.MESSAGE_TYPE_INFO

@@ -38,6 +43,12 @@ def message_list_api(request):

 def message_type_list_api(request, msg_type):

+    """

+    分类消息列表

+    :param request:

+    :param msg_type:

+    :return:

+    """

     user_id = request.POST.get('user_id', '') or request.GET.get('user_id', '')

     page = int(request.POST.get('page', 0) or request.GET.get('page', 0) or 1)

     num = int(request.POST.get('num', 0) or request.GET.get('num', 0) or settings.MESSAGE_NUM_PER_PAGE)

@@ -62,6 +73,11 @@ def message_type_list_api(request, msg_type):

 def message_read_api(request):

+    """

+    消息读取

+    :param request:

+    :return:

+    """

     pk = int(request.POST.get('pk', 0) or request.GET.get('pk', 0) or -1)

     user_id = request.POST.get('user_id', '') or request.GET.get('user_id', '')

@@ -6,6 +6,11 @@ from operation.models import LatestAppInfo, SplashInfo

 def upgrade_api(request):

+    """

+    APP 升级

+    :param request:

+    :return:

+    """

     try:

         appinfo = LatestAppInfo.objects.all()[0].data

     except IndexError:

@@ -21,6 +26,11 @@ def upgrade_api(request):

 def splash_api(request):

+    """

+    启动页面

+    :param request:

+    :return:

+    """

     splashes = SplashInfo.objects.all()

     splashes = [splash.data for splash in splashes]

@@ -22,6 +22,11 @@ wxpay = WeChatPay(WECHAT['appID'], WECHAT['apiKey'], WECHAT['mchID'])

 @transaction.atomic

 def wx_order_create_api(request):

+    """

+    订单创建

+    :param request:

+    :return:

+    """

     from_uid = request.POST.get('from_uid', '')

     to_lid = request.POST.get('to_lid', '')

     to_uid = request.POST.get('to_uid', '')

@@ -71,6 +76,11 @@ def order_paid_success(order):

 @transaction.atomic

 def wx_notify_url_api(request):

+    """

+    支付异步通知回调地址

+    :param request:

+    :return:

+    """

     try:

         data = xmltodict.parse(request.body)['xml']

     except xmltodict.ParsingInterrupted:

@@ -19,6 +19,9 @@ from utils.watermark_utils import watermark_wrap

 from utils.error.errno_utils import PhotoStatusCode

 from utils.error.response_utils import response

+from utils.redis.rkeys import GROUP_LAST_PHOTO_PK

+from utils.redis.rgroup import get_group_info, get_group_users_info

+

 from curtail_uuid import CurtailUUID

 from TimeConvert import TimeConvert as tc

@@ -27,7 +30,15 @@ import os

 import shortuuid

+r = settings.REDIS_CACHE

+

+

 def uuid_init(request):

+    """

+    生成唯一标识

+    :param request:

+    :return:

+    """

     num = int(request.GET.get('num', 1000))

     for i in xrange(num):

@@ -43,6 +54,11 @@ def uuid_init(request):

 # curl -X POST -F user=xxxxxxx -F num=100 http://api.pai.ai/uuid

 @transaction.atomic

 def uuid(request):

+    """

+    获取唯一标识

+    :param request:

+    :return:

+    """

     lensman_id = request.POST.get('user', '')

     num = int(request.POST.get('num', 100))

@@ -72,6 +88,11 @@ def uuid(request):

 #

 # curl -X POST -F user=xxxxxxx -F session=xxxxxxx -F photo_id=xxxxxxx -F photo=@xxxxxxx.jpg http://api.pai.ai/photos/upload

 def upload_photo(request):

+    """

+    上传图片

+    :param request:

+    :return:

+    """

     lensman_id = request.POST.get('user', '')

     session_id = request.POST.get('session', '')

     photo_id = request.POST.get('photo_id', '')

@@ -121,6 +142,12 @@ def upload_photo(request):

 def session_detail_api(request, session):

+    """

+    Session 详情

+    :param request:

+    :param session:

+    :return:

+    """

     user_id = request.POST.get('user_id', '')

     # 判断 user_id 是否存在，如果不存在，则直接分配帐户

@@ -142,9 +169,8 @@ def session_detail_api(request, session):

     group_id = group.group_id

     # 判断 group_id/user_id 的群组用户是否存在，如果不存在，则直接创建

-    group_photo = GroupPhotoInfo.objects.filter(group_id=group_id).last()

     group_user = GroupUserInfo.objects.get_or_create(group_id=group_id, user_id=user_id, defaults={

-        'current_id': group_photo and group_photo.id or -1,

+        'current_id': int(r.get(GROUP_LAST_PHOTO_PK % group_id) or -1),

         'nickname': user.final_nickname,

         'admin': False,

         'user_status': GroupUserInfo.PASSED,

@@ -159,9 +185,9 @@ def session_detail_api(request, session):

             'count': photos.count(),

             'photos': [p.detail for p in photos],

             'group_id': group_id,

-            'group': group.data,

+            'group': get_group_info(group_id),

             'user_id': user_id,

-            'users': group.users(user_id),

+            'users': get_group_users_info(group_id, user_id),

         }

     })

@@ -45,7 +45,6 @@ class GroupStatusCode(BaseStatusCode):

     NO_REFUSE_PERMISSION = StatusCodeField(402009, u'No Refuse Permission', description=u'没有拒绝权限')

     DUPLICATE_JOIN_REQUEST = StatusCodeField(402010, u'Duplicate Join Request', description=u'重复加群申请')

     JOIN_REQUEST_NOT_FOUND = StatusCodeField(402011, u'Join Request Not Found', description=u'加群申请不存在')

-    GROUP_USER_NOT_FOUND = StatusCodeField(402012, u'Group User Not Found', description=u'该用户不在群组')

 class GroupUserStatusCode(BaseStatusCode):

@@ -6,6 +6,7 @@ from django.http import JsonResponse

 def response(status_code, data={}):

     return JsonResponse({

         'status': status_code,

-        'message': status_code.description,

+        'message': status_code.message,

+        'description': status_code.description,

         'data': data,

     })

@@ -1,7 +0,0 @@

-# -*- coding: utf-8 -*-

-

-# 用户相关

-PROFILE_USER_INFO = 'profile:user:info:%s'  # 用户信息，uid

-

-# 群组相关

-GROUP_INFO = 'group:info:%s'  # 群组信息，group_id

@@ -0,0 +1,33 @@

+# -*- coding: utf-8 -*-

+

+from django.conf import settings

+

+from group.models import GroupInfo, GroupUserInfo, GroupPhotoInfo

+

+from utils.redis.rkeys import GROUP_USERS_APPLYING_SET, GROUP_USERS_PASSED_SET, GROUP_USERS_REFUSED_SET, GROUP_USERS_DELETED_SET

+from utils.redis.rkeys import GROUP_LAST_PHOTO_PK

+

+

+r = settings.REDIS_CACHE

+

+

+def retrieve_redis_data():

+    # 群组／群组照片相关

+    groups = GroupInfo.objects.filter(status=True)

+    for group in groups:

+        group_photo = GroupPhotoInfo.objects.filter(group_id=group.group_id).last()

+        # 设置群组最后一张照片PK

+        r.set(GROUP_LAST_PHOTO_PK % group.group_id, group_photo and group_photo.pk or -1)

+

+    # 群组用户相关

+    group_users = GroupUserInfo.objects.filter(status=True)

+    for group_user in group_users:

+        group_id, user_id = group_user.group_id, group_user.user_id

+        if group_user.user_status == GroupUserInfo.PASSED:

+            r.sadd(GROUP_USERS_PASSED_SET % group_id, user_id)

+        elif group_user.user_status == GroupUserInfo.DELETED:

+            r.sadd(GROUP_USERS_DELETED_SET % group_id, user_id)

+        elif group_user.user_status == GroupUserInfo.APPLYING:

+            r.sadd(GROUP_USERS_APPLYING_SET % group_id, user_id)

+        elif group_user.user_status == GroupUserInfo.REFUSED:

+            r.sadd(GROUP_USERS_REFUSED_SET % group_id, user_id)

@@ -0,0 +1,68 @@

+# -*- coding: utf-8 -*-

+

+from django.conf import settings

+from django.core.serializers.json import DjangoJSONEncoder

+

+from utils.redis.rkeys import GROUP_INFO, GROUP_USERS_INFO, GROUP_LAST_PHOTO_PK

+

+import json

+

+

+r = settings.REDIS_CACHE

+

+

+# 群组信息相关

+

+

+def set_group_info(group):

+    """ 设置群组信息 """

+    group_data = group.data

+    r.set(GROUP_INFO % group.group_id, json.dumps(group_data, cls=DjangoJSONEncoder))

+    return group_data

+

+

+def set_group_info_by_id(group_id):

+    """ 设置群组信息 """

+    from group.models import GroupInfo

+    try:

+        group = GroupInfo.objects.get(group_id=group_id)

+    except GroupInfo.DoesNotExist:

+        return {}

+    return set_group_info(group)

+

+

+def get_group_info(group_id):

+    """ 获取群组信息 """

+    return json.loads(r.get(GROUP_INFO % group_id) or '{}') or set_group_info_by_id(group_id)

+

+

+# 群组用户信息相关

+

+

+def set_group_users_info(group):

+    """ 设置群组用户信息 """

+    group_users = group.users(admin=False)

+    r.set(GROUP_USERS_INFO % group.group_id, json.dumps({

+        'group_users': group_users,

+        'admin_id': group.admin_id,

+    }, cls=DjangoJSONEncoder))

+    return group_users

+

+

+def set_group_users_info_by_id(group_id):

+    """ 设置群组用户信息 """

+    from group.models import GroupInfo

+    try:

+        group = GroupInfo.objects.get(group_id=group_id)

+    except GroupInfo.DoesNotExist:

+        return {}

+    return set_group_users_info(group)

+

+

+def get_group_users_info(group_id, user_id):

+    """ 获取群组用户信息 """

+    group_users_data = json.loads(r.get(GROUP_USERS_INFO % group_id) or '{}') or set_group_users_info_by_id(group_id)

+    group_users, admin_id = group_users_data.get('group_users', {}), group_users_data.get('admin_id', '')

+    if group_users and user_id != admin_id:

+        [group_users.pop(k) for k in ['applying_count', 'applying']]

+    return group_users

@@ -0,0 +1,17 @@

+# -*- coding: utf-8 -*-

+

+# 用户相关

+PROFILE_INFO = 'profile:info:%s'  # STRING，用户信息，uid

+

+# 群组相关

+GROUP_INFO = 'group:info:%s'  # STRING，群组信息，group_id

+

+# 群组用户相关

+GROUP_USERS_INFO = 'group:users:info:%s'  # STRING，群组用户信息，group_id

+GROUP_USERS_APPLYING_SET = 'group:users:applying:set:%s'  # SET，群组用户申请集合，group_id

+GROUP_USERS_PASSED_SET = 'group:users:passed:set:%s'  # SET，群组用户通过集合，group_id

+GROUP_USERS_REFUSED_SET = 'group:users:refused:set:%s'  # SET，群组用户拒绝集合，group_id

+GROUP_USERS_DELETED_SET = 'group:users:deleted:set:%s'  # SET，群组用户移除集合，group_id

+

+# 群组照片相关

+GROUP_LAST_PHOTO_PK = 'group:last:photo:pk:%s'  # STRING，群组最后一张照片PK，group_id

Главная Обзор Помощь

Зарегистрироваться Войти

tonglan

/

adminSystem

Следить 1

В избранное 0

Ответвить 0

Обсуждения 0 Пулл реквесты 0 Коммиты 1 Релизы 0

Нет описания

SSH HTTPS

ZIP TAR.GZ

• Дерево: 11e3a9652a

  Ветки Метки

  master
• adminSystem

  /

  node_modules

  /

  postcss-merge-longhand

FFIB: 11e3a9652a first лет %!s(int64=7): %!d(string=назад)
	..
	dist	11e3a9652a	first	лет %!s(int64=7): %!d(string=назад)
	node_modules	11e3a9652a	first	лет %!s(int64=7): %!d(string=назад)
	CHANGELOG.md	11e3a9652a	first	лет %!s(int64=7): %!d(string=назад)
	LICENSE-MIT	11e3a9652a	first	лет %!s(int64=7): %!d(string=назад)
	README.md	11e3a9652a	first	лет %!s(int64=7): %!d(string=назад)
	package.json	11e3a9652a	first	лет %!s(int64=7): %!d(string=назад)

README.md

postcss-merge-longhand

Merge longhand properties into shorthand with PostCSS.

Install

With npm do:

npm install postcss-merge-longhand --save

Example

Merge longhand properties into shorthand; works with margin, padding & border. For more examples see the tests.

Input

h1 {
    margin-top: 10px;
    margin-right: 20px;
    margin-bottom: 10px;
    margin-left: 20px;
}

Output

h1 {
    margin: 10px 20px;
}

Usage

See the PostCSS documentation for examples for your environment.

Contributing

Pull requests are welcome. If you add functionality, then please add unit tests to cover it.

License

MIT © Ben Briggs