diff --git a/lib/router.js b/lib/router.js index 80d0cfa6fc..825eea7304 100644 --- a/lib/router.js +++ b/lib/router.js @@ -208,7 +208,8 @@ router.get('/utdallas/isso', lazyloadRouteHandler('./routes/universities/utdalla router.get('/nchu/jwc/:type?', lazyloadRouteHandler('./routes/universities/nchu/jwc')); // 重庆大学 -router.get('/cqu/jwc/:path*', lazyloadRouteHandler('./routes/universities/cqu/jwc/announcement')); +router.get('/cqu/jwc/', lazyloadRouteHandler('./routes/universities/cqu/jwc/announcement')); +router.get('/cqu/jwc/:path{.+}', lazyloadRouteHandler('./routes/universities/cqu/jwc/announcement')); router.get('/cqu/news/jzyg', lazyloadRouteHandler('./routes/universities/cqu/news/jzyg')); router.get('/cqu/news/tz', lazyloadRouteHandler('./routes/universities/cqu/news/tz')); router.get('/cqu/youth/:category', lazyloadRouteHandler('./routes/universities/cqu/youth/info')); @@ -827,7 +828,8 @@ router.get('/hanime/video', lazyloadRouteHandler('./routes/hanime/video')); // Soul router.get('/soul/:id', lazyloadRouteHandler('./routes/soul')); -router.get('/soul/posts/hot/:pid*', lazyloadRouteHandler('./routes/soul/hot')); +router.get('/soul/posts/hot/', lazyloadRouteHandler('./routes/soul/hot')); +router.get('/soul/posts/hot/:pid{.+}', lazyloadRouteHandler('./routes/soul/hot')); // 单向空间 router.get('/owspace/read/:type?', lazyloadRouteHandler('./routes/owspace/read')); @@ -858,7 +860,8 @@ router.get('/queshu/book/:bookid', lazyloadRouteHandler('./routes/queshu/book')) router.get('/latexstudio/home', lazyloadRouteHandler('./routes/latexstudio/home')); // 邮箱 -// router.get('/mail/imap/:email/:folder*', lazyloadRouteHandler('./routes/mail/imap')); +// router.get('/mail/imap/:email/', lazyloadRouteHandler('./routes/mail/imap')); +// router.get('/mail/imap/:email/:folder{.+}', lazyloadRouteHandler('./routes/mail/imap')); // 北华航天工业学院 - 新闻 router.get('/nciae/news', lazyloadRouteHandler('./routes/universities/nciae/news')); diff --git a/lib/routes/8kcos/router.js b/lib/routes/8kcos/router.js index abbe2965c9..f201e24cb7 100644 --- a/lib/routes/8kcos/router.js +++ b/lib/routes/8kcos/router.js @@ -1,5 +1,6 @@ export default (router) => { router.get('/', './latest'); - router.get('/cat/:cat*', './cat'); + router.get('/cat/', './cat'); + router.get('/cat/:cat{.+}', './cat'); router.get('/tag/:tag', './tag'); }; diff --git a/lib/routes/abc/router.js b/lib/routes/abc/router.js index cffd8f2def..a5f8cf7d4d 100644 --- a/lib/routes/abc/router.js +++ b/lib/routes/abc/router.js @@ -1,3 +1,4 @@ export default (router) => { - router.get('/:category*', './'); + router.get('/', './'); + router.get('/:category{.+}', './'); }; diff --git a/lib/routes/asiantolick/router.js b/lib/routes/asiantolick/router.js index cffd8f2def..a5f8cf7d4d 100644 --- a/lib/routes/asiantolick/router.js +++ b/lib/routes/asiantolick/router.js @@ -1,3 +1,4 @@ export default (router) => { - router.get('/:category*', './'); + router.get('/', './'); + router.get('/:category{.+}', './'); }; diff --git a/lib/routes/bnu/router.js b/lib/routes/bnu/router.js index 5cc4e62f04..c6bb013461 100644 --- a/lib/routes/bnu/router.js +++ b/lib/routes/bnu/router.js @@ -1,6 +1,7 @@ export default (router) => { router.get('/bs/:category?', './bs'); router.get('/dwxgb/:category/:type', './dwxgb'); - router.get('/fdy/:path*', './fdy'); + router.get('/fdy/', './fdy'); + router.get('/fdy/:path{.+}', './fdy'); router.get('/lib/:category?', './lib'); }; diff --git a/lib/routes/buaa/router.js b/lib/routes/buaa/router.js index 572c3dae8a..c2fc514cd0 100755 --- a/lib/routes/buaa/router.js +++ b/lib/routes/buaa/router.js @@ -1,4 +1,5 @@ export default (router) => { router.get('/news/:type', './news/index'); - router.get('/sme/:path*', './sme'); + router.get('/sme/', './sme'); + router.get('/sme/:path{.+}', './sme'); }; diff --git a/lib/routes/cfmmc/router.js b/lib/routes/cfmmc/router.js index b00fca6005..374fb324cf 100644 --- a/lib/routes/cfmmc/router.js +++ b/lib/routes/cfmmc/router.js @@ -1,3 +1,4 @@ export default (router) => { - router.get('/:id*', './'); + router.get('/', './'); + router.get('/:id{.+}', './'); }; diff --git a/lib/routes/chinawriter/router.js b/lib/routes/chinawriter/router.js index b00fca6005..374fb324cf 100644 --- a/lib/routes/chinawriter/router.js +++ b/lib/routes/chinawriter/router.js @@ -1,3 +1,4 @@ export default (router) => { - router.get('/:id*', './'); + router.get('/', './'); + router.get('/:id{.+}', './'); }; diff --git a/lib/routes/cmde/router.js b/lib/routes/cmde/router.js index d78ef6be00..db08317e80 100644 --- a/lib/routes/cmde/router.js +++ b/lib/routes/cmde/router.js @@ -1,3 +1,4 @@ export default (router) => { - router.get('/:cate*', './index'); + router.get('/', './index'); + router.get('/:cate{.+}', './index'); }; diff --git a/lib/routes/cs/router.js b/lib/routes/cs/router.js index f994ea4a80..9e9aefcb89 100644 --- a/lib/routes/cs/router.js +++ b/lib/routes/cs/router.js @@ -9,5 +9,6 @@ export default (router) => { router.get('/news/zzkx', toZzkx); router.get('/zzkx', toZzkx); router.get('/video/:category?', './video'); - router.get('/:category*', './'); + router.get('/', './'); + router.get('/:category{.+}', './'); }; diff --git a/lib/routes/getitfree/router.js b/lib/routes/getitfree/router.js index 294eda5f5e..106b704123 100644 --- a/lib/routes/getitfree/router.js +++ b/lib/routes/getitfree/router.js @@ -1,3 +1,4 @@ export default (router) => { - router.get('/:filter*', './index'); + router.get('/', './index'); + router.get('/:filter{.+}', './index'); }; diff --git a/lib/routes/gov/router.js b/lib/routes/gov/router.js index 5d9cd08c1a..c816b0df3a 100644 --- a/lib/routes/gov/router.js +++ b/lib/routes/gov/router.js @@ -3,14 +3,17 @@ export default (router) => { router.get('/cac/*', './cac/index'); router.get('/caac/cjwt/:category?', './caac/cjwt'); router.get('/ccdi/*', './ccdi'); - router.get('/chinamine-safety/zfxxgk/:category*', './chinamine-safety/zfxxgk'); - router.get('/chinamine-safety/xw/:category*', './chinamine-safety/xw'); + router.get('/chinamine-safety/zfxxgk/', './chinamine-safety/zfxxgk'); + router.get('/chinamine-safety/zfxxgk/:category{.+}', './chinamine-safety/zfxxgk'); + router.get('/chinamine-safety/xw/', './chinamine-safety/xw'); + router.get('/chinamine-safety/xw/:category{.+}', './chinamine-safety/xw'); router.get('/chinatax/latest', './chinatax/latest'); router.get('/cmse/fxrw', './cmse/fxrw'); router.get('/cmse/*', './cmse'); router.get('/cnnic/*', './cnnic'); router.get('/csrc/auditstatus/:apply_id', './csrc/auditstatus'); - router.get('/csrc/news/:suffix*', './csrc/news'); + router.get('/csrc/news/', './csrc/news'); + router.get('/csrc/news/:suffix{.+}', './csrc/news'); router.get('/customs/list/:gchannel?', './customs/list'); router.get('/fmprc/:category?', './mfa/wjdt'); router.get('/forestry/gjlckjdjt/:category?', './forestry/gjlckjdjt'); @@ -20,14 +23,17 @@ export default (router) => { router.get('/mee/ywdt/:category?', './mee/ywdt'); router.get('/mem/gk/sgcc/:category?', './mem/sgcc'); router.get('/mfa/wjdt/:category?', './mfa/wjdt'); - router.get('/mot/:category*', './mot'); + router.get('/mot/', './mot'); + router.get('/mot/:category{.+}', './mot'); router.get('/miit/wjfb/:ministry', './miit/wjfb'); router.get('/miit/yjzj', './miit/yjzj'); router.get('/miit/zcwj', './miit/zcwj'); router.get('/miit/wjgs', './miit/wjgs'); router.get('/miit/zcjd', './miit/zcjd'); - router.get('/moa/sjzxfb/:category*', './moa/zdscxx'); - router.get('/moa/zdscxx/:category*', './moa/zdscxx'); + router.get('/moa/sjzxfb/', './moa/zdscxx'); + router.get('/moa/sjzxfb/:category{.+}', './moa/zdscxx'); + router.get('/moa/zdscxx/', './moa/zdscxx'); + router.get('/moa/zdscxx/:category{.+}', './moa/zdscxx'); router.get('/moa/:suburl(.*)', './moa/moa'); router.get('/moe/:type', './moe/moe'); router.get('/moe/s78/:column', './moe/s78'); @@ -35,11 +41,14 @@ export default (router) => { router.get('/mofcom/article/:suffix{.+}', './mofcom/article'); router.get('/moj/aac/news/:type?', './moj/aac/news'); router.get('/moj/lfyjzj', './moj/lfyjzj'); - router.get('/ndrc/fggz/:category*', './ndrc/fggz'); - router.get('/ndrc/xwdt/:category*', './ndrc/xwdt'); + router.get('/ndrc/fggz/', './ndrc/fggz'); + router.get('/ndrc/fggz/:category{.+}', './ndrc/fggz'); + router.get('/ndrc/xwdt/', './ndrc/xwdt'); + router.get('/ndrc/xwdt/:category{.+}', './ndrc/xwdt'); router.get('/nea/sjzz/ghs', './nea/ghs'); router.get('/news/:uid', './news'); - router.get('/nifdc/:path*', './nifdc'); + router.get('/nifdc/', './nifdc'); + router.get('/nifdc/:path{.+}', './nifdc'); router.get('/nmpa/*', './nmpa/generic'); router.get('/nopss/*', './nopss'); router.get('/npc/:caty', './npc/index'); @@ -59,14 +68,16 @@ export default (router) => { router.get('/zhengce/wenjian/:pcodeJiguan?', './zhengce/wenjian'); router.get('/zhengce/zhengceku/:department', './zhengce/zhengceku'); router.get('/zhengce/zuixin', './zhengce'); - router.get('/zhengce/:category*', './zhengce'); + router.get('/zhengce/', './zhengce'); + router.get('/zhengce/:category{.+}', './zhengce'); // province router.get('/anhui/kjt/*', './anhui/kjt'); router.get('/beijing/bjedu/gh/:urlPath?', './beijing/bjedu/gh'); router.get('/beijing/bphc/*', './beijing/bphc'); router.get('/beijing/jw/tzgg', './beijing/jw/tzgg'); router.get('/beijing/kw/:channel', './beijing/kw/index'); - router.get('/chongqing/gzw/:category*', './chongqing/gzw'); + router.get('/chongqing/gzw/', './chongqing/gzw'); + router.get('/chongqing/gzw/:category{.+}', './chongqing/gzw'); router.get('/chongqing/rsks', './chongqing/rsks'); router.get('/chongqing/sydwgkzp', './chongqing/sydwgkzp'); router.get('/dianbai/*', './dianbai/dianbai'); @@ -95,7 +106,8 @@ export default (router) => { router.get('/sichuan/deyang/govpublicinfo/:countyName/:infoType?', './sichuan/deyang/govpublicinfo'); router.get('/sichuan/deyang/mztoday/:infoType?', './sichuan/deyang/mztoday'); router.get('/suzhou/doc', './suzhou/doc'); - router.get('/suzhou/fg/:category*', './suzhou/fg'); + router.get('/suzhou/fg/', './suzhou/fg'); + router.get('/suzhou/fg/:category{.+}', './suzhou/fg'); router.get('/suzhou/news/:uid', './suzhou/news'); router.get('/taiyuan/rsj/:caty/:page?', './taiyuan/rsj'); router.get('/wuhan/sy/whyw', './wuhan/whyw'); diff --git a/lib/routes/iqilu/router.js b/lib/routes/iqilu/router.js index d990c6707e..109fa73360 100644 --- a/lib/routes/iqilu/router.js +++ b/lib/routes/iqilu/router.js @@ -1,3 +1,4 @@ export default (router) => { - router.get('/v/:category*', './program'); + router.get('/v/', './program'); + router.get('/v/:category{.+}', './program'); }; diff --git a/lib/routes/jiemian/router.js b/lib/routes/jiemian/router.js index 5a448fbbb9..6696b03f2d 100644 --- a/lib/routes/jiemian/router.js +++ b/lib/routes/jiemian/router.js @@ -1,4 +1,5 @@ export default (router) => { router.get('/list/:id', './list'); - router.get('/:category*', './lists'); + router.get('/', './lists'); + router.get('/:category{.+}', './lists'); }; diff --git a/lib/routes/kantarworldpanel/router.js b/lib/routes/kantarworldpanel/router.js index 4ab9c9bb81..fbcdcd487f 100644 --- a/lib/routes/kantarworldpanel/router.js +++ b/lib/routes/kantarworldpanel/router.js @@ -1,3 +1,4 @@ export default (router) => { - router.get('/:region?/:category*', './'); + router.get('/:region?', './'); + router.get('/:region/:category{.+}', './'); }; diff --git a/lib/routes/liulinblog/router.js b/lib/routes/liulinblog/router.js index 425afe2004..79620c3048 100644 --- a/lib/routes/liulinblog/router.js +++ b/lib/routes/liulinblog/router.js @@ -1,4 +1,5 @@ export default (router) => { router.get('/itnews/:channel', './itnews'); - router.get('/:params*', './'); + router.get('/', './'); + router.get('/:params{.+}', './'); }; diff --git a/lib/routes/logclub/router.js b/lib/routes/logclub/router.js index 5421415a9c..5b55a8fc54 100644 --- a/lib/routes/logclub/router.js +++ b/lib/routes/logclub/router.js @@ -1,5 +1,6 @@ export default (router) => { router.get('/lc_report/:id?', './report'); router.get('/report/:id?', './report'); - router.get('/:category*', './'); + router.get('/', './'); + router.get('/:category{.+}', './'); }; diff --git a/lib/routes/m4/router.js b/lib/routes/m4/router.js index fccbe3a58d..5d2f0ee833 100644 --- a/lib/routes/m4/router.js +++ b/lib/routes/m4/router.js @@ -1,3 +1,4 @@ export default (router) => { - router.get('/:id?/:category*', './'); + router.get('/:id?', './'); + router.get('/:id/:category{.+}', './'); }; diff --git a/lib/routes/mail/router.js b/lib/routes/mail/router.js index d2c2ca54b5..97971b607d 100644 --- a/lib/routes/mail/router.js +++ b/lib/routes/mail/router.js @@ -1,3 +1,4 @@ export default (router) => { - router.get('/imap/:email/:folder*', './imap'); + router.get('/imap/:email/', './imap'); + router.get('/imap/:email/:folder{.+}', './imap'); }; diff --git a/lib/routes/mydrivers/router.js b/lib/routes/mydrivers/router.js index a802b49c33..94a4550bb2 100644 --- a/lib/routes/mydrivers/router.js +++ b/lib/routes/mydrivers/router.js @@ -2,5 +2,6 @@ export default (router) => { router.get('/cid/:id?', './cid'); router.get('/rank/:range?', './rank'); router.get('/zhibo', './cid'); - router.get('/:category*', './'); + router.get('/', './'); + router.get('/:category{.+}', './'); }; diff --git a/lib/routes/ncc-cma/router.js b/lib/routes/ncc-cma/router.js index 83b9dae976..d99e5b3e48 100644 --- a/lib/routes/ncc-cma/router.js +++ b/lib/routes/ncc-cma/router.js @@ -1,3 +1,4 @@ export default (router) => { - router.get('/cmdp/image/:id*', './cmdp'); + router.get('/cmdp/image/', './cmdp'); + router.get('/cmdp/image/:id{.+}', './cmdp'); }; diff --git a/lib/routes/papers/router.js b/lib/routes/papers/router.js index cffd8f2def..a5f8cf7d4d 100644 --- a/lib/routes/papers/router.js +++ b/lib/routes/papers/router.js @@ -1,3 +1,4 @@ export default (router) => { - router.get('/:category*', './'); + router.get('/', './'); + router.get('/:category{.+}', './'); }; diff --git a/lib/routes/people/router.js b/lib/routes/people/router.js index 6f2aa9bc48..f9766a990f 100644 --- a/lib/routes/people/router.js +++ b/lib/routes/people/router.js @@ -1,5 +1,6 @@ export default (router) => { router.get('/liuyan/:id/:state?', './liuyan'); router.get('/xjpjh/:keyword?/:year?', './xjpjh'); - router.get('/:site?/:category*', './'); + router.get('/:site?', './'); + router.get('/:site/:category{.+}', './'); }; diff --git a/lib/routes/pnas/router.js b/lib/routes/pnas/router.js index 83ffd0cdd0..a732d138a9 100644 --- a/lib/routes/pnas/router.js +++ b/lib/routes/pnas/router.js @@ -1,3 +1,4 @@ export default (router) => { - router.get('/:topicPath*', './index'); + router.get('/', './index'); + router.get('/:topicPath{.+}', './index'); }; diff --git a/lib/routes/qianp/router.js b/lib/routes/qianp/router.js index 0b591ce95a..eea3f6b761 100644 --- a/lib/routes/qianp/router.js +++ b/lib/routes/qianp/router.js @@ -1,3 +1,4 @@ export default (router) => { - router.get('/news/:path*', './news'); + router.get('/news/', './news'); + router.get('/news/:path{.+}', './news'); }; diff --git a/lib/routes/rfi/router.js b/lib/routes/rfi/router.js index 93410ef377..8a4785ee04 100644 --- a/lib/routes/rfi/router.js +++ b/lib/routes/rfi/router.js @@ -1,3 +1,4 @@ export default (router) => { - router.get('/:path*', './news'); + router.get('/', './news'); + router.get('/:path{.+}', './news'); }; diff --git a/lib/routes/stheadline/router.js b/lib/routes/stheadline/router.js index a9d9a43c63..bd7c166ed8 100644 --- a/lib/routes/stheadline/router.js +++ b/lib/routes/stheadline/router.js @@ -1,3 +1,4 @@ export default (router) => { - router.get('/std/realtime/:category*', './std/realtime'); + router.get('/std/realtime/', './std/realtime'); + router.get('/std/realtime/:category{.+}', './std/realtime'); }; diff --git a/lib/routes/surfshark/router.js b/lib/routes/surfshark/router.js index 77c97e32a8..e6482519af 100644 --- a/lib/routes/surfshark/router.js +++ b/lib/routes/surfshark/router.js @@ -1,3 +1,4 @@ export default (router) => { - router.get('/blog/:category*', './blog'); + router.get('/blog/', './blog'); + router.get('/blog/:category{.+}', './blog'); }; diff --git a/lib/routes/toodaylab/router.js b/lib/routes/toodaylab/router.js index 82774a018b..2757d8eb82 100644 --- a/lib/routes/toodaylab/router.js +++ b/lib/routes/toodaylab/router.js @@ -1,3 +1,4 @@ export default (router) => { - router.get('/:params*', './'); + router.get('/', './'); + router.get('/:params{.+}', './'); }; diff --git a/lib/routes/tradingview/router.js b/lib/routes/tradingview/router.js index d23cae06c2..5e45bca2f5 100644 --- a/lib/routes/tradingview/router.js +++ b/lib/routes/tradingview/router.js @@ -1,5 +1,6 @@ export default (router) => { - router.get('/blog/:category*', './blog'); + router.get('/blog/', './blog'); + router.get('/blog/:category{.+}', './blog'); router.get('/desktop', './desktop'); router.get('/pine/:version?', './pine'); }; diff --git a/lib/routes/whu/router.js b/lib/routes/whu/router.js index 2ba9b44d75..e003049f69 100644 --- a/lib/routes/whu/router.js +++ b/lib/routes/whu/router.js @@ -1,6 +1,8 @@ export default (router) => { router.get('/cs/:type', './cs'); router.get('/gs/:type?', './gs/index.js'); - router.get('/hyxt/:category*', './hyxt'); - router.get('/news/:category*', './news'); + router.get('/hyxt/', './hyxt'); + router.get('/hyxt/:category{.+}', './hyxt'); + router.get('/news/', './news'); + router.get('/news/:category{.+}', './news'); }; diff --git a/lib/routes/wmc-bj/router.js b/lib/routes/wmc-bj/router.js index 204156cc44..2434779f2c 100644 --- a/lib/routes/wmc-bj/router.js +++ b/lib/routes/wmc-bj/router.js @@ -1,3 +1,4 @@ export default (router) => { - router.get('/publish/:category*', './publish'); + router.get('/publish/', './publish'); + router.get('/publish/:category{.+}', './publish'); }; diff --git a/lib/routes/worldjournal/router.js b/lib/routes/worldjournal/router.js index 47c58ab516..7c55eb4ec5 100644 --- a/lib/routes/worldjournal/router.js +++ b/lib/routes/worldjournal/router.js @@ -1,3 +1,4 @@ export default (router) => { - router.get('/:path*', './index'); + router.get('/', './index'); + router.get('/:path{.+}', './index'); }; diff --git a/lib/routes/xmnn/router.js b/lib/routes/xmnn/router.js index bff855ea4b..eb18d3d973 100644 --- a/lib/routes/xmnn/router.js +++ b/lib/routes/xmnn/router.js @@ -1,4 +1,5 @@ export default (router) => { router.get('/epaper/:id?', './epaper'); - router.get('/news/:category*', './news'); + router.get('/news/', './news'); + router.get('/news/:category{.+}', './news'); };