diff --git a/assets/radar-rules.js b/assets/radar-rules.js index 8c0257371..4110d95b3 100644 --- a/assets/radar-rules.js +++ b/assets/radar-rules.js @@ -626,15 +626,6 @@ { title: '支持的快递公司列表', docs: 'https://docs.rsshub.app/other.html#kuai-di-100', source: '/', target: '/kuaidi100/company' }, ], }, - 'nsfc.gov.cn': { - _name: '国家自然科学基金委员会', - www: [ - { title: '基金要闻', docs: 'https://docs.rsshub.app/other.html#guo-jia-zi-ran-ke-xue-ji-jin-wei-yuan-hui', source: '/*', target: '/nsfc/news/jjyw' }, - { title: '通知公告', docs: 'https://docs.rsshub.app/other.html#guo-jia-zi-ran-ke-xue-ji-jin-wei-yuan-hui', source: '/*', target: '/nsfc/news/tzgg' }, - { title: '资助成果', docs: 'https://docs.rsshub.app/other.html#guo-jia-zi-ran-ke-xue-ji-jin-wei-yuan-hui', source: '/*', target: '/nsfc/news/zzcg' }, - { title: '科普快讯', docs: 'https://docs.rsshub.app/other.html#guo-jia-zi-ran-ke-xue-ji-jin-wei-yuan-hui', source: '/*', target: '/nsfc/news/kpkx' }, - ], - }, 'japanpost.jp': { _name: '日本郵便', 'trackings.post': [ diff --git a/lib/router.js b/lib/router.js index 6a7fa9a62..058b1bfc9 100644 --- a/lib/router.js +++ b/lib/router.js @@ -2674,9 +2674,6 @@ router.get('/lagou/jobs/:position/:city', lazyloadRouteHandler('./routes/lagou/j router.get('/yzu/home/:type', lazyloadRouteHandler('./routes/universities/yzu/home')); router.get('/yzu/yjszs/:type', lazyloadRouteHandler('./routes/universities/yzu/yjszs')); -// 国家自然科学基金委员会 -router.get('/nsfc/news/:type?', lazyloadRouteHandler('./routes/nsfc/news')); - // 德国新闻社卫健新闻 router.get('/krankenkassen', lazyloadRouteHandler('./routes/krankenkassen')); diff --git a/lib/v2/nsfc/maintainer.js b/lib/v2/nsfc/maintainer.js new file mode 100644 index 000000000..a5098aa71 --- /dev/null +++ b/lib/v2/nsfc/maintainer.js @@ -0,0 +1,3 @@ +module.exports = { + '/news/:type?': ['Derekmini'], +}; diff --git a/lib/routes/nsfc/news.js b/lib/v2/nsfc/news.js similarity index 100% rename from lib/routes/nsfc/news.js rename to lib/v2/nsfc/news.js diff --git a/lib/v2/nsfc/radar.js b/lib/v2/nsfc/radar.js new file mode 100644 index 000000000..2b802eaca --- /dev/null +++ b/lib/v2/nsfc/radar.js @@ -0,0 +1,31 @@ +module.exports = { + 'nsfc.gov.cn': { + _name: '国自然基金委', + www: [ + { + title: '基金要闻', + docs: 'https://docs.rsshub.app/other.html#guo-jia-zi-ran-ke-xue-ji-jin-wei-yuan-hui', + source: '/*', + target: '/nsfc/news/jjyw', + }, + { + title: '通知公告', + docs: 'https://docs.rsshub.app/other.html#guo-jia-zi-ran-ke-xue-ji-jin-wei-yuan-hui', + source: '/*', + target: '/nsfc/news/tzgg', + }, + { + title: '资助成果', + docs: 'https://docs.rsshub.app/other.html#guo-jia-zi-ran-ke-xue-ji-jin-wei-yuan-hui', + source: '/*', + target: '/nsfc/news/zzcg', + }, + { + title: '科普快讯', + docs: 'https://docs.rsshub.app/other.html#guo-jia-zi-ran-ke-xue-ji-jin-wei-yuan-hui', + source: '/*', + target: '/nsfc/news/kpkx', + }, + ], + }, +}; diff --git a/lib/v2/nsfc/router.js b/lib/v2/nsfc/router.js new file mode 100644 index 000000000..c36fd4f1c --- /dev/null +++ b/lib/v2/nsfc/router.js @@ -0,0 +1,3 @@ +module.exports = function (router) { + router.get('/news/:type?', require('./news')); +};