rsshub 1.0.0-master.f72af1b → 1.0.0-master.f7347d9

package/lib/routes/gov/jgjcndrc/index.ts

@@ -1,96 +1,125 @@
 import { Route } from '@/types';
+
 import cache from '@/utils/cache';
 import got from '@/utils/got';
 import { load } from 'cheerio';
+import timezone from '@/utils/timezone';
 import { parseDate } from '@/utils/parse-date';
 
-export const route: Route = {
-    path: '/jgjcndrc/:id?',
-    categories: ['government'],
-    example: '/gov/jgjcndrc',
-    parameters: { id: '栏目 id，见下表，默认为 692，即通知公告' },
-    features: {
-        requireConfig: false,
-        requirePuppeteer: false,
-        antiCrawler: false,
-        supportBT: false,
-        supportPodcast: false,
-        supportScihub: false,
-    },
-    name: '价格监测中心',
-    maintainers: ['nczitzk'],
-    handler,
-    description: `| 通知公告 | 中心工作动态 | 地方工作动态 | 监测信息 | 分析预测 | 调查报告 |
-  | -------- | ------------ | ------------ | -------- | -------- | -------- |
-  | 692      | 693          | 694          | 695      | 696      | 697      |
-
-  | 价格指数 | 地方价格监测 | 价格监测报告制度 | 监测法规 | 媒体聚焦 |
-  | -------- | ------------ | ---------------- | -------- | -------- |
-  | 698      | 699          | 700              | 701      | 753      |
-
-  #### 监测信息
+export const handler = async (ctx) => {
+    const { columnId = '1832739866673426433', subColumnId } = ctx.req.param();
+    const limit = ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit'), 10) : 30;
 
-  | 国内外市场价格监测情况周报 | 主要粮油副食品日报 | 生猪出厂价与玉米价格周报 | 国际市场石油价格每日 动态 |
-  | -------------------------- | ------------------ | ------------------------ | ------------------------- |
-  | 749                        | 703                | 704                      | 705                       |
+    const rootUrl = 'https://www.jgjcndrc.org.cn';
+    const currentUrl = new URL(`list?clmId=${columnId}${subColumnId ? `&sclmId=${subColumnId}` : ''}`, rootUrl).href;
+    const apiColumnUrl = new URL(`prod-api/portal/artPageByColumn/${subColumnId ?? columnId}`, rootUrl).href;
 
-  | 非学科类培训服务价格 | 监测周期价格动态 | 月度监测行情表 | 猪料、鸡料、蛋料比价 |
-  | -------------------- | ---------------- | -------------- | -------------------- |
-  | 821                  | 706              | 707            | 708                  |`,
-};
+    const { data: currentResponse } = await got(currentUrl);
 
