amass/md
1
0
Fork 0
mirror of https://github.com/doocs/md.git synced 2024-11-24 19:10:34 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: update cdnHost

Browse Source
This commit is contained in:
yanglbme 2020-10-15 09:22:56 +08:00
parent 9848a76c84
commit b344d67351
2 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/api/file.js
View File

@ -5,6 +5,7 @@ import Buffer from 'buffer-from';
import { import {
v4 as uuidv4 v4 as uuidv4
} from 'uuid'; } from 'uuid';
import { resolveConfigFile } from 'prettier';
const defaultConfig = { const defaultConfig = {
username: 'filess', username: 'filess',
@ -95,10 +96,7 @@ async function aliOSSFileUpload(content, filename) {
accessKeySecret: aliOSSConfig.accessKeySecret accessKeySecret: aliOSSConfig.accessKeySecret
}); });
const res = await client.put(dir, buffer); const res = await client.put(dir, buffer);
if(aliOSSConfig.cdnHost != ''){ return aliOSSConfig.cdnHost == '' ? res.url : aliOSSConfig.cdnHost + '/' + (aliOSSConfig.path == '' ? dateFilename : dir);
return aliOSSConfig.cdnHost +'/'+dir;
}
return res.url;
} catch (e) { } catch (e) {
return Promise.reject(e); return Promise.reject(e);
} }
@ -117,16 +115,15 @@ async function txCOSFileUpload(file) {
Region: txCOSConfig.region, Region: txCOSConfig.region,
Key: txCOSConfig.path + '/' + dateFilename, Key: txCOSConfig.path + '/' + dateFilename,
Body: file Body: file
}, function(err, data) { }, function (err, data) {
if (err) { if (err) {
reject(err); reject(err);
} else if (txCOSConfig.cdnHost) {
// if cdnHost exists
resolve(txCOSConfig.path != '' ? txCOSConfig.cdnHost + '/' + txCOSConfig.path + '/' + dateFilename : txCOSConfig.cdnHost + '/' + dateFilename);
} else { } else {
if(txCOSConfig.cdnHost != ''){ // if cdnHost not exists
resolve(txCOSConfig.cdnHost+'/'+txCOSConfig.path + '/' + dateFilename); reject(data.Location);
}else{
resolve(data.Location);
}
} }
}); });
}) })

6
src/components/CodemirrorEditor/uploadImgDialog.vue
View File

@ -86,7 +86,7 @@
<el-input v-model.trim="formTxCOS.region" <el-input v-model.trim="formTxCOS.region"
placeholder="如：ap-guangzhou"></el-input> placeholder="如：ap-guangzhou"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="自定义CDN域名" :required="false"> <el-form-item label="自定义 CDN 域名" :required="false">
<el-input v-model.trim="formTxCOS.cdnHost" <el-input v-model.trim="formTxCOS.cdnHost"
placeholder="如：https://imagecdn.alidaodao.com"></el-input> placeholder="如：https://imagecdn.alidaodao.com"></el-input>
</el-form-item> </el-form-item>
@ -131,7 +131,7 @@ export default {
bucket: "", bucket: "",
region: "", region: "",
path: "", path: "",
cdnHost:"" cdnHost: "",
}, },
formTxCOS: { formTxCOS: {
secretId: "", secretId: "",
@ -139,7 +139,7 @@ export default {
bucket: "", bucket: "",
region: "", region: "",
path: "", path: "",
cdnHost:"" cdnHost: "",
}, },
options: [{ options: [{
value: "default", value: "default",