@@ -0,0 +1,20 @@  | 
            ||
| 1 | 
                +# -*- coding: utf-8 -*-  | 
            |
| 2 | 
                +from __future__ import unicode_literals  | 
            |
| 3 | 
                +  | 
            |
| 4 | 
                +from django.db import models, migrations  | 
            |
| 5 | 
                +import shortuuidfield.fields  | 
            |
| 6 | 
                +  | 
            |
| 7 | 
                +  | 
            |
| 8 | 
                +class Migration(migrations.Migration):  | 
            |
| 9 | 
                +  | 
            |
| 10 | 
                + dependencies = [  | 
            |
| 11 | 
                +        ('group', '0032_groupinfo_gather_screenshot'),
               | 
            |
| 12 | 
                + ]  | 
            |
| 13 | 
                +  | 
            |
| 14 | 
                + operations = [  | 
            |
| 15 | 
                + migrations.AddField(  | 
            |
| 16 | 
                + model_name='groupphotoinfo',  | 
            |
| 17 | 
                + name='photo_id',  | 
            |
| 18 | 
                + field=shortuuidfield.fields.ShortUUIDField(help_text='\u7167\u7247\u552f\u4e00\u6807\u8bc6', max_length=22, editable=False, db_index=True, blank=True),  | 
            |
| 19 | 
                + ),  | 
            |
| 20 | 
                + ]  | 
            
                @@ -2,6 +2,7 @@  | 
            ||
| 2 | 2 | 
                 | 
            
| 3 | 3 | 
                from django.db import models  | 
            
| 4 | 4 | 
                from django.utils.translation import ugettext_lazy as _  | 
            
| 5 | 
                +from shortuuidfield import ShortUUIDField  | 
            |
| 5 | 6 | 
                from TimeConvert import TimeConvert as tc  | 
            
| 6 | 7 | 
                 | 
            
| 7 | 8 | 
                from pai2.basemodels import CreateUpdateMixin  | 
            
                @@ -214,6 +215,8 @@ class GroupPhotoInfo(CreateUpdateMixin):  | 
            ||
| 214 | 215 | 
                (SESSION_GROUP, u'SESSION 建群'),  | 
            
| 215 | 216 | 
                )  | 
            
| 216 | 217 | 
                 | 
            
| 218 | 
                + photo_id = ShortUUIDField(_(u'photo_id'), max_length=255, help_text=u'照片唯一标识', db_index=True)  | 
            |
| 219 | 
                +  | 
            |
| 217 | 220 | 
                group_id = models.CharField(_(u'group_id'), max_length=255, blank=True, null=True, help_text=u'群组唯一标识', db_index=True)  | 
            
| 218 | 221 | 
                user_id = models.CharField(_(u'user_id'), max_length=255, blank=True, null=True, help_text=u'用户唯一标识', db_index=True)  | 
            
| 219 | 222 | 
                nickname = models.CharField(_(u'nickname'), max_length=255, blank=True, null=True, help_text=u'用户群组昵称')  | 
            
                @@ -265,7 +268,7 @@ class GroupPhotoInfo(CreateUpdateMixin):  | 
            ||
| 265 | 268 | 
                 | 
            
| 266 | 269 | 
                @property  | 
            
| 267 | 270 | 
                def photo_share_url(self):  | 
            
| 268 | 
                - return share_url(self.pk)  | 
            |
| 271 | 
                + return share_url(self.photo_id)  | 
            |
| 269 | 272 | 
                 | 
            
| 270 | 273 | 
                @property  | 
            
| 271 | 274 | 
                def photo_data(self):  |