num-new"> 
-    # Redis 群组照片数据缓存
393 
-    set_group_photo_data(group_id)
394 
-
395 
-    # Redis 群组照片评论列表缓存刷新
396 
-    set_group_photo_comment_list(photo_id)
397 
-
398 
-    r.sadd(GROUP_PHOTO_WATCHER_SET % photo_id, user_id)
399 
-
400 
-    # 判断群组照片发布者是否已经被管理员移除／主动退出，如若移除／退出，则不给发布者提醒
401 
-    if r.sismember(GROUP_USERS_PASSED_SET % group_photo.group_id, group_photo.user_id):
402 
-        UserMessageInfo.objects.create(
403 
-            from_uid=user_id,
404 
-            from_nickname=group_user.nickname,
405 
-            from_avatar=group_user.avatar,
406 
-            to_uid=group_photo.user_id,
407 
-            group_id=group_photo.group_id,
408 
-            photo_id=group_photo.photo_id,
409 
-            msg_type=UserMessageInfo.COMMENT,
410 
-            msg_title=u'评论',
411 
-            msg_content=comment,
412 
-        )
413 
-
414 
-    # 给所有关注者(评论/点赞)发送提醒，移除(评论/点赞)者和照片所有者
415 
-    watchers = get_group_photo_watchers(photo_id, [user_id, group_photo.user_id])
416 
-    for watcher in watchers:
417 
-        UserMessageInfo.objects.create(
418 
-            from_uid=user_id,
419 
-            from_nickname=group_user.nickname,
420 
-            from_avatar=group_user.avatar,
421 
-            to_uid=watcher,
422 
-            group_id=group_photo.group_id,
423 
-            photo_id=group_photo.photo_id,
424 
-            msg_type=UserMessageInfo.COMMENT,
425 
-            msg_title=u'评论',
426 
-            msg_content=comment,
427 
-        )
428 
-
429 
-    return response(200, 'Comment Success', u'评论成功', {
430 
-        'comments': get_group_photo_comment_list(photo_id),
431 
-    })
432 
-
433 
-
434 
-@logit
435 
-def comment_list_api(request):
436 
-    """ 飞图评论列表 """
437 
-    photo_id = request.POST.get('photo_id', '')
438 
-
439 
-    # 群组照片校验
440 
-    if not GroupPhotoInfo.objects.filter(photo_id=photo_id).exists():
441 
-        return response(GroupPhotoStatusCode.GROUP_PHOTO_NOT_FOUND)
442 
-
443 
-    return response(200, 'Get Comment List Success', u'获取评论列表成功', {
444 
-        'comments': get_group_photo_comment_list(photo_id),
445 
-    })
446 
-
447 
-
448 
-@logit
449 
-def thumbup_submit_api(request):
450 
-    """ 飞图点赞提交 """
451 
-    group_id = request.POST.get('group_id', '')
452 
-    user_id = request.POST.get('user_id', '')
453 
-    photo_id = request.POST.get('photo_id', '')
454 
-
455 
-    # 群组用户校验
456 
-    try:
457 
-        group_user = GroupUserInfo.objects.get(group_id=group_id, user_id=user_id, user_status=GroupUserInfo.PASSED)
458 
-    except GroupUserInfo.DoesNotExist:
459 
-        return response(GroupUserStatusCode.GROUP_USER_NOT_FOUND)
460 
-
461 
-    # 群组照片校验
462 
-    try:
463 
-        group_photo = GroupPhotoInfo.objects.get(photo_id=photo_id)
464 
-    except GroupPhotoInfo.DoesNotExist:
465 
-        return response(GroupPhotoStatusCode.GROUP_PHOTO_NOT_FOUND)
466 
-
467 
-    # user_id 是否点赞 photo_id
468 
-    if get_group_photo_thumbup_flag(photo_id, user_id):
469 
-        return response(GroupPhotoStatusCode.DUPLICATE_THUMB_UP)
470 
-
471 
-    # 群组照片点赞记录创建／更新
472 
-    photo_thumbup, created = PhotoThumbUpInfo.objects.get_or_create(
473 
-        photo_id=photo_id,
474 
-        user_id=user_id,
475 
-    )
476 
-    photo_thumbup.nickname = group_user.nickname
477 
-    photo_thumbup.avatar = group_user.avatar
478 
-    photo_thumbup.thumbup = True
479 
-    photo_thumbup.save()
480 
-
481 
-    # Redis 群组照片点赞数据缓存
482 
-    set_group_photo_thumbup_flag(photo_id, user_id)
483 
-
484 
-    # 群组照片点赞数更新
485 
-    group_photo.thumbup_num += 1
486 
-    group_photo.save()
487 
-
488 
-    # Redis 群组照片数据缓存
489 
-    set_group_photo_data(group_id)
490 
-
491 
-    # Redis 群组照片点赞列表缓存刷新
492 
-    set_group_photo_thumbup_list(photo_id)
493 
-
494 
-    r.sadd(GROUP_PHOTO_WATCHER_SET % photo_id, user_id)
495 
-
496 
-    # 判断群组照片发布者是否已经被管理员移除／主动退出，如若移除／退出，则不给发布者提醒
497 
-    if r.sismember(GROUP_USERS_PASSED_SET % group_photo.group_id, group_photo.user_id):
498 
-        UserMessageInfo.objects.create(
499 
-            from_uid=user_id,
500 
-            from_nickname=group_user.nickname,
501 
-            from_avatar=group_user.avatar,
502 
-            to_uid=group_photo.user_id,
503 
-            group_id=group_photo.group_id,
504 
-            photo_id=group_photo.photo_id,
505 
-            msg_type=UserMessageInfo.THUMBUP,
506 
-            msg_title=u'点赞',
507 
-            msg_content=u'点赞',
508 
-        )
509 
-
510 
-    # 给所有关注者(评论/点赞)发送提醒，移除(评论/点赞)者和照片所有者
511 
-    watchers = get_group_photo_watchers(photo_id, [user_id, group_photo.user_id])
512 
-    for watcher in watchers:
513 
-        UserMessageInfo.objects.create(
514 
-            from_uid=user_id,
515 
-            from_nickname=group_user.nickname,
516 
-            from_avatar=group_user.avatar,
517 
-            to_uid=watcher,
518 
-            group_id=group_photo.group_id,
519 
-            photo_id=group_photo.photo_id,
520 
-            msg_type=UserMessageInfo.THUMBUP,
521 
-            msg_title=u'点赞',
522 
-            msg_content=u'点赞',
523 
-        )
524 
-
525 
-    return response(200, 'Thumbup Success', u'点赞提交成功', {
526 
-        'thumbup': True,
527 
-        'thumbups': get_group_photo_thumbup_list(photo_id),
528 
-    })
529 
-
530 
-
531 
-@logit
532 
-def thumbup_list_api(request):
533 
-    """ 飞图点赞列表 """
534 
-    user_id = request.POST.get('user_id', '')
535 
-    photo_id = request.POST.get('photo_id', '')
536 
-
537 
-    return response(200, 'Get Thumbup List Success', u'获取点赞列表成功', {
538 
-        'thumbup': get_group_photo_thumbup_flag(photo_id, user_id),  # user_id 是否点赞 photo_id
539 
-        'thumbups': get_group_photo_thumbup_list(photo_id),  # 群组照片点赞列表
540 
-    })
541 
-
542 
-
543 
-@logit
544 
-def thumbup_cancel_api(request):
545 
-    """ 飞图点赞取消 """
546 
-    group_id = request.POST.get('group_id', '')
547 
-    user_id = request.POST.get('user_id', '')
548 
-    photo_id = request.POST.get('photo_id', '')
549 
-
550 
-    # 群组用户校验
551 
-    try:
552 
-        group_user = GroupUserInfo.objects.get(group_id=group_id, user_id=user_id, user_status=GroupUserInfo.PASSED)
553 
-    except GroupUserInfo.DoesNotExist:
554 
-        return response(GroupUserStatusCode.GROUP_USER_NOT_FOUND)
555 
-
556 
-    # 群组照片校验
557 
-    try:
558 
-        group_photo = GroupPhotoInfo.objects.get(photo_id=photo_id)
559 
-    except GroupPhotoInfo.DoesNotExist:
560 
-        return response(GroupPhotoStatusCode.GROUP_PHOTO_NOT_FOUND)
561 
-
562 
-    # user_id 是否点赞 photo_id
563 
-    if not get_group_photo_thumbup_flag(photo_id, user_id):
564 
-        return response(GroupPhotoStatusCode.THUMB_UP_NOT_FOUND)
565 
-
566 
-    # 群组照片点赞取消
567 
-    photo_thumbup, created = PhotoThumbUpInfo.objects.get_or_create(
568 
-        photo_id=photo_id,
569 
-        user_id=user_id,
570 
-    )
571 
-    photo_thumbup.thumbup = False
572 
-    photo_thumbup.save()
573 
-
574 
-    # Redis 群组照片点赞数据移除
575 
-    del_group_photo_thumbup_flag(photo_id, user_id)
576 
-
577 
-    # 群组照片点赞数更新
578 
-    group_photo.thumbup_num -= 1
579 
-    group_photo.save()
580 
-
581 
-    # Redis 群组照片数据缓存
582 
-    set_group_photo_data(group_id)
583 
-
584 
-    # Redis 群组照片点赞列表缓存刷新
585 
-    set_group_photo_thumbup_list(photo_id)
586 
-
587 
-    # 判断群组照片发布者是否已经被管理员移除／主动退出，如若移除／退出，则不给发布者提醒
588 
-    if r.sismember(GROUP_USERS_PASSED_SET % group_photo.group_id, group_photo.user_id):
589 
-        UserMessageInfo.objects.create(
590 
-            from_uid=user_id,
591 
-            from_nickname=group_user.nickname,
592 
-            from_avatar=group_user.avatar,
593 
-            to_uid=group_photo.user_id,
594 
-            group_id=group_photo.group_id,
595 
-            photo_id=group_photo.photo_id,
596 
-            msg_type=UserMessageInfo.THUMBUP,
597 
-            msg_title=u'取消点赞',
598 
-            msg_content=u'取消点赞',
599 
-        )
600 
-
601 
-    # 群组照片点赞列表
602 
-    photo_thumbups = PhotoThumbUpInfo.objects.filter(photo_id=photo_id, thumbup=True, status=True)
603 
-
604 
-    return response(200, 'Thumbup Cancel Success', u'点赞取消成功', {
605 
-        'thumbup': False,
606 
-        'thumbups': [thumbup.thumbup_info for thumbup in photo_thumbups],
607 
-    })
608 
-
609 
-
610 
-@logit
611 
-def pai2_home_api(request):
612 
-    """ 首页照片信息 """
613 
-    user_id = request.POST.get('user_id', '')
614 
-    page = int(request.POST.get('page', 1))
615 
-    num = int(request.POST.get('num', settings.PAI2_HOME_PER_PAGE))
616 
-
617 
-    # 执行原生 SQL 语句，获取首页照片列表
618 
-    cursor = connection.cursor()
619 
-    cursor.execute((PAI2_HOME_WX_API if request.weixin else PAI2_HOME_API).format(
620 
-        user_id=user_id,
621 
-        offset=0,
622 
-        rows=settings.PAI2_HOME_MAX_ROWS,
623 
-    ))
624 
-    rows = cursor.fetchall()
625 
-
626 
-    # 首页照片分页
627 
-    rows, left = pagination(rows, page, num)
628 
-
629 
-    # 首页照片信息
630 
-    rows = [{
631 
-        'group_id': row[0],
632 
-        'group_name': row[1],
633 
-        'group_default_avatar': row[2],
634 
-        'group_avatar': row[3],
635 
-        'group_from': row[4],
636 
-        'photo_id': row[5],
637 
-        'photo_url': qiniu_file_url(row[6], bucket='watermark' if row[7] else 'photo'),
638 
-        'photo_w': row[8],
639 
-        'photo_h': row[9],
640 
-        'photo_thumbnail_url': qiniu_file_url(row[10], bucket='thumbnail'),
641 
-        'photo_thumbnail_w': row[11],
642 
-        'photo_thumbnail_h': row[12],
643 
-        'photo_thumbnail2_url': qiniu_file_url(row[13], bucket='thumbnail2'),
644 
-        'photo_thumbnail2_w': row[14],
645 
-        'photo_thumbnail2_h': row[15],
646 
-        'photo_share_url': share_url(row[5]),  # Warning: Index of This Line is 5
647 
-        'user_id': row[16],
648 
-        'nickname': row[17],
649 
-        'avatar': row[18],
650 
-        'comment_num': row[19],
651 
-        'thumbup_num': row[20],
652 
-        'photo_from': row[21],
653 
-        'session_id': row[22],
654 
-        'nomark': row[23],
655 
-        'origin': row[24],
656 
-        'created_at': row[25],
657 
-        'origin_expired_stamps': origin_expired_stamps(row[25], row[16]),
658 
-        'thumbup': get_group_photo_thumbup_flag(row[5], user_id),
659 
-        'porder': get_lensman_order_record(row[5], user_id) if row[21] == GroupPhotoInfo.SESSION_GROUP else {},
660 
-        'display_payment_btn': row[21] == GroupPhotoInfo.SESSION_GROUP and row[26] not in [GroupPhotoInfo.OUTTAKE],
661 
-    } for row in rows]
662 
-
663 
-    return response(200, 'Get Home Data Success', u'获取首页数据成功', {
664 
-        'photos': rows,
665 
-        'left': left,
666 
-    })
667 
-
668 
-
669 
-@logit
670 
-def lensman_photo_price(request):
671 
-    """ 摄影师照片价格获取 """
672 
-    user_id = request.POST.get('user_id', '')
673 
-    photo_id = request.POST.get('photo_id', '')
674 
-    photo_type = request.POST.get('photo_type', 'nomark')  # nomark for 去除水印, origin for 获取高清图
675 
-
676 
-    # 群组照片校验
677 
-    try:
678 
-        group_photo = GroupPhotoInfo.objects.get(photo_id=photo_id)
679 
-    except GroupPhotoInfo.DoesNotExist:
680 
-        return response(GroupPhotoStatusCode.GROUP_PHOTO_NOT_FOUND)
681 
-
682 
-    return response(200, 'Get Price Success', u'获取价格成功', {
683 
-        'price': get_group_photo_price(group_photo, photo_type)
684 
-    })
685 
-
686 
-
687 
-@logit
688 
-def lensman_photo_bought(request):
689 
-    """ 摄影师照片已购买 """
690 
-    user_id = request.POST.get('user_id', '')
691 
-    photo_id = request.POST.get('photo_id', '')
692 
-
693 
-    return response(200, 'Get Bought Data Success', u'获取购买数据成功', {
694 
-        'porder': get_lensman_order_record(photo_id, user_id)
695 
-    })
696 
-
697 
-
698 
-class GroupInfoViewSet(viewsets.ModelViewSet):
699 
-    queryset = GroupInfo.objects.all().order_by('-pk')
700 
-    serializer_class = GroupInfoSerializer
701 
-
702 
-
703 
-class GroupUserInfoViewSet(viewsets.ModelViewSet):
704 
-    queryset = GroupUserInfo.objects.all().order_by('-pk')
705 
-    serializer_class = GroupUserInfoSerializer
706 
-
707 
-
708 
-class GroupPhotoInfoViewSet(viewsets.ModelViewSet):
709 
-    queryset = GroupPhotoInfo.objects.all().order_by('-pk')
710 
-    serializer_class = GroupPhotoInfoSerializer
7 
+# Create your views here.