-async function handler(ctx) {
-    const { id = 'sytzgg' } = ctx.req.param();
-    const limit = ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit'), 10) : 30;
+    const $ = load(currentResponse);
 
-    const rootUrl = 'http://www.jgjcndrc.org.cn';
-    const currentUrl = new URL(`list.aspx?clmId=${id}`, rootUrl).href;
+    const language = $('html').prop('lang');
 
-    const { data: response } = await got(currentUrl);
+    const { data: response } = await got(apiColumnUrl, {
+        searchParams: {
+            pageNum: 1,
+            pageSize: limit,
+        },
+    });
 
-    const $ = load(response);
+    let items = response.data.slice(0, limit).map((item) => {
+        const guid = `jgjcndrc-${item.articleId}`;
 
-    let items = $('ul.list_02 li.li a[title]')
-        .slice(0, limit)
-        .toArray()
-        .map((item) => {
-            item = $(item);
-
-            return {
-                title: item.text(),
-                link: new URL(item.prop('href'), rootUrl).href,
-                pubDate: parseDate(item.prev().text()),
-            };
-        });
+        return {
+            title: item.articleTitle,
+            pubDate: parseDate(item.pubDate),
+            link: new URL(`prod-api/portal/article/${item.articleId}`, rootUrl).href,
+            guid,
+            id: guid,
+            language,
+        };
+    });
 
     items = await Promise.all(
         items.map((item) =>
             cache.tryGet(item.link, async () => {
                 const { data: detailResponse } = await got(item.link);
 
-                const content = load(detailResponse);
-
-                item.title = content('div.txt_title1').text();
-                item.description = content('div#zoom').html();
-                item.pubDate = parseDate(content('div.txt_subtitle1').text().trim());
+                const data = detailResponse.data;
+
+                const title = data.articleTitle;
+                const description = data.articleContent;
+                const guid = `jgjcndrc-${data.articleId}`;
+
+                item.title = title;
+                item.description = description;
+                item.pubDate = timezone(parseDate(data.pubDate), +8);
+                item.link = data.linkUrl || new URL(data.articleUrl, rootUrl).href;
+                item.category = data.parentColumns.map((c) => c.columnName);
+                item.guid = guid;
+                item.id = guid;
+                item.content = {
+                    html: description,
+                    text: description,
+                };
+                item.language = language;
 
                 return item;
             })
         )
     );
 
-    const author = $('title').text();
-    const subtitle = $('li.L').first().text();
-    const image = new URL($('img.logo2').prop('src'), rootUrl).href;
+    const image = new URL($('header img').last().prop('src'), rootUrl).href;
 
     return {
-        item: items,
-        title: `${author} - ${subtitle}`,
+        title: `${$('title').text()}${$('div.tit').text() ? ` - ${$('div.tit').text()}` : ''}`,
+        description: $('meta[name="description"]').prop('content'),
         link: currentUrl,
-        description: author,
-        language: $('html').prop('lang'),
+        item: items,
+        allowEmpty: true,
         image,
-        subtitle,
-        author,
+        author: $('header h1').text(),
+        language,
     };
-}
+};
+
+export const route: Route = {
+    path: '/jgjcndrc/:columnId?/:subColumnId?',
+    name: '中华人民共和国国家发展和改革委员会价格监测中心',
+    url: 'www.jgjcndrc.org.cn',
+    maintainers: ['nczitzk'],
+    handler,
+    example: '/gov/jgjcndrc/1832739866673426433',
+    parameters: {
+        columnId: '栏目 id，默认为 `1832739866673426433`，即通知公告，可在对应栏目页 URL 中找到',
+        subColumnId: '子栏目 id，默认为空，可在对应子栏目页 URL 中找到',
+    },
+    description: `:::tip
+  若订阅 [通知公告](https://www.jgjcndrc.org.cn/list?clmId=1832739866673426433)，网址为 \`https://www.jgjcndrc.org.cn/list?clmId=1832739866673426433\`。截取 \`clmId\` 的参数部分 \`1832739866673426433\` 作为参数填入，此时路由为 [\`/gov/jgjcndrc/1832739866673426433\`](https://rsshub.app/gov/jgjcndrc/1832739866673426433)。
+
+  若订阅 [国内外市场价格监测情况周报](https://www.jgjcndrc.org.cn/list?clmId=1832298113994649601&sclmId=1832751799531220993)，网址为 \`https://www.jgjcndrc.org.cn/list?clmId=1832298113994649601&sclmId=1832751799531220993\`。截取 \`clmId\` 和 \`sclmId\` 的参数部分 \`1832298113994649601\` 和 \`1832751799531220993\` 作为参数填入，此时路由为 [\`/gov/jgjcndrc/1832298113994649601/1832751799531220993\`](https://rsshub.app/gov/jgjcndrc/1832298113994649601/1832751799531220993)。
+  :::`,
+    categories: ['government'],
+
+    features: {
+        requireConfig: false,
+        requirePuppeteer: false,
+        antiCrawler: false,
+        supportRadar: true,
+        supportBT: false,
+        supportPodcast: false,
+        supportScihub: false,
+    },
+    radar: [
+        {
+            source: ['www.jgjcndrc.org.cn/list'],
+            target: (_, url) => {
+                url = new URL(url);
+                const columnId = url.searchParams.get('clmId');
+                const subColumnId = url.searchParams.get('sclmId');
+
+                return `/jgjcndrc${columnId ? `/${columnId}${subColumnId ? `/${subColumnId}` : ''}` : ''}`;
+            },
+        },
+    ],
+};

package/lib/routes/gov/moa/moa.ts

