Merge branch 'hotfix/video' into 'master'

Hotfix/video

See merge request alpha/sun!27

api/token.py

@@ -3,20 +3,13 @@
 # __author__ = "chenwei"
 # Date: 2018/11/20
 
-from django.middleware.csrf import get_token
 from utils.base import APIView
-from gm_upload.utils.qiniu_tool import QiniuTool
-
-qiniu_video = {
-    'domain': 'video-static.igengmei.com',
-    'bucket': 'video',
-}
+from gm_upload import get_video_upload_token
 
 
 class QiniuToken(APIView):
 
     def get(self, request):
-        token = QiniuTool.get_token(qiniu_video['bucket'])
         return {
-            'token': token
+            'token': get_video_upload_token()
         }
\ No newline at end of file

vu/src/components/Upload/utils/default.js

 // 视频host
-export const VIDEO_PREFIX = 'http://video-static.igengmei.com/'
+export const VIDEO_PREFIX = 'http://alpha-video.gmeiapp.com/'
 // 默认头像
 export const defaultAvatar = `data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyB3aWR0aD0iMTEwcHgiIGhlaWdodD0iMTEwcHgiIHZpZXdCb3g9IjAgMCAxMTAgMTEwIiB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiPgogICAgPCEtLSBHZW5lcmF0b3I6IFNrZXRjaCA0Ny4xICg0NTQyMikgLSBodHRwOi8vd3d3LmJvaGVtaWFuY29kaW5nLmNvbS9za2V0Y2ggLS0+CiAgICA8dGl0bGU+6buY6K6k5aS05YOPPC90aXRsZT4KICAgIDxkZXNjPkNyZWF0ZWQgd2l0aCBTa2V0Y2guPC9kZXNjPgogICAgPGRlZnM+PC9kZWZzPgogICAgPGcgaWQ9IlBhZ2UtMSIgc3Ryb2tlPSJub25lIiBzdHJva2Utd2lkdGg9IjEiIGZpbGw9Im5vbmUiIGZpbGwtcnVsZT0iZXZlbm9kZCI+CiAgICAgICAgPGcgaWQ9Ium7mOiupOWktOWDjyI+CiAgICAgICAgICAgIDxwb2x5Z29uIGlkPSJSZWN0YW5nbGUtNi1Db3B5LTUiIGZpbGw9IiNGMEYyRjMiIHBvaW50cz0iMCAwIDExMCAwIDExMCAxMTAgMCAxMTAiPjwvcG9seWdvbj4KICAgICAgICAgICAgPGcgaWQ9IkNvbWJpbmVkLVNoYXBlIiB0cmFuc2Zvcm09InRyYW5zbGF0ZSgyMy4wMDAwMDAsIDIzLjAwMDAwMCkiIGZpbGw9IiNGRkZGRkYiPgogICAgICAgICAgICAgICAgPHBhdGggZD0iTTMyLDAgQzQwLjIxNjY2NjcsMCA0Ni41LDYuMTI2OTY4IDQ2LjUsMTQuMTM5MTU2OSBDNDYuNSwyMi4xNTEzNDU5IDQwLjIxNjY2NjcsMjguMjc4MzEzOSAzMiwyOC4yNzgzMTM5IEMyMy43ODMzMzMzLDI4LjI3ODMxMzkgMTcuNSwyMi4xNTEzNDU5IDE3LjUsMTQuMTM5MTU2OSBDMTcuNSw2LjEyNjk2OCAyMy43ODMzMzMzLDAgMzIsMCBaIE0zMiw2NCBDMTkuOTE2NjY2Nyw2NCA5LjI4MzMzMzMzLDU3Ljg3MzAzMiAzLDQ4LjkxODIzMjYgQzMsMzkuNDkyMTI4IDIyLjMzMzMzMzMsMzQuMzA3NzcwNCAzMiwzNC4zMDc3NzA0IEM0MS42NjY2NjY3LDM0LjMwNzc3MDQgNjEsMzkuNDkyMTI4IDYxLDQ4LjkxODIzMjYgQzU0LjcxNjY2NjcsNTcuODczMDMyIDQ0LjA4MzMzMzMsNjQgMzIsNjQgWiI+PC9wYXRoPgogICAgICAgICAgICA8L2c+CiAgICAgICAgPC9nPgogICAgPC9nPgo8L3N2Zz4=`
 // 默认图片

vu/src/views/topic/components/TopicDetail.vue

@@ -136,7 +136,7 @@
                 <div class="name">
                   <span style="color: #606266;text-align:center;font-size:14px;padding:0 12px 0 0;">帖子视频</span>
                 </div>
-                <div class="value" style="margin-left: 50px">q
+                <div class="value" style="margin-left: 50px">
                   <div class="up-video">
                     <ul class="video-items clearfix" v-if="edit.video_url">
                       <li class="video-item" @click.stop="playVideo">