Skip to content

Commit d17035b

Browse files
authored
Merge pull request #585 from DIYgod/master
[pull] master from diygod:master
2 parents a6a03b5 + 9892bbe commit d17035b

File tree

20 files changed

+327
-191
lines changed

20 files changed

+327
-191
lines changed

docs/en/study.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,20 @@ pageClass: routes
44

55
# Study
66

7+
## Asian Innovation and Entrepreneurship Association
8+
9+
### Seminar Series
10+
11+
<RouteEn author="zxx-457" example="/aiea/seminars/upcoming" path="/aiea/seminars/:period" :paramsDesc="['Time frame']">
12+
13+
| Time frame |
14+
| ----- |
15+
| upcoming |
16+
| past |
17+
| both|
18+
19+
</RouteEn>
20+
721
## gradCafe
822

923
### gradCafe result

docs/government.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1002,7 +1002,7 @@ pageClass: routes
10021002

10031003
<Route author="hillerliao" example="/csrc/auditstatus/:apply_id" path="/csrc/auditstatus" :paramsDesc="['事项类别id,`https://neris.csrc.gov.cn/alappl/home/xkDetail` 列表中各地址的 appMatrCde 参数']"/>
10041004

1005-
## 中国政府
1005+
## 中国政府网
10061006

10071007
### 数据
10081008

@@ -1040,7 +1040,7 @@ pageClass: routes
10401040

10411041
### 最新文件
10421042

1043-
<Route author="ciaranchen" example="/gov/zhengce/wenjian" path="/gov/zhengce/wenjian/:pcodeJiguan?" :paramsDesc="['文种分类。国令; 国发; 国函; 国发明电; 国办发; 国办函; 国办发明电; 其他']" />
1043+
<Route author="ciaranchen" example="/gov/zhengce/wenjian" path="/gov/zhengce/wenjian/:pcodeJiguan?" :paramsDesc="['文种分类。国令、国发、国函、国发明电国办发国办函国办发明电其他']" />
10441044

10451045
### 信息稿件
10461046

@@ -1059,6 +1059,10 @@ pageClass: routes
10591059

10601060
</Route>
10611061

1062+
### 国务院政策文件库
1063+
1064+
<Route author="zxx-457" example="/gov/zhengce/zhengceku/bmwj" path="/gov/zhengce/zhengceku/:department" :paramsDesc="['库名']" />
1065+
10621066
### 政府新闻
10631067

10641068
<Route author="EsuRt" example="/gov/news/:uid" path="/gov/news" :paramsDesc="['分类名']">

docs/study.md

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,26 @@ pageClass: routes
3737
| bilingual | 双语新闻 (Bilingual News) |
3838
| address | 总统演讲 (President Address) |
3939

40+
## Asian Innovation and Entrepreneurship Association
41+
42+
### Seminar Series
43+
44+
<Route author="zxx-457" example="/aiea/seminars/upcoming" path="/aiea/seminars/:period" :paramsDesc="['时间段']">
45+
46+
| 时间段 |
47+
| -------- |
48+
| upcoming |
49+
| past |
50+
| both |
51+
52+
</Route>
53+
4054
## CTFHub Calendar
4155

4256
### 查询国内外 CTF 赛事信息
4357

44-
<Route author="frankli0324" example="/ctfhub/search"
45-
path="/ctfhub/search/:limit?/:form?/:class?/:title?"
58+
<Route author="frankli0324" example="/ctfhub/search"
59+
path="/ctfhub/search/:limit?/:form?/:class?/:title?"
4660
:paramsDesc="['一个整数,筛选最新的limit场比赛,默认为10', '比赛形式', '比赛类型', '通过CTF赛事名称过滤']">
4761

4862
| `:class` | 类型 |
@@ -65,8 +79,8 @@ path="/ctfhub/search/:limit?/:form?/:class?/:title?"
6579

6680
### 查询近期赛事
6781

