github
/
halo-admin
mirror of https://github.com/halo-dev/halo-admin
1
0
Fork 0
Code Issues Releases Wiki Activity

Support set cdn url instead of base url.

pull/40/head
ruibaby 2019-09-04 09:35:41 +08:00
parent 054354d357
commit d523fc5339
7 changed files with 52 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
package-lock.json generated
View File

@ -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",

2
src/utils/service.js
View File

@ -147,7 +147,7 @@ service.interceptors.response.use(
message.error(data.message)
}
} else {
message.error('服务异常')
message.error('网络异常')
}
return Promise.reject(error)

3
src/views/comment/components/CommentDetail.vue
View File

@ -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>

3
src/views/comment/components/CommentTab.vue
View File

@ -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'"

3
src/views/post/PostList.vue
View File

@ -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

3
src/views/sheet/SheetList.vue
View File

@ -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

6
src/views/system/OptionForm.vue
View File

@ -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"