837db1e10959bbdc7788c75f0de347697fe3338fL656">656
|
|
- cursor.execute(r"select T1.group_id, T2.group_name, T2.group_default_avatar, T2.group_avatar, T3.photo_thumbnail_path, T3.photo_thumbnail_w, T3.photo_thumbnail_h, T3.comment_num, T3.thumbup_num, T3.created_at from (select * from group_groupuserinfo where user_id='{user_id}') as T1 left outer join group_groupinfo as T2 on T1.group_id = T2.group_id left outer join group_groupphotoinfo as T3 on T1.group_id = T3.group_id and T3.id > T1.current_id order by T3.id desc, T3.thumbup_num desc limit {offset}, {rows};".format(
|
|
|
658
|
+ cursor.execute(r"select T1.group_id, T2.group_name, T2.group_default_avatar, T2.group_avatar, T3.id, T3.photo_path, T3.photo_w, T3.photo_h, T3.photo_thumbnail_path, T3.photo_thumbnail_w, T3.photo_thumbnail_h, T3.user_id, T3.nickname, T3.avatar, T3.comment_num, T3.thumbup_num, T3.created_at from (select * from group_groupuserinfo where user_id='{user_id}') as T1 left outer join group_groupinfo as T2 on T1.group_id = T2.group_id left outer join group_groupphotoinfo as T3 on T1.group_id = T3.group_id and T3.id > T1.current_id order by T3.id desc, T3.thumbup_num desc limit {offset}, {rows};".format(
|
|
657
|
659
|
user_id=user_id,
|
|
658
|
660
|
offset=0,
|
|
659
|
661
|
rows=settings.PAI2_HOME_MAX_ROWS,
|
|
|
|
@@ -667,12 +669,19 @@ def pai2_home_api(request):
|
|
667
|
669
|
'group_name': row[1],
|
|
668
|
670
|
'group_default_avatar': row[2],
|
|
669
|
671
|
'group_avatar': row[3],
|
|
670
|
|
- 'photo_thumbnail_url': u'{0}/{1}'.format(settings.IMG_DOMAIN, row[4]) if row[4] else '',
|
|
671
|
|
- 'photo_thumbnail_w': row[5],
|
|
672
|
|
- 'photo_thumbnail_h': row[6],
|
|
673
|
|
- 'comment_num': row[7],
|
|
674
|
|
- 'thumbup_num': row[8],
|
|
675
|
|
- 'created_at': row[9],
|
|
|
672
|
+ 'photo_id': row[4],
|
|
|
673
|
+ 'photo_url': img_url(row[5]),
|
|
|
674
|
+ 'photo_w': row[6],
|
|
|
675
|
+ 'photo_h': row[7],
|
|
|
676
|
+ 'photo_thumbnail_url': img_url(row[8]),
|
|
|
677
|
+ 'photo_thumbnail_w': row[9],
|
|
|
678
|
+ 'photo_thumbnail_h': row[10],
|
|
|
679
|
+ 'user_id': row[11],
|
|
|
680
|
+ 'nickname': row[12],
|
|
|
681
|
+ 'avatar': row[13],
|
|
|
682
|
+ 'comment_num': row[14],
|
|
|
683
|
+ 'thumbup_num': row[15],
|
|
|
684
|
+ 'created_at': row[16],
|
|
676
|
685
|
} for row in rows]
|
|
677
|
686
|
|
|
678
|
687
|
return JsonResponse({
|
|
|
|
@@ -6,6 +6,8 @@ from django.utils.translation import ugettext_lazy as _
|
|
6
|
6
|
|
|
7
|
7
|
from pai2.basemodels import CreateUpdateMixin
|
|
8
|
8
|
|
|
|
9
|
+from utils.url_utils import img_url
|
|
|
10
|
+
|
|
9
|
11
|
|
|
10
|
12
|
class UUIDInfo(CreateUpdateMixin):
|
|
11
|
13
|
uuid = models.CharField(_(u'uuid'), max_length=22, blank=True, null=True, help_text=u'唯一标识', db_index=True, unique=True)
|
|
|
|
@@ -49,19 +51,19 @@ class PhotosInfo(CreateUpdateMixin):
|
|
49
|
51
|
|
|
50
|
52
|
@property
|
|
51
|
53
|
def p_photo_url(self):
|
|
52
|
|
- return u'{0}/{1}'.format(settings.IMG_DOMAIN, self.p_photo_path) if self.p_photo_path else ''
|
|
|
54
|
+ return img_url(self.p_photo_path)
|
|
53
|
55
|
|
|
54
|
56
|
@property
|
|
55
|
57
|
def m_photo_url(self):
|
|
56
|
|
- return u'{0}/{1}'.format(settings.IMG_DOMAIN, self.m_photo_path) if self.m_photo_path else ''
|
|
|
58
|
+ return img_url(self.m_photo_path)
|
|
57
|
59
|
|
|
58
|
60
|
@property
|
|
59
|
61
|
def l_photo_url(self):
|
|
60
|
|
- return u'{0}/{1}'.format(settings.IMG_DOMAIN, self.l_photo_path) if self.l_photo_path else ''
|
|
|
62
|
+ return img_url(self.l_photo_path)
|
|
61
|
63
|
|
|
62
|
64
|
@property
|
|
63
|
65
|
def r_photo_url(self):
|
|
64
|
|
- return u'{0}/{1}'.format(settings.IMG_DOMAIN, self.r_photo_path) if self.r_photo_path else ''
|
|
|
66
|
+ return img_url(self.r_photo_path)
|
|
65
|
67
|
|
|
66
|
68
|
@property
|
|
67
|
69
|
def data(self):
|
|
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+# -*- coding: utf-8 -*-
|
|
|
2
|
+
|
|
|
3
|
+from django.conf import settings
|
|
|
4
|
+
|
|
|
5
|
+
|
|
|
6
|
+def img_url(img_path):
|
|
|
7
|
+ return u'{0}/{1}'.format(settings.IMG_DOMAIN, img_path) if img_path else ''
|