add origin_expired_stamps
Brightcells
5 ha cambiato i file con 18 aggiunte e 1 eliminazioni
+ 2
- 0
group/models.py
@@ -7,6 +7,7 @@ from django.utils.translation import ugettext_lazy as _ |
||
| 7 | 7 |
from pai2.basemodels import CreateUpdateMixin |
| 8 | 8 |
from utils.redis.rgroup import get_group_photo_thumbup_flag |
| 9 | 9 |
from utils.redis.rorder import get_lensman_order_record |
| 10 |
+from utils.time_utils import origin_expired_stamps |
|
| 10 | 11 |
from utils.url_utils import img_url, share_url |
| 11 | 12 |
|
| 12 | 13 |
|
@@ -226,6 +227,7 @@ class GroupPhotoInfo(CreateUpdateMixin): |
||
| 226 | 227 |
'photo_from': self.photo_from, |
| 227 | 228 |
'porder': porder, |
| 228 | 229 |
'created_at': self.created_at.replace(microsecond=0), |
| 230 |
+ 'origin_expired_stamps': origin_expired_stamps(self.lensman_photo_id, self.user_id) |
|
| 229 | 231 |
} |
| 230 | 232 |
|
| 231 | 233 |
|
+ 2
- 0
group/views.py
@@ -34,6 +34,7 @@ from utils.redis.rkeys import (GROUP_LAST_PHOTO_PK, GROUP_PHOTO_WATCHER_SET, GRO |
||
| 34 | 34 |
from utils.redis.rorder import get_lensman_order_record |
| 35 | 35 |
from utils.sql.raw import PAI2_HOME_API |
| 36 | 36 |
from utils.thumbnail_utils import make_thumbnail |
| 37 |
+from utils.time_utils import origin_expired_stamps |
|
| 37 | 38 |
from utils.url_utils import img_url, share_url |
| 38 | 39 |
|
| 39 | 40 |
|
@@ -918,6 +919,7 @@ def pai2_home_api(request): |
||
| 918 | 919 |
'thumbup_num': row[19], |
| 919 | 920 |
'photo_from': row[20], |
| 920 | 921 |
'created_at': row[21], |
| 922 |
+ 'origin_expired_stamps': origin_expired_stamps(row[22], row[15]), |
|
| 921 | 923 |
'thumbup': get_group_photo_thumbup_flag(row[5], user_id), |
| 922 | 924 |
'porder': get_lensman_order_record(row[5], user_id) if row[20] == GroupPhotoInfo.SESSION_GROUP else {},
|
| 923 | 925 |
} for row in rows] |
+ 3
- 0
pai2/settings.py
@@ -266,6 +266,9 @@ CURTAIL_UUID_LENGTH = 7 |
||
| 266 | 266 |
# 水印设置 |
| 267 | 267 |
WATERMARK_LOGO = os.path.join(PROJ_DIR, 'static/pai2/img/paiai_96_96.png').replace('\\', '/')
|
| 268 | 268 |
|
| 269 |
+# 原图设置 |
|
| 270 |
+ORIGIN_EXPIRED_MSEL = 604800000 # 7d = 7 * 24 * 3600 * 1000msel |
|
| 271 |
+ |
|
| 269 | 272 |
# 缩略图设置 |
| 270 | 273 |
THUMBNAIL_MAX_WIDTH = 540 |
| 271 | 274 |
THUMBNAIL_MAX_WIDTH2 = 1080 |
+ 1
- 1
utils/sql/raw.py
@@ -5,7 +5,7 @@ PAI2_HOME_API = ( |
||
| 5 | 5 |
r"T1.group_id, T2.group_name, T2.group_default_avatar, T2.group_avatar, T2.group_from, T3.id as photo_id, " |
| 6 | 6 |
r"T3.photo_path, T3.photo_w, T3.photo_h, T3.photo_thumbnail_path, T3.photo_thumbnail_w, T3.photo_thumbnail_h, " |
| 7 | 7 |
r"T3.photo_thumbnail2_path, T3.photo_thumbnail2_w, T3.photo_thumbnail2_h, T3.user_id, T3.nickname, T3.avatar, " |
| 8 |
- r"T3.comment_num, T3.thumbup_num, T3.photo_from, T3.created_at " |
|
| 8 |
+ r"T3.comment_num, T3.thumbup_num, T3.photo_from, T3.created_at, T3.lensman_photo_id " |
|
| 9 | 9 |
r"from (select * from group_groupuserinfo where user_id='{user_id}' and user_status=1) as T1 "
|
| 10 | 10 |
r"left outer join group_groupinfo as T2 on T1.group_id = T2.group_id " |
| 11 | 11 |
r"left outer join group_groupphotoinfo as T3 on T1.group_id = T3.group_id and T3.id > T1.current_id " |
+ 10
- 0
utils/time_utils.py
@@ -0,0 +1,10 @@ |
||
| 1 |
+# -*- coding: utf-8 -*- |
|
| 2 |
+ |
|
| 3 |
+from django.conf import settings |
|
| 4 |
+ |
|
| 5 |
+ |
|
| 6 |
+def origin_expired_stamps(origin_stamps, user_id): |
|
| 7 |
+ try: |
|
| 8 |
+ return int(origin_stamps) + settings.ORIGIN_EXPIRED_MSEL |
|
| 9 |
+ except: |
|
| 10 |
+ return 0 |