diff --git a/lib/routes/x6d/index.ts b/lib/routes/x6d/index.ts
index ca3de354a6..6320c74283 100644
--- a/lib/routes/x6d/index.ts
+++ b/lib/routes/x6d/index.ts
@@ -1,28 +1,19 @@
 import { Route } from '@/types';
+
 import cache from '@/utils/cache';
 import got from '@/utils/got';
 import { load } from 'cheerio';
-import { parseDate } from '@/utils/parse-date';
 import timezone from '@/utils/timezone';
-
-const baseUrl = 'https://xd.x6d.com';
+import { parseDate } from '@/utils/parse-date';
 
 export const route: Route = {
     path: '/:id?',
-    categories: ['new-media'],
-    example: '/x6d/34',
-    parameters: { id: '分类 id，可在对应分类页面的 URL 中找到，默认为首页最近更新' },
-    features: {
-        requireConfig: false,
-        requirePuppeteer: false,
-        antiCrawler: false,
-        supportBT: false,
-        supportPodcast: false,
-        supportScihub: false,
-    },
     name: '分类',
+    url: 'xd.x6d.com',
     maintainers: ['nczitzk'],
     handler,
+    example: '/x6d/34',
+    parameters: { id: '分类 id，可在对应分类页面的 URL 中找到，默认为首页最近更新' },
     description: `| 技巧分享 | QQ 技巧 | 微信技巧 | 其他教程 | 其他分享 |
   | -------- | ------- | -------- | -------- | -------- |
   | 31       | 55      | 112      | 33       | 88       |
@@ -46,54 +37,105 @@ export const route: Route = {
   | 资源宝库 | 书籍资料 | 设计资源 | 剪辑资源 | 办公资源 | 壁纸资源 | 编程资源 |
   | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
   | 106      | 107      | 108      | 109      | 110      | 111      | 113      |`,
+    categories: ['new-media'],
+
+    features: {
+        requireConfig: false,
+        requirePuppeteer: false,
+        antiCrawler: false,
+        supportBT: false,
+        supportPodcast: false,
+        supportScihub: false,
+    },
 };
 
-async function handler(ctx) {
+export async function handler(ctx) {
     const { id = 'latest' } = ctx.req.param();
+    const limit = ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit'), 10) : 22;
 
-    const currentUrl = id === 'latest' ? baseUrl : `${baseUrl}/html/${id}.html`;
+    const rootUrl = 'https://xd.x6d.com';
 
-    const { data: response } = await got(currentUrl);
+    let currentUrl = new URL(id === 'latest' ? '' : `html/${id}.html`, rootUrl).href;
 
-    const $ = load(response);
+    const { data: firstResponse } = await got(currentUrl);
+
+    let $;
+
+    if (/<meta\s/.test(firstResponse)) {
+        $ = load(firstResponse);
+    } else {
+        currentUrl = new URL(
+            id === 'latest'
+                ? ''
+                : firstResponse
+                      .match(/'([\w./=?]+)'/g)
+                      .reverse()
+                      .join('')
+                      .replaceAll("'", ''),
+            rootUrl
+        ).href;
+
+        const { data: response } = await got(currentUrl);
+
+        $ = load(response);
+    }
 
     $('i.rj').remove();
 
-    const query =
-        id === 'latest'
-            ? $('#newslist ul')
-                  .eq(0)
-                  .find('li')
-                  .not('.addd')
-                  .find('a')
-                  .slice(0, ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : 22)
-            : $('a.soft-title').slice(0, ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : 10);
+    const language = 'zh';
 
-    const list = query.toArray().map((item) => {
+    const query = id === 'latest' ? $('#newslist ul').first().find('li').not('li.addd').find('a').slice(0, limit) : $('a.soft-title').slice(0, limit);
+
+    let items = query.toArray().map((item) => {
         item = $(item);
+
         return {
-            title: item.text(),
-            link: `${baseUrl}${item.attr('href')}`,
+            title: item.prop('title') ?? item.text(),
+            link: new URL(item.prop('href'), rootUrl).href,
+            language,
         };
     });
 
-    const items = await Promise.all(
-        list.map((item) =>
+    items = await Promise.all(
+        items.map((item) =>
             cache.tryGet(item.link, async () => {
                 const { data: detailResponse } = await got(item.link);
-                const content = load(detailResponse);
 
-                item.description = content('div.article-content').html();
-                item.pubDate = timezone(parseDate(content('time').text()), 8);
+                const $$ = load(detailResponse);
+
+                const title = $$('h1.article-title').text();
+                const description = $$('div.article-content').html();
+                const image = new URL($$('div.article-content img').first().prop('src'), rootUrl).href;
+
+                item.title = title;
+                item.description = description;
+                item.pubDate = timezone(parseDate($$('time').text()), +8);
+                item.category = $$('b.bq-wg')
+                    .toArray()
+                    .map((c) => $$(c).text());
+                item.author = $$('span.bq-zz').text();
+                item.content = {
+                    html: description,
+                    text: $$('div.article-content').text(),
+                };
+                item.image = image;
+                item.banner = image;
+                item.language = language;
 
                 return item;
             })
         )
     );
 
+    const image = new URL($('div.header-logo img').prop('src'), rootUrl).href;
+
     return {
-        title: `小刀娱乐网 - ${$('title').text().split('-')[0]}`,
+        title: $('title').text().split(/\s-/)[0],
+        description: $('meta[name="description"]').prop('content'),
         link: currentUrl,
         item: items,
+        allowEmpty: true,
+        image,
+        language,
     };
 }