Merge branch 'dev'

ShunCai · Jan 25, 2022 · d85f597 · d85f597
2 parents ff759a3 + 747894d
commit d85f597
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/src/js/api.js b/src/js/api.js
@@ -1704,7 +1704,7 @@ API.Common = {
      */
     getUserLogoLocalUrl(uin) {
         // 头像默认PNG格式
-        return "Common/images/{uin}".format({
+        return "Common/Images/{uin}".format({
             uin: uin
         });
     },

diff --git a/src/js/config.js b/src/js/config.js
@@ -635,13 +635,13 @@ const ExportFiles = [{
     target: 'Common/js/sidebar.js'
 }, {
     original: 'export/images/index.jpg',
-    target: 'Common/images/index.jpg'
+    target: 'Common/Images/index.jpg'
 }, {
     original: 'export/images/video-play.png',
-    target: 'Common/images/video-play.png'
+    target: 'Common/Images/video-play.png'
 }, {
     original: 'export/images/loading.gif',
-    target: 'Common/images/loading.gif'
+    target: 'Common/Images/loading.gif'
 }, {
     original: 'export/js/common.js',
     target: 'Common/js/common.js'

diff --git a/src/js/modules/common.js b/src/js/modules/common.js
@@ -264,7 +264,7 @@ API.Common.handerContentImages = (module, content, type) => {
     if ("MD" === type) {
         content.replace(/!\[.*?\]\((.+?)\)/g, function(linkmd, url) {
             let custom_filename = API.Common.addDownloadTask(module, url, content);
-            return linkmd.replace(url, API.Common.getMediaPath(url, 'Common/images/' + custom_filename, "Messages_HTML"));
+            return linkmd.replace(url, API.Common.getMediaPath(url, 'Common/Images/' + custom_filename, "Messages_HTML"));
         })
         return content;
     }
@@ -275,7 +275,7 @@ API.Common.handerContentImages = (module, content, type) => {
         const $img = $(images[i]);
         let url = $img.attr('orgsrc') || $img.attr('src') || '';
         let custom_filename = API.Common.addDownloadTask(module, url, content);
-        $img.attr('src', API.Common.getMediaPath(url, 'Common/images/' + custom_filename, "Messages_HTML"));
+        $img.attr('src', API.Common.getMediaPath(url, 'Common/Images/' + custom_filename, "Messages_HTML"));
     }
     return _html.html();
 }
@@ -291,7 +291,7 @@ API.Common.addDownloadTask = (module, url, content) => {
     if (!custom_filename) {
         custom_filename = API.Utils.newSimpleUid(8, 16);
         // 添加下载任务
-        API.Utils.newDownloadTask(module, url, 'Common/images', custom_filename, content);
+        API.Utils.newDownloadTask(module, url, 'Common/Images', custom_filename, content);
         QZone.Common.FILE_URLS.set(url, custom_filename);
     }
     return custom_filename;
@@ -1043,7 +1043,7 @@ API.Common.downloadUserAvatar = (user) => {
         return;
     }
 
-    API.Utils.newDownloadTask('Friends', avatarUrl, 'Common/images', user.uin + '', user);
+    API.Utils.newDownloadTask('Friends', avatarUrl, 'Common/Images', user.uin + '', user);
     user.avatar = API.Common.getUserLogoUrl(user.uin);
     user.custom_avatar = API.Common.getUserLogoLocalUrl(user.uin);