@@ -8,13 +8,13 @@ const hostUrl = 'http://www.moa.gov.cn/';
 const hostUrlObj = new URL(hostUrl); // 用于在下面判断 host
 
 export const route: Route = {
-    path: '/moa/:suburl{.+}',
+    path: '/moa/suburl/:suburl{.+}',
     categories: ['government'],
-    example: '/gov/moa/gk/zcjd/',
+    example: '/gov/moa/suburl/gk/zcjd/',
     radar: [
         {
             source: ['moa.gov.cn/'],
-            target: '/moa/:suburl',
+            target: '/moa/suburl/:suburl',
         },
     ],
     parameters: { suburl: '下级目录，请使用最下级的目录' },

package/lib/routes/gov/moa/szcpxx.ts

@@ -0,0 +1,115 @@
+import { Route } from '@/types';
+
+import cache from '@/utils/cache';
+import got from '@/utils/got';
+import { load } from 'cheerio';
+import timezone from '@/utils/timezone';
+import { parseDate } from '@/utils/parse-date';
+
+export const handler = async (ctx) => {
+    const limit = ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit'), 10) : 6;
+
+    const rootUrl = 'http://www.moa.gov.cn';
+    const currentUrl = new URL(`ztzl/szcpxx/zyzc/index.htm`, rootUrl).href;
+
+    const { data: response } = await got(currentUrl);
+
+    const $ = load(response);
+
+    const language = $('html').prop('lang');
+
+    let items = $('div.ztst_list_contBox_inner ul li')
+        .slice(0, limit)
+        .toArray()
+        .map((item) => {
+            item = $(item);
+
+            const a = item.find('a.content');
+
+            return {
+                title: a.prop('title'),
+                pubDate: parseDate(item.find('div.pubTime').text().split(/：/).pop(), 'YYYY.MM.DD'),
+                link: new URL(a.prop('href'), currentUrl).href,
+                language,
+            };
+        });
+
+    items = await Promise.all(
+        items.map((item) =>
+            cache.tryGet(item.link, async () => {
+                const { data: detailResponse } = await got(item.link);
+
+                const $$ = load(detailResponse);
+
+                const title = $$('h2.xxgk_title, h1.bjjMTitle').text();
+                const description = $$('div.gsj_htmlcon_bot, div.TRS_Editor').html();
+                const guid = `moa-${$$('meta[name="contentid"]').prop('content')}`;
+
+                item.title = title;
+                item.description = description;
+                item.pubDate = timezone(parseDate($$('meta[name="PubDate"]').prop('content')), +8);
+                item.category = [
+                    ...new Set([
+                        $$('meta[name="SiteName"]').prop('content'),
+                        $$('meta[name="ColumnName"]').prop('content'),
+                        $$('meta[name="ColumnType"]').prop('content'),
+                        $$('meta[name="ContentSource"]').prop('content'),
+                        $$('meta[name="Keywords"]').prop('content'),
+                    ]),
+                ].filter(Boolean);
+                item.author = $$('meta[name="Author"]').prop('content') || $$('meta[name="source"]').prop('content');
+                item.guid = guid;
+                item.id = guid;
+                item.content = {
+                    html: description,
+                    text: $$('div.gsj_htmlcon_bot, div.TRS_Editor').text(),
+                };
+                item.language = language;
+
+                return item;
+            })
+        )
+    );
+
+    const title = `${$('title').text()} - ${$('li.now').text()}`;
+    const image = new URL($('img.leftLogo').prop('src'), currentUrl).href;
+
+    return {
+        title,
+        description: title,
+        link: currentUrl,
+        item: items,
+        allowEmpty: true,
+        image,
+        author: '中华人民共和国农业农村部',
+        language,
+    };
+};
+
+export const route: Route = {
+    path: '/moa/szcpxx',
+    name: '中华人民共和国农业农村部生猪专题重要政策',
+    url: 'www.moa.gov.cn',
+    maintainers: ['nczitzk'],
+    handler,
+    example: '/gov/moa/szcpxx',
+    parameters: undefined,
+    description: undefined,
+    categories: ['government'],
+
+    features: {
+        requireConfig: false,
+        requirePuppeteer: false,
+        antiCrawler: false,
+        supportRadar: true,
+        supportBT: false,
+        supportPodcast: false,
+        supportScihub: false,
+    },
+    radar: [
+        {
+            source: ['www.moa.gov.cn/ztzl/szcpxx/zyzc/index.htm'],
+            target: '/moa/szcpxx',
+        },
+    ],
+};

package/lib/routes/gov/moa/zdscxx.ts

@@ -1,18 +1,12 @@
 import { Route } from '@/types';
+
 import cache from '@/utils/cache';
 import got from '@/utils/got';
 import { load } from 'cheerio';
 import { parseDate } from '@/utils/parse-date';
 
-export const route: Route = {
-    path: ['/moa/sjzxfb/:category{.+}?', '/moa/zdscxx/:category{.+}?'],
-    name: 'Unknown',
-    maintainers: [],
-    handler,
-};
-
-async function handler(ctx) {
-    const category = ctx.req.param('category');
+export const handler = async (ctx) => {
+    const { category } = ctx.req.param();
     const limit = ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit'), 10) : 5;
 
     const domain = 'moa.gov.cn';
@@ -36,7 +30,7 @@ async function handler(ctx) {
         });
 
         const filters = filterResponse.result.reduce((filters, f) => {
-            filters[f.name] = f.data.map((d) => d.name);
+            filters[f.name.trim()] = f.data.map((d) => d.name.trim());
             return filters;
         }, {});
 
@@ -92,20 +86,76 @@ async function handler(ctx) {
     const $ = load(frameResponse);
 
     const title = $('title').text();
-    const description = '数据';
-    const icon = new URL('favicon.ico', rootUrl).href;
 
     return {
-        item: items,
-        title: `${title} - ${description} - ${category}`,
+        title: `${title}${category ? ` - ${category}` : ''}`,
+        description: '数据',
         link: currentUrl,
-        description,
-        language: 'zh',
+        item: items,
+        allowEmpty: true,
         image: $('h1.logo a img').prop('src'),
-        icon,
-        logo: icon,
-        subtitle: category,
         author: title,
-        allowEmpty: true,
     };
-}
+};
+
+export const route: Route = {
+    path: '/moa/zdscxx/:category{.+}?',
+    name: '中华人民共和国农业农村部数据',
+    url: 'www.moa.gov.cn',
+    maintainers: ['nczitzk'],
+    handler,
+    example: '/gov/moa/zdscxx',
+    parameters: { category: '分类，默认为全部，见下表' },
+    description: `:::tip
+  若订阅 [中华人民共和国农业农村部数据](http://zdscxx.moa.gov.cn:8080/nyb/pc/messageList.jsp) 的 \`价格指数\` 报告主题。此时路由为 [\`/gov/moa/zdscxx/价格指数\`](https://rsshub.app/gov/moa/zdscxx/价格指数)。
+  
+  若订阅 \`央视网\` 报告来源 的 \`蔬菜生产\` 报告主题。此时路由为 [\`/gov/moa/zdscxx/央视网/蔬菜生产\`](https://rsshub.app/gov/moa/zdscxx/央视网/蔬菜生产)。
+  :::
+
+  | 价格指数 | 供需形势 | 分析报告周报 | 分析报告日报 | 日历信息 | 蔬菜生产 |
+  | -------- | -------- | ------------ | ------------ | -------- | -------- |
+    `,
+    categories: ['government'],
+
+    features: {
+        requireConfig: false,
+        requirePuppeteer: false,
+        antiCrawler: false,
+        supportRadar: true,
+        supportBT: false,
+        supportPodcast: false,
+        supportScihub: false,
+    },
+    radar: [
+        {
+            title: '价格指数',
+            source: ['zdscxx.moa.gov.cn:8080/nyb/pc/messageList.jsp'],
+            target: '/gov/moa/zdscxx/价格指数',
+        },
+        {
+            title: '供需形势',
+            source: ['zdscxx.moa.gov.cn:8080/nyb/pc/messageList.jsp'],
+            target: '/gov/moa/zdscxx/供需形势',
+        },
+        {
+            title: '分析报告周报',
+            source: ['zdscxx.moa.gov.cn:8080/nyb/pc/messageList.jsp'],
+            target: '/gov/moa/zdscxx/分析报告周报',
+        },
+        {
+            title: '分析报告日报',
+            source: ['zdscxx.moa.gov.cn:8080/nyb/pc/messageList.jsp'],
+            target: '/gov/moa/zdscxx/分析报告日报',
+        },
+        {
+            title: '日历信息',
+            source: ['zdscxx.moa.gov.cn:8080/nyb/pc/messageList.jsp'],
+            target: '/gov/moa/zdscxx/日历信息',
+        },
+        {
+            title: '蔬菜生产',
+            source: ['zdscxx.moa.gov.cn:8080/nyb/pc/messageList.jsp'],
+            target: '/gov/moa/zdscxx/蔬菜生产',
+        },
+    ],
+};

package/lib/routes/gov/ndrc/zfxxgk.ts

@@ -0,0 +1,106 @@
+import { Route } from '@/types';
+
+import cache from '@/utils/cache';
+import got from '@/utils/got';
+import { load } from 'cheerio';
+import { parseDate } from '@/utils/parse-date';
+
+export const handler = async (ctx) => {
+    const limit = ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit'), 10) : 15;
+
+    const rootUrl = 'https://zfxxgk.ndrc.gov.cn';
+    const currentUrl = new URL('web/dirlist.jsp', rootUrl).href;
+
+    const { data: response } = await got(currentUrl);
+
+    const $ = load(response);
+
+    const language = $('html').prop('lang');
+
+    $('th').parent().remove();
+
+    let items = $('div.zwxxkg-result tr')
+        .slice(0, limit)
+        .toArray()
+        .map((item) => {
+            item = $(item);
+
+            const a = item.find('a.xxgk_list1');
+
+            return {
+                title: a.text(),
+                pubDate: parseDate(item.find('td').last().text()),
+                link: new URL(a.prop('href'), currentUrl).href,
+                language,
+            };
+        });
+
+    items = await Promise.all(
+        items.map((item) =>
+            cache.tryGet(item.link, async () => {
+                const { data: detailResponse } = await got(item.link);
+
+                const $$ = load(detailResponse);
+
+                const title = $$('meta[name="ArticleTitle"]').prop('content');
+                const description = $$('div.zwgkdetail').html();
+
+                item.title = title;
+                item.description = description;
+                item.category = [...new Set([$$('meta[name="ContentSource"]').prop('content'), $$('meta[name="ColumnName"]').prop('content'), $$('meta[name="ColumnType"]').prop('content')])].filter(Boolean);
+                item.author = $$('meta[name="ContentSource"]').prop('content');
+                item.content = {
+                    html: description,
+                    text: $$('div.article').text(),
+                };
+                item.language = language;
+                item.enclosure_url = $$('table.enclosure a.xxgk_list1').length === 0 ? undefined : new URL($$('table.enclosure a.xxgk_list1').first().prop('href'), currentUrl).href;
+                item.enclosure_title = item.enclosure_url ? $$('table.enclosure a.xxgk_list1').first().text() : undefined;
+
+                return item;
+            })
+        )
+    );
+
+    const image = new URL($('div.zwgklogo img').prop('src'), currentUrl).href;
+
+    return {
+        title: `${$('meta[name="SiteName"]').prop('content')} - ${$('div.zwgktoptitle').text()}`,
+        description: $('meta[name="ColumnDescription"]').prop('content'),
+        link: currentUrl,
+        item: items,
+        allowEmpty: true,
+        image,
+        author: $('meta[name="SiteName"]').prop('content'),
+        language,
+    };
+};
+
+export const route: Route = {
+    path: ['/ndrc/zfxxgk'],
+    // path: ['/ndrc/zfxxgk', '/ndrc/zfxxgk/iteminfo'],
+    name: '中华人民共和国国家发展和改革委员会政府信息公开',
+    url: 'zfxxgk.ndrc.gov.cn',
+    maintainers: ['howfool', 'nczitzk'],
+    handler,
+    example: '/gov/ndrc/zfxxgk',
+    parameters: undefined,
+    description: undefined,
+    categories: ['government'],
+
+    features: {
+        requireConfig: false,
+        requirePuppeteer: false,
+        antiCrawler: false,
+        supportRadar: true,
+        supportBT: false,
+        supportPodcast: false,
+        supportScihub: false,
+    },
+    radar: [
+        {
+            source: ['zfxxgk.ndrc.gov.cn/web/dirlist.jsp'],
+            target: '/ndrc/zfxxgk',
+        },
+    ],
+};

package/lib/routes/gov/pudong/zwgk.ts

@@ -0,0 +1,65 @@
+import { Route } from '@/types';
+import ofetch from '@/utils/ofetch';
+import { load } from 'cheerio';
+import { parseDate } from '@/utils/parse-date'; // 解析日期的工具函数
+import cache from '@/utils/cache';
+
+export const route: Route = {
+    path: '/pudong/zwgk',
+    categories: ['government'],
+    example: '/gov/pudong/zwgk',
+    features: {
+        requireConfig: false,
+        requirePuppeteer: false,
+        antiCrawler: false,
+        supportBT: false,
+        supportPodcast: false,
+        supportScihub: false,
+    },
+    radar: [
+        {
+            source: ['www.pudong.gov.cn/zwgk/zxxxgk/index.html'],
+            target: '/pudong/zwgk',
+        },
+    ],
+    name: '政务公开-浦东新区',
+    maintainers: ['himingway'],
+    handler,
+};
+
+async function handler() {
+    const response = await ofetch('https://www.pudong.gov.cn/zwgk-search-front/api/data/affair', {
+        method: 'POST',
+        body: {
+            channelList: ['5144'],
+            pageSize: 20,
+        },
+    });
+    const data = response.data.list;
+
+    const list = data.map((item) => ({
+        title: item.title,
+        link: item.url,
+        pubDate: parseDate(item.display_date),
+    }));
+
+    const items = await Promise.all(
+        list.map((item) =>
+            cache.tryGet(item.link, async () => {
+                const response = await ofetch(item.link);
+                const $ = load(response);
+                item.description = $('#ivs_content').first().html();
+                return item;
+            })
+        )
+    );
+
+    return {
+        // 源标题
+        title: '信息公开_政务公开-上海市浦东新区门户网站',
+        // 源链接
+        link: 'https://www.pudong.gov.cn/zwgk/zxxxgk/index.html',
+        // 源文章
+        item: items,
+    };
+}

package/lib/routes/gov/zj/search.ts

@@ -1,9 +1,8 @@
-import { Route } from '@/types';
+import { Route, DataItem } from '@/types';
 import { parseDate } from '@/utils/parse-date';
 import got from '@/utils/got';
 import { load } from 'cheerio';
 import dayjs from 'dayjs';
-
 export const route: Route = {
     path: '/zj/search/:websiteid?/:word/:cateid?',
     categories: ['government'],
@@ -24,18 +23,18 @@ export const route: Route = {
     url: 'search.zj.gov.cn/jsearchfront/search.do',
     maintainers: ['HaoyuLee'],
     description: `
-        | 行政区域         | websiteid |
-        | ------------ | -- |
-        | 宁波市本级     | 330201000000000  |
+| 行政区域         | websiteid |
+| ------------ | -- |
+| 宁波市本级     | 330201000000000  |
 
-        | 搜索关键词         | word    |
+| 搜索关键词         | word    |
 
-        | 信息分类         | cateid    |
+| 信息分类         | cateid    |
 
-        | 排序类型         | sortType    |
-        | ------------ | -- |
-        | 按相关度     | 1  |
-        | 按时间     | 2  |
+| 排序类型         | sortType    |
+| ------------ | -- |
+| 按相关度     | 1  |
+| 按时间     | 2  |
     `,
     async handler(ctx) {
         const { websiteid = '330201000000000', word = '人才', cateid = 658, sortType = 2 } = ctx.req.param();
@@ -71,10 +70,16 @@ export const route: Route = {
                     description: $('.newsDescribe>a').text() || '',
                 };
             }) || [];
+        const res = {};
+        for (const current of items) {
+            if (!res[current.link]) {
+                res[current.link] = current;
+            }
+        }
         return {
             title: '浙江省人民政府-全省政府网站统一搜索',
             link: 'https://search.zj.gov.cn/jsearchfront/search.do',
-            item: items,
+            item: Object.entries(res).map(([, value]) => value) as DataItem[],
         };
     },
 };