t='prettify') 90 90
91 91 
     @property
92 92 
     def r_photo_url(self):
93 
-        return img_url(self.r_photo_path)
93 
+        return qiniu_file_url(self.r_photo_path, bucket='original')
94 94
95 95 
     @property
96 96 
     def data(self):

+ 1 - 1
photo/views.py
Просмотреть файл 

@@ -21,7 +21,7 @@ from utils.redis.rkeys import (GROUP_LAST_PHOTO_PK, GROUP_USERS_DELETED_SET, GRO
21 21 
                                GROUP_USERS_QUIT_SET, GROUP_USERS_REFUSED_SET, UUID_LIST)
22 22 
 from utils.redis.rprice import get_lensman_price_fixed
23 23 
 from utils.redis.ruuid import generate_uuids, update_uuids
24 
-from utils.storage_utils import file_save
24 
+from utils.storage_qiniu_utils import file_save
25 25
26 26
27 27 
 @logit

+ 5 - 4
requirements.txt
Просмотреть файл 

@@ -18,21 +18,22 @@ django-paginator2==1.0.3
18 18 
 django-rlog==1.0.7
19 19 
 django-shortuuidfield==0.1.3
20 20 
 django-six==1.0.2
21 
-djangorestframework==3.5.3
22 
-furl==0.5.7
21 
+djangorestframework==3.6.3
22 
+furl==1.0.0
23 23 
 hiredis==0.2.0
24 24 
 isoweek==1.3.3
25 
-jsonfield==2.0.1
25 
+jsonfield==2.0.2
26 26 
 mock==2.0.0
27 27 
 pep8==1.7.0
28 28 
 pysnippets==1.0.4
29 29 
 pywe-miniapp==1.0.0
30 30 
 pywe-oauth==1.0.3
31 31 
 pywe-response==1.0.1
32 
+qiniu==7.1.4
32 33 
 redis-extensions==1.0.50
33 34 
 requests==2.12.4
34 35 
 rlog==0.2
35 36 
 shortuuid==0.5.0
36 
-uWSGI==2.0.14
37 
+uWSGI==2.0.15
37 38 
 versions==0.10.0
38 39 
 wechatpy==1.2.8

+ 43 - 0
utils/qiniucdn.py
Просмотреть файл 

@@ -0,0 +1,43 @@
1 
+# -*- coding: utf-8 -*-
2 
+
3 
+import qiniu
4 
+from django.conf import settings
5 
+
6 
+
7 
+QINIU = settings.QINIU
8 
+auth = qiniu.Auth(QINIU['access_key'], QINIU['secret_key'])
9 
+
10 
+
11 
+def upload(data, key=None, mime_type='application/octet-stream', bucket=QINIU['bucket_default']):
12 
+    if not data:
13 
+        return ''
14 
+    token = auth.upload_token(bucket, key=key)
15 
+    ret, _ = qiniu.put_data(token, key, data, mime_type=mime_type)
16 
+    return ret.get('key')
17 
+
18 
+
19 
+def upload_file_admin(obj, key=None, mime_type='application/octet-stream', bucket=QINIU['bucket_default']):
20 
+    # Django Admin Upload
21 
+    if not obj.image:
22 
+        return ''
23 
+    return upload(obj.image.read(), key=key, mime_type=mime_type, bucket=bucket)
24 
+
25 
+
26 
+def upload_file_req(photo, key=None, mime_type='application/octet-stream', bucket=QINIU['bucket_default']):
27 
+    # photo = request.FILES.get('photo', '')
28 
+    # <InMemoryUploadedFile: photo.png (image/png)>
29 
+    if not photo:
30 
+        return ''
31 
+    return upload(photo.read(), key=key, mime_type=mime_type, bucket=bucket)
32 
+
33 
+
34 
+def upload_file_path(path, key=None, mime_type='application/octet-stream', bucket=QINIU['bucket_default']):
35 
+    if not path:
36 
+        return ''
37 
+    token = auth.upload_token(bucket, key=key)
38 
+    ret, _ = qiniu.put_file(token, key, path, mime_type=mime_type)
39 
+    return ret.get('key')
40 
+
41 
+
42 
+def qiniu_file_url(key, bucket):
43 
+    return '{}/{}'.format(QINIU['buckets'][bucket], key)

+ 135 - 0
utils/storage_qiniu_utils.py
Просмотреть файл 

