diff --git a/scripts/tag/oss-image.js b/scripts/tag/oss-image.js index 3f4f1fb..1e6a23c 100644 --- a/scripts/tag/oss-image.js +++ b/scripts/tag/oss-image.js @@ -1,33 +1,32 @@ hexo.extend.tag.register('oss_image', function(args) { let { config } = hexo; - let requestImage = args[0] || ''; - let versionCode = args[1] || ''; - if (requestImage.length === 0 || versionCode.length === 0) { + let requestImage = args.shift() || ''; + if (requestImage.length === 0) { return ''; } - let imageSrc = `${config.oss.endpoint}/${requestImage}?versionId=${versionCode}`; + let imageSrc = `${config.oss.endpoint}/${requestImage}`; let attrs = []; attrs.push(`src="${imageSrc}"`); - let altMessage = args[2] || ''; + let altMessage = args.shift() || ''; attrs.push(`alt="${altMessage}"`); - let classes = args[5] || ''; - if (classes.length !== 0) { - attrs.push(`class="${classes}"`); - } - - let width = args[3] || 0; + let width = args.shift() || 0; if (width !== 0) { attrs.push(`width="${width}"`); } - let height = args[4] || 0; + let height = args.shift() || 0; if (height !== 0) { attrs.push(`height="${height}"`); } + let classes = args.shift() || ''; + if (classes.length !== 0) { + attrs.push(`class="${classes}"`); + } + return ``; }); \ No newline at end of file diff --git a/scripts/tag/oss-video.js b/scripts/tag/oss-video.js index d4d6f0f..26ba87e 100644 --- a/scripts/tag/oss-video.js +++ b/scripts/tag/oss-video.js @@ -1,20 +1,20 @@ hexo.extend.tag.register('oss_video', function(args) { let { config } = hexo; - let src = args[0] || ''; - let versionId = args[1] || ''; - if (src.length === 0 || versionId.length === 0) { + let src = args.shift() || ''; + // let versionId = args[1] || ''; + if (src.length === 0) { return ''; } - let fullUrl = `${config.oss.endpoint}/${src}?versionId=${versionId}`; + let fullUrl = `${config.oss.endpoint}/${src}`; let affix = src.substring(src.lastIndexOf('.') + 1); let attrs = [] attrs.push('controls'); attrs.push('muted="true"'); - let width = args[2] || 0; - let height = args[3] || 0; + let width = args.shift() || 0; + let height = args.shift() || 0; if (width !== 0) { attrs.push(`width="${width}"`); }