Home Erkunden Hilfe
Registrieren Anmelden
Kodo
/
kodo
Beobachten 2
Markieren 0
Fork 0

Quellcode durchsuchen
:art: Change user avatar url

huangqimin001 vor 2 Jahren
Ursprung
93ded19497
Commit
1da9278ecd
7 geänderte Dateien mit 36 neuen Zeilen und 17 gelöschten Zeilen
Diff-Statistik anzeigen
  1. 9 4
      account/models.py
  2. 7 7
      api/member_views.py
  3. 1 1
      commands/management/commands/sale.py
  4. 6 1
      guideline/models.py
  5. 7 3
      member/models.py
  6. 5 0
      sales/models.py
  7. 1 1
      sales/views.py

+ 9 - 4
account/models.py
Datei anzeigen 

@@ -1,5 +1,6 @@
1 1 
 # -*- coding: utf-8 -*-
2 2
3 
+from django.conf import settings
3 4 
 from django.db import models
4 5 
 from django.utils.translation import ugettext_lazy as _
5 6 
 from django_models_ext import BaseModelMixin, SexModelMixin
 
@@ -186,13 +187,17 @@ class UserInfo(BaseModelMixin, LensmanTypeBoolMixin):
186 187 
         return self.nickname
187 188
188 189 
     @property
190 
+    def final_avatar(self):
191 
+        return self.avatar and self.avatar.replace(settings.QINIU_FILE_URL_BEFORE, settings.QINIU_FILE_URL_AFTER).replace(settings.QINIU_FILE_URL_BEFORE2, settings.QINIU_FILE_URL_AFTER)
192 
+
193 
+    @property
189 194 
     def data(self):
190 195 
         return {
191 196 
             'user_id': self.user_id,
192 197 
             'name': self.name,
193 198 
             'username': self.username,
194 199 
             'nickname': self.nickname,
195 
-            'avatar': self.avatar,
200 
+            'avatar': self.final_avatar,
196 201 
             'phone': self.phone,
197 202 
         }
198 203 
 
@@ -232,7 +237,7 @@ class UserInfo(BaseModelMixin, LensmanTypeBoolMixin):
232 237 
             'name': self.name,
233 238 
             'username': self.username,
234 239 
             'nickname': self.nickname,
235 
-            'avatar': self.avatar,
240 
+            'avatar': self.final_avatar,
236 241 
             'phone': self.phone,
237 242 
             'subscribe': self.subscribe,
238 243 
             're_membercard': True if self.has_membercard and not self.memberusercardcode else False,
 
@@ -278,7 +283,7 @@ class UserInfo(BaseModelMixin, LensmanTypeBoolMixin):
278 283 
             'name': self.name,
279 284 
             'username': self.username,
280 285 
             'nickname': self.nickname,
281 
-            'avatar': self.avatar,
286 
+            'avatar': self.final_avatar,
282 287 
             'phone': self.phone,
283 288 
             'subscribe': self.subscribe,
284 289 
             're_membercard': True if self.has_membercard and not self.memberusercardcode else False,
 
