From 2a6fa60587cbda5734c71f662e17567968980ffe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BE=90=E6=B6=9B?= <midnite@outlook.com>
Date: Wed, 5 May 2021 11:44:51 +0800
Subject: [PATCH] =?UTF-8?q?tag:=E5=8E=BB=E6=8E=89=E4=BA=86OSS=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84=E7=89=88=E6=9C=AC=E5=8F=82=E6=95=B0=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scripts/tag/oss-image.js | 23 +++++++++++------------
 scripts/tag/oss-video.js | 12 ++++++------
 2 files changed, 17 insertions(+), 18 deletions(-)

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 `<img ${attrs.join(" ")} />`;
 });
\ 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}"`);
     }