From a5388cb9e713abc017014b494c8993bb4521c72f Mon Sep 17 00:00:00 2001
From: youngS <ly_1301b@163.com>
Date: Mon, 15 Mar 2021 18:07:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=90=AFcdn,=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81=E7=94=9F=E6=88=90=E5=A4=B1=E8=B4=A5?=
 =?UTF-8?q?=EF=BC=8C=E9=9C=80=E8=A6=81=E5=9C=A8=E9=98=BF=E9=87=8C=E4=BA=91?=
 =?UTF-8?q?cdn=20=E6=B7=BB=E5=8A=A0=E8=87=AA=E5=AE=9A=E4=B9=89=E5=A4=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fir_client/src/components/FirAppInfosBase.vue | 35 ++++++++-----------
 fir_client/src/utils/index.js                 |  2 +-
 fir_ser/fir_ser/settings.py                   |  4 ++-
 3 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/fir_client/src/components/FirAppInfosBase.vue b/fir_client/src/components/FirAppInfosBase.vue
index 6fd2bb4..d1846bd 100644
--- a/fir_client/src/components/FirAppInfosBase.vue
+++ b/fir_client/src/components/FirAppInfosBase.vue
@@ -4,7 +4,7 @@
             <div class="banner">
                 <div class="middle-wrapper">
                     <div @click="defaulttimeline">
-                        <img :src="icon_url" class="appicon" style="width:100px; height:100px">
+                        <img ref="icon_url" :src="icon_url" class="appicon" style="width:100px; height:100px" alt="">
                     </div>
                     <div class="badges">
                         <span class="bundleid">SHORT<b class="short">&nbsp;&nbsp;{{ appinfos.short }}</b></span>
@@ -19,7 +19,7 @@
                                 width="288">
                             <div style="text-align: center; margin: 0">
                                 <vue-qr :margin="qrinfo.margin"
-                                        :logoSrc="b64_icon_url" :logoScale="qrinfo.logoScale"
+                                        :logoSrc="icon_url" :logoScale="qrinfo.logoScale"
                                         :logoCornerRadius="qrinfo.logoCornerRadius"
                                         :correctLevel="qrinfo.correctLevel"
                                         :text="short_url()" :size="266"
@@ -94,7 +94,6 @@
 <script>
     import {apputils} from "../restful";
     import VueQr from 'vue-qr';
-    import {ImgToBase64} from "../utils"
 
     export default {
         name: "FirAppInfosBase",
@@ -103,19 +102,6 @@
         },
         data() {
             return {
-                save_qr() {
-                    let dtype = "I";
-                    if (this.master_release.release_type === 0) {
-                        dtype = "A";
-                    }
-                    let a = document.createElement('a');
-                    // 下载图名字
-                    a.download = this.appinfos.name + '_' + dtype + "_下载码";
-                    //url
-                    a.href = this.$refs.qr.$el.src;
-                    //合成函数，执行下载
-                    a.dispatchEvent(new MouseEvent('click'))
-                },
                 qrinfo: {
                     logoScale: 0.3,
                     logoCornerRadius: 12,
@@ -123,7 +109,6 @@
                     margin: 20
                 },
                 icon_url: "",
-                b64_icon_url: '',
                 appinfos: {},
                 master_release: {},
                 allapp: [],
@@ -133,6 +118,19 @@
             }
         },
         methods: {
+            save_qr() {
+                let dtype = "I";
+                if (this.master_release.release_type === 0) {
+                    dtype = "A";
+                }
+                let a = document.createElement('a');
+                // 下载图名字
+                a.download = this.appinfos.name + '_' + dtype + "_下载码";
+                //url
+                a.href = this.$refs.qr.$el.src;
+                //合成函数，执行下载
+                a.dispatchEvent(new MouseEvent('click'))
+            },
             short_url() {
                 return location.origin + '/' + this.appinfos.short;
             },
@@ -186,9 +184,6 @@
             },
             set_icon_url() {
                 this.icon_url = this.$store.state.currentapp.master_release.icon_url;
-                ImgToBase64(this.icon_url, dataURL => {
-                    this.b64_icon_url = dataURL;
-                })
             },
         }, created() {
 
diff --git a/fir_client/src/utils/index.js b/fir_client/src/utils/index.js
index fde4c37..f241c9e 100644
--- a/fir_client/src/utils/index.js
+++ b/fir_client/src/utils/index.js
@@ -276,7 +276,7 @@ export function ImgToBase64(url, callback) {
     let Img = new Image(),
         dataURL = '';
     Img.src = url + '?v=' + Math.random();
-    Img.setAttribute('crossOrigin', 'Anonymous');
+    Img.crossOrigin = 'Anonymous';
     Img.onload = function () {
         let canvas = document.createElement('canvas'),
             width = Img.width,
diff --git a/fir_ser/fir_ser/settings.py b/fir_ser/fir_ser/settings.py
index 5650d74..2d52c8f 100644
--- a/fir_ser/fir_ser/settings.py
+++ b/fir_ser/fir_ser/settings.py
@@ -196,7 +196,9 @@ THIRD_PART_CONFIG = {
             'name': 'local',
             'type': 0,
             'auth': {
-                'domain_name': 'app.hehelucky.cn',  # 正式环境需要填写正式的访问域名,如果配置cdn，可以填写cdn的域名，仅支持阿里云 cdn
+                'domain_name': 'app.hehelucky.cn',
+                # 正式环境需要填写正式的访问域名,如果配置cdn，可以填写cdn的域名，仅支持阿里云 cdn,
+                # 开启cdn之后，如果该域名和服务器域名不相同，需要设置阿里云cdn 缓存配置，自定义HTTP响应头 添加 Access-Control-Allow-Origin * 才可以
                 'is_https': True,
                 'download_auth_type': 0,  # 0:不开启token 1:本地token 2:cdn 开启cdn，并且使用本地存储，使用阿里云cdn进行url鉴权，
                 'cnd_auth_key': '',  # 当cdn为阿里云并且 download_auth_type=2 的时候 生效,需要 开启阿里云OSS私有Bucket回源