+ 1 - 1
pai2/settings.py
View File 

@@ -44,7 +44,7 @@ INSTALLED_APPS = (
44 44 
     'django.contrib.messages',
45 45 
     'django.contrib.staticfiles',
46 46 
     'rest_framework',
47 
-    'django_q',
47 
+    # 'django_q',
48 48 
     'django_rlog',
49 49 
     'django_uniapi',
50 50 
     'django_we',

+ 1 - 2
pai2/urls.py
View File 

@@ -22,8 +22,7 @@ from django.contrib import admin
22 22 
 from rest_framework import routers
23 23
24 24 
 from account import views as account_views
25 
-from group import views as group_views
26 
-from group import grouppage_views
25 
+from group import group_views, grouppage_views
27 26 
 from miniapp import views as mini_views
28 27 
 from photo import views as photo_views
29 28 
 from website import views as website_views

+ 1 - 1
photo/admin.py
View File 

@@ -20,6 +20,6 @@ class PhotosInfoAdmin(admin.ModelAdmin):
20 20 
     list_filter = ('lensman_id', 'status')
21 21
22 22
23 
-admin.site.register(UUIDInfo, UUIDInfoAdmin)
23 
+# admin.site.register(UUIDInfo, UUIDInfoAdmin)
24 24 
 admin.site.register(PhotosInfo, PhotosInfoAdmin)
25 25 
 admin.site.register(PhotoUUIDInfo, PhotoUUIDInfoAdmin)

+ 8 - 8
photo/views.py
View File 

@@ -3,7 +3,7 @@
3 3 
 from curtail_uuid import CurtailUUID
4 4 
 from django.db import transaction
5 5 
 from django.shortcuts import render
6 
-from django_q.tasks import async
6 
+# from django_q.tasks import async
7 7 
 from django_response import response
8 8 
 from ipaddr import client_ip
9 9 
 from logit import logit
 
@@ -46,13 +46,13 @@ def uuid(request):
46 46 
     # 从 Redis 中 Pop 中指定数量的 UUID
47 47 
     uuids, succeed, left = r.multi_pop(UUID_LIST, num)
48 48
49 
-    # 异步更新 UUID 数据库中状态
50 
-    if uuids:
51 
-        async(update_uuids, lensman_id, uuids)
52 
-
53 
-    # 当可用 UUID 数量少于 500 时, 异步创建
54 
-    if left < 500:
55 
-        async(generate_uuids)
49 
+    # # 异步更新 UUID 数据库中状态
50 
+    # if uuids:
51 
+    #     async(update_uuids, lensman_id, uuids)
52 
+    #
53 
+    # # 当可用 UUID 数量少于 500 时, 异步创建
54 
+    # if left < 500:
55 
+    #     async(generate_uuids)
56 56
57 57 
     return response(200, 'Get UUID Success', u'获取唯一标识成功', uuids)
58 58

+ 0 - 1
requirements.txt
View File 

@@ -1,4 +1,3 @@
1 
--e git+https://github.com/Brightcells/django-q.git#egg=django-q
2 1 
 CodeConvert==2.0.4
3 2 
 Django==1.11.9
4 3 
 MySQL-python==1.2.5

kodo - Gogs: Go Git Service
Главная Обзор Помощь
Зарегистрироваться Войти
Kodo
/
kodo
Следить 2
В избранное 0
Ответвить 0
Обсуждения 0 Пулл реквесты 0 Коммиты 87 Релизы 0

Нет описания

ZIP TAR.GZ
Brightcells: ebaa78d5ad add api feedback_api лет %!s(int64=10): %!d(string=назад)
..
migrations ebaa78d5ad add api feedback_api лет %!s(int64=10): %!d(string=назад)
__init__.py df1df69fe3 add api upgrade/splash лет %!s(int64=10): %!d(string=назад)
admin.py ebaa78d5ad add api feedback_api лет %!s(int64=10): %!d(string=назад)
models.py ebaa78d5ad add api feedback_api лет %!s(int64=10): %!d(string=назад)
tests.py df1df69fe3 add api upgrade/splash лет %!s(int64=10): %!d(string=назад)
views.py ebaa78d5ad add api feedback_api лет %!s(int64=10): %!d(string=назад)