@@ -0,0 +1,135 @@
1 
+# -*- coding: utf-8 -*-
2 
+
3 
+import os
4 
+
5 
+import shortuuid
6 
+from django.conf import settings
7 
+from django.core.files.storage import default_storage
8 
+from django.db import transaction
9 
+from filemd5 import calculate_md5
10 
+
11 
+from photo.models import PhotoUUIDInfo
12 
+from utils.qiniucdn import upload_file_path
13 
+from utils.thumbnail_utils import make_thumbnail
14 
+from utils.watermark_utils import watermark_wrap
15 
+
16 
+
17 
+class DotDict(dict):
18 
+    """ dot.notation access to dictionary attributes """
19 
+    def __getattr__(self, attr):
20 
+        return self.get(attr)
21 
+    __setattr__ = dict.__setitem__
22 
+    __delattr__ = dict.__delitem__
23 
+
24 
+
25 
+def file_abspath(file_path=None):
26 
+    return os.path.join(settings.MEDIA_ROOT, file_path).replace('\\', '/')
27 
+
28 
+
29 
+@transaction.atomic
30 
+def file_save(file_=None, file_path=None, prefix='img', ext='.jpeg', watermark=False, thumbnail=False):
31 
+    photo_path, photo_watermark_path, photo_thumbnail_path, photo_thumbnail2_path = '', '', '', ''
32 
+
33 
+    # Photo
34 
+    file_ = file_ or default_storage.open(file_path)
35 
+
36 
+    # Ext
37 
+    ext = os.path.splitext(file_.name)[-1] or ext
38 
+
39 
+    # Photo MD5
40 
+    photo_md5 = calculate_md5(file_)
41 
+
42 
+    # Photo UUID Get or Create
43 
+    photo, created = PhotoUUIDInfo.objects.select_for_update().get_or_create(photo_md5=photo_md5)
44 
+
45 
+    # 无水印
46 
+    if not photo.photo_path:
47 
+        photo_path = '{}/{}{}'.format(prefix, shortuuid.uuid(), ext)
48 
+        if default_storage.exists(photo_path):
49 
+            default_storage.delete(photo_path)
50 
+        default_storage.save(photo_path, file_)
51 
+        photo_path_qiniu = upload_file_path(file_abspath(photo_path), bucket='photo')
52 
+        photo.photo_path = photo_path_qiniu
53 
+        photo.save()
54 
+    else:
55 
+        if ((watermark and not photo.photo_watermark_path) or (thumbnail and not (photo.photo_thumbnail_path and photo.photo_thumbnail2_path))) and (not default_storage.exists(photo.photo_path)):
56 
+            default_storage.save(photo.photo_path, file_)
57 
+
58 
+    # 有水印
59 
+    if watermark:
60 
+        if not photo.photo_watermark_path:
61 
+            if settings.WATERMARK_OR_NOT:
62 
+                photo_watermark_path = 'photo/{}{}'.format(shortuuid.uuid(), ext)
63 
+                watermark_wrap(
64 
+                    file_abspath(photo_path),
65 
+                    settings.WATERMARK_LOGO_PATH,
66 
+                    file_abspath(photo_watermark_path)
67 
+                )
68 
+                photo_watermark_path_qiniu = upload_file_path(file_abspath(photo_watermark_path), bucket='watermark')
69 
+                photo.photo_watermark_path = photo_watermark_path_qiniu
70 
+            else:
71 
+                photo.photo_watermark_path = photo_path_qiniu
72 
+            photo.save()
73 
+
74 
+    # 缩略图
75 
+    if thumbnail:
76 
+        if not photo.photo_thumbnail_path:
77 
+            # 双列: 540, 40-50K
78 
+            photo_thumbnail_path = photo_path.replace('.', '_thumbnail.')
79 
+            photo_w, photo_h, photo_thumbnail_w, photo_thumbnail_h = make_thumbnail(
80 
+                file_abspath(photo_path),
81 
+                file_abspath(photo_thumbnail_path),
82 
+                settings.THUMBNAIL_MAX_WIDTH
83 
+            )
84 
+            photo_thumbnail_path_qiniu = upload_file_path(file_abspath(photo_thumbnail_path), bucket='thumbnail')
85 
+            photo.photo_w = photo_w
86 
+            photo.photo_h = photo_h
87 
+            photo.photo_thumbnail_path = photo_thumbnail_path_qiniu
88 
+            photo.photo_thumbnail_w = photo_thumbnail_w
89 
+            photo.photo_thumbnail_h = photo_thumbnail_h
90 
+        if not photo.photo_thumbnail2_path:
91 
+            # 单列: 1080, xx-100K
92 
+            photo_thumbnail2_path = photo_path.replace('.', '_thumbnail2.')
93 
+            photo_w, photo_h, photo_thumbnail2_w, photo_thumbnail2_h = make_thumbnail(
94 
+                file_abspath(photo_path),
95 
+                file_abspath(photo_thumbnail2_path),
96 
+                settings.THUMBNAIL_MAX_WIDTH2
97 
+            )
98 
+            if watermark and settings.WATERMARK_OR_NOT:
99 
+                watermark_wrap(
100 
+                    file_abspath(photo_thumbnail2_path),
101 
+                    settings.WATERMARK_LOGO_PATH,
102 
+                    file_abspath(photo_thumbnail2_path)
103 
+                )
104 
+            photo_thumbnail2_path_qiniu = upload_file_path(file_abspath(photo_thumbnail2_path), bucket='thumbnail2')
105 
+            photo.photo_w = photo_w
106 
+            photo.photo_h = photo_h
107 
+            photo.photo_thumbnail2_path = photo_thumbnail2_path_qiniu
108 
+            photo.photo_thumbnail2_w = photo_thumbnail2_w
109 
+            photo.photo_thumbnail2_h = photo_thumbnail2_h
110 
+        photo.save()
111 
+
112 
+    # 本地删除
113 
+    for path in [photo_path, photo_watermark_path, photo_thumbnail_path, photo_thumbnail2_path]:
114 
+        if path and default_storage.exists(path):
115 
+            default_storage.delete(path)
116 
+
117 
+    return DotDict({
118 
+        'ext': ext,
119 
+
120 
+        'photo_md5': photo_md5,
121 
+
122 
+        'photo_path': photo.photo_path,
123 
+        'photo_w': photo.photo_w,
124 
+        'photo_h': photo.photo_h,
125 
+
126 
+        'photo_watermark_path': photo.photo_watermark_path,
127 
+
128 
+        'photo_thumbnail_path': photo.photo_thumbnail_path,
129 
+        'photo_thumbnail_w': photo.photo_thumbnail_w,
130 
+        'photo_thumbnail_h': photo.photo_thumbnail_h,
131 
+
132 
+        'photo_thumbnail2_path': photo.photo_thumbnail2_path,
133 
+        'photo_thumbnail2_w': photo.photo_thumbnail2_w,
134 
+        'photo_thumbnail2_h': photo.photo_thumbnail2_h,
135 
+    })