@@ -310,7 +315,7 @@ class UserInfo(BaseModelMixin, LensmanTypeBoolMixin):
310 315 
         return {
311 316 
             'user_id': self.user_id,
312 317 
             'nickname': self.nickname,
313 
-            'avatar': self.avatar,
318 
+            'avatar': self.final_avatar,
314 319 
             'phone': self.phone,
315 320 
             'sex': self.sex,
316 321 
             'province': self.province,

+ 7 - 7
api/member_views.py
Datei anzeigen 

@@ -55,7 +55,7 @@ def member(request):
55 55
56 56 
     return response(data={
57 57 
         'nickname': user.final_nickname,
58 
-        'avatar': user.avatar,
58 
+        'avatar': user.final_avatar,
59 59 
         'integral': user.integral,
60 60 
         'freeze_integral': user.freeze_integral,
61 61 
         'final_integral': user.final_integral,
 
@@ -85,7 +85,7 @@ def rights(request):
85 85
86 86 
     return response(data={
87 87 
         'nickname': user.final_nickname,
88 
-        'avatar': user.avatar,
88 
+        'avatar': user.final_avatar,
89 89 
         'integral': user.integral,
90 90 
         'freeze_integral': user.freeze_integral,
91 91 
         'final_integral': user.final_integral,
 
@@ -132,7 +132,7 @@ def goods(request):
132 132
133 133 
     return response(data={
134 134 
         'nickname': user.final_nickname,
135 
-        'avatar': user.avatar,
135 
+        'avatar': user.final_avatar,
136 136 
         'integral': user.integral,
137 137 
         'freeze_integral': user.freeze_integral,
138 138 
         'final_integral': user.final_integral,
 
@@ -162,7 +162,7 @@ def good_detail(request):
162 162
163 163 
     return response(data={
164 164 
         'nickname': user.final_nickname,
165 
-        'avatar': user.avatar,
165 
+        'avatar': user.final_avatar,
166 166 
         'integral': user.integral,
167 167 
         'freeze_integral': user.freeze_integral,
168 168 
         'final_integral': user.final_integral,
 
@@ -252,7 +252,7 @@ def good_exchange(request):
252 252
253 253 
     return response(data={
254 254 
         'nickname': user.final_nickname,
255 
-        'avatar': user.avatar,
255 
+        'avatar': user.final_avatar,
256 256 
         'integral': user.integral,
257 257 
         'freeze_integral': user.freeze_integral,
258 258 
         'final_integral': user.final_integral,
 
@@ -578,7 +578,7 @@ def activity_contribute(request):
578 578 
         images=images,
579 579 
         video_url=video_url,
580 580 
         user_name=signup_info.name if signup_info else '',
581 
-        user_avatar=signup_info.avatar if signup_info else '',
581 
+        user_avatar=signup_info.final_avatar if signup_info else '',
582 582 
     )
583 583
584 584 
     return response(data={
 
@@ -615,7 +615,7 @@ def activity_contribute_update(request):
615 615 
         'images': images,
616 616 
         'video_url': video_url,
617 617 
         'user_name': signup_info.name if signup_info else '',
618 
-        'user_avatar': signup_info.avatar if signup_info else '',
618 
+        'user_avatar': signup_info.final_avatar if signup_info else '',
619 619 
         'audit_status': 0,
620 620 
     })
621 621

+ 1 - 1
commands/management/commands/sale.py
Datei anzeigen 

@@ -88,7 +88,7 @@ class Command(CompatibilityBaseCommand):
88 88 
                     brand_id=b.brand_id,
89 89 
                     sr_id=s.sr_id,
90 90 
                     sr_name=s.name,
91 
-                    sr_avatar=s.avatar,
91 
+                    sr_avatar=s.final_avatar,
92 92 
                     ymd=day,
93 93 
                     yesterday_num=yesterday_num,
94 94 
                     current_month=current_month,

+ 6 - 1
guideline/models.py
Datei anzeigen 

@@ -1,5 +1,6 @@
1 1 
 # -*- coding: utf-8 -*-
2 2
3 
+from django.conf import settings
3 4 
 from django.db import models
4 5 
 from django.utils.translation import ugettext_lazy as _
5 6 
 from django_models_ext import BaseModelMixin, SexModelMixin
 
@@ -49,9 +50,13 @@ class ScreenAdminInfo(BaseModelMixin):
49 50 
         return '%d' % self.pk
50 51
51 52 
     @property
53 
+    def final_avatar(self):
54 
+        return self.avatar and self.avatar.replace(settings.QINIU_FILE_URL_BEFORE, settings.QINIU_FILE_URL_AFTER).replace(settings.QINIU_FILE_URL_BEFORE2, settings.QINIU_FILE_URL_AFTER)
55 
+
56 
+    @property
52 57 
     def data(self):
53 58 
         return {
54 59 
             'admin_id': self.admin_id,
55 60 
             'nickname': self.nickname,
56 
-            'avatar': self.avatar,
61 
+            'avatar': self.final_avatar,
57 62 
         }

+ 7 - 3
member/models.py
Datei anzeigen 

@@ -678,11 +678,15 @@ class MemberActivitySignupInfo(BaseModelMixin, BrandInfoMixin):
678 678 
         return '%d' % self.pk
679 679
680 680 
     @property
681 
+    def final_avatar(self):
682 
+        return self.avatar and self.avatar.replace(settings.QINIU_FILE_URL_BEFORE, settings.QINIU_FILE_URL_AFTER).replace(settings.QINIU_FILE_URL_BEFORE2, settings.QINIU_FILE_URL_AFTER)
683 
+
684 
+    @property
681 685 
     def data(self):
682 686 
         return {
683 687 
             'signup_id': self.signup_id,
684 688 
             'title': self.title,
685 
-            'avatar': self.avatar,
689 
+            'avatar': self.final_avatar,
686 690 
             'name': self.name,
687 691 
             'phone': self.phone,
688 692 
         }
 
@@ -694,7 +698,7 @@ class MemberActivitySignupInfo(BaseModelMixin, BrandInfoMixin):
694 698 
             'user_id': self.user_id,
695 699 
             'activity_id': self.activity_id,
696 700 
             'title': self.title,
697 
-            'avatar': self.avatar,
701 
+            'avatar': self.final_avatar,
698 702 
             'name': self.name,
699 703 
             'phone': self.phone,
700 704 
         }
 
@@ -969,5 +973,5 @@ class MemberActivityContributionWelfareUnlockingInfo(BaseModelMixin, BrandInfoMi
969 973 
             'created_at': tc.local_string(utc_dt=self.created_at),
970 974
971 975 
             'username': user.name if user else '',
972 
-            'useravatar': user.avatar if user else '',
976 
+            'useravatar': user.final_avatar if user else '',
973 977 
         }

+ 5 - 0
sales/models.py
Datei anzeigen 

@@ -1,5 +1,6 @@
1 1 
 # -*- coding: utf-8 -*-
2 2
3 
+from django.conf import settings
3 4 
 from django.db import models
4 5 
 from django.utils.translation import ugettext_lazy as _
5 6 
 from django_models_ext import BaseModelMixin, upload_file_url, upload_path
 
@@ -55,6 +56,10 @@ class SalesResponsibilityInfo(BaseModelMixin):
55 56 
         return u'{}-{}'.format(self.name, self.phone)
56 57
57 58 
     @property
59 
+    def final_avatar(self):
60 
+        return self.avatar and self.avatar.replace(settings.QINIU_FILE_URL_BEFORE, settings.QINIU_FILE_URL_AFTER).replace(settings.QINIU_FILE_URL_BEFORE2, settings.QINIU_FILE_URL_AFTER)
61 
+
62 
+    @property
58 63 
     def base_data(self):
59 64 
         return {
60 65 
             'sr_id': self.sr_id,

+ 1 - 1
sales/views.py
Datei anzeigen 

@@ -34,7 +34,7 @@ def sr_submit_api(request):
34 34 
         'openid': user.openid,
35 35 
         'name': name,
36 36 
         'phone': phone,
37 
-        'avatar': user.avatar,
37 
+        'avatar': user.final_avatar,
38 38 
         'user_status': SalesResponsibilityInfo.UNVERIFIED,
39 39 
         'status': True,
40 40 
     })