68-
<Route author="frankli0324" example="/ctfhub/upcoming"
69-
path="/ctfhub/upcoming/:limit?"
82+
<Route author="frankli0324" example="/ctfhub/upcoming"
83+
path="/ctfhub/upcoming/:limit?"
7084
:paramsDesc="['一个整数,筛选最近的limit场比赛,默认为5']">
7185

7286
</Route>

lib/router.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1174,9 +1174,9 @@ router.get('/cyzone/author/:id', lazyloadRouteHandler('./routes/cyzone/author'))
11741174
router.get('/cyzone/label/:name', lazyloadRouteHandler('./routes/cyzone/label'));
11751175

11761176
// 政府
1177-
router.get('/gov/zhengce/zuixin', lazyloadRouteHandler('./routes/gov/zhengce/zuixin'));
1178-
router.get('/gov/zhengce/wenjian/:pcodeJiguan?', lazyloadRouteHandler('./routes/gov/zhengce/wenjian'));
1179-
router.get('/gov/zhengce/govall/:advance?', lazyloadRouteHandler('./routes/gov/zhengce/govall'));
1177+
// router.get('/gov/zhengce/zuixin', lazyloadRouteHandler('./routes/gov/zhengce/zuixin'));
1178+
// router.get('/gov/zhengce/wenjian/:pcodeJiguan?', lazyloadRouteHandler('./routes/gov/zhengce/wenjian'));
1179+
// router.get('/gov/zhengce/govall/:advance?', lazyloadRouteHandler('./routes/gov/zhengce/govall'));
11801180
router.get('/gov/province/:name/:category', lazyloadRouteHandler('./routes/gov/province'));
11811181
router.get('/gov/city/:name/:category', lazyloadRouteHandler('./routes/gov/city'));
11821182
router.get('/gov/statecouncil/briefing', lazyloadRouteHandler('./routes/gov/statecouncil/briefing'));

lib/routes/gov/zhengce/govall.js

Lines changed: 0 additions & 59 deletions
This file was deleted.

lib/routes/gov/zhengce/wenjian.js

Lines changed: 0 additions & 53 deletions
This file was deleted.

lib/routes/gov/zhengce/zuixin.js

Lines changed: 0 additions & 42 deletions
This file was deleted.

lib/v2/aiea/index.js

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
const buildData = require('@/utils/common-config');
2+
3+
module.exports = async (ctx) => {
4+
const link = 'http://www.aiea.org/0504';
5+
const period = ctx.params.period ?? '';
6+
7+
let nth_child = 'n';
8+
switch (period) {
9+
case 'upcoming':
10+
nth_child = '1';
11+
break;
12+
13+
case 'past':
14+
nth_child = '2';
15+
break;
16+
17+
case 'both':
18+
nth_child = 'n';
19+
break;
20+
21+
default:
22+
break;
23+
}
24+
25+
ctx.state.data = await buildData({
26+
link,
27+
url: link,
28+
title: `%title%`,
29+
params: {
30+
title: 'AIEA Seminars',
31+
},
32+
item: {
33+
item: `.seminar-contents .seminar-partWrap:nth-child(${nth_child}) > .seminar-list`,
34+
title: `$('.seminar-list-title > span').text()`,
35+
link: `$('a[href^="/0504"]').attr('href')`,
36+
description: `$('.seminar-list .txt > .title').text()`,
37+
},
38+
});
39+
};

lib/v2/aiea/maintainer.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
module.exports = {
2+
'/seminars/:period': ['zxx-457'],
3+
};

lib/v2/aiea/radar.js

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
module.exports = {
2+
'aiea.org': {
3+
_name: 'Asian Innovation and Entrepreneurship Association',
4+
www: [
5+
{
6+
title: 'Seminar Series',
7+
docs: 'https://docs.rsshub.app/study.html#AIEA-Seminar-Series',
8+
source: ['/0504', '/'],
9+
target: '/aiea/seminars/upcoming',
10+
},
11+
],
12+
},
13+
};

0 commit comments

Comments
 (0)