|
@@ -1,6 +1,7 @@
|
|
const http = require('http')
|
|
const http = require('http')
|
|
|
|
|
|
const iconv = require('iconv-lite')
|
|
const iconv = require('iconv-lite')
|
|
|
|
+const minify = require('html-minifier').minify
|
|
const BufferHelper = require('bufferhelper')
|
|
const BufferHelper = require('bufferhelper')
|
|
|
|
|
|
/*
|
|
/*
|
|
@@ -15,7 +16,7 @@ const BufferHelper = require('bufferhelper')
|
|
|
|
|
|
const pReg = /<td><a href='(.*?).html'>(.*?)<br\/><\/a><\/td>/g
|
|
const pReg = /<td><a href='(.*?).html'>(.*?)<br\/><\/a><\/td>/g
|
|
const casReg = /<tr class='.*?'><td><a href=.*?>(.*?)<\/a><\/td><td><a href=.*?>(.*?)<\/a><\/td><\/tr>/g
|
|
const casReg = /<tr class='.*?'><td><a href=.*?>(.*?)<\/a><\/td><td><a href=.*?>(.*?)<\/a><\/td><\/tr>/g
|
|
-const vReg = /<td>(.*?)<\/td><td>.*?<\/td><td>(.*?)<\/td>/g
|
|
|
|
|
|
+const vReg = /<tr class='.*?'><td>(.*?)<\/td><td>.*?<\/td><td>(.*?)<\/td><\/tr>/g
|
|
|
|
|
|
const host = 'www.stats.gov.cn'
|
|
const host = 'www.stats.gov.cn'
|
|
const path = '/tjsj/tjbz/tjyqhdmhcxhfdm/2017/#{route}.html'
|
|
const path = '/tjsj/tjbz/tjyqhdmhcxhfdm/2017/#{route}.html'
|
|
@@ -42,7 +43,7 @@ exports.fetch = (host, route, regexp, codeLen) =>
|
|
res.on('data', chunk => bufferHelper.concat(chunk))
|
|
res.on('data', chunk => bufferHelper.concat(chunk))
|
|
|
|
|
|
res.on('end', () => {
|
|
res.on('end', () => {
|
|
- const rawData = iconv.decode(bufferHelper.toBuffer(), 'GBK')
|
|
|
|
|
|
+ const rawData = minify(iconv.decode(bufferHelper.toBuffer(), 'GBK'), { collapseWhitespace: true, quoteCharacter: '\'' })
|
|
|
|
|
|
const result = {}
|
|
const result = {}
|
|
let current
|
|
let current
|