+ 0 - 4
utils/url_utils.py
Просмотреть файл 

@@ -3,10 +3,6 @@
3 3 
 from django.conf import settings
4 4
5 5
6 
-def img_url(img_path):
7 
-    return '{}/{}'.format(settings.IMG_DOMAIN, img_path) if img_path else ''
8 
-
9 
-
10 6 
 def share_url(photo_id):
11 7 
     return '{}/gp/{}'.format(settings.DOMAIN, photo_id) if photo_id else ''
12 8

调整活动分享逻辑：不管活动是否下线都记录到数据库，如果下线就不给积分。 · 944aa5ed8b - Gogs: Go Git Service
首页 探索 帮助
注册 登录
Kodo
/
kodo
关注 2
点赞 0
派生 0

浏览代码
调整活动分享逻辑：不管活动是否下线都记录到数据库，如果下线就不给积分。

FFIB 4 年之前
父节点
865ffb4e93
当前提交
944aa5ed8b
共有 1 个文件被更改，包括 9 次插入 和 9 次删除
显示文件统计
  1. 9 9
      api/member_views.py

+ 9 - 9
api/member_views.py
查看文件 

@@ -466,7 +466,7 @@ def activity_group_share(request):
466 466 
         return response()
467 467
468 468 
     try:
469 
-        user = UserInfo.objects.get(user_id=click_user_id, status=True)
469 
+        user = UserInfo.objects.get(user_id=share_user_id, status=True)
470 470 
     except:
471 471 
         return response(UserStatusCode.USER_NOT_FOUND)
472 472 
 
@@ -478,13 +478,9 @@ def activity_group_share(request):
478 478 
     isOffline = act.activity_state != 0 or act.final_state == '已结束'
479 479
480 480 
     # 判断是否给积分 & 给多少积分
481 
-    if isOffline:
482 
-        is_integral = False
483 
-        integral = 0
484 
-    else:
485 
-        is_integral, integral = get_group_share_info_integral(act.activity_id, share_user_id, open_gid, act.group_share_integral, act.group_share_max_integral)
486 
-        user.integral += integral
487 
-        user.save()
481 
+    is_integral, integral = get_group_share_info_integral(act.activity_id, share_user_id, open_gid, act.group_share_integral, act.group_share_max_integral)
482 
+
483 
+    # 活动未结束，则给用户加积分
488 484
489 485 
     if is_integral:
490 486 
         MemberActivityGroupShareInfo.objects.create(**{
 
@@ -496,9 +492,13 @@ def activity_group_share(request):
496 492 
             'activity_id': activity_id,
497 493 
             'title': act.title,
498 494 
             'is_integral': is_integral,
499 
-            'integral': integral,
495 
+            'integral': 0 if isOffline else integral,
500 496 
         })
501 497
498 
+        if not isOffline:
499 
+            user.integral += integral
500 
+            user.save()
501 
+
502 502 
     if isOffline:
503 503 
         return response(400002, 'Activity has been offline', '会员活动已下线')
504 504