:art: Support QINIU_FILE_URL_HTTPS
huangqimin001
променени са 4 файла, в които са добавени 42 реда и са изтрити 12 реда
+ 15
- 8
api/wxa_views.py
@@ -14,17 +14,11 @@ from utils.redis.rwxacode import get_wxa_code_qiniu_url, get_wxa_code_scene_, se |
||
| 14 | 14 |
WECHAT = settings.WECHAT |
| 15 | 15 |
|
| 16 | 16 |
|
| 17 |
-# Support API Cache |
|
| 18 |
-def get_wxa_code(request): |
|
| 19 |
- scene = request.POST.get('scene', '')
|
|
| 20 |
- page = request.POST.get('page', '')
|
|
| 21 |
- |
|
| 17 |
+def __get_wxa_code(scene, page): |
|
| 22 | 18 |
qiniu_url = get_wxa_code_qiniu_url(scene, page) |
| 23 | 19 |
|
| 24 | 20 |
if qiniu_url: |
| 25 |
- return response(data={
|
|
| 26 |
- 'qiniu_url': qiniu_url, |
|
| 27 |
- }) |
|
| 21 |
+ return qiniu_url |
|
| 28 | 22 |
|
| 29 | 23 |
si, created = SceneInfo.objects.get_or_create(scene=scene, page=page, status=True) |
| 30 | 24 |
|
@@ -48,6 +42,19 @@ def get_wxa_code(request): |
||
| 48 | 42 |
|
| 49 | 43 |
set_wxa_code_info(scene, page, qiniu_url, si.sid) |
| 50 | 44 |
|
| 45 |
+ return qiniu_url |
|
| 46 |
+ |
|
| 47 |
+ |
|
| 48 |
+# Support API Cache |
|
| 49 |
+def get_wxa_code(request): |
|
| 50 |
+ scene = request.POST.get('scene', '')
|
|
| 51 |
+ page = request.POST.get('page', '')
|
|
| 52 |
+ |
|
| 53 |
+ qiniu_url = __get_wxa_code(scene, page) |
|
| 54 |
+ |
|
| 55 |
+ if not settings.QINIU_FILE_URL_HTTPS: |
|
| 56 |
+ qiniu_url = qiniu_url.replace('https://img.tamron.kodo.com.cn/', 'http://img.tamron.kodo.com.cn/')
|
|
| 57 |
+ |
|
| 51 | 58 |
return response(data={
|
| 52 | 59 |
'qiniu_url': qiniu_url, |
| 53 | 60 |
}) |
+ 1
- 1
member/admin.py
@@ -100,7 +100,7 @@ class MemberActivityGroupShareInfoAdmin(admin.ModelAdmin): |
||
| 100 | 100 |
|
| 101 | 101 |
|
| 102 | 102 |
class MemberActivityContributionInfoAdmin(admin.ModelAdmin): |
| 103 |
- list_display = ('contribution_id', 'user_id', 'activity_id', 'content_type', 'title', 'content', 'images', 'video_url', 'audit_status', 'is_selected', 'status', 'created_at', 'updated_at')
|
|
| 103 |
+ list_display = ('contribution_id', 'user_id', 'activity_id', 'content_type', 'title', 'content', 'user_name', 'user_avatar', 'images', 'video_url', 'audit_status', 'is_selected', 'status', 'created_at', 'updated_at')
|
|
| 104 | 104 |
list_filter = ('activity_id', 'content_type', 'audit_status', 'is_selected', 'status')
|
| 105 | 105 |
|
| 106 | 106 |
|
+ 24
- 0
member/migrations/0052_auto_20221107_2238.py
@@ -0,0 +1,24 @@ |
||
| 1 |
+# -*- coding: utf-8 -*- |
|
| 2 |
+# Generated by Django 3.2.16 on 2022-11-07 14:38 |
|
| 3 |
+ |
|
| 4 |
+from django.db import migrations, models |
|
| 5 |
+ |
|
| 6 |
+ |
|
| 7 |
+class Migration(migrations.Migration): |
|
| 8 |
+ |
|
| 9 |
+ dependencies = [ |
|
| 10 |
+ ('member', '0051_alter_memberactivitycontributionwelfareunlockinginfo_unique_together'),
|
|
| 11 |
+ ] |
|
| 12 |
+ |
|
| 13 |
+ operations = [ |
|
| 14 |
+ migrations.AlterField( |
|
| 15 |
+ model_name='memberactivitycontributioninfo', |
|
| 16 |
+ name='user_avatar', |
|
| 17 |
+ field=models.CharField(blank=True, help_text='用户头像', max_length=255, null=True, verbose_name='user_avatar'), |
|
| 18 |
+ ), |
|
| 19 |
+ migrations.AlterField( |
|
| 20 |
+ model_name='memberactivitycontributioninfo', |
|
| 21 |
+ name='user_name', |
|
| 22 |
+ field=models.CharField(blank=True, help_text='用户名称', max_length=255, null=True, verbose_name='user_name'), |
|
| 23 |
+ ), |
|
| 24 |
+ ] |
+ 2
- 3
member/models.py
@@ -734,8 +734,8 @@ class MemberActivityContributionInfo(BaseModelMixin, BrandInfoMixin): |
||
| 734 | 734 |
# 传参图片列表（默认第一张为封面图，包括图片url、宽、高）、标题、内容（纯文本）。 |
| 735 | 735 |
title = models.CharField(_(u'title'), max_length=255, blank=True, null=True, help_text=u'标题') |
| 736 | 736 |
content = models.TextField(_(u'content'), blank=True, null=True, help_text=u'内容') |
| 737 |
- user_avatar = models.CharField(_(u'avatar'), max_length=255, blank=True, null=True, help_text=u'用户头像') |
|
| 738 |
- user_name = models.CharField(_(u'name'), max_length=255, blank=True, null=True, help_text=u'用户名称') |
|
| 737 |
+ user_name = models.CharField(_(u'user_name'), max_length=255, blank=True, null=True, help_text=u'用户名称') |
|
| 738 |
+ user_avatar = models.CharField(_(u'user_avatar'), max_length=255, blank=True, null=True, help_text=u'用户头像') |
|
| 739 | 739 |
# content_rich_text = RichTextField(_(u'content_rich_text'), blank=True, default='', help_text=u'内容') |
| 740 | 740 |
# [{
|
| 741 | 741 |
# 'image_url': '', |
@@ -760,7 +760,6 @@ class MemberActivityContributionInfo(BaseModelMixin, BrandInfoMixin): |
||
| 760 | 760 |
if settings.QINIU_FILE_URL_HTTPS: |
| 761 | 761 |
return self.images |
| 762 | 762 |
return [dict(image, **{'image_url': image.get('image_url', '').replace('https://img.tamron.kodo.com.cn/', 'http://img.tamron.kodo.com.cn/')}) for image in self.images]
|
| 763 |
- return self.poster_kv_img_url |
|
| 764 | 763 |
|
| 765 | 764 |
@property |
| 766 | 765 |
def data(self): |