From 16e5990ae6faade2ae478b036848b172d7fb710f Mon Sep 17 00:00:00 2001
From: ruibaby <i@ryanc.cc>
Date: Wed, 4 Sep 2019 09:35:41 +0800
Subject: [PATCH] Support set cdn url instead of base url.

---
 package-lock.json                             | 41 +++++++++++++++++++
 src/utils/service.js                          |  2 +-
 .../comment/components/CommentDetail.vue      |  3 +-
 src/views/comment/components/CommentTab.vue   |  3 +-
 src/views/post/PostList.vue                   |  3 +-
 src/views/sheet/SheetList.vue                 |  3 +-
 src/views/system/OptionForm.vue               |  6 +++
 7 files changed, 52 insertions(+), 9 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 31dffda6d..cfc12daff 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4643,6 +4643,16 @@
       "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=",
       "dev": true
     },
+    "clipboard": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npm.taobao.org/clipboard/download/clipboard-2.0.4.tgz",
+      "integrity": "sha1-g22v1mzw/qXXHOXVsL9ulYAJES0=",
+      "requires": {
+        "good-listener": "^1.2.2",
+        "select": "^1.1.2",
+        "tiny-emitter": "^2.0.0"
+      }
+    },
     "clipboardy": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/clipboardy/-/clipboardy-2.0.0.tgz",
@@ -5798,6 +5808,11 @@
       "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
       "dev": true
     },
+    "delegate": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npm.taobao.org/delegate/download/delegate-3.2.0.tgz",
+      "integrity": "sha1-tmtxwxWFIuirV0T3INjKDCr1kWY="
+    },
     "depd": {
       "version": "1.1.2",
       "resolved": "http://registry.npm.taobao.org/depd/download/depd-1.1.2.tgz",
@@ -8437,6 +8452,14 @@
         }
       }
     },
+    "good-listener": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npm.taobao.org/good-listener/download/good-listener-1.2.2.tgz",
+      "integrity": "sha1-1TswzfkxPf+33JoNR3CWqm0UXFA=",
+      "requires": {
+        "delegate": "^3.1.2"
+      }
+    },
     "graceful-fs": {
       "version": "4.1.15",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
@@ -14867,6 +14890,11 @@
         "ajv-keywords": "^3.1.0"
       }
     },
+    "select": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npm.taobao.org/select/download/select-1.1.2.tgz",
+      "integrity": "sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0="
+    },
     "select-hose": {
       "version": "2.0.0",
       "resolved": "http://registry.npm.taobao.org/select-hose/download/select-hose-2.0.0.tgz",
@@ -16157,6 +16185,11 @@
       "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=",
       "dev": true
     },
+    "tiny-emitter": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npm.taobao.org/tiny-emitter/download/tiny-emitter-2.1.0.tgz",
+      "integrity": "sha1-HRpW7fxRxD6GPLtTgqcjMONVVCM="
+    },
     "tinycolor2": {
       "version": "1.4.1",
       "resolved": "https://registry.npm.taobao.org/tinycolor2/download/tinycolor2-1.4.1.tgz",
@@ -16775,6 +16808,14 @@
       "resolved": "https://registry.npmjs.org/vue/-/vue-2.6.10.tgz",
       "integrity": "sha512-ImThpeNU9HbdZL3utgMCq0oiMzAkt1mcgy3/E6zWC/G6AaQoeuFdsl9nDhTDU3X1R6FK7nsIUuRACVcjI+A2GQ=="
     },
+    "vue-clipboard2": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npm.taobao.org/vue-clipboard2/download/vue-clipboard2-0.3.1.tgz",
+      "integrity": "sha1-blUft704SImyiw2jsSKJ7WvKSJQ=",
+      "requires": {
+        "clipboard": "^2.0.0"
+      }
+    },
     "vue-codemirror-lite": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/vue-codemirror-lite/-/vue-codemirror-lite-1.0.4.tgz",
diff --git a/src/utils/service.js b/src/utils/service.js
index 135e5e395..b3c0787bf 100644
--- a/src/utils/service.js
+++ b/src/utils/service.js
@@ -147,7 +147,7 @@ service.interceptors.response.use(
         message.error(data.message)
       }
     } else {
-      message.error('服务异常')
+      message.error('网络异常')
     }
 
     return Promise.reject(error)
diff --git a/src/views/comment/components/CommentDetail.vue b/src/views/comment/components/CommentDetail.vue
index 1dd7ffc5f..69f881377 100644
--- a/src/views/comment/components/CommentDetail.vue
+++ b/src/views/comment/components/CommentDetail.vue
@@ -46,8 +46,7 @@
             <a-list-item>
               <a-list-item-meta>
                 <span slot="description">
-                  <a-badge :status="comment.statusProperty.status" />
-                  {{ comment.statusProperty.text }}
+                  <a-badge :status="comment.statusProperty.status" :text="comment.statusProperty.text"/>
                 </span>
                 <span slot="title">评论状态：</span>
               </a-list-item-meta>
diff --git a/src/views/comment/components/CommentTab.vue b/src/views/comment/components/CommentTab.vue
index ee4456d16..d7d5b32ab 100644
--- a/src/views/comment/components/CommentTab.vue
+++ b/src/views/comment/components/CommentTab.vue
@@ -119,8 +119,7 @@
             slot="status"
             slot-scope="statusProperty"
           >
-            <a-badge :status="statusProperty.status" />
-            {{ statusProperty.text }}
+            <a-badge :status="statusProperty.status" :text="statusProperty.text"/>
           </span>
           <a
             v-if="type==='posts'"
diff --git a/src/views/post/PostList.vue b/src/views/post/PostList.vue
index 0043a9c79..18d19d6a5 100644
--- a/src/views/post/PostList.vue
+++ b/src/views/post/PostList.vue
@@ -157,8 +157,7 @@
             slot="status"
             slot-scope="statusProperty"
           >
-            <a-badge :status="statusProperty.status" />
-            {{ statusProperty.text }}
+            <a-badge :status="statusProperty.status" :text="statusProperty.text" />
           </span>
 
           <span
diff --git a/src/views/sheet/SheetList.vue b/src/views/sheet/SheetList.vue
index cd466520f..7cc017223 100644
--- a/src/views/sheet/SheetList.vue
+++ b/src/views/sheet/SheetList.vue
@@ -118,8 +118,7 @@
                   slot="status"
                   slot-scope="statusProperty"
                 >
-                  <a-badge :status="statusProperty.status" />
-                  {{ statusProperty.text }}
+                  <a-badge :status="statusProperty.status" :text="statusProperty.text"/>
                 </span>
 
                 <span
diff --git a/src/views/system/OptionForm.vue b/src/views/system/OptionForm.vue
index b0b49f209..2c00adc34 100644
--- a/src/views/system/OptionForm.vue
+++ b/src/views/system/OptionForm.vue
@@ -656,6 +656,12 @@
                 <a-icon type="align-left" />其他设置
               </span>
               <a-form layout="vertical">
+                <a-form-item
+                  label="CDN 加速域名："
+                  :wrapper-col="wrapperCol"
+                >
+                  <a-input v-model="options.blog_cdn_domain" placeholder="请确保 CDN 已经缓存了静态资源"/>
+                </a-form-item>
                 <a-form-item
                   label="自定义 head："
                   :wrapper-col="wrapperCol"