rsshub 1.0.0-master.f7cdf8b → 1.0.0-master.f7f8b7a
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +3 -3
- package/lib/config.js +21 -8
- package/lib/middleware/cache/index.js +4 -3
- package/lib/middleware/cache/redis.js +3 -3
- package/lib/middleware/onerror.js +8 -0
- package/lib/middleware/template.js +79 -85
- package/lib/router.js +7 -7
- package/lib/routes/index.js +6 -13
- package/lib/utils/common-utils.js +2 -6
- package/lib/utils/render.js +2 -0
- package/lib/v2/1point3acres/maintainer.js +2 -2
- package/lib/v2/95mm/utils.js +3 -2
- package/lib/v2/aliyun/notice.js +1 -1
- package/lib/v2/amazon/maintainer.js +1 -1
- package/lib/v2/apnews/topics.js +1 -1
- package/lib/v2/arcteryx/maintainer.js +3 -3
- package/lib/v2/bangumi/maintainer.js +1 -0
- package/lib/v2/bangumi/radar.js +6 -0
- package/lib/v2/bangumi/router.js +1 -0
- package/lib/v2/bangumi/tv/user/wish.js +38 -0
- package/lib/v2/bellroy/maintainer.js +1 -1
- package/lib/v2/bilibili/cache.js +10 -7
- package/lib/v2/bilibili/maintainer.js +1 -0
- package/lib/v2/bilibili/platform.js +43 -0
- package/lib/v2/bilibili/radar.js +8 -0
- package/lib/v2/bilibili/router.js +1 -0
- package/lib/v2/bilibili/video.js +8 -1
- package/lib/v2/bossdesign/index.js +41 -0
- package/lib/v2/bossdesign/maintainer.js +3 -0
- package/lib/v2/bossdesign/radar.js +13 -0
- package/lib/v2/bossdesign/router.js +3 -0
- package/lib/v2/brave/latest.js +4 -2
- package/lib/v2/buaa/maintainer.js +4 -0
- package/lib/v2/buaa/news/index.js +46 -0
- package/lib/v2/buaa/radar.js +21 -0
- package/lib/v2/buaa/router.js +4 -0
- package/lib/v2/buaa/sme.js +59 -0
- package/lib/v2/cfachina/analygarden.js +60 -0
- package/lib/v2/cfachina/maintainer.js +3 -0
- package/lib/v2/cfachina/radar.js +13 -0
- package/lib/v2/cfachina/router.js +3 -0
- package/lib/v2/cna/maintainer.js +1 -0
- package/lib/v2/cna/radar.js +6 -0
- package/lib/v2/cna/router.js +1 -0
- package/lib/v2/cna/web/index.js +62 -0
- package/lib/v2/cste/radar.js +1 -1
- package/lib/v2/dahecube/radar.js +40 -4
- package/lib/v2/dongqiudi/utils.js +1 -1
- package/lib/v2/douban/maintainer.js +1 -0
- package/lib/v2/douban/other/discussion.js +58 -0
- package/lib/v2/douban/radar.js +8 -0
- package/lib/v2/douban/router.js +1 -0
- package/lib/v2/dut/defaults.js +4 -0
- package/lib/v2/dut/index.js +21 -9
- package/lib/v2/dut/maintainer.js +8 -7
- package/lib/v2/dut/radar.js +37 -29
- package/lib/v2/dut/shortcuts.js +5 -0
- package/lib/v2/egsea/flash.js +30 -0
- package/lib/v2/egsea/maintainer.js +3 -0
- package/lib/v2/egsea/radar.js +13 -0
- package/lib/v2/egsea/router.js +3 -0
- package/lib/v2/fisher-spb/news.js +1 -2
- package/lib/v2/fosshub/radar.js +1 -1
- package/lib/v2/fxiaoke/crm.js +63 -0
- package/lib/v2/fxiaoke/maintainer.js +3 -0
- package/lib/v2/fxiaoke/radar.js +37 -0
- package/lib/v2/fxiaoke/router.js +3 -0
- package/lib/v2/gdsrx/index.js +72 -0
- package/lib/v2/gdsrx/maintainer.js +3 -0
- package/lib/v2/gdsrx/radar.js +61 -0
- package/lib/v2/gdsrx/router.js +3 -0
- package/lib/v2/gogoanimehd/radar.js +1 -1
- package/lib/v2/gogoanimehd/recent-releases.js +1 -1
- package/lib/v2/google/alerts.js +33 -0
- package/lib/v2/google/maintainer.js +1 -0
- package/lib/v2/google/router.js +1 -0
- package/lib/v2/gov/maintainer.js +9 -2
- package/lib/v2/gov/moa/zdscxx.js +104 -0
- package/lib/v2/gov/mot/index.js +66 -0
- package/lib/v2/gov/nea/ghs.js +58 -0
- package/lib/v2/gov/nifdc/index.js +40 -33
- package/lib/v2/gov/radar.js +232 -4
- package/lib/v2/gov/router.js +10 -2
- package/lib/v2/gov/safe/business.js +8 -0
- package/lib/v2/gov/safe/complaint.js +8 -0
- package/lib/v2/gov/safe/templates/message.art +25 -0
- package/lib/v2/gov/safe/util.js +87 -0
- package/lib/v2/gov/zhengce/index.js +99 -0
- package/lib/v2/greasyfork/maintainer.js +1 -0
- package/lib/v2/greasyfork/router.js +1 -0
- package/lib/v2/greasyfork/scripts.js +25 -20
- package/lib/{routes/universities → v2}/harvard/health/blog.js +8 -7
- package/lib/v2/harvard/maintainer.js +3 -0
- package/lib/v2/harvard/radar.js +13 -0
- package/lib/v2/harvard/router.js +3 -0
- package/lib/v2/huxiu/briefColumn.js +13 -25
- package/lib/v2/huxiu/channel.js +28 -0
- package/lib/v2/huxiu/club.js +30 -0
- package/lib/v2/huxiu/collection.js +14 -26
- package/lib/v2/huxiu/maintainer.js +8 -5
- package/lib/v2/huxiu/member.js +27 -0
- package/lib/v2/huxiu/moment.js +11 -25
- package/lib/v2/huxiu/radar.js +24 -16
- package/lib/v2/huxiu/router.js +7 -4
- package/lib/v2/huxiu/search.js +16 -21
- package/lib/v2/huxiu/tag.js +13 -25
- package/lib/v2/huxiu/templates/description.art +46 -0
- package/lib/v2/huxiu/util.js +460 -0
- package/lib/v2/ifi-audio/maintainer.js +1 -1
- package/lib/v2/imiker/jinghua.js +87 -0
- package/lib/v2/imiker/maintainer.js +3 -0
- package/lib/v2/imiker/radar.js +13 -0
- package/lib/v2/imiker/router.js +3 -0
- package/lib/v2/imiker/templates/description.art +32 -0
- package/lib/v2/inoreader/maintainer.js +1 -1
- package/lib/v2/instagram/common-utils.js +7 -4
- package/lib/v2/instagram/templates/images.art +9 -2
- package/lib/v2/instagram/templates/video.art +4 -1
- package/lib/v2/instagram/web-api/index.js +30 -9
- package/lib/v2/instagram/web-api/utils.js +149 -25
- package/lib/v2/kemono/index.js +26 -2
- package/lib/v2/kemono/radar.js +1 -1
- package/lib/v2/kepu/live.js +89 -0
- package/lib/v2/kepu/maintainer.js +3 -0
- package/lib/v2/kepu/radar.js +13 -0
- package/lib/v2/kepu/router.js +3 -0
- package/lib/v2/kepu/templates/description.art +33 -0
- package/lib/v2/leetcode/maintainer.js +1 -1
- package/lib/v2/lightnovel/lightNovel.js +62 -0
- package/lib/v2/lightnovel/maintainer.js +3 -0
- package/lib/v2/lightnovel/radar.js +13 -0
- package/lib/v2/lightnovel/router.js +3 -0
- package/lib/v2/line/radar.js +1 -1
- package/lib/v2/liquipedia/cs_matches.js +52 -0
- package/lib/v2/liquipedia/dota2_matches.js +47 -0
- package/lib/v2/liquipedia/maintainer.js +4 -0
- package/lib/v2/liquipedia/radar.js +19 -0
- package/lib/v2/liquipedia/router.js +4 -0
- package/lib/v2/magazinelib/maintainer.js +1 -1
- package/lib/v2/mihoyo/radar.js +1 -1
- package/lib/v2/missav/maintainer.js +3 -0
- package/lib/v2/missav/new.js +36 -0
- package/lib/v2/missav/radar.js +13 -0
- package/lib/v2/missav/router.js +3 -0
- package/lib/v2/missav/templates/preview.art +3 -0
- package/lib/v2/modb/maintainer.js +3 -0
- package/lib/v2/modb/radar.js +13 -0
- package/lib/v2/modb/router.js +3 -0
- package/lib/v2/modb/topic.js +59 -0
- package/lib/v2/nature/cover.js +32 -42
- package/lib/v2/nature/highlight.js +2 -2
- package/lib/v2/nature/news-and-comment.js +2 -2
- package/lib/v2/nature/news.js +2 -2
- package/lib/v2/nature/research.js +2 -2
- package/lib/v2/nature/siteindex.js +5 -5
- package/lib/v2/nature/utils.js +124 -5
- package/lib/v2/ncu/jwc.js +33 -0
- package/lib/v2/ncu/maintainer.js +3 -0
- package/lib/v2/ncu/radar.js +13 -0
- package/lib/v2/ncu/router.js +3 -0
- package/lib/v2/nmtv/radar.js +1 -1
- package/lib/v2/oo-software/radar.js +1 -1
- package/lib/v2/patagonia/maintainer.js +1 -1
- package/lib/v2/phoronix/index.js +177 -48
- package/lib/v2/phoronix/maintainer.js +1 -1
- package/lib/v2/phoronix/radar.js +3 -3
- package/lib/v2/phoronix/router.js +1 -1
- package/lib/v2/picnob/maintainer.js +1 -1
- package/lib/v2/picnob/templates/desc.art +3 -3
- package/lib/v2/picnob/user.js +74 -37
- package/lib/v2/picnob/utils.js +24 -0
- package/lib/v2/qbitai/category.js +27 -0
- package/lib/v2/qbitai/maintainer.js +4 -0
- package/lib/v2/qbitai/radar.js +19 -0
- package/lib/v2/qbitai/router.js +4 -0
- package/lib/v2/qbitai/tag.js +27 -0
- package/lib/v2/questmobile/maintainer.js +3 -0
- package/lib/v2/questmobile/radar.js +18 -0
- package/lib/v2/questmobile/report.js +127 -0
- package/lib/v2/questmobile/router.js +3 -0
- package/lib/v2/questmobile/templates/description.art +17 -0
- package/lib/v2/readhub/daily.js +43 -0
- package/lib/v2/readhub/index.js +19 -72
- package/lib/v2/readhub/maintainer.js +1 -0
- package/lib/v2/readhub/radar.js +6 -0
- package/lib/v2/readhub/router.js +1 -0
- package/lib/v2/readhub/util.js +69 -0
- package/lib/v2/routledge/book-series.js +78 -0
- package/lib/v2/routledge/maintainer.js +3 -0
- package/lib/v2/routledge/radar.js +13 -0
- package/lib/v2/routledge/router.js +3 -0
- package/lib/v2/routledge/templates/description.art +7 -0
- package/lib/v2/showstart/artist.js +15 -0
- package/lib/v2/showstart/brand.js +15 -0
- package/lib/v2/showstart/const.js +4 -0
- package/lib/v2/showstart/event.js +18 -0
- package/lib/v2/showstart/maintainer.js +6 -0
- package/lib/v2/showstart/radar.js +40 -0
- package/lib/v2/showstart/router.js +6 -0
- package/lib/v2/showstart/search.js +51 -0
- package/lib/v2/showstart/service.js +166 -0
- package/lib/v2/showstart/utils.js +92 -0
- package/lib/v2/snowpeak/maintainer.js +1 -1
- package/lib/v2/sony/maintainer.js +1 -1
- package/lib/v2/sse/disclosure.js +4 -3
- package/lib/v2/sspu/jwc.js +44 -0
- package/lib/v2/sspu/maintainer.js +3 -0
- package/lib/v2/sspu/radar.js +13 -0
- package/lib/v2/sspu/router.js +3 -0
- package/lib/v2/techcrunch/maintainer.js +1 -1
- package/lib/v2/theatlantic/maintainer.js +1 -1
- package/lib/v2/thepaper/radar.js +2 -2
- package/lib/v2/threads/index.js +20 -150
- package/lib/v2/threads/utils.js +147 -0
- package/lib/v2/twitter/keyword.js +1 -3
- package/lib/v2/twitter/media.js +1 -5
- package/lib/v2/twitter/user.js +1 -3
- package/lib/v2/twitter/utils.js +5 -3
- package/lib/v2/twitter/web-api/constants.js +80 -68
- package/lib/v2/twitter/web-api/twitter-api.js +96 -103
- package/lib/v2/uniqlo/maintainer.js +3 -0
- package/lib/v2/uniqlo/new.js +62 -0
- package/lib/v2/uniqlo/radar.js +12 -0
- package/lib/v2/uniqlo/router.js +3 -0
- package/lib/v2/wechat/maintainer.js +1 -1
- package/lib/v2/weibo/maintainer.js +1 -1
- package/lib/v2/weibo/radar.js +1 -1
- package/lib/v2/weibo/router.js +1 -1
- package/lib/v2/weibo/search/hot.js +118 -7
- package/lib/v2/weibo/search/template/digest.art +17 -0
- package/lib/v2/xiaohongshu/util.js +17 -7
- package/lib/v2/xmnn/docs.js +0 -0
- package/lib/v2/xmnn/maintainer.js +1 -0
- package/lib/v2/xmnn/news.js +65 -0
- package/lib/v2/xmnn/radar.js +67 -1
- package/lib/v2/xmnn/router.js +1 -0
- package/lib/v2/xsijishe/maintainer.js +1 -0
- package/lib/v2/xsijishe/radar.js +12 -0
- package/lib/v2/xsijishe/rank.js +60 -0
- package/lib/v2/xsijishe/router.js +1 -0
- package/lib/v2/yahoo/maintainer.js +2 -0
- package/lib/v2/yahoo/news/tw/index.js +24 -0
- package/lib/v2/yahoo/news/tw/provider-helper.js +22 -0
- package/lib/v2/yahoo/news/tw/provider.js +24 -0
- package/lib/v2/yahoo/news/tw/utils.js +129 -0
- package/lib/v2/yahoo/radar.js +29 -1
- package/lib/v2/yahoo/router.js +4 -1
- package/lib/v2/yahoo/templates/youtube.art +1 -0
- package/lib/v2/yuque/book.js +6 -1
- package/lib/v2/yuque/utils.js +16 -0
- package/lib/v2/zagg/maintainer.js +1 -1
- package/lib/views/error.art +1 -1
- package/lib/views/rss3-ums.js +62 -0
- package/lib/views/welcome.art +1 -1
- package/package.json +45 -39
- package/lib/routes/egsea/flash.js +0 -40
- package/lib/routes/gov/moa/sjzxfb.js +0 -20
- package/lib/routes/liquipedia/dota2_matches.js +0 -50
- package/lib/routes/questmobile/report.js +0 -121
- package/lib/routes/uniqlo/stylingbook.js +0 -24
- package/lib/routes/universities/buaa/news/index.js +0 -66
- package/lib/routes/universities/buaa/utils.js +0 -57
- package/lib/v2/gov/zhengce/zuixin.js +0 -39
- package/lib/v2/huxiu/article.js +0 -33
- package/lib/v2/huxiu/author.js +0 -36
- package/lib/v2/huxiu/templates/brief.art +0 -22
- package/lib/v2/huxiu/templates/img.art +0 -3
- package/lib/v2/huxiu/templates/moment.art +0 -16
- package/lib/v2/huxiu/templates/video.art +0 -7
- package/lib/v2/huxiu/utils.js +0 -154
- package/lib/v2/twitter/web-api/twitter-got.js +0 -113
- /package/lib/{routes → v2}/gov/moa/moa.js +0 -0
- /package/lib/v2/yahoo/news/{index.js → us/index.js} +0 -0
|
@@ -0,0 +1,58 @@
|
|
|
1
|
+
/*
|
|
2
|
+
* @Author: nightmare-mio wanglongwei2009@qq.com
|
|
3
|
+
* @Date: 2023-11-20 23:36:12
|
|
4
|
+
* @LastEditTime: 2023-11-22 20:11:24
|
|
5
|
+
* @Description:
|
|
6
|
+
*/
|
|
7
|
+
const got = require('@/utils/got');
|
|
8
|
+
const cheerio = require('cheerio');
|
|
9
|
+
const { parseDate } = require('@/utils/parse-date');
|
|
10
|
+
|
|
11
|
+
module.exports = async (ctx) => {
|
|
12
|
+
const { id } = ctx.params;
|
|
13
|
+
const link = 'https://book.douban.com/subject';
|
|
14
|
+
const { data: response } = await got(`${link}/${id}/discussion/`);
|
|
15
|
+
const $ = cheerio.load(response);
|
|
16
|
+
// 列表
|
|
17
|
+
const list = $('#posts-table>tbody>tr')
|
|
18
|
+
.toArray()
|
|
19
|
+
.slice(1)
|
|
20
|
+
.map((item) => {
|
|
21
|
+
item = $(item);
|
|
22
|
+
const a = item.find('a').first();
|
|
23
|
+
return {
|
|
24
|
+
title: a.attr('title'),
|
|
25
|
+
link: a.attr('href'),
|
|
26
|
+
pubDate: parseDate(item.find('.time').text()),
|
|
27
|
+
author: item.find('a').eq(1).text(),
|
|
28
|
+
};
|
|
29
|
+
});
|
|
30
|
+
const title = $('#content>h1').text();
|
|
31
|
+
|
|
32
|
+
const items = await Promise.all(
|
|
33
|
+
list.map((item) =>
|
|
34
|
+
ctx.cache.tryGet(item.link, async () => {
|
|
35
|
+
const { data: response } = await got(item.link);
|
|
36
|
+
const $ = cheerio.load(response);
|
|
37
|
+
// 评论
|
|
38
|
+
const list = $('#comments>.comment-item').toArray();
|
|
39
|
+
const replyContent = list
|
|
40
|
+
.map((item, index) => {
|
|
41
|
+
const post = $(item);
|
|
42
|
+
const content = post.find('.content>p').html();
|
|
43
|
+
const author = post.find('.author>a').text();
|
|
44
|
+
return `<p><div>#${index + 1}: <i>${author}</i></div><div>${content}</div></p>`;
|
|
45
|
+
})
|
|
46
|
+
.join('');
|
|
47
|
+
item.description = `${$('#link-report>div').eq(1).html()}<div>${replyContent}</div>`;
|
|
48
|
+
return item;
|
|
49
|
+
})
|
|
50
|
+
)
|
|
51
|
+
);
|
|
52
|
+
|
|
53
|
+
ctx.state.data = {
|
|
54
|
+
title,
|
|
55
|
+
link: `${link}/${id}/discussion`,
|
|
56
|
+
item: items,
|
|
57
|
+
};
|
|
58
|
+
};
|
package/lib/v2/douban/radar.js
CHANGED
package/lib/v2/douban/router.js
CHANGED
|
@@ -26,4 +26,5 @@ module.exports = function (router) {
|
|
|
26
26
|
router.get('/replied/:uid', require('./other/replied'));
|
|
27
27
|
router.get('/replies/:uid', require('./other/replies'));
|
|
28
28
|
router.get('/topic/:id/:sort?', require('./other/topic.js'));
|
|
29
|
+
router.get('/:id/discussion', require('./other/discussion.js'));
|
|
29
30
|
};
|
package/lib/v2/dut/defaults.js
CHANGED
|
@@ -50,4 +50,8 @@ module.exports = {
|
|
|
50
50
|
// 体育场馆中心:http://tycgzx.dlut.edu.cn
|
|
51
51
|
// 默认 -> 通知公告 http://tycgzx.dlut.edu.cn/tzgg/tzgg.htm
|
|
52
52
|
tycgzx: 'tzgg/tzgg',
|
|
53
|
+
|
|
54
|
+
// 公共基础学院:http://fldpj.dlut.edu.cn/index.htm
|
|
55
|
+
// 默认 -> 重要通知 http://fldpj.dlut.edu.cn/index/zytz.htm
|
|
56
|
+
fldpj: 'index/zytz',
|
|
53
57
|
};
|
package/lib/v2/dut/index.js
CHANGED
|
@@ -27,6 +27,8 @@ module.exports = async (ctx) => {
|
|
|
27
27
|
|
|
28
28
|
if (site === 'panjin') {
|
|
29
29
|
items = $('a.news').slice(0, -4);
|
|
30
|
+
} else if (site === 'fldpj') {
|
|
31
|
+
items = $('li[id^="line_u9"]').find('a');
|
|
30
32
|
} else {
|
|
31
33
|
$('.Next, .rjxw_left, .pb_sys_common').remove();
|
|
32
34
|
items = $('.txt, .itemlist, .wall, .list, .list01, .ny_list, .rjxw_right, .rj_yjs_con, .c_hzjl_list1, .winstyle67894, .winstyle80936, .winstyle50738, #lili').find('a');
|
|
@@ -38,18 +40,28 @@ module.exports = async (ctx) => {
|
|
|
38
40
|
.map((item) => {
|
|
39
41
|
item = $(item);
|
|
40
42
|
|
|
41
|
-
const
|
|
43
|
+
const result = {
|
|
44
|
+
link: item.attr('href').startsWith('http') ? item.attr('href') : `${rootUrl}/${item.attr('href').replace(/^[./]+/, '')}`,
|
|
45
|
+
};
|
|
46
|
+
|
|
47
|
+
if (site === 'fldpj') {
|
|
48
|
+
result.title = item.find('em').text();
|
|
49
|
+
result.pubDate = parseDate(item.find('span').text());
|
|
50
|
+
} else {
|
|
51
|
+
const dateRegex = /(\d{4}[-/年]\d{2}[-/月]\d{2})/;
|
|
52
|
+
|
|
53
|
+
let dateMatch = item.parent().text().match(dateRegex);
|
|
54
|
+
if (!dateMatch) {
|
|
55
|
+
dateMatch = item.parent().parent().text().match(dateRegex);
|
|
56
|
+
}
|
|
42
57
|
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
58
|
+
result.title = item.text().trim() === '' ? item.next().text() : item.text();
|
|
59
|
+
if (dateMatch) {
|
|
60
|
+
result.pubDate = parseDate(dateMatch[1].replace(/年|月/g, '-'));
|
|
61
|
+
}
|
|
46
62
|
}
|
|
47
63
|
|
|
48
|
-
return
|
|
49
|
-
title: item.text() === '' ? item.next().text() : item.text(),
|
|
50
|
-
link: /^http/.test(item.attr('href')) ? item.attr('href') : `${rootUrl}/${item.attr('href').replace(/^[./]+/, '')}`,
|
|
51
|
-
pubDate: parseDate(dateMatch ? dateMatch[1].replace(/年|月/g, '-') : new Date().toString()),
|
|
52
|
-
};
|
|
64
|
+
return result;
|
|
53
65
|
});
|
|
54
66
|
|
|
55
67
|
items = await Promise.all(
|
package/lib/v2/dut/maintainer.js
CHANGED
|
@@ -1,14 +1,15 @@
|
|
|
1
1
|
module.exports = {
|
|
2
|
-
'/
|
|
3
|
-
'/perdep/:category?': ['nczitzk'],
|
|
4
|
-
'/teach/:category?': ['beautyyuyanli', 'nczitzk'],
|
|
5
|
-
'/gs/:category?': ['nczitzk'],
|
|
6
|
-
'/ssdut/:category?': ['nczitzk'],
|
|
2
|
+
'/dutdice/:category?': ['beautyyuyanli', 'nczitzk'],
|
|
7
3
|
'/eda/:category?': ['nczitzk'],
|
|
4
|
+
'/fldpj/:category?': ['ueiu'],
|
|
5
|
+
'/gs/:category?': ['nczitzk'],
|
|
6
|
+
'/news/:category?': ['nczitzk'],
|
|
8
7
|
'/panjin/:category?': ['nczitzk'],
|
|
9
|
-
'/
|
|
8
|
+
'/perdep/:category?': ['nczitzk'],
|
|
10
9
|
'/pjteach/:category?': ['nczitzk'],
|
|
11
10
|
'/pjxqzwb/:category?': ['nczitzk'],
|
|
12
|
-
'/
|
|
11
|
+
'/ssdut/:category?': ['nczitzk'],
|
|
12
|
+
'/teach/:category?': ['beautyyuyanli', 'nczitzk'],
|
|
13
13
|
'/tycgzx/:category?': ['beatyyuyanli', 'nczitzk'],
|
|
14
|
+
'/xsgzb/:category?': ['nczitzk'],
|
|
14
15
|
};
|
package/lib/v2/dut/radar.js
CHANGED
|
@@ -1,26 +1,26 @@
|
|
|
1
1
|
module.exports = {
|
|
2
2
|
'dlut.edu.cn': {
|
|
3
3
|
_name: '大连理工大学',
|
|
4
|
-
|
|
4
|
+
dutdice: [
|
|
5
5
|
{
|
|
6
|
-
title: '
|
|
7
|
-
docs: 'https://docs.rsshub.app/routes/university#da-lian-li-gong-da-xue-
|
|
6
|
+
title: '国际合作与交流处(港澳台办)',
|
|
7
|
+
docs: 'https://docs.rsshub.app/routes/university#da-lian-li-gong-da-xue-guo-ji-he-zuo-yu-jiao-liu-chu-gang-ao-tai-ban',
|
|
8
8
|
source: ['/'],
|
|
9
9
|
target: (params, url) => `/dut/${url.match(/:\/\/[\w\d]+\./)[1]}/${url.match(/\.cn\/(.*)\.htm/)[1]}`,
|
|
10
10
|
},
|
|
11
11
|
],
|
|
12
|
-
|
|
12
|
+
eda: [
|
|
13
13
|
{
|
|
14
|
-
title: '
|
|
15
|
-
docs: 'https://docs.rsshub.app/routes/university#da-lian-li-gong-da-xue-
|
|
14
|
+
title: '开发区校区',
|
|
15
|
+
docs: 'https://docs.rsshub.app/routes/university#da-lian-li-gong-da-xue-kai-fa-qu-xiao-qu',
|
|
16
16
|
source: ['/'],
|
|
17
17
|
target: (params, url) => `/dut/${url.match(/:\/\/[\w\d]+\./)[1]}/${url.match(/\.cn\/(.*)\.htm/)[1]}`,
|
|
18
18
|
},
|
|
19
19
|
],
|
|
20
|
-
|
|
20
|
+
fldpj: [
|
|
21
21
|
{
|
|
22
|
-
title: '
|
|
23
|
-
docs: 'https://docs.rsshub.app/routes/university#da-lian-li-gong-da-xue-
|
|
22
|
+
title: '公共基础学院',
|
|
23
|
+
docs: 'https://docs.rsshub.app/routes/university#da-lian-li-gong-da-xue-gong-gong-ji-chu-xue-yuan',
|
|
24
24
|
source: ['/'],
|
|
25
25
|
target: (params, url) => `/dut/${url.match(/:\/\/[\w\d]+\./)[1]}/${url.match(/\.cn\/(.*)\.htm/)[1]}`,
|
|
26
26
|
},
|
|
@@ -33,18 +33,10 @@ module.exports = {
|
|
|
33
33
|
target: (params, url) => `/dut/${url.match(/:\/\/[\w\d]+\./)[1]}/${url.match(/\.cn\/(.*)\.htm/)[1]}`,
|
|
34
34
|
},
|
|
35
35
|
],
|
|
36
|
-
|
|
37
|
-
{
|
|
38
|
-
title: '软件学院',
|
|
39
|
-
docs: 'https://docs.rsshub.app/routes/university#da-lian-li-gong-da-xue-ruan-jian-xue-yuan',
|
|
40
|
-
source: ['/'],
|
|
41
|
-
target: (params, url) => `/dut/${url.match(/:\/\/[\w\d]+\./)[1]}/${url.match(/\.cn\/(.*)\.htm/)[1]}`,
|
|
42
|
-
},
|
|
43
|
-
],
|
|
44
|
-
eda: [
|
|
36
|
+
news: [
|
|
45
37
|
{
|
|
46
|
-
title: '
|
|
47
|
-
docs: 'https://docs.rsshub.app/routes/university#da-lian-li-gong-da-xue-
|
|
38
|
+
title: '新闻网',
|
|
39
|
+
docs: 'https://docs.rsshub.app/routes/university#da-lian-li-gong-da-xue-xin-wen-wang',
|
|
48
40
|
source: ['/'],
|
|
49
41
|
target: (params, url) => `/dut/${url.match(/:\/\/[\w\d]+\./)[1]}/${url.match(/\.cn\/(.*)\.htm/)[1]}`,
|
|
50
42
|
},
|
|
@@ -57,10 +49,10 @@ module.exports = {
|
|
|
57
49
|
target: (params, url) => `/dut/${url.match(/:\/\/[\w\d]+\./)[1]}/${url.match(/\.cn\/(.*)\.htm/)[1]}`,
|
|
58
50
|
},
|
|
59
51
|
],
|
|
60
|
-
|
|
52
|
+
perdep: [
|
|
61
53
|
{
|
|
62
|
-
title: '
|
|
63
|
-
docs: 'https://docs.rsshub.app/routes/university#da-lian-li-gong-da-xue-
|
|
54
|
+
title: '人事处',
|
|
55
|
+
docs: 'https://docs.rsshub.app/routes/university#da-lian-li-gong-da-xue-ren-shi-chu',
|
|
64
56
|
source: ['/'],
|
|
65
57
|
target: (params, url) => `/dut/${url.match(/:\/\/[\w\d]+\./)[1]}/${url.match(/\.cn\/(.*)\.htm/)[1]}`,
|
|
66
58
|
},
|
|
@@ -81,18 +73,26 @@ module.exports = {
|
|
|
81
73
|
target: (params, url) => `/dut/${url.match(/:\/\/[\w\d]+\./)[1]}/${url.match(/\.cn\/(.*)\.htm/)[1]}`,
|
|
82
74
|
},
|
|
83
75
|
],
|
|
84
|
-
|
|
76
|
+
ssdut: [
|
|
85
77
|
{
|
|
86
|
-
title: '
|
|
87
|
-
docs: 'https://docs.rsshub.app/routes/university#da-lian-li-gong-da-xue-
|
|
78
|
+
title: '软件学院',
|
|
79
|
+
docs: 'https://docs.rsshub.app/routes/university#da-lian-li-gong-da-xue-ruan-jian-xue-yuan',
|
|
88
80
|
source: ['/'],
|
|
89
81
|
target: (params, url) => `/dut/${url.match(/:\/\/[\w\d]+\./)[1]}/${url.match(/\.cn\/(.*)\.htm/)[1]}`,
|
|
90
82
|
},
|
|
91
83
|
],
|
|
92
|
-
|
|
84
|
+
teach: [
|
|
93
85
|
{
|
|
94
|
-
title: '
|
|
95
|
-
docs: 'https://docs.rsshub.app/routes/university#da-lian-li-gong-da-xue-
|
|
86
|
+
title: '教务处',
|
|
87
|
+
docs: 'https://docs.rsshub.app/routes/university#da-lian-li-gong-da-xue-jiao-wu-chu',
|
|
88
|
+
source: ['/'],
|
|
89
|
+
target: (params, url) => `/dut/${url.match(/:\/\/[\w\d]+\./)[1]}/${url.match(/\.cn\/(.*)\.htm/)[1]}`,
|
|
90
|
+
},
|
|
91
|
+
],
|
|
92
|
+
tjpj: [
|
|
93
|
+
{
|
|
94
|
+
title: '体育与健康学院盘锦分院',
|
|
95
|
+
docs: 'https://docs.rsshub.app/routes/university#da-lian-li-gong-da-xue-ti-yu-jian-kang-xue-yuan-pan-jin-fen-yuan',
|
|
96
96
|
source: ['/'],
|
|
97
97
|
target: (params, url) => `/dut/${url.match(/:\/\/[\w\d]+\./)[1]}/${url.match(/\.cn\/(.*)\.htm/)[1]}`,
|
|
98
98
|
},
|
|
@@ -105,5 +105,13 @@ module.exports = {
|
|
|
105
105
|
target: (params, url) => `/dut/${url.match(/:\/\/[\w\d]+\./)[1]}/${url.match(/\.cn\/(.*)\.htm/)[1]}`,
|
|
106
106
|
},
|
|
107
107
|
],
|
|
108
|
+
xsgzb: [
|
|
109
|
+
{
|
|
110
|
+
title: '盘锦校区学生事务办公室',
|
|
111
|
+
docs: 'https://docs.rsshub.app/routes/university#da-lian-li-gong-da-xue-pan-jin-xiao-qu-xue-sheng-shi-wu-ban-gong-shi',
|
|
112
|
+
source: ['/'],
|
|
113
|
+
target: (params, url) => `/dut/${url.match(/:\/\/[\w\d]+\./)[1]}/${url.match(/\.cn\/(.*)\.htm/)[1]}`,
|
|
114
|
+
},
|
|
115
|
+
],
|
|
108
116
|
},
|
|
109
117
|
};
|
package/lib/v2/dut/shortcuts.js
CHANGED
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
const got = require('@/utils/got');
|
|
2
|
+
const { parseDate } = require('@/utils/parse-date');
|
|
3
|
+
|
|
4
|
+
module.exports = async (ctx) => {
|
|
5
|
+
const response = await got({
|
|
6
|
+
method: 'get',
|
|
7
|
+
url: 'https://www.egsea.com/news/flash-list?per-page=30',
|
|
8
|
+
});
|
|
9
|
+
|
|
10
|
+
const out = response.data.data.map((item) => {
|
|
11
|
+
const pubDate = parseDate(item.pageTime, 'X');
|
|
12
|
+
const link = 'https://www.egsea.com' + item.url;
|
|
13
|
+
const title = item.title;
|
|
14
|
+
const description = item.content;
|
|
15
|
+
|
|
16
|
+
return {
|
|
17
|
+
title,
|
|
18
|
+
link,
|
|
19
|
+
pubDate,
|
|
20
|
+
description,
|
|
21
|
+
category: item.tags.map((tag) => tag.name),
|
|
22
|
+
};
|
|
23
|
+
});
|
|
24
|
+
|
|
25
|
+
ctx.state.data = {
|
|
26
|
+
title: '快讯 - e 公司',
|
|
27
|
+
link: 'https://www.egsea.com/news/flash',
|
|
28
|
+
item: out,
|
|
29
|
+
};
|
|
30
|
+
};
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
const got = require('@/utils/got');
|
|
2
2
|
const cheerio = require('cheerio');
|
|
3
|
-
const iconv = require('iconv-lite');
|
|
4
3
|
const { parseDate } = require('@/utils/parse-date');
|
|
5
4
|
const { art } = require('@/utils/render');
|
|
6
5
|
const path = require('path');
|
|
@@ -16,7 +15,7 @@ module.exports = async (ctx) => {
|
|
|
16
15
|
responseType: 'buffer',
|
|
17
16
|
});
|
|
18
17
|
|
|
19
|
-
const $ = cheerio.load(
|
|
18
|
+
const $ = cheerio.load(response.data);
|
|
20
19
|
|
|
21
20
|
const descBuilder = (element) => {
|
|
22
21
|
const content = cheerio.load(`<p>${$('.news-message-text', element).html()}</p>`).root();
|
package/lib/v2/fosshub/radar.js
CHANGED
|
@@ -6,7 +6,7 @@ module.exports = {
|
|
|
6
6
|
title: 'Software Update',
|
|
7
7
|
docs: 'https://docs.rsshub.app/routes/program-update#fosshub-software-update',
|
|
8
8
|
source: ['/'],
|
|
9
|
-
target: (params, url) => `/fosshub/${
|
|
9
|
+
target: (params, url) => `/fosshub/${url.match(/\/(.*?)\.html$/)[1]}`,
|
|
10
10
|
},
|
|
11
11
|
],
|
|
12
12
|
},
|
|
@@ -0,0 +1,63 @@
|
|
|
1
|
+
const got = require('@/utils/got');
|
|
2
|
+
const cheerio = require('cheerio');
|
|
3
|
+
const { parseDate } = require('@/utils/parse-date');
|
|
4
|
+
const baseUrl = 'https://www.fxiaoke.com/crm';
|
|
5
|
+
const baseTitle = '纷享销客 CRM';
|
|
6
|
+
const titleMap = new Map([
|
|
7
|
+
['news', `全部文章 - ${baseTitle}`],
|
|
8
|
+
['blog', `文章干货 - ${baseTitle}`],
|
|
9
|
+
['articles', `CRM 知识 - ${baseTitle}`],
|
|
10
|
+
['about-influence', `纷享动态 - ${baseTitle}`],
|
|
11
|
+
['customers', `签约喜报 - ${baseTitle}`],
|
|
12
|
+
]);
|
|
13
|
+
|
|
14
|
+
module.exports = async (ctx) => {
|
|
15
|
+
const t = ctx.params.type;
|
|
16
|
+
const title = titleMap.get(t);
|
|
17
|
+
const url = `${baseUrl}/${t}/`;
|
|
18
|
+
const resp = await got(url);
|
|
19
|
+
const $ = cheerio.load(resp.data);
|
|
20
|
+
const desc = $('.meeting').text().trim();
|
|
21
|
+
let items = $('.content-item')
|
|
22
|
+
.toArray()
|
|
23
|
+
.map((item) => {
|
|
24
|
+
item = $(item);
|
|
25
|
+
const c1 = item.find('.baike-content-t1');
|
|
26
|
+
const c3 = item.find('.baike-content-t3').find('span');
|
|
27
|
+
return {
|
|
28
|
+
title: c1.text().trim(),
|
|
29
|
+
// pubDate: parseDate(c3.first().text().trim()),
|
|
30
|
+
link: item.find('a').attr('href'),
|
|
31
|
+
author: c3.last().text().trim(),
|
|
32
|
+
};
|
|
33
|
+
});
|
|
34
|
+
items = await Promise.all(
|
|
35
|
+
items.map((item) =>
|
|
36
|
+
ctx.cache.tryGet(item.link, async () => {
|
|
37
|
+
const resp = await got(item.link);
|
|
38
|
+
const $ = cheerio.load(resp.data);
|
|
39
|
+
const firstViewBox = $('.body-wrapper-article').first();
|
|
40
|
+
|
|
41
|
+
firstViewBox.find('img').each((_, img) => {
|
|
42
|
+
img = $(img);
|
|
43
|
+
if (img.attr('zoomfile')) {
|
|
44
|
+
img.attr('src', img.attr('zoomfile'));
|
|
45
|
+
img.removeAttr('zoomfile');
|
|
46
|
+
img.removeAttr('file');
|
|
47
|
+
}
|
|
48
|
+
img.removeAttr('onmouseover');
|
|
49
|
+
});
|
|
50
|
+
|
|
51
|
+
item.description = firstViewBox.html();
|
|
52
|
+
item.pubDate = parseDate($('.month-day').first().text().trim());
|
|
53
|
+
return item;
|
|
54
|
+
})
|
|
55
|
+
)
|
|
56
|
+
);
|
|
57
|
+
ctx.state.data = {
|
|
58
|
+
title,
|
|
59
|
+
link: url,
|
|
60
|
+
description: desc,
|
|
61
|
+
item: items,
|
|
62
|
+
};
|
|
63
|
+
};
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
module.exports = {
|
|
2
|
+
'fxiaoke.com': {
|
|
3
|
+
_name: '纷享销客 CRM',
|
|
4
|
+
'.': [
|
|
5
|
+
{
|
|
6
|
+
title: '全部文章',
|
|
7
|
+
docs: 'https://docs.rsshub.app/routes/blog#fen-xiang-xiao-ke-crm',
|
|
8
|
+
source: ['/*'],
|
|
9
|
+
target: '/fxiaoke/crm/news',
|
|
10
|
+
},
|
|
11
|
+
{
|
|
12
|
+
title: '文章干货',
|
|
13
|
+
docs: 'https://docs.rsshub.app/routes/blog#fen-xiang-xiao-ke-crm',
|
|
14
|
+
source: ['/*'],
|
|
15
|
+
target: '/fxiaoke/crm/blog',
|
|
16
|
+
},
|
|
17
|
+
{
|
|
18
|
+
title: 'CRM 知识',
|
|
19
|
+
docs: 'https://docs.rsshub.app/routes/blog#fen-xiang-xiao-ke-crm',
|
|
20
|
+
source: ['/*'],
|
|
21
|
+
target: '/fxiaoke/crm/articles',
|
|
22
|
+
},
|
|
23
|
+
{
|
|
24
|
+
title: '纷享动态',
|
|
25
|
+
docs: 'https://docs.rsshub.app/routes/blog#fen-xiang-xiao-ke-crm',
|
|
26
|
+
source: ['/*'],
|
|
27
|
+
target: '/fxiaoke/crm/about-influence',
|
|
28
|
+
},
|
|
29
|
+
{
|
|
30
|
+
title: '签约喜报',
|
|
31
|
+
docs: 'https://docs.rsshub.app/routes/blog#fen-xiang-xiao-ke-crm',
|
|
32
|
+
source: ['/*'],
|
|
33
|
+
target: '/fxiaoke/crm/customers',
|
|
34
|
+
},
|
|
35
|
+
],
|
|
36
|
+
},
|
|
37
|
+
};
|
|
@@ -0,0 +1,72 @@
|
|
|
1
|
+
const got = require('@/utils/got');
|
|
2
|
+
const cheerio = require('cheerio');
|
|
3
|
+
const { parseDate } = require('@/utils/parse-date');
|
|
4
|
+
|
|
5
|
+
module.exports = async (ctx) => {
|
|
6
|
+
const { id = '10' } = ctx.params;
|
|
7
|
+
const limit = ctx.query.limit ? parseInt(ctx.query.limit, 10) : 15;
|
|
8
|
+
|
|
9
|
+
const rootUrl = 'http://www.gdsrx.org.cn';
|
|
10
|
+
const currentUrl = new URL(`portal/list/index/id/${id}.html`, rootUrl).href;
|
|
11
|
+
|
|
12
|
+
const { data: response } = await got(currentUrl);
|
|
13
|
+
|
|
14
|
+
const $ = cheerio.load(response);
|
|
15
|
+
|
|
16
|
+
let items = $('a.xn-item, a.t-item')
|
|
17
|
+
.slice(0, limit)
|
|
18
|
+
.toArray()
|
|
19
|
+
.map((item) => {
|
|
20
|
+
item = $(item);
|
|
21
|
+
|
|
22
|
+
return {
|
|
23
|
+
title: item.find('div.xn-d, div.t-e').text(),
|
|
24
|
+
link: new URL(item.prop('href'), rootUrl).href,
|
|
25
|
+
pubDate: parseDate(item.find('div.xn-time, div.t-f').text()),
|
|
26
|
+
};
|
|
27
|
+
});
|
|
28
|
+
|
|
29
|
+
items = await Promise.all(
|
|
30
|
+
items.map((item) =>
|
|
31
|
+
ctx.cache.tryGet(item.link, async () => {
|
|
32
|
+
const { data: detailResponse } = await got(item.link);
|
|
33
|
+
|
|
34
|
+
const content = cheerio.load(detailResponse);
|
|
35
|
+
|
|
36
|
+
const categories = content('a.nav-a')
|
|
37
|
+
.slice(1)
|
|
38
|
+
.toArray()
|
|
39
|
+
.map((c) => content(c).text());
|
|
40
|
+
|
|
41
|
+
item.title = categories.pop() || content('div.u-c').text();
|
|
42
|
+
item.description = content('div.u-f').html();
|
|
43
|
+
item.author = content('.author').text();
|
|
44
|
+
item.category = categories;
|
|
45
|
+
item.pubDate = parseDate(content('div.u-d').text());
|
|
46
|
+
|
|
47
|
+
return item;
|
|
48
|
+
})
|
|
49
|
+
)
|
|
50
|
+
);
|
|
51
|
+
|
|
52
|
+
const author = $('title').text();
|
|
53
|
+
const image = $('a.h-g img').prop('src');
|
|
54
|
+
const icon = new URL('favicon.ico', rootUrl).href;
|
|
55
|
+
const subtitle = $('a.nav-a')
|
|
56
|
+
.toArray()
|
|
57
|
+
.map((c) => $(c).text())
|
|
58
|
+
.pop();
|
|
59
|
+
|
|
60
|
+
ctx.state.data = {
|
|
61
|
+
item: items,
|
|
62
|
+
title: `${author} - ${subtitle}`,
|
|
63
|
+
link: currentUrl,
|
|
64
|
+
description: $('meta[name="description"]').prop('content'),
|
|
65
|
+
language: 'zh',
|
|
66
|
+
image,
|
|
67
|
+
icon,
|
|
68
|
+
logo: icon,
|
|
69
|
+
subtitle,
|
|
70
|
+
author,
|
|
71
|
+
};
|
|
72
|
+
};
|
|
@@ -0,0 +1,61 @@
|
|
|
1
|
+
module.exports = {
|
|
2
|
+
'gdsrx.org.cn': {
|
|
3
|
+
_name: '广东省食品药品审评认证技术协会',
|
|
4
|
+
'.': [
|
|
5
|
+
{
|
|
6
|
+
title: '栏目',
|
|
7
|
+
docs: 'https://docs.rsshub.app/routes/other#guang-dong-sheng-shi-pin-yao-pin-shen-ping-ren-zheng-ji-shu-xie-hui-lan-mu',
|
|
8
|
+
source: ['/portal/list/index/id'],
|
|
9
|
+
target: (_, url) => {
|
|
10
|
+
url = new URL(url);
|
|
11
|
+
|
|
12
|
+
const idMatches = url.href.match(/\/id\/(\d+)\.html/);
|
|
13
|
+
|
|
14
|
+
return `/gdsrx${idMatches ? `/${idMatches[1]}` : ''}`;
|
|
15
|
+
},
|
|
16
|
+
},
|
|
17
|
+
{
|
|
18
|
+
title: '法规文库',
|
|
19
|
+
docs: 'https://docs.rsshub.app/routes/other#guang-dong-sheng-shi-pin-yao-pin-shen-ping-ren-zheng-ji-shu-xie-hui-lan-mu',
|
|
20
|
+
source: ['/portal/list/index/id/10.html'],
|
|
21
|
+
target: '/gdsrx/10',
|
|
22
|
+
},
|
|
23
|
+
{
|
|
24
|
+
title: '法规资讯',
|
|
25
|
+
docs: 'https://docs.rsshub.app/routes/other#guang-dong-sheng-shi-pin-yao-pin-shen-ping-ren-zheng-ji-shu-xie-hui-lan-mu',
|
|
26
|
+
source: ['/portal/list/index/id/12.html'],
|
|
27
|
+
target: '/gdsrx/12',
|
|
28
|
+
},
|
|
29
|
+
{
|
|
30
|
+
title: '专家供稿',
|
|
31
|
+
docs: 'https://docs.rsshub.app/routes/other#guang-dong-sheng-shi-pin-yao-pin-shen-ping-ren-zheng-ji-shu-xie-hui-lan-mu',
|
|
32
|
+
source: ['/portal/list/index/id/13.html'],
|
|
33
|
+
target: '/gdsrx/13',
|
|
34
|
+
},
|
|
35
|
+
{
|
|
36
|
+
title: '协会动态 会员动态',
|
|
37
|
+
docs: 'https://docs.rsshub.app/routes/other#guang-dong-sheng-shi-pin-yao-pin-shen-ping-ren-zheng-ji-shu-xie-hui-lan-mu',
|
|
38
|
+
source: ['/portal/list/index/id/20.html'],
|
|
39
|
+
target: '/gdsrx/20',
|
|
40
|
+
},
|
|
41
|
+
{
|
|
42
|
+
title: '协会动态',
|
|
43
|
+
docs: 'https://docs.rsshub.app/routes/other#guang-dong-sheng-shi-pin-yao-pin-shen-ping-ren-zheng-ji-shu-xie-hui-lan-mu',
|
|
44
|
+
source: ['/portal/list/index/id/37.html'],
|
|
45
|
+
target: '/gdsrx/37',
|
|
46
|
+
},
|
|
47
|
+
{
|
|
48
|
+
title: '协会通知公告',
|
|
49
|
+
docs: 'https://docs.rsshub.app/routes/other#guang-dong-sheng-shi-pin-yao-pin-shen-ping-ren-zheng-ji-shu-xie-hui-lan-mu',
|
|
50
|
+
source: ['/portal/list/index/id/38.html'],
|
|
51
|
+
target: '/gdsrx/38',
|
|
52
|
+
},
|
|
53
|
+
{
|
|
54
|
+
title: '会员动态',
|
|
55
|
+
docs: 'https://docs.rsshub.app/routes/other#guang-dong-sheng-shi-pin-yao-pin-shen-ping-ren-zheng-ji-shu-xie-hui-lan-mu',
|
|
56
|
+
source: ['/portal/list/index/id/39.html'],
|
|
57
|
+
target: '/gdsrx/39',
|
|
58
|
+
},
|
|
59
|
+
],
|
|
60
|
+
},
|
|
61
|
+
};
|