guoziyun 1 год назад
Родитель
Сommit
eb56c5b4fc
2 измененных файлов с 14 добавлено и 14 удалено
  1. 13 13
      routes/index.js
  2. 1 1
      routes/res/thumbs.js

+ 13 - 13
routes/index.js

@@ -80,7 +80,7 @@ router.get(/^\/(en|zh|es|pt|ja)$/, function (req, res, next) {  // 限制严格
         .exec();
       if (dailydocs && dailydocs.length >= 1) {
         todayDoc = dailydocs[0];
-        todayDoc.artInfo.thumb = `${host}/thumbs/coloring-page/page/480/${todayDoc.artInfo._id}.jpeg`;
+        todayDoc.artInfo.thumb = `${host}/thumbs/coloring-page/page/480/${todayDoc.artInfo._id}.webp`;
       }
 
       let baseSort = { publishTime: 'desc' };
@@ -127,8 +127,8 @@ router.get(/^\/(en|zh|es|pt|ja)$/, function (req, res, next) {  // 限制严格
         .exec();
 
       for (let doc of albums) {
-        doc.icon = `${host}/res/coloring/album_icon/320/${doc._id}.jpeg`;
-        doc.cover = `${host}/res/coloring/album_cover/320/${doc._id}.jpeg`;
+        doc.icon = `${host}/thumbs/coloring-page/album_icon/320/${doc._id}.webp`;
+        doc.cover = `${host}/thumbs/coloring-page/album_cover/320/${doc._id}.webp`;
         doc.title = doc.title ? doc.title[lang] : '';
         doc.slogon = doc.slogon ? doc.slogon[lang] : '';
         doc.size = doc.contents.length;
@@ -166,7 +166,7 @@ router.get(/^\/(en|zh|es|pt|ja)$/, function (req, res, next) {  // 限制严格
       ]);
 
       for (let doc of designers) {
-        doc.avatar = `/thumbs/v1/avatar/320/${doc._id}.jpeg`;
+        doc.avatar = `/thumbs/v1/avatar/320/${doc._id}.webp`;
       }
 
 
@@ -524,8 +524,8 @@ router.get('/:lang/albums', function (req, res, next) {
 
       let host = config.cdnHost ?? config.resHost;
       for (let doc of albums) {
-        doc.icon = `${host}/res/coloring/album_icon/320/${doc._id}.jpeg`;
-        doc.cover = `${host}/res/coloring/album_cover/480/${doc._id}.jpeg`;
+        doc.icon = `${host}/thumbs/coloring-page/album_icon/320/${doc._id}.webp`;
+        doc.cover = `${host}/thumbs/coloring-page/album_cover/480/${doc._id}.webp`;
         doc.title = doc.title ? doc.title[lang] : '';
         doc.slogon = doc.slogon ? doc.slogon[lang] : '';
         doc.size = doc.contents.length;
@@ -596,8 +596,8 @@ router.get('/:lang/album/:id', function (req, res, next) {
       if (!doc) throw createError(404, 'Album Not Found!');
 
       let host = config.cdnHost ?? config.resHost;
-      doc.icon = `${host}/res/coloring/album_icon/320/${doc._id}.jpeg`;
-      doc.cover = `${host}/res/coloring/album_cover/640/${doc._id}.jpeg`;
+      doc.icon = `${host}/thumbs/coloring-page/album_icon/320/${doc._id}.webp`;
+      doc.cover = `${host}/thumbs/coloring-page/album_cover/640/${doc._id}.webp`;
       doc.title = doc.title ? doc.title[lang] : '';
       doc.slogon = doc.slogon ? doc.slogon[lang] : '';
       doc.size = doc.contents.length;
@@ -686,7 +686,7 @@ router.get('/:lang/designers', function (req, res, next) {
 
 
       for (let doc of docs) {
-        doc.avatar = `/thumbs/v1/avatar/320/${doc._id}.jpeg`;
+        doc.avatar = `/thumbs/v1/avatar/320/${doc._id}.webp`;
       }
 
       let data = {
@@ -746,7 +746,7 @@ router.get('/:lang/designer/:id', function (req, res, next) {
       if (!user) throw createError(404, 'User Not Found!');
       let count = await models.Art.countDocuments({ user: id, status: 9000 });
       user.count = count;
-      user.avatar = `/thumbs/v1/avatar/320/${user._id}.jpeg`;
+      user.avatar = `/thumbs/v1/avatar/320/${user._id}.webp`;
 
 
       // find user arts
@@ -1089,7 +1089,7 @@ const organizeData = (data, lang) => {
     let publishVersion = doc.publishVersion || 0;
     let version = publishVersion + 1500;
 
-    doc.thumb = `${host}/thumbs/coloring-page/page/480/${doc._id}.jpeg`;
+    doc.thumb = `${host}/thumbs/coloring-page/page/480/${doc._id}.webp`;
     doc.zip = `${host}/zips/v2/number_mini/${version}/${doc._id}.zip`;
 
     let uriTitle = doc.name;
@@ -1124,7 +1124,7 @@ const organizeDetail = (doc, lang) => {
   let publishVersion = doc.publishVersion || 0;
   let version = publishVersion + 1500;
 
-  doc.thumb = `${host}/thumbs/coloring-page/page/480/${doc._id}.jpeg`;
+  doc.thumb = `${host}/thumbs/coloring-page/page/480/${doc._id}.webp`;
   doc.zip = `${host}/zips/v2/number_mini/${version}/${doc._id}.zip`
 
   // doc.title = translate.titleTest[lang];
@@ -1157,7 +1157,7 @@ const organizeDetail = (doc, lang) => {
   let utf8name = encodeURIComponent(uriTitle.replace(/[\s_]+/g, '-')).toLowerCase();
   doc.uri = `/${lang}/coloring-page/${utf8name}-${doc._id}`;
 
-  doc.downlink = `${host}/thumbs/coloring-page/page/1200/${doc._id}.jpeg`;
+  doc.downlink = `${host}/thumbs/coloring-page/page/1200/${doc._id}.webp`;
 
   delete doc.hasSpecial;
   delete doc.useSpecialThumb;

+ 1 - 1
routes/res/thumbs.js

@@ -7,7 +7,7 @@ const config = require('../../config/app');
 const { makeThumb } = require('../../libs/image');
 
 
-router.get(/^\/(avatar)\/(128|256|512|480|320|640|720)\/([a-f0-9]{24}).(png|jpg|jpeg)$/, function (req, res, next) {
+router.get(/^\/(avatar)\/(128|256|512|480|320|640|720)\/([a-f0-9]{24}).(png|jpg|jpeg|webp)$/, function (req, res, next) {
   (async function () {
     let params = Object.values(req.params);
     let [type, size, id, ext] = params;