Fix Bug: photo_url error
Brightcells
2 zmienionych plików z 22 dodań i 22 usunięć
+ 21
- 21
group/views.py
@@ -634,29 +634,29 @@ def pai2_home_api(request): |
||
| 634 | 634 |
'group_avatar': row[3], |
| 635 | 635 |
'group_from': row[4], |
| 636 | 636 |
'photo_id': row[5], |
| 637 |
- 'photo_url': qiniu_file_url(row[6], bucket='photo'), |
|
| 638 |
- 'photo_w': row[7], |
|
| 639 |
- 'photo_h': row[8], |
|
| 640 |
- 'photo_thumbnail_url': qiniu_file_url(row[9], bucket='thumbnail'), |
|
| 641 |
- 'photo_thumbnail_w': row[10], |
|
| 642 |
- 'photo_thumbnail_h': row[11], |
|
| 643 |
- 'photo_thumbnail2_url': qiniu_file_url(row[12], bucket='thumbnail2'), |
|
| 644 |
- 'photo_thumbnail2_w': row[13], |
|
| 645 |
- 'photo_thumbnail2_h': row[14], |
|
| 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 | 646 |
'photo_share_url': share_url(row[5]), # Warning: Index of This Line is 5 |
| 647 |
- 'user_id': row[15], |
|
| 648 |
- 'nickname': row[16], |
|
| 649 |
- 'avatar': row[17], |
|
| 650 |
- 'comment_num': row[18], |
|
| 651 |
- 'thumbup_num': row[19], |
|
| 652 |
- 'photo_from': row[20], |
|
| 653 |
- 'session_id': row[21], |
|
| 654 |
- 'nomark': row[22], |
|
| 655 |
- 'origin': row[23], |
|
| 656 |
- 'created_at': row[24], |
|
| 657 |
- 'origin_expired_stamps': origin_expired_stamps(row[24], row[15]), |
|
| 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 | 658 |
'thumbup': get_group_photo_thumbup_flag(row[5], user_id), |
| 659 |
- 'porder': get_lensman_order_record(row[5], user_id) if row[20] == GroupPhotoInfo.SESSION_GROUP else {},
|
|
| 659 |
+ 'porder': get_lensman_order_record(row[5], user_id) if row[21] == GroupPhotoInfo.SESSION_GROUP else {},
|
|
| 660 | 660 |
} for row in rows] |
| 661 | 661 |
|
| 662 | 662 |
return response(200, 'Get Home Data Success', u'获取首页数据成功', {
|
+ 1
- 1
utils/sql/raw.py
@@ -3,7 +3,7 @@ |
||
| 3 | 3 |
PAI2_HOME_API = ( |
| 4 | 4 |
r"select " |
| 5 | 5 |
r"T1.group_id, T2.group_name, T2.group_default_avatar, T2.group_avatar, T2.group_from, T3.photo_id, " |
| 6 |
- r"T3.photo_path, T3.photo_w, T3.photo_h, T3.photo_thumbnail_path, T3.photo_thumbnail_w, T3.photo_thumbnail_h, " |
|
| 6 |
+ r"T3.photo_path, T3.has_watermark, 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 | 8 |
r"T3.comment_num, T3.thumbup_num, T3.photo_from, T3.session_id, T3.nomark, T3.origin, T3.created_at, T3.lensman_photo_id " |
| 9 | 9 |
r"from (select * from group_groupuserinfo where user_id='{user_id}' and user_status=1 and status=1) as T1 "
|