Merge branch 'release/2.4.0'

README.md

@@ -15,7 +15,7 @@
     * [中华人民共和国国家统计局-统计用区划和城乡划分代码](http://www.stats.gov.cn/tjsj/tjbz/tjyqhdmhcxhfdm/)
     * [中华人民共和国国家统计局-统计用区划代码和城乡划分代码编制规则](http://www.stats.gov.cn/tjsj/tjbz/200911/t20091125_8667.html)
 *   本项目已更新至：
-    * [2019年统计用区划代码和城乡划分代码（截止时间：2019-10-31，发布时间：2020-02-25）](http://www.stats.gov.cn/tjsj/tjbz/tjyqhdmhcxhfdm/2019/index.html)
+    * [2020年统计用区划代码和城乡划分代码（截止时间：2020-06-30，发布时间：2020-11-06）](http://www.stats.gov.cn/tjsj/tjbz/tjyqhdmhcxhfdm/2020/index.html)
 
 ## 数据下载
 
@@ -39,9 +39,23 @@
 ## 数据更新
 
 ```
-$ yarn
+$ npm install
 $ npm run fetch
 ```
+
+如果需要更新所有数据，只需删除现有数据重新抓取即可：
+
+```
+# 删除现有的数据
+$ rm dist/*.csv && rm dist/[a-z]*.json && rm dist/data.sqlite && touch dist/data.sqlite
+
+# 拉数据（这个步骤比较耗时）
+$ npm run fetch
+
+# 格式化 json csv 和联动数据等
+$ npm run build
+```
+
 ```
 [1/1]正在抓取省级数据...
 

dist/areas.csv

@@ -102,15 +102,14 @@ code,name,cityCode,provinceCode
 130471,"邯郸经济技术开发区",1304,13
 130473,"邯郸冀南新区",1304,13
 130481,"武安市",1304,13
-130502,"桥东区",1305,13
-130503,"桥西区",1305,13
-130521,"邢台县",1305,13
+130502,"襄都区",1305,13
+130503,"信都区",1305,13
+130505,"任泽区",1305,13
+130506,"南和区",1305,13
 130522,"临城县",1305,13
 130523,"内丘县",1305,13
 130524,"柏乡县",1305,13
 130525,"隆尧县",1305,13
-130526,"任县",1305,13
-130527,"南和县",1305,13
 130528,"宁晋县",1305,13
 130529,"巨鹿县",1305,13
 130530,"新河县",1305,13
@@ -276,12 +275,12 @@ code,name,cityCode,provinceCode
 140671,"山西朔州经济开发区",1406,14
 140681,"怀仁市",1406,14
 140702,"榆次区",1407,14
+140703,"太谷区",1407,14
 140721,"榆社县",1407,14
 140722,"左权县",1407,14
 140723,"和顺县",1407,14
 140724,"昔阳县",1407,14
 140725,"寿阳县",1407,14
-140726,"太谷县",1407,14
 140727,"祁县",1407,14
 140728,"平遥县",1407,14
 140729,"灵石县",1407,14
@@ -353,7 +352,6 @@ code,name,cityCode,provinceCode
 150123,"和林格尔县",1501,15
 150124,"清水河县",1501,15
 150125,"武川县",1501,15
-150171,"呼和浩特金海工业园区",1501,15
 150172,"呼和浩特经济技术开发区",1501,15
 150202,"东河区",1502,15
 150203,"昆都仑区",1502,15
@@ -567,6 +565,7 @@ code,name,cityCode,provinceCode
 220174,"长春汽车经济技术开发区",2201,22
 220182,"榆树市",2201,22
 220183,"德惠市",2201,22
+220184,"公主岭市",2201,22
 220202,"昌邑区",2202,22
 220203,"龙潭区",2202,22
 220204,"船营区",2202,22
@@ -583,7 +582,6 @@ code,name,cityCode,provinceCode
 220303,"铁东区",2203,22
 220322,"梨树县",2203,22
 220323,"伊通满族自治县",2203,22
-220381,"公主岭市",2203,22
 220382,"双辽市",2203,22
 220402,"龙山区",2204,22
 220403,"西安区",2204,22
@@ -982,9 +980,9 @@ code,name,cityCode,provinceCode
 340221,"芜湖县",3402,34
 340222,"繁昌县",3402,34
 340223,"南陵县",3402,34
-340225,"无为县",3402,34
 340271,"芜湖经济技术开发区",3402,34
 340272,"安徽芜湖长江大桥经济开发区",3402,34
+340281,"无为市",3402,34
 340302,"龙子湖区",3403,34
 340303,"蚌山区",3403,34
 340304,"禹会区",3403,34
@@ -1171,9 +1169,9 @@ code,name,cityCode,provinceCode
 360102,"东湖区",3601,36
 360103,"西湖区",3601,36
 360104,"青云谱区",3601,36
-360105,"湾里区",3601,36
 360111,"青山湖区",3601,36
 360112,"新建区",3601,36
+360113,"红谷滩区",3601,36
 360121,"南昌县",3601,36
 360123,"安义县",3601,36
 360124,"进贤县",3601,36
@@ -1212,7 +1210,6 @@ code,name,cityCode,provinceCode
 360724,"上犹县",3607,36
 360725,"崇义县",3607,36
 360726,"安远县",3607,36
-360727,"龙南县",3607,36
 360728,"定南县",3607,36
 360729,"全南县",3607,36
 360730,"宁都县",3607,36
@@ -1222,6 +1219,7 @@ code,name,cityCode,provinceCode
 360734,"寻乌县",3607,36
 360735,"石城县",3607,36
 360781,"瑞金市",3607,36
+360783,"龙南市",3607,36
 360802,"吉州区",3608,36
 360803,"青原区",3608,36
 360821,"吉安县",3608,36
@@ -1317,13 +1315,12 @@ code,name,cityCode,provinceCode
 370611,"福山区",3706,37
 370612,"牟平区",3706,37
 370613,"莱山区",3706,37
-370634,"长岛县",3706,37
+370614,"蓬莱区",3706,37
 370671,"烟台高新技术产业开发区",3706,37
 370672,"烟台经济技术开发区",3706,37
 370681,"龙口市",3706,37
 370682,"莱阳市",3706,37
 370683,"莱州市",3706,37
-370684,"蓬莱市",3706,37
 370685,"招远市",3706,37
 370686,"栖霞市",3706,37
 370687,"海阳市",3706,37
@@ -1383,8 +1380,6 @@ code,name,cityCode,provinceCode
 371328,"蒙阴县",3713,37
 371329,"临沭县",3713,37
 371371,"临沂高新技术产业开发区",3713,37
-371372,"临沂经济技术开发区",3713,37
-371373,"临沂临港经济开发区",3713,37
 371402,"德城区",3714,37
 371403,"陵城区",3714,37
 371422,"宁津县",3714,37
@@ -1848,7 +1843,6 @@ code,name,cityCode,provinceCode
 433126,"古丈县",4331,43
 433127,"永顺县",4331,43
 433130,"龙山县",4331,43
-433173,"湖南永顺经济开发区",4331,43
 440103,"荔湾区",4401,44
 440104,"越秀区",4401,44
 440105,"海珠区",4401,44
@@ -2046,7 +2040,6 @@ code,name,cityCode,provinceCode
 451002,"右江区",4510,45
 451003,"田阳区",4510,45
 451022,"田东县",4510,45
-451023,"平果县",4510,45
 451024,"德保县",4510,45
 451026,"那坡县",4510,45
 451027,"凌云县",4510,45
@@ -2055,6 +2048,7 @@ code,name,cityCode,provinceCode
 451030,"西林县",4510,45
 451031,"隆林各族自治县",4510,45
 451081,"靖西市",4510,45
+451082,"平果市",4510,45
 451102,"八步区",4511,45
 451103,"平桂区",4511,45
 451121,"昭平县",4511,45
@@ -2160,10 +2154,10 @@ code,name,cityCode,provinceCode
 510115,"温江区",5101,51
 510116,"双流区",5101,51
 510117,"郫都区",5101,51
+510118,"新津区",5101,51
 510121,"金堂县",5101,51
 510129,"大邑县",5101,51
 510131,"蒲江县",5101,51
-510132,"新津县",5101,51
 510181,"都江堰市",5101,51
 510182,"彭州市",5101,51
 510183,"邛崃市",5101,51
@@ -2448,13 +2442,13 @@ code,name,cityCode,provinceCode
 530381,"宣威市",5303,53
 530402,"红塔区",5304,53
 530403,"江川区",5304,53
-530422,"澄江县",5304,53
 530423,"通海县",5304,53
 530424,"华宁县",5304,53
 530425,"易门县",5304,53
 530426,"峨山彝族自治县",5304,53
 530427,"新平彝族傣族自治县",5304,53
 530428,"元江哈尼族彝族傣族自治县",5304,53
+530481,"澄江市",5304,53
 530502,"隆阳区",5305,53
 530521,"施甸县",5305,53
 530523,"龙陵县",5305,53
@@ -2829,8 +2823,8 @@ code,name,cityCode,provinceCode
 630103,"城中区",6301,63
 630104,"城西区",6301,63
 630105,"城北区",6301,63
+630106,"湟中区",6301,63
 630121,"大通回族土族自治县",6301,63
-630122,"湟中县",6301,63
 630123,"湟源县",6301,63
 630202,"乐都区",6302,63
 630203,"平安区",6302,63
@@ -2932,8 +2926,8 @@ code,name,cityCode,provinceCode
 652829,"博湖县",6528,65
 652871,"库尔勒经济技术开发区",6528,65
 652901,"阿克苏市",6529,65
+652902,"库车市",6529,65
 652922,"温宿县",6529,65
-652923,"库车县",6529,65
 652924,"沙雅县",6529,65
 652925,"新和县",6529,65
 652926,"拜城县",6529,65
@@ -2993,4 +2987,9 @@ code,name,cityCode,provinceCode
 659002,"阿拉尔市",6590,65
 659003,"图木舒克市",6590,65
 659004,"五家渠市",6590,65
+659005,"北屯市",6590,65
 659006,"铁门关市",6590,65
+659007,"双河市",6590,65
+659008,"可克达拉市",6590,65
+659009,"昆玉市",6590,65
+659010,"胡杨河市",6590,65

lib/crawler.js

@@ -19,7 +19,7 @@ const casReg = /<tr class='.*?'><td><a href=.*?>(.*?)<\/a><\/td><td><a href=.*?>
 const vReg = /<tr class='.*?'><td>(.*?)<\/td><td>.*?<\/td><td>(.*?)<\/td><\/tr>/g
 
 const host = 'www.stats.gov.cn'
-const path = '/tjsj/tjbz/tjyqhdmhcxhfdm/2019/#{route}.html'
+const path = '/tjsj/tjbz/tjyqhdmhcxhfdm/2020/#{route}.html'
 
 /**
  * 抓取数据