Merge remote-tracking branch 'upstream/master' into add-unit-image

lib/router.js

@@ -1,4 +1,5 @@
 const Router = require('@koa/router');
+const config = require('@/config').value;
 const router = new Router();
 
 // 遍历整个 routes 文件夹，导入模块路由 router.js 和 router-custom.js 文件
@@ -24,13 +25,23 @@ router.get('/', require('./routes/index'));
 // test
 router.get('/test/:id', require('./routes/test'));
 
+router.get('/robots.txt', async (ctx, next) => {
+    if (config.disallowRobot) {
+        ctx.set('Content-Type', 'text/plain');
+        ctx.body = 'User-agent: *\nDisallow: /';
+    } else {
+        ctx.throw(404, 'Not Found');
+    }
+    await next();
+});
+
 // RSSHub
 router.get('/rsshub/rss', require('./routes/rsshub/routes')); // 弃用
 router.get('/rsshub/routes', require('./routes/rsshub/routes'));
 router.get('/rsshub/sponsors', require('./routes/rsshub/sponsors'));
 
 // 1draw
-router.get('/1draw/', require('./routes/1draw/index'));
+router.get('/1draw', require('./routes/1draw/index'));
 
 // 1X Magazine
 router.get('/1x/magazine', require('./routes/1x/magazine'));
@@ -143,7 +154,7 @@ router.get('/mzitu/tag/:tag', require('./routes/mzitu/tag'));
 // pixiv
 router.get('/pixiv/user/bookmarks/:id', require('./routes/pixiv/bookmarks'));
 router.get('/pixiv/user/illustfollows', require('./routes/pixiv/illustfollow'));
-router.get('/pixiv/user/:id/', require('./routes/pixiv/user'));
+router.get('/pixiv/user/:id', require('./routes/pixiv/user'));
 router.get('/pixiv/ranking/:mode/:date?', require('./routes/pixiv/ranking'));
 router.get('/pixiv/search/:keyword/:order?/:r18?', require('./routes/pixiv/search'));
 
@@ -528,7 +539,7 @@ router.get('/novel/ptwxz/:id1/:id2', require('./routes/novel/ptwxz'));
 router.get('/novel/zhaishuyuan/:id', require('./routes/novel/zhaishuyuan'));
 
 // 中国气象网
-router.get('/weatheralarm', require('./routes/weatheralarm'));
+router.get('/weatheralarm/:province?', require('./routes/weatheralarm'));
 
 // Gitlab
 router.get('/gitlab/explore/:type', require('./routes/gitlab/explore'));
@@ -694,8 +705,8 @@ router.get('/whu/news/:type?', require('./routes/universities/whu/news'));
 
 // 华中科技大学
 router.get('/hust/auto/notice/:type?', require('./routes/universities/hust/aia/notice'));
-router.get('/hust/auto/news/', require('./routes/universities/hust/aia/news'));
-router.get('/hust/aia/news/', require('./routes/universities/hust/aia/news'));
+router.get('/hust/auto/news', require('./routes/universities/hust/aia/news'));
+router.get('/hust/aia/news', require('./routes/universities/hust/aia/news'));
 router.get('/hust/aia/notice/:type?', require('./routes/universities/hust/aia/notice'));
 
 // 井冈山大学
@@ -778,7 +789,7 @@ router.get('/guokr/:channel', require('./routes/guokr/calendar'));
 // 联合早报
 router.get('/zaobao/realtime/:section?', require('./routes/zaobao/realtime'));
 router.get('/zaobao/znews/:section?', require('./routes/zaobao/znews'));
-router.get('/zaobao/:type/:section', require('./routes/zaobao/'));
+router.get('/zaobao/:type/:section', require('./routes/zaobao/index'));
 
 // Apple
 router.get('/apple/exchange_repair/:country?', require('./routes/apple/exchange_repair'));
@@ -1228,7 +1239,7 @@ router.get('/wenku8/chapter/:id', require('./routes/wenku8/chapter'));
 
 // 鲸跃汽车
 router.get('/whalegogo/home', require('./routes/whalegogo/home'));
-router.get('/whalegogo/portal/:type_id/:tagid?/', require('./routes/whalegogo/portal'));
+router.get('/whalegogo/portal/:type_id/:tagid?', require('./routes/whalegogo/portal'));
 
 // 爱思想
 router.get('/aisixiang/column/:id', require('./routes/aisixiang/column'));
@@ -1379,7 +1390,7 @@ router.get('/zju/cst/:type', require('./routes/universities/zju/cst'));
 
 // 浙江大学城市学院
 router.get('/zucc/news/latest', require('./routes/universities/zucc/news'));
-router.get('/zucc/cssearch/latest/:webVpn/:key/', require('./routes/universities/zucc/cssearch'));
+router.get('/zucc/cssearch/latest/:webVpn/:key', require('./routes/universities/zucc/cssearch'));
 
 // 华中师范大学
 router.get('/ccnu/career', require('./routes/universities/ccnu/career'));
@@ -1898,11 +1909,11 @@ router.get('/latexstudio/home', require('./routes/latexstudio/home'));
 
 // 上证债券信息网 - 可转换公司债券公告
 router.get('/sse/convert/:query?', require('./routes/sse/convert'));
-router.get('/sse/renewal/', require('./routes/sse/renewal'));
-router.get('/sse/inquire/', require('./routes/sse/inquire'));
+router.get('/sse/renewal', require('./routes/sse/renewal'));
+router.get('/sse/inquire', require('./routes/sse/inquire'));
 
 // 深圳证券交易所——上市公告
-router.get('/szse/notice/', require('./routes/szse/notice'));
+router.get('/szse/notice', require('./routes/szse/notice'));
 router.get('/szse/inquire/:type', require('./routes/szse/inquire'));
 
 // 前端艺术家每日整理&&飞冰早报
@@ -2555,6 +2566,10 @@ router.get('/51voa/:channel', require('./routes/51voa/channel'));
 // zhuixinfan
 router.get('/zhuixinfan/list', require('./routes/zhuixinfan/list'));
 
+// scoresaber
+router.get('/scoresaber/user/:id', require('./routes/scoresaber/user'));
+
 // unit-image
 router.get('/unit-image/films/:type?', require('./routes/unit-image/films'));
+
 module.exports = router;