rsshub 1.0.0-master.fb2a407 → 1.0.0-master.fc5a2f6

package/lib/{routes → v2}/ehentai/ehapi.js

@@ -1,14 +1,16 @@
 const got = require('@/utils/got');
+const logger = require('@/utils/logger');
 const cheerio = require('cheerio');
+const path = require('path');
 const config = require('@/config').value.ehentai;
 
 const headers = {};
-const has_cookie = config.ipb_member_id && config.ipb_pass_hash && (config.sk || config.igneous);
+const has_cookie = config.ipb_member_id && config.ipb_pass_hash && config.sk;
 const from_ex = has_cookie && config.igneous;
 if (has_cookie) {
     if (from_ex) {
-        const { ipb_member_id, ipb_pass_hash, igneous } = config;
-        headers.cookie = `ipb_member_id=${ipb_member_id};ipb_pass_hash=${ipb_pass_hash};igneous=${igneous}`;
+        const { ipb_member_id, ipb_pass_hash, sk, igneous } = config;
+        headers.cookie = `ipb_member_id=${ipb_member_id};ipb_pass_hash=${ipb_pass_hash};sk=${sk};igneous=${igneous}`;
     } else {
         const { ipb_member_id, ipb_pass_hash, sk } = config;
         headers.cookie = `ipb_member_id=${ipb_member_id};ipb_pass_hash=${ipb_pass_hash};sk=${sk}`;
@@ -23,26 +25,53 @@ function ehgot(url) {
     }
 }
 
-async function parsePage(cache, data, get_bittorrent = false) {
+function ehgot_thumb(cache, thumb_url) {
+    return cache.tryGet(thumb_url, async () => {
+        try {
+            const buffer = await got({ method: 'get', url: thumb_url, headers });
+            const data = new Buffer.from(buffer.rawBody).toString('base64');
+            const ext = path.extname(thumb_url).slice(1);
+            return `data:image/${ext};base64,${data}`;
+        } catch (e) {
+            logger.warn('Cannot download thumbnail: ' + thumb_url, e);
+            return thumb_url;
+        }
+    });
+}
+
+async function parsePage(cache, data, get_bittorrent = false, embed_thumb = false) {
     const $ = cheerio.load(data);
-    const table = $('table[class="itg gltc"] tbody');
+    const table = $('table[class^="itg glt"] tbody');
     if (!table) {
         return [];
     }
 
     async function parseTableRow(cache, element) {
         const el = $(element);
-        const el_a = el.find('td[class="gl3c glname"] a');
-        const el_img = el.find('td.gl2c div.glthumb div img');
-        const title = el_a.find('div.glink').html();
-        const thumbnail = el_img.attr('data-src') ? el_img.attr('data-src') : el_img.attr('src');
-        const description = `<img src='${thumbnail}' alt='thumbnail'>`;
+        const title = el.find('div.glink').html();
         const pubDate = el.find('div[id^="posted_"]').html();
+        // match "Minimal", "Minimal+" and "Compact"
+        let el_a = el.find('td[class^="gl3"] a');
+        let el_img = el.find('td[class^=gl2] div.glthumb div img');
+        // if not, match "Extended"
+        if (!(el_a.length && el_img.length)) {
+            el_a = el.find('td[class^="gl1"] a');
+            el_img = el_a.find('img');
+        }
         const link = el_a.attr('href');
+        let thumbnail = el_img.attr('data-src') ? el_img.attr('data-src') : el_img.attr('src');
+        if (config.img_proxy && thumbnail) {
+            const url = new URL(thumbnail);
+            thumbnail = config.img_proxy + url.pathname + url.search;
+        }
+        if (embed_thumb && thumbnail) {
+            thumbnail = await ehgot_thumb(cache, thumbnail);
+        }
+        const description = `<img src='${thumbnail}' alt='thumbnail'>`;
         if (title && link) {
             const item = { title, description, pubDate, link };
             if (get_bittorrent) {
-                const el_down = el.find('td.gl2c div div.gldown');
+                const el_down = el.find('div.gldown');
                 const bittorrent_page_url = el_down.find('a').attr('href');
                 if (bittorrent_page_url) {
                     const bittorrent_url = await getBittorrent(cache, bittorrent_page_url);
@@ -113,31 +142,31 @@ function updateBittorrent_url(cache, items) {
     return items;
 }
 
-async function gatherItemsByPage(cache, url, get_bittorrent = false) {
+async function gatherItemsByPage(cache, url, get_bittorrent = false, embed_thumb = false) {
     const response = await ehgot(url);
-    const items = await parsePage(cache, response.data, get_bittorrent);
+    const items = await parsePage(cache, response.data, get_bittorrent, embed_thumb);
     return updateBittorrent_url(cache, items);
 }
 
-async function getFavoritesItems(cache, page, favcat, inline_set, get_bittorrent = false) {
+async function getFavoritesItems(cache, page, favcat, inline_set, get_bittorrent = false, embed_thumb = false) {
     const response = await ehgot(`favorites.php?favcat=${favcat}&inline_set=${inline_set}`);
     if (parseInt(page) === 0) {
-        const items = await parsePage(cache, response.data, get_bittorrent);
+        const items = await parsePage(cache, response.data, get_bittorrent, embed_thumb);
         return updateBittorrent_url(cache, items);
     }
-    return gatherItemsByPage(cache, `favorites.php?page=${page}&favcat=${favcat}`, get_bittorrent);
+    return gatherItemsByPage(cache, `favorites.php?page=${page}&favcat=${favcat}`, get_bittorrent, embed_thumb);
 }
 
-function getSearchItems(cache, params, page = undefined, get_bittorrent = false) {
+function getSearchItems(cache, params, page = undefined, get_bittorrent = false, embed_thumb = false) {
     if (page) {
-        return gatherItemsByPage(cache, `?page=${page}&${params}`, get_bittorrent);
+        return gatherItemsByPage(cache, `?page=${page}&${params}`, get_bittorrent, embed_thumb);
     } else {
-        return gatherItemsByPage(cache, `?${params}`, get_bittorrent);
+        return gatherItemsByPage(cache, `?${params}`, get_bittorrent, embed_thumb);
     }
 }
 
-function getTagItems(cache, tag, page, get_bittorrent = false) {
-    return gatherItemsByPage(cache, `tag/${tag}/${page}`, get_bittorrent);
+function getTagItems(cache, tag, page, get_bittorrent = false, embed_thumb = false) {
+    return gatherItemsByPage(cache, `tag/${tag}/${page}`, get_bittorrent, embed_thumb);
 }
 
 module.exports = { getFavoritesItems, getSearchItems, getTagItems, has_cookie, from_ex };

package/lib/{routes → v2}/ehentai/favorites.js

@@ -6,9 +6,11 @@ module.exports = async (ctx) => {
     }
     const favcat = ctx.params.favcat ? parseInt(ctx.params.favcat) : 0;
     const page = ctx.params.page ? parseInt(ctx.params.page) : 0;
-    const bittorrent = ctx.params.bittorrent || false;
+    const routeParams = new URLSearchParams(ctx.params.routeParams);
+    const bittorrent = routeParams.get('bittorrent') || false;
+    const embed_thumb = routeParams.get('embed_thumb') || false;
     const inline_set = ctx.params.order === 'posted' ? 'fs_p' : 'fs_f';
-    const items = await EhAPI.getFavoritesItems(ctx.cache, page, favcat, inline_set, bittorrent);
+    const items = await EhAPI.getFavoritesItems(ctx.cache, page, favcat, inline_set, bittorrent, embed_thumb);
 
     if (EhAPI.from_ex) {
         ctx.state.data = {

package/lib/v2/ehentai/maintainer.js

@@ -0,0 +1,5 @@
+module.exports = {
+    '/favorites/:favcat?/:order?/:page?/:routeParams?': ['yindaheng98'],
+    '/search/:params?/:page?/:routeParams?': ['yindaheng98'],
+    '/tag/:tag/:page?/:routeParams?': ['yindaheng98'],
+};

package/lib/v2/ehentai/router.js

@@ -0,0 +1,5 @@
+module.exports = (router) => {
+    router.get('/favorites/:favcat?/:order?/:page?/:routeParams?', require('./favorites'));
+    router.get('/search/:params?/:page?/:routeParams?', require('./search'));
+    router.get('/tag/:tag/:page?/:routeParams?', require('./tag'));
+};

package/lib/{routes → v2}/ehentai/search.js

@@ -3,14 +3,16 @@ const EhAPI = require('./ehapi');
 module.exports = async (ctx) => {
     const page = ctx.params.page;
     let params = ctx.params.params;
-    const bittorrent = ctx.params.bittorrent || false;
+    const routeParams = new URLSearchParams(ctx.params.routeParams);
+    const bittorrent = routeParams.get('bittorrent') || false;
+    const embed_thumb = routeParams.get('embed_thumb') || false;
     let items;
     if (page) {
         // 如果定义了page，就要覆盖params
         params = params.replace(/&*page=[^&]$/, '').replace(/page=[^&]&/, '');
-        items = await EhAPI.getSearchItems(ctx.cache, params, parseInt(page), bittorrent);
+        items = await EhAPI.getSearchItems(ctx.cache, params, parseInt(page), bittorrent, embed_thumb);
     } else {
-        items = await EhAPI.getSearchItems(ctx.cache, params, undefined, bittorrent);
+        items = await EhAPI.getSearchItems(ctx.cache, params, undefined, bittorrent, embed_thumb);
     }
     let title = params;
     const match = /f_search=([^&]+)/.exec(title);

package/lib/{routes → v2}/ehentai/tag.js

@@ -3,8 +3,10 @@ const EhAPI = require('./ehapi');
 module.exports = async (ctx) => {
     const page = ctx.params.page ? parseInt(ctx.params.page) : 0;
     const tag = ctx.params.tag;
-    const bittorrent = ctx.params.bittorrent || false;
-    const items = await EhAPI.getTagItems(ctx.cache, tag, page, bittorrent);
+    const routeParams = new URLSearchParams(ctx.params.routeParams);
+    const bittorrent = routeParams.get('bittorrent') || false;
+    const embed_thumb = routeParams.get('embed_thumb') || false;
+    const items = await EhAPI.getTagItems(ctx.cache, tag, page, bittorrent, embed_thumb);
 
     if (EhAPI.from_ex) {
         ctx.state.data = {

package/lib/v2/elasticsearch-cn/index.js

@@ -0,0 +1,57 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+const timezone = require('@/utils/timezone');
+const { parseDate, parseRelativeDate } = require('@/utils/parse-date');
+
+module.exports = async (ctx) => {
+    const params = ctx.params.params ?? '';
+
+    const rootUrl = 'https://elasticsearch.cn';
+    const currentUrl = `${rootUrl}${params ? `/${params}` : ''}`;
+
+    const response = await got({
+        method: 'get',
+        url: currentUrl,
+    });
+
+    const $ = cheerio.load(response.data);
+
+    let items = $('.aw-question-content')
+        .toArray()
+        .map((item) => {
+            item = $(item);
+
+            const a = item.find('h4 a');
+            const pubDate = item.find('span.text-color-999').not('.pull-right').first().text().split('•').pop().trim();
+
+            return {
+                title: a.text(),
+                link: a.attr('href'),
+                author: item.find('.aw-user-name').text(),
+                pubDate: timezone(/\d{4}-\d{2}-\d{2} \d{2}:\d{2}/.test(pubDate) ? parseDate(pubDate) : parseRelativeDate(pubDate), +8),
+            };
+        });
+
+    items = await Promise.all(
+        items.map((item) =>
+            ctx.cache.tryGet(item.link, async () => {
+                const detailResponse = await got({
+                    method: 'get',
+                    url: item.link,
+                });
+
+                const content = cheerio.load(detailResponse.data);
+
+                item.description = content('.markitup-box').first().html();
+
+                return item;
+            })
+        )
+    );
+
+    ctx.state.data = {
+        title: $('title').text(),
+        link: currentUrl,
+        item: items,
+    };
+};

package/lib/v2/elasticsearch-cn/maintainer.js

@@ -0,0 +1,3 @@
+module.exports = {
+    '/:params?': ['nczitzk'],
+};

package/lib/v2/elasticsearch-cn/radar.js

@@ -0,0 +1,13 @@
+module.exports = {
+    'elasticsearch.cn': {
+        _name: 'Elastic 中文社区',
+        '.': [
+            {
+                title: '发现',
+                docs: 'https://docs.rsshub.app/bbs.html#elastic-zhong-wen-she-qu-fa-xian',
+                source: ['/:params', '/'],
+                target: '/elasticsearch-cn/:params',
+            },
+        ],
+    },
+};

package/lib/v2/elasticsearch-cn/router.js

@@ -0,0 +1,3 @@
+module.exports = function (router) {
+    router.get('/:params?', require('./index'));
+};

package/lib/v2/elsevier/templates/description.art

@@ -1,5 +1,7 @@
 <p>
     <span><big>{{ item.title }}</big></span><br />
+</p>
+<p>
     <span><small><i>{{ item.authors }}</i></small></span><br />
     <span><small><i>https://doi.org/{{ item.doi }}</i></small></span><br />
     <span><small><i>{{ item.volume }}</i></small></span><br />

package/lib/v2/embassy/index.js

@@ -0,0 +1,60 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+const { parseDate } = require('@/utils/parse-date');
+
+const supportedList = require('./supportedList');
+
+module.exports = async (ctx) => {
+    const country = ctx.params.country;
+    const city = ctx.params.city ?? undefined;
+
+    let config = supportedList[country.toLowerCase()];
+    let desc;
+
+    if (city === undefined) {
+        desc = `中国驻${config.countryCN}大使馆 -- 重要通知`;
+    } else {
+        config = config.consulates[city.toLowerCase()];
+        desc = `中国驻${config.cityCN}领事馆 -- 重要通知`;
+    }
+
+    const link = config.link;
+    const hostname = new URL(link).hostname;
+
+    const res = await got(link);
+    const $ = cheerio.load(res.data);
+
+    const list = [];
+
+    $(config.list)
+        .slice(0, 10)
+        .each((i, e) => {
+            const temp = new URL($(e).attr('href'), link);
+            if (temp.hostname === hostname) {
+                list.push(temp);
+            }
+        });
+
+    const out = await Promise.all(
+        list.map((link) =>
+            ctx.cache.tryGet(link.href, async () => {
+                const response = await got(link);
+                const $ = cheerio.load(response.data);
+                const single = {
+                    title: $(config.title).text(),
+                    link,
+                    description: $(config.description).html(),
+                    pubDate: parseDate($(config.pubDate).text().replace('(', '').replace(')', '')),
+                };
+                return single;
+            })
+        )
+    );
+
+    ctx.state.data = {
+        title: desc,
+        description: desc,
+        link,
+        item: out,
+    };
+};

package/lib/v2/embassy/maintainer.js

@@ -0,0 +1,3 @@
+module.exports = {
+    '/:country/:city?': ['HenryQW'],
+};

package/lib/v2/embassy/radar.js

@@ -0,0 +1,258 @@
+module.exports = {
+    'china-embassy.org': {
+        _name: '中国驻外使领馆',
+        ca: [
+            {
+                title: '重要通知 - 加拿大大使馆',
+                docs: 'https://docs.rsshub.app/government.html#zhong-guo-zhu-wai-shi-ling-guan',
+                source: ['/chn/zytz', '/'],
+                target: '/embassy/ca',
+            },
+        ],
+        jp: [
+            {
+                title: '通知通告 - 日本大使馆',
+                docs: 'https://docs.rsshub.app/government.html#zhong-guo-zhu-wai-shi-ling-guan',
+                source: ['/chn/lsfws/LSB', '/'],
+                target: '/embassy/jp',
+            },
+        ],
+        kr: [
+            {
+                title: '重要通知 - 韩国大使馆',
+                docs: 'https://docs.rsshub.app/government.html#zhong-guo-zhu-wai-shi-ling-guan',
+                source: ['/lsqz/ls_tz', '/'],
+                target: '/embassy/kr',
+            },
+        ],
+        my: [
+            {
+                title: '重要通知 - 马来西亚大使馆',
+                docs: 'https://docs.rsshub.app/government.html#zhong-guo-zhu-wai-shi-ling-guan',
+                source: ['/chn/zytz', '/'],
+                target: '/embassy/my',
+            },
+        ],
+        sg: [
+            {
+                title: '重要通知 - 新加坡大使馆',
+                docs: 'https://docs.rsshub.app/government.html#zhong-guo-zhu-wai-shi-ling-guan',
+                source: ['/chn/lsfw/zytzs', '/'],
+                target: '/embassy/sg',
+            },
+        ],
+    },
+    'china-embassy.gov.cn': {
+        _name: '中国驻外使领馆',
+        us: [
+            {
+                title: '重要通知 - 美国大使馆',
+                docs: 'https://docs.rsshub.app/government.html#zhong-guo-zhu-wai-shi-ling-guan',
+                source: ['/zytz', '/'],
+                target: '/embassy/us',
+            },
+        ],
+    },
+    'chinese-embassy.org.uk': {
+        _name: '中国驻外使领馆',
+        www: [
+            {
+                title: '领事协助 - 英国大使馆',
+                docs: 'https://docs.rsshub.app/government.html#zhong-guo-zhu-wai-shi-ling-guan',
+                source: ['/chn/lsfw/lsxz', '/'],
+                target: '/embassy/us',
+            },
+        ],
+    },
+    'chineseembassy.org': {
+        _name: '中国驻外使领馆',
+        de: [
+            {
+                title: '近期通知 - 德国大使馆',
+                docs: 'https://docs.rsshub.app/government.html#zhong-guo-zhu-wai-shi-ling-guan',
+                source: ['/chn/lsfw/jqtz', '/'],
+                target: '/embassy/de',
+            },
+        ],
+        fr: [
+            {
+                title: '重要通知 - 法国大使馆',
+                docs: 'https://docs.rsshub.app/government.html#zhong-guo-zhu-wai-shi-ling-guan',
+                source: ['/chn/zgzfg/zgsg/lsb', '/'],
+                target: '/embassy/fr',
+            },
+        ],
+    },
+    'china-consulate.org': {
+        _name: '中国驻外使领馆',
+        marseille: [
+            {
+                title: '领事服务最新公告 - 马赛总领事馆',
+                docs: 'https://docs.rsshub.app/government.html#zhong-guo-zhu-wai-shi-ling-guan',
+                source: ['/chn/lsfwgg', '/'],
+                target: '/embassy/fr/marseille',
+            },
+        ],
+        strasbourg: [
+            {
+                title: '重要通知 - 斯特拉斯堡总领事馆',
+                docs: 'https://docs.rsshub.app/government.html#zhong-guo-zhu-wai-shi-ling-guan',
+                source: ['/chn/lsfw', '/'],
+                target: '/embassy/fr/strasbourg',
+            },
+        ],
+        lyon: [
+            {
+                title: '通知、通告 - 里昂总领事馆',
+                docs: 'https://docs.rsshub.app/government.html#zhong-guo-zhu-wai-shi-ling-guan',
+                source: ['/chn/tztg', '/'],
+                target: '/embassy/fr/lyon',
+            },
+        ],
+        nagasaki: [
+            {
+                title: '通知公告 - 长崎总领事馆',
+                docs: 'https://docs.rsshub.app/government.html#zhong-guo-zhu-wai-shi-ling-guan',
+                source: ['/chn/tzgg', '/'],
+                target: '/embassy/jp/nagasaki',
+            },
+        ],
+        osaka: [
+            {
+                title: '通知公告 - 大阪总领事馆',
+                docs: 'https://docs.rsshub.app/government.html#zhong-guo-zhu-wai-shi-ling-guan',
+                source: ['/chn/tzgg', '/'],
+                target: '/embassy/jp/osaka',
+            },
+        ],
+        fukuoka: [
+            {
+                title: '通知公告 - 福冈总领事馆',
+                docs: 'https://docs.rsshub.app/government.html#zhong-guo-zhu-wai-shi-ling-guan',
+                source: ['/chn/tzgg', '/'],
+                target: '/embassy/jp/fukuoka',
+            },
+        ],
+        sapporo: [
+            {
+                title: '通知公告 - 札幌总领事馆',
+                docs: 'https://docs.rsshub.app/government.html#zhong-guo-zhu-wai-shi-ling-guan',
+                source: ['/chn/tzgg', '/'],
+                target: '/embassy/jp/sapporo',
+            },
+        ],
+        niigata: [
+            {
+                title: '通知通告 - 新潟总领事馆',
+                docs: 'https://docs.rsshub.app/government.html#zhong-guo-zhu-wai-shi-ling-guan',
+                source: ['/chn/lsbh/tztg', '/'],
+                target: '/embassy/jp/niigata',
+            },
+        ],
+        busan: [
+            {
+                title: '通知公告 - 釜山总领事馆',
+                docs: 'https://docs.rsshub.app/government.html#zhong-guo-zhu-wai-shi-ling-guan',
+                source: ['/chn/lsfw/tzgg101', '/'],
+                target: '/embassy/kr/busan',
+            },
+        ],
+        gwangju: [
+            {
+                title: '公告通知 - 光州总领事馆',
+                docs: 'https://docs.rsshub.app/government.html#zhong-guo-zhu-wai-shi-ling-guan',
+                source: ['/chn/lbxx/ggtz', '/'],
+                target: '/embassy/kr/gwangju',
+            },
+        ],
+        edinburgh: [
+            {
+                title: '重要通知 - 爱丁堡总领事馆',
+                docs: 'https://docs.rsshub.app/government.html#zhong-guo-zhu-wai-shi-ling-guan',
+                source: ['/chn/zytz', '/'],
+                target: '/embassy/uk/edinburgh',
+            },
+        ],
+        newyork: [
+            {
+                title: '重要通知 - 纽约总领事馆',
+                docs: 'https://docs.rsshub.app/government.html#zhong-guo-zhu-wai-shi-ling-guan',
+                source: ['/chn/fwzc/zxtz', '/'],
+                target: '/embassy/us/newyork',
+            },
+        ],
+    },
+    'chinaconsulatechicago.org': {
+        _name: '中国驻外使领馆',
+        www: [
+            {
+                title: '领馆重要通知 - 芝加哥总领事馆',
+                docs: 'https://docs.rsshub.app/government.html#zhong-guo-zhu-wai-shi-ling-guan',
+                source: ['/chn/zytz', '/'],
+                target: '/embassy/us/chicago',
+            },
+        ],
+    },
+    'chinaconsulatesf.org': {
+        _name: '中国驻外使领馆',
+        www: [
+            {
+                title: '重要通知 - 旧金山总领事馆',
+                docs: 'https://docs.rsshub.app/government.html#zhong-guo-zhu-wai-shi-ling-guan',
+                source: ['/chn/zytz', '/'],
+                target: '/embassy/us/sanfrancisco',
+            },
+        ],
+    },
+    'chineseconsulate.org': {
+        _name: '中国驻外使领馆',
+        montreal: [
+            {
+                title: '重要通知 - 蒙特利尔总领事馆',
+                docs: 'https://docs.rsshub.app/government.html#zhong-guo-zhu-wai-shi-ling-guan',
+                source: ['/chn/zytz', '/'],
+                target: '/embassy/ca/montreal',
+            },
+        ],
+        munich: [
+            {
+                title: '近期通知 - 慕尼黑总领馆',
+                docs: 'https://docs.rsshub.app/government.html#zhong-guo-zhu-wai-shi-ling-guan',
+                source: ['/chn/jqtz', '/'],
+                target: '/embassy/de/munich',
+            },
+        ],
+        nagoya: [
+            {
+                title: '通知公告 - 名古屋总领事馆',
+                docs: 'https://docs.rsshub.app/government.html#zhong-guo-zhu-wai-shi-ling-guan',
+                source: '',
+                target: '/embassy/jp/nagoya',
+            },
+        ],
+        jeju: [
+            {
+                title: '公告栏 - 济州总领事馆',
+                docs: 'https://docs.rsshub.app/government.html#zhong-guo-zhu-wai-shi-ling-guan',
+                source: ['/chn/ggl', '/'],
+                target: '/embassy/kr/jeju',
+            },
+        ],
+        belfast: [
+            {
+                title: '通知通告 - 贝尔法斯特总领馆',
+                docs: 'https://docs.rsshub.app/government.html#zhong-guo-zhu-wai-shi-ling-guan',
+                source: ['/chn/tztg', '/'],
+                target: '/embassy/uk/belfast',
+            },
+        ],
+        manchester: [
+            {
+                title: '通知公告 - 曼彻斯特总领事馆',
+                docs: 'https://docs.rsshub.app/government.html#zhong-guo-zhu-wai-shi-ling-guan',
+                source: ['/chn/tzgg', '/'],
+                target: '/embassy/uk/manchester',
+            },
+        ],
+    },
+};

package/lib/v2/embassy/router.js

@@ -0,0 +1,3 @@
+module.exports = (router) => {
+    router.get('/:country/:city?', require('./index'));
+};

package/lib/{routes → v2}/embassy/supportedList.js

@@ -222,11 +222,11 @@ module.exports = {
     us: {
         country: 'us',
         countryCN: '美国',
-        link: 'http://www.china-embassy.org/chn/lszj/zytz/',
-        list: 'div#docMore a',
-        title: '#News_Body_Title',
-        description: '#News_Body_Txt_A',
-        pubDate: '#News_Body_Time > div:nth-child(1) > span',
+        link: 'http://us.china-embassy.gov.cn/zytz/',
+        list: '.list-content ul li a',
+        title: 'div.title',
+        description: 'div.trs_editor_view',
+        pubDate: 'div.date',
         consulates: {
             chicago: {
                 cityCN: '芝加哥',