group/lensman_views.py

@@ -22,6 +22,7 @@ from utils.redis.connect import r

                 from utils.redis.rbrief import set_brief_info
              

                 from utils.redis.rgroup import set_group_info, set_group_info_by_id
              

                 from utils.redis.rkeys import GROUP_LAST_PHOTO_PK, TODAY_INCOME, TODAY_UPLOAD_PHOTO_AMOUNT, WEEK_INCOME, WEEK_SOLD
              

                +from utils.redis.rlock import upload_lock
              

                 from utils.redis.rorder import set_lensman_order_record
              

                 from utils.redis.rprice import get_lensman_price_fixed, set_lensman_price_fixed
              

                 from utils.redis.rprofile import set_profile_info
              
@@ -170,7 +171,7 @@ def lensman_photo_upload_api(request):

                 
              

                         group_id = group.group_id
              

                 
              

                -    if photo and r.acquire_lock('{}:{}:{}'.format(group_id, user_id, photo.name), time=60):
              

                +    if photo and upload_lock(group_id, user_id, photo):
              

                         # 写 PhotosInfo 表
              

                         photo_info = file_save(photo, prefix='photo', ext='jpeg', watermark=True, thumbnail=True)
              

                 
              
@@ -293,7 +294,7 @@ def lensman_origin_photo_upload_api(request):

                         order.reback_at = tc.utc_datetime()
              

                         order.save()
              

                 
              

                -    if photo and r.acquire_lock('{}:{}:{}'.format(order_id, user_id, photo.name), time=60):
              

                +    if photo and upload_lock(group_id, user_id, photo):
              

                         # 写 PhotosInfo 表
              

                         photo_info = file_save(photo, prefix='photo', ext='jpeg')
              

                 
              

group/views.py

@@ -24,6 +24,7 @@ from utils.redis.rgroup import (del_group_photo_thumbup_flag, get_group_info, ge

                                                 set_group_photo_comment_list, set_group_photo_data, set_group_photo_thumbup_flag,
              

                                                 set_group_photo_thumbup_list, set_group_users_info)
              

                 from utils.redis.rkeys import GROUP_LAST_PHOTO_PK, GROUP_PHOTO_WATCHER_SET, GROUP_USERS_PASSED_SET
              

                +from utils.redis.rlock import upload_lock
              

                 from utils.redis.rorder import get_lensman_order_record
              

                 from utils.redis.rprice import get_lensman_price_fixed
              

                 from utils.sql.raw import PAI2_HOME_API
              
@@ -278,7 +279,7 @@ def flyimg_upload_api(request):

                     except GroupUserInfo.DoesNotExist:
              

                         return response(GroupUserStatusCode.GROUP_USER_NOT_FOUND)
              

                 
              

                -    if photo and r.acquire_lock('{}:{}:{}'.format(group_id, user_id, photo.name), time=60):
              

                +    if photo and upload_lock(group_id, user_id, photo):
              

                         photo_info = file_save(photo, prefix='fly', ext='jpeg', thumbnail=True)
              

                 
              

                         # 群组照片记录创建
              

utils/redis/rlock.py

@@ -0,0 +1,9 @@

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

                +
              

                +from filemd5 import calculate_md5
              

                +
              

                +from utils.redis.connect import r
              

                +
              

                +
              

                +def upload_lock(group_id, user_id, file_):
              

                +    return r.acquire_lock('{}:{}:{}'.format(group_id, user_id, calculate_md5(file_)))