rsshub 1.0.0-master.fe69819 → 1.0.0-master.febd623

package/lib/v2/gov/radar.js

@@ -1,4 +1,21 @@
 module.exports = {
+    'ah.gov.cn': {
+        _name: '安徽省科技厅',
+        kjt: [
+            {
+                title: '科技资讯',
+                docs: 'https://docs.rsshub.app/government.html#an-hui-sheng-ke-ji-ting-ke-ji-zi-xun',
+                source: ['/*'],
+                target: (params, url) => `/gov/anhui/kjt${new URL(url).href.match(/kjt\.ah\.gov\.cn(.*)\/index.html/)[1] ?? ''}`,
+            },
+            {
+                title: '科技资源',
+                docs: 'https://docs.rsshub.app/government.html#an-hui-sheng-ke-ji-ting-ke-ji-zi-yuan',
+                source: ['/*'],
+                target: (params, url) => `/gov/anhui/kjt${new URL(url).href.match(/kjt\.ah\.gov\.cn(.*)\/index.html/)[1] ?? ''}`,
+            },
+        ],
+    },
     'beijing.gov.cn': {
         _name: '北京市人民政府',
         kw: [
@@ -272,61 +289,71 @@ module.exports = {
             },
         ],
     },
-    'hrss.sz.gov.cn': {
-        _name: '深圳考试院',
-        '.': [
+    'customs.gov.cn': {
+        _name: '中华人民共和国海关总署',
+        www: [
             {
-                title: '公告',
-                docs: 'https://docs.rsshub.app/government.html#guang-dong-sheng-ren-min-zheng-fu-shen-zhen-shi-wei-zu-zhi-bu',
-                source: ['/*'],
-                target: '/gov/shenzhen/hrss/szksy/:caty/:page?',
+                title: '拍卖信息 / 海关法规',
+                docs: 'https://docs.rsshub.app/government.html#zhong-hua-ren-min-gong-he-guo-hai-guan-zong-shu',
+                source: ['/'],
+                target: '/gov/customs/list',
             },
         ],
     },
-    'zzb.sz.gov.cn': {
-        _name: '深圳组工在线',
-        www: [
+    'deyang.gov.cn': {
+        _name: '德阳市人民政府',
+        '.': [
             {
-                title: '公告',
-                docs: 'https://docs.rsshub.app/government.html#guang-dong-sheng-ren-min-zheng-fu-shen-zhen-shi-kao-shi-yuan',
+                title: '德阳市政府公开信息',
+                docs: 'https://docs.rsshub.app/government.html#de-yang-shi-fu-ren-min-zheng-zheng-fu',
                 source: ['/*'],
-                target: '/gov/shenzhen/zzb/:caty/:page?',
+                target: '/sichuan/deyang/govpulicinfo/:countyName',
             },
         ],
     },
-    'sh.gov.cn': {
-        _name: '上海市人民政府',
-        wsjkw: [
+    'hebei.gov.cn': {
+        _name: '河北省人民政府',
+        czt: [
             {
-                title: '上海卫健委 疫情通报',
-                docs: 'https://docs.rsshub.app/other.html#xin-guan-fei-yan-yi-qing-xin-wen-dong-tai-yi-qing-tong-bao-shang-hai-wei-jian-wei',
-                source: ['/'],
-                target: '/gov/shanghai/wsjkw/yqtb',
+                title: '河北省财政厅 - 财政动态',
+                docs: 'https://docs.rsshub.app/government.html#he-bei-sheng-cai-zheng-ting-cai-zheng-dong-tai',
+                source: ['/xwdt/:category'],
+                target: (params) => {
+                    if (params.category === 'gzdt') {
+                        return '/gov/hebei/czt/xwdt/:category';
+                    }
+                },
             },
-        ],
-        rsj: [
             {
-                title: '上海市职业能力考试院 考试项目',
-                docs: 'https://docs.rsshub.app/government.html#shang-hai-shi-zhi-ye-neng-li-kao-shi-yuan-kao-shi-xiang-mu',
-                source: ['/'],
-                target: '/gov/shanghai/rsj/ksxm',
+                title: '河北省财政厅 - 综合新闻',
+                docs: 'https://docs.rsshub.app/government.html#he-bei-sheng-cai-zheng-ting-zong-he-xin-wen',
+                source: ['/xwdt/:category'],
+                target: (params) => {
+                    if (params.category === 'zhxw') {
+                        return '/gov/hebei/czt/xwdt/:category';
+                    }
+                },
             },
-        ],
-    },
-    'tqyb.com.cn': {
-        _name: '广州天气',
-        www: [
             {
-                title: '突发性天气提示',
-                docs: 'https://docs.rsshub.app/government.html#guang-zhou-tian-qi-tu-fa-xing-tian-qi-ti-shi',
-                source: ['/gz/weatherAlarm/suddenWeather/'],
-                target: '/gov/guangdong/tqyb/tfxtq',
+                title: '河北省财政厅 - 通知公告',
+                docs: 'https://docs.rsshub.app/government.html#he-bei-sheng-cai-zheng-ting-tong-zhi-gong-gao',
+                source: ['/xwdt/:category'],
+                target: (params) => {
+                    if (params.category === 'tzgg') {
+                        return '/gov/hebei/czt/xwdt/:category';
+                    }
+                },
             },
+        ],
+    },
+    'homeaffairs.gov.au': {
+        _name: 'Department of Home Affairs',
+        immi: [
             {
-                title: '广东省内城市预警信号',
-                docs: 'https://docs.rsshub.app/government.html#guang-zhou-tian-qi-guang-dong-sheng-nei-cheng-shi-yu-jing-xin-hao',
-                source: ['/gz/weatherAlarm/otherCity/'],
-                target: '/gov/guangdong/tqyb/sncsyjxh',
+                title: 'Immigration and Citizenship',
+                docs: 'https://docs.rsshub.app/en/government.html#Australia-Department-of-Home-Affairs',
+                source: '/news-media/archive',
+                target: () => '/gov/immiau/news',
             },
         ],
     },
@@ -365,14 +392,148 @@ module.exports = {
             },
         ],
     },
-    'deyang.gov.cn': {
-        _name: '德阳市人民政府',
+    'mee.gov.cn': {
+        _name: '生态环境部',
+        www: [
+            {
+                title: '要闻动态',
+                docs: 'https://docs.rsshub.app/government.html#zhong-hua-ren-min-gong-he-guo-sheng-tai-huan-jing-bu',
+                source: ['/ywdt/:category'],
+                target: '/gov/mee/ywdt/:category',
+            },
+        ],
+    },
+    'mfa.gov.cn': {
+        _name: '中华人民共和国外交部',
+        www: [
+            {
+                title: '外交动态',
+                docs: 'https://docs.rsshub.app/government.html#zhong-hua-ren-min-gong-he-guo-wai-jiao-bu-wai-jiao-dong-tai',
+                source: ['/web/wjdt_674879/:category'],
+                target: (params) => `/gov/mfa/wjdt/${params.category.split('_')[0]}`,
+            },
+        ],
+    },
+    'miit.gov.cn': {
+        _name: '工业和信息化部',
         '.': [
             {
-                title: '德阳市政府公开信息',
-                docs: 'https://docs.rsshub.app/government.html#de-yang-shi-fu-ren-min-zheng-zheng-fu',
+                title: '部门 文件发布',
+                docs: 'https://docs.rsshub.app/government.html#zhong-guo-gong-ye-he-xin-xi-hua-bu',
+                source: ['/jgsj/:ministry/wjfb/index.html'],
+                target: '/miit/wjfb/:ministry',
+            },
+            {
+                title: '征集意见',
+                docs: 'https://docs.rsshub.app/government.html#zhong-guo-gong-ye-he-xin-xi-hua-bu',
+                source: ['/gzcy/yjzj/index.html'],
+                target: '/miit/yjzj',
+            },
+        ],
+    },
+    'moe.gov.cn': {
+        _name: '中华人民共和国教育部',
+        '.': [
+            {
+                title: '新闻',
+                docs: 'https://docs.rsshub.app/government.html#zhong-hua-ren-min-gong-he-guo-jiao-yu-bu',
+                source: ['/'],
+                target: '/gov/moe/newest_file',
+            },
+        ],
+    },
+    'nrta.gov.cn': {
+        _name: '国家广播电视总局',
+        '.': [
+            {
+                title: '分类',
+                docs: 'https://docs.rsshub.app/government.html#nrta-gov',
+                source: ['/col/*category'],
+                target: (params) => `/gov/nrta/news/${params.category.replace('col', '').replace('/index.html', '')}`,
+            },
+        ],
+    },
+    'pbc.gov.cn': {
+        _name: '中国人民银行',
+        '.': [
+            {
+                title: '沟通交流',
+                docs: 'https://docs.rsshub.app/finance.html#zhong-guo-ren-min-yin-xing',
+                source: ['/goutongjiaoliu/113456/113469/index.html'],
+                target: '/gov/pbc/goutongjiaoliu',
+            },
+            {
+                title: '货币政策司公开市场交易公告',
+                docs: 'https://docs.rsshub.app/finance.html#zhong-guo-ren-min-yin-xing',
+                source: ['/zhengcehuobisi/125207/125213/125431/125475/index.html'],
+                target: '/gov/pbc/zhengcehuobisi',
+            },
+            {
+                title: '政策研究',
+                docs: 'https://docs.rsshub.app/finance.html#zhong-guo-ren-min-yin-xing',
+                source: ['/redianzhuanti/118742/4122386/4122510/index.html'],
+                target: '/gov/pbc/zcyj',
+            },
+            {
+                title: '工作论文',
+                docs: 'https://docs.rsshub.app/finance.html#zhong-guo-ren-min-yin-xing',
+                source: ['/redianzhuanti/118742/4122386/4122692/index.html'],
+                target: '/gov/pbc/gzlw',
+            },
+        ],
+    },
+    'sh.gov.cn': {
+        _name: '上海市人民政府',
+        wsjkw: [
+            {
+                title: '上海卫健委 疫情通报',
+                docs: 'https://docs.rsshub.app/other.html#xin-guan-fei-yan-yi-qing-xin-wen-dong-tai-yi-qing-tong-bao-shang-hai-wei-jian-wei',
+                source: ['/'],
+                target: '/gov/shanghai/wsjkw/yqtb',
+            },
+        ],
+        rsj: [
+            {
+                title: '上海市职业能力考试院 考试项目',
+                docs: 'https://docs.rsshub.app/government.html#shang-hai-shi-zhi-ye-neng-li-kao-shi-yuan-kao-shi-xiang-mu',
+                source: ['/'],
+                target: '/gov/shanghai/rsj/ksxm',
+            },
+        ],
+    },
+    'sz.gov.cn': {
+        _name: '深圳政府在线移动门户',
+        hrss: [
+            {
+                title: '考试院公告',
+                docs: 'https://docs.rsshub.app/government.html#guang-dong-sheng-ren-min-zheng-fu-shen-zhen-shi-wei-zu-zhi-bu',
+                source: ['/*'],
+                target: '/gov/shenzhen/hrss/szksy/:caty/:page?',
+            },
+        ],
+        zzb: [
+            {
+                title: '组工在线公告',
+                docs: 'https://docs.rsshub.app/government.html#guang-dong-sheng-ren-min-zheng-fu-shen-zhen-shi-kao-shi-yuan',
                 source: ['/*'],
-                target: '/sichuan/deyang/govpulicinfo/:countyName/:institutionName?',
+                target: '/gov/shenzhen/zzb/:caty/:page?',
+            },
+        ],
+    },
+    'tqyb.com.cn': {
+        _name: '广州天气',
+        www: [
+            {
+                title: '突发性天气提示',
+                docs: 'https://docs.rsshub.app/government.html#guang-zhou-tian-qi-tu-fa-xing-tian-qi-ti-shi',
+                source: ['/gz/weatherAlarm/suddenWeather/'],
+                target: '/gov/guangdong/tqyb/tfxtq',
+            },
+            {
+                title: '广东省内城市预警信号',
+                docs: 'https://docs.rsshub.app/government.html#guang-zhou-tian-qi-guang-dong-sheng-nei-cheng-shi-yu-jing-xin-hao',
+                source: ['/gz/weatherAlarm/otherCity/'],
+                target: '/gov/guangdong/tqyb/sncsyjxh',
             },
         ],
     },

package/lib/v2/gov/router.js

@@ -1,5 +1,25 @@
 module.exports = function (router) {
+    // ministry
+    router.get('/customs/list/:gchannel?', require('./customs/list'));
+    router.get('/fmprc/:category?', require('./mfa/wjdt'));
+    router.get('/immiau/news', require('./immiau/news'));
+    router.get('/mee/ywdt/:category?', require('./mee/ywdt'));
+    router.get('/mfa/wjdt/:category?', require('./mfa/wjdt'));
+    router.get('/miit/wjfb/:ministry', require('./miit/wjfb'));
+    router.get('/miit/yjzj', require('./miit/yjzj'));
+    router.get('/miit/zcwj', require('./miit/zcwj'));
+    router.get('/miit/wjgs', require('./miit/wjgs'));
+    router.get('/miit/zcjd', require('./miit/zcjd'));
+    router.get('/moe/:type', require('./moe/moe'));
+    router.get('/nrta/news/:category?', require('./nrta/news'));
+    router.get('/pbc/goutongjiaoliu', require('./pbc/goutongjiaoliu'));
+    router.get('/pbc/gzlw', require('./pbc/gzlw'));
+    router.get('/pbc/tradeAnnouncement', require('./pbc/tradeAnnouncement'));
+    router.get('/pbc/zcyj', require('./pbc/zcyj'));
+    // province
+    router.get(/anhui\/kjt\/([\w\d/-]+)?/, require('./anhui/kjt'));
     router.get('/beijing/kw/:channel', require('./beijing/kw/index'));
+    router.get('/hebei/czt/xwdt/:category?', require('./hebei/czt'));
     router.get('/shenzhen/hrss/szksy/:caty/:page?', require('./shenzhen/hrss/szksy/index'));
     router.get('/shenzhen/zzb/:caty/:page?', require('./shenzhen/zzb/index'));
     router.get('/shanghai/rsj/ksxm', require('./shanghai/rsj/ksxm'));
@@ -7,5 +27,5 @@ module.exports = function (router) {
     router.get('/guangdong/tqyb/tfxtq', require('./guangdong/tqyb/tfxtq'));
     router.get('/guangdong/tqyb/sncsyjxh', require('./guangdong/tqyb/sncsyjxh'));
     router.get('/huizhou/zwgk/:category?', require('./huizhou/zwgk/index'));
-    router.get('/sichuan/deyang/govpulicinfo/:countyName/:institutionName?', require('./sichuan/deyang/govpulicinfo'));
+    router.get('/sichuan/deyang/govpulicinfo/:countyName', require('./sichuan/deyang/govpulicinfo'));
 };

package/lib/v2/gov/sichuan/deyang/govpulicinfo.js

@@ -4,111 +4,91 @@ const { parseDate } = require('@/utils/parse-date');
 const { art } = require('@/utils/render');
 const path = require('path');
 
-const rootUrl = 'http://xxgk.deyang.gov.cn/xxgkml2020';
-
-// 地区名称对照表
-const nameDict = {
-    德阳市: 'dys',
-    绵竹市: 'mzs',
-    什邡市: 'sfs',
-    旌阳区: 'jyq',
-    罗江区: 'ljx',
-    广汉市: 'ghs',
-    中江县: 'zjx',
-    高新区: 'gxq',
+// 各地区url信息
+const basicInfoDict = {
+    绵竹市: {
+        rootUrl: 'https://www.mz.gov.cn',
+        infoUrl: 'https://www.mz.gov.cn/info/iList.jsp?tm_id=1805&cur_page=',
+    },
 };
 
-const getInstitutionId = async (ctx, county) => {
-    const url = `${rootUrl}/ptlj.jsp?regionName=${county}`;
-
-    return await ctx.cache.tryGet(`${county}InstitutionId`, async () => {
-        const response = await got.get(url);
+const getInfoUrlList = async (countyName) => {
+    const url = basicInfoDict[countyName].infoUrl;
+    const infoUrlList = [];
+    const expectToday = new Date();
+    for (let pageNum = 1; ; pageNum++) {
+        let response;
+        try {
+            // eslint-disable-next-line no-await-in-loop
+            response = await got(`${url}${pageNum}`);
+        } catch (err) {
+            // eslint-disable-next-line no-await-in-loop
+            response = await got(`${url}${pageNum}`, { dnsLookupIpVersion: 'ipv6' });
+        }
         const $ = cheerio.load(response.data);
-        const dataList = $('#details_content > div > div > div > div:nth-child(4) > ul > li > a');
-        const _tmp = {};
-        for (let i = 0; i < dataList.length; i++) {
-            _tmp[$(dataList[i]).html()] = parseInt($(dataList[i]).attr('href').split('deptId=')[1]);
+        const infoList = $('#list_content > ul > li');
+        // 判断当前页是否有数据
+        if (infoList.length !== 0) {
+            for (let infoIdx = 0; infoIdx < infoList.length; infoIdx++) {
+                const date = parseDate($('span', infoList[infoIdx]).html());
+                // 判断当前信息日期是否是今日
+                if (date.getUTCFullYear() === expectToday.getUTCFullYear() && date.getUTCMonth() === expectToday.getUTCMonth() && date.getUTCDate() === expectToday.getUTCDate() - 1) {
+                    infoUrlList.push(`${basicInfoDict[countyName].rootUrl}${$('a', infoList[infoIdx]).attr('href')}`);
+                } else {
+                    return infoUrlList;
+                }
+            }
+        } else {
+            return infoUrlList;
         }
-        return _tmp;
-    });
-};
-
-const getInfoUrlList = async (county, institutionId) => {
-    const url = `${rootUrl}/gklist_iframe.jsp?deptId=${institutionId}&regionName=${county}&pageSize=15`;
-    const response = await got.get(url);
-    const $ = cheerio.load(response.data);
-    const pageNum = parseInt($('#list_content > div > span:nth-child(3)').html().match(/\d*/g)[1]);
-    const pageUrlList = [];
-
-    // 此处建议限制最大pageNum,最大5页,单页15条
-    for (let i = 1; i <= Math.min(pageNum, 5); i++) {
-        pageUrlList.push(`${rootUrl}/gklist_iframe.jsp?deptId=${institutionId}&regionName=${county}&pageSize=15$pageIndex=${i}`);
-    }
-    const _tmpList = await Promise.all(
-        pageUrlList.map(async (url) => {
-            const response = await got.get(url);
-            const $ = cheerio.load(response.data);
-            const InfoList = $('#list_content > ul > li > a');
-            return InfoList.map((item) => `${rootUrl}/${$(InfoList[item]).attr('href')}`);
-        })
-    );
-    let infoUrlList = [];
-    for (let i = 0; i < _tmpList.length; i++) {
-        infoUrlList = infoUrlList.concat(_tmpList[i].toArray());
     }
-    return infoUrlList;
 };
 
-const getInfoContent = async (ctx, url) => {
-    const infoId = url.split('id=')[1].split('&type')[0];
-    return await ctx.cache.tryGet(`govPublicInfo${infoId}`, async () => {
-        const response = await got.get(url);
+// 获取信息正文内容
+const getInfoContent = async (ctx, url, countyName) =>
+    await ctx.cache.tryGet(url, async () => {
+        let response;
+        try {
+            response = await got(url);
+        } catch (err) {
+            response = await got(url, { dnsLookupIpVersion: 'ipv6' });
+        }
         const $ = cheerio.load(response.data);
-        const fileNodes = $('#symbol > div:nth-child(3) > div > a');
+        const fileNodes = $('#symbol > div:nth-child(4) > div > span > a');
         const fileList = [];
         for (let i = 0; i < fileNodes.length; i++) {
             fileList.push({
                 name: $(fileNodes[i]).text(),
-                url: `${rootUrl}/${$(fileNodes[i]).attr('href')}`,
+                url: `${basicInfoDict[countyName].rootUrl}/${$(fileNodes[i]).attr('href')}`,
             });
         }
-        const rawDate = $('#symbol > div:nth-child(1) > div:nth-child(3)').text().split('\n')[1].trim();
+        const rawDate = $('#symbol > div:nth-child(1) > div:nth-child(3)').text().split('：')[1].trim();
         return {
-            title: $('#headline').text(),
-            id: infoId,
-            infoNum: $('#symbol > div:nth-child(1) > div:nth-child(2) > span').text().split('\n')[1].trim(),
+            title: $('#main').text().trim(),
+            id: $('#symbol > div:nth-child(1) > div:nth-child(1)').text().split('：')[1].trim(),
+            infoNum: $('#symbol > div:nth-child(1) > div:nth-child(2) > span').text().split('：')[1].trim(),
             pubDate: parseDate(rawDate),
             date: rawDate,
-            keyWord: $('#symbol > div:nth-child(2) > div:nth-child(1)').text().slice(8),
-            source: $('#symbol > div:nth-child(2) > div:nth-child(3)').text().slice(5),
-            content: $('#details_content > div.content').html(),
+            keyWord: $('#symbol > div:nth-child(2) > div:nth-child(3)').text().split('：')[1].trim(),
+            source: $('#symbol > div:nth-child(2) > div:nth-child(2)').text().split('：')[1].trim(),
+            content: $('#container > div.ewb-white > div.ewb-article-detail').html(),
             file: fileList,
             link: url,
         };
     });
-};
 
 module.exports = async (ctx) => {
     const countyName = ctx.params.countyName;
-    const county = nameDict[countyName];
-    const institutionName = ctx.params.institutionName || '';
-    let institutionId = 0;
-    if (institutionName) {
-        const institutionDict = await getInstitutionId(ctx, county);
-        institutionId = institutionDict[institutionName];
-    }
-
-    const infoUrlList = await getInfoUrlList(county, institutionId);
-    const items = await Promise.all(infoUrlList.map(async (item) => await getInfoContent(ctx, item)));
+    const infoUrlList = await getInfoUrlList(countyName);
+    const items = await Promise.all(infoUrlList.map(async (item) => await getInfoContent(ctx, item, countyName)));
 
     ctx.state.data = {
-        title: `政府公开信息 - ${countyName} ${institutionName}`,
-        link: `${rootUrl}/gklist_iframe.jsp?deptId=${institutionId}&regionName=${county}`,
+        title: `政府公开信息 - ${countyName}`,
+        link: basicInfoDict[countyName].infoUrl,
         item: items.map((item) => ({
             title: item.title,
             description: art(path.resolve(__dirname, './templates/govPublicInfo.art'), { item }),
             link: item.link,
-            guid: item.id,
             pubDate: item.pubDate,
         })),
     };

package/lib/v2/gov/sichuan/deyang/templates/govPublicInfo.art

@@ -33,6 +33,7 @@
     </tbody>
 </table>
 
+<hr/>
 <div>
     {{@ item.content}}
 </div>

package/lib/v2/guancha/headline.js

@@ -0,0 +1,51 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+const timezone = require('@/utils/timezone');
+const { parseDate } = require('@/utils/parse-date');
+
+module.exports = async (ctx) => {
+    const rootUrl = 'https://www.guancha.cn';
+    const currentUrl = `${rootUrl}/GuanChaZheTouTiao/list_1.shtml`;
+
+    const response = await got({
+        method: 'get',
+        url: currentUrl,
+    });
+
+    const $ = cheerio.load(response.data);
+
+    let items = $('.headline-list li .content-headline h3 a')
+        .toArray()
+        .map((item) => {
+            item = $(item);
+            return {
+                title: item.text(),
+                description: item.parent().next().html(),
+                link: `${rootUrl}${item.attr('href').replace(/\.shtml$/, '_s.shtml')}`,
+                pubDate: timezone(parseDate(item.parents('div').first().find('span').text()), +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('.all-txt').html();
+
+                return item;
+            })
+        )
+    );
+
+    ctx.state.data = {
+        title: '观察者网 - 头条',
+        link: currentUrl,
+        item: items,
+    };
+};