김윤지

Merge branch 'master' into 'master'

Master



See merge request !2
당신이 지금 죽을 확률은?
당신이 지금 죽을 확률은?
http://52.79.234.167
\ No newline at end of file
http://52.79.234.167
임시 http://127.0.0.1
\ No newline at end of file
......
module.exports = {
key = "XOLqI9tY4gVCdk1i2BoOM3EYmSUYqt8WlXUfIDSfD4RnNBrFwwthbNAtGOxoskP540JbUAzcnuABsydoE2U2dA%3D%3D"
}
module.exports = {
host: 'localhost',
user: 'root',
password: 'abcd',
database: 'db_option_trafficinfo'
}
\ No newline at end of file
{
"fields": [
{ "id": "afos_fid" },
{ "id": "afos_id" },
{ "id": "bjd_cd" },
{ "id": "spot_cd" },
{ "id": "sido_sgg_nm" },
{ "id": "spot_nm" },
{ "id": "occrrnc_cnt" },
{ "id": "caslt_cnt" },
{ "id": "dth_dnv_cnt" },
{ "id": "se_dnv_cnt" },
{ "id": "sl_dnv_cnt" },
{ "id": "wnd_dnv_cnt" },
{ "id": "geom_json" },
{ "id": "lo_crd" },
{ "id": "la_crd" }
],
"records": [
{
"lo_crd": "126.913415969472",
"dth_dnv_cnt": "1",
"geom_json": "{type:Polygon/coordinates:[[[126.914763442398/37.5492293175798]/[126.914737551084/37.5490208989909]/[126.914660872129/37.5488204892619]/[126.914536352264/37.5486357901207]/[126.914368776716/37.5484738995931]/[126.91416458532/37.548341039208]/[126.913931625036/37.5482423148821]/[126.913678848399/37.5481815206774]/[126.913415969472/37.5481609929754]/[126.913153090545/37.5481815206774]/[126.912900313908/37.5482423148821]/[126.912667353624/37.548341039208]/[126.912463162228/37.5484738995931]/[126.912295586681/37.5486357901207]/[126.912171066815/37.5488204892619]/[126.91209438786/37.5490208989909]/[126.912068496546/37.5492293175798]/[126.91209438786/37.5494377355859]/[126.912171066815/37.5496381436553]/[126.912295586681/37.5498228403127]/[126.912463162228/37.5499847279105]/[126.912667353624/37.5501175853658]/[126.912900313908/37.5502163072079]/[126.913153090545/37.550277099753]/[126.913415969472/37.5502976268722]/[126.913678848399/37.550277099753]/[126.913931625036/37.5502163072079]/[126.91416458532/37.5501175853658]/[126.914368776716/37.5499847279105]/[126.914536352264/37.5498228403127]/[126.914660872129/37.5496381436553]/[126.914737551084/37.5494377355859]/[126.914763442398/37.5492293175798]]]}",
"se_dnv_cnt": "8",
"sl_dnv_cnt": "79",
"afos_fid": "6467443",
"bjd_cd": "11440122",
"sido_sgg_nm": "서울특별시 마포구1",
"spot_nm": "서울특별시 마포구 합정동(합정역 인근)",
"afos_id": "2018074",
"spot_cd": "11440001",
"occrrnc_cnt": "60",
"caslt_cnt": "94",
"wnd_dnv_cnt": "6",
"la_crd": "37.54922931758"
},
{
"lo_crd": "126.947032472871",
"dth_dnv_cnt": "1",
"geom_json": "{type:Polygon/coordinates:[[[126.948379945797/37.5404063720573]/[126.948354054483/37.5401979288003]/[126.948277375528/37.5399974953512]/[126.948152855663/37.5398127743496]/[126.947985280115/37.5396508646611]/[126.947781088719/37.539517988551]/[126.947548128435/37.5394192525405]/[126.947295351798/37.5393584511404]/[126.947032472871/37.5393379210089]/[126.946769593944/37.5393584511404]/[126.946516817307/37.5394192525405]/[126.946283857023/37.539517988551]/[126.946079665627/37.5396508646611]/[126.945912090079/37.5398127743496]/[126.945787570214/37.5399974953512]/[126.945710891259/37.5401979288003]/[126.945684999945/37.5404063720573]/[126.945710891259/37.5406148147315]/[126.945787570214/37.5408152465211]/[126.945912090079/37.5409999650393]/[126.946079665627/37.5411618717982]/[126.946283857023/37.5412947449786]/[126.946516817307/37.5413934785055]/[126.946769593944/37.5414542782462]/[126.947032472871/37.541474807795]/[126.947295351798/37.5414542782462]/[126.947548128435/37.5413934785055]/[126.947781088719/37.5412947449786]/[126.947985280115/37.5411618717982]/[126.948152855663/37.5409999650393]/[126.948277375528/37.5408152465211]/[126.948354054483/37.5406148147315]/[126.948379945797/37.5404063720573]]]}",
"se_dnv_cnt": "6",
"sl_dnv_cnt": "51",
"afos_fid": "6467444",
"bjd_cd": "11440104",
"sido_sgg_nm": "서울특별시 마포구2",
"spot_nm": "서울특별시 마포구 도화동(일진빌딩 인근)",
"afos_id": "2018074",
"spot_cd": "11440002",
"occrrnc_cnt": "42",
"caslt_cnt": "60",
"wnd_dnv_cnt": "2",
"la_crd": "37.540406372057"
},
{
"lo_crd": "126.950985152444",
"dth_dnv_cnt": "0",
"geom_json": "{type:Polygon/coordinates:[[[126.95233262537/37.5439369566262]/[126.952306734056/37.5437285232398]/[126.952230055101/37.543528099282]/[126.952105535236/37.5433433870274]/[126.951937959688/37.5431814850059]/[126.951733768292/37.5430486151879]/[126.951500808008/37.5429498838529]/[126.951248031371/37.5428890853319]/[126.950985152444/37.5428685561725]/[126.950722273517/37.5428890853319]/[126.95046949688/37.5429498838529]/[126.950236536596/37.5430486151879]/[126.9500323452/37.5431814850059]/[126.949864769652/37.5433433870274]/[126.949740249787/37.543528099282]/[126.949663570832/37.5437285232398]/[126.949637679518/37.5439369566262]/[126.949663570832/37.5441453894298]/[126.949740249787/37.5443458117281]/[126.949864769652/37.544530521499]/[126.9500323452/37.5446924205909]/[126.950236536596/37.5448252874792]/[126.95046949688/37.5449240163305]/[126.950722273517/37.544984813192]/[126.950985152444/37.5450053417687]/[126.951248031371/37.544984813192]/[126.951500808008/37.5449240163305]/[126.951733768292/37.5448252874792]/[126.951937959688/37.5446924205909]/[126.952105535236/37.544530521499]/[126.952230055101/37.5443458117281]/[126.952306734056/37.5441453894298]/[126.95233262537/37.5439369566262]]]}",
"se_dnv_cnt": "8",
"sl_dnv_cnt": "51",
"afos_fid": "6467445",
"bjd_cd": "11440104",
"sido_sgg_nm": "서울특별시 마포구3",
"spot_nm": "서울특별시 마포구 도화동(공덕오거리 인근)",
"afos_id": "2018074",
"spot_cd": "11440003",
"occrrnc_cnt": "41",
"caslt_cnt": "62",
"wnd_dnv_cnt": "3",
"la_crd": "37.543936956626"
}
]
}
\ No newline at end of file
<response>
<header>
<resultCode>00</resultCode>
<resultMsg>NORMAL_CODE</resultMsg>
</header>
<body>
<items>
<item>
<afos_fid>6467443</afos_fid>
<afos_id>2018074</afos_id>
<bjd_cd>11440122</bjd_cd>
<spot_cd>11440001</spot_cd>
<sido_sgg_nm>서울특별시 마포구1</sido_sgg_nm>
<spot_nm>서울특별시 마포구 합정동(합정역 인근)</spot_nm>
<occrrnc_cnt>60</occrrnc_cnt>
<caslt_cnt>94</caslt_cnt>
<dth_dnv_cnt>1</dth_dnv_cnt>
<se_dnv_cnt>8</se_dnv_cnt>
<sl_dnv_cnt>79</sl_dnv_cnt>
<wnd_dnv_cnt>6</wnd_dnv_cnt>
<geom_json>{"type":"Polygon","coordinates":[[[126.914763442398,37.5492293175798],[126.914737551084,37.5490208989909],[126.914660872129,37.5488204892619],[126.914536352264,37.5486357901207],[126.914368776716,37.5484738995931],[126.91416458532,37.548341039208],[126.913931625036,37.5482423148821],[126.913678848399,37.5481815206774],[126.913415969472,37.5481609929754],[126.913153090545,37.5481815206774],[126.912900313908,37.5482423148821],[126.912667353624,37.548341039208],[126.912463162228,37.5484738995931],[126.912295586681,37.5486357901207],[126.912171066815,37.5488204892619],[126.91209438786,37.5490208989909],[126.912068496546,37.5492293175798],[126.91209438786,37.5494377355859],[126.912171066815,37.5496381436553],[126.912295586681,37.5498228403127],[126.912463162228,37.5499847279105],[126.912667353624,37.5501175853658],[126.912900313908,37.5502163072079],[126.913153090545,37.550277099753],[126.913415969472,37.5502976268722],[126.913678848399,37.550277099753],[126.913931625036,37.5502163072079],[126.91416458532,37.5501175853658],[126.914368776716,37.5499847279105],[126.914536352264,37.5498228403127],[126.914660872129,37.5496381436553],[126.914737551084,37.5494377355859],[126.914763442398,37.5492293175798]]]}</geom_json>
<lo_crd>126.913415969472</lo_crd>
<la_crd>37.54922931758</la_crd>
</item>
<item>
<afos_fid>6467444</afos_fid>
<afos_id>2018074</afos_id>
<bjd_cd>11440104</bjd_cd>
<spot_cd>11440002</spot_cd>
<sido_sgg_nm>서울특별시 마포구2</sido_sgg_nm>
<spot_nm>서울특별시 마포구 도화동(일진빌딩 인근)</spot_nm>
<occrrnc_cnt>42</occrrnc_cnt>
<caslt_cnt>60</caslt_cnt>
<dth_dnv_cnt>1</dth_dnv_cnt>
<se_dnv_cnt>6</se_dnv_cnt>
<sl_dnv_cnt>51</sl_dnv_cnt>
<wnd_dnv_cnt>2</wnd_dnv_cnt>
<geom_json>{"type":"Polygon","coordinates":[[[126.948379945797,37.5404063720573],[126.948354054483,37.5401979288003],[126.948277375528,37.5399974953512],[126.948152855663,37.5398127743496],[126.947985280115,37.5396508646611],[126.947781088719,37.539517988551],[126.947548128435,37.5394192525405],[126.947295351798,37.5393584511404],[126.947032472871,37.5393379210089],[126.946769593944,37.5393584511404],[126.946516817307,37.5394192525405],[126.946283857023,37.539517988551],[126.946079665627,37.5396508646611],[126.945912090079,37.5398127743496],[126.945787570214,37.5399974953512],[126.945710891259,37.5401979288003],[126.945684999945,37.5404063720573],[126.945710891259,37.5406148147315],[126.945787570214,37.5408152465211],[126.945912090079,37.5409999650393],[126.946079665627,37.5411618717982],[126.946283857023,37.5412947449786],[126.946516817307,37.5413934785055],[126.946769593944,37.5414542782462],[126.947032472871,37.541474807795],[126.947295351798,37.5414542782462],[126.947548128435,37.5413934785055],[126.947781088719,37.5412947449786],[126.947985280115,37.5411618717982],[126.948152855663,37.5409999650393],[126.948277375528,37.5408152465211],[126.948354054483,37.5406148147315],[126.948379945797,37.5404063720573]]]}</geom_json>
<lo_crd>126.947032472871</lo_crd>
<la_crd>37.540406372057</la_crd>
</item>
<item>
<afos_fid>6467445</afos_fid>
<afos_id>2018074</afos_id>
<bjd_cd>11440104</bjd_cd>
<spot_cd>11440003</spot_cd>
<sido_sgg_nm>서울특별시 마포구3</sido_sgg_nm>
<spot_nm>서울특별시 마포구 도화동(공덕오거리 인근)</spot_nm>
<occrrnc_cnt>41</occrrnc_cnt>
<caslt_cnt>62</caslt_cnt>
<dth_dnv_cnt>0</dth_dnv_cnt>
<se_dnv_cnt>8</se_dnv_cnt>
<sl_dnv_cnt>51</sl_dnv_cnt>
<wnd_dnv_cnt>3</wnd_dnv_cnt>
<geom_json>{"type":"Polygon","coordinates":[[[126.95233262537,37.5439369566262],[126.952306734056,37.5437285232398],[126.952230055101,37.543528099282],[126.952105535236,37.5433433870274],[126.951937959688,37.5431814850059],[126.951733768292,37.5430486151879],[126.951500808008,37.5429498838529],[126.951248031371,37.5428890853319],[126.950985152444,37.5428685561725],[126.950722273517,37.5428890853319],[126.95046949688,37.5429498838529],[126.950236536596,37.5430486151879],[126.9500323452,37.5431814850059],[126.949864769652,37.5433433870274],[126.949740249787,37.543528099282],[126.949663570832,37.5437285232398],[126.949637679518,37.5439369566262],[126.949663570832,37.5441453894298],[126.949740249787,37.5443458117281],[126.949864769652,37.544530521499],[126.9500323452,37.5446924205909],[126.950236536596,37.5448252874792],[126.95046949688,37.5449240163305],[126.950722273517,37.544984813192],[126.950985152444,37.5450053417687],[126.951248031371,37.544984813192],[126.951500808008,37.5449240163305],[126.951733768292,37.5448252874792],[126.951937959688,37.5446924205909],[126.952105535236,37.544530521499],[126.952230055101,37.5443458117281],[126.952306734056,37.5441453894298],[126.95233262537,37.5439369566262]]]}</geom_json>
<lo_crd>126.950985152444</lo_crd>
<la_crd>37.543936956626</la_crd>
</item>
</items>
<totalCount>3</totalCount>
<numOfRows>3</numOfRows>
<pageNo>1</pageNo>
</body>
</response>
No preview for this file type
......@@ -9,7 +9,7 @@
"resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz",
"integrity": "sha1-63d99gEXI6OxTopywIBcjoZ0a9I=",
"requires": {
"mime-types": "2.1.21",
"mime-types": "~2.1.18",
"negotiator": "0.6.1"
}
},
......@@ -23,10 +23,10 @@
"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.6.1.tgz",
"integrity": "sha512-ZoJjft5B+EJBjUyu9C9Hc0OZyPZSSlOF+plzouTrg6UlA8f+e/n8NIgBFG/9tppJtpPWfthHakK7juJdNDODww==",
"requires": {
"fast-deep-equal": "2.0.1",
"fast-json-stable-stringify": "2.0.0",
"json-schema-traverse": "0.4.1",
"uri-js": "4.2.2"
"fast-deep-equal": "^2.0.1",
"fast-json-stable-stringify": "^2.0.0",
"json-schema-traverse": "^0.4.1",
"uri-js": "^4.2.2"
}
},
"array-flatten": {
......@@ -44,7 +44,7 @@
"resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
"integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
"requires": {
"safer-buffer": "2.1.2"
"safer-buffer": "~2.1.0"
}
},
"assert-plus": {
......@@ -100,7 +100,7 @@
"resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
"integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
"requires": {
"tweetnacl": "0.14.5"
"tweetnacl": "^0.14.3"
}
},
"better-assert": {
......@@ -127,15 +127,15 @@
"integrity": "sha1-WykhmP/dVTs6DyDe0FkrlWlVyLQ=",
"requires": {
"bytes": "3.0.0",
"content-type": "1.0.4",
"content-type": "~1.0.4",
"debug": "2.6.9",
"depd": "1.1.2",
"http-errors": "1.6.3",
"depd": "~1.1.2",
"http-errors": "~1.6.3",
"iconv-lite": "0.4.23",
"on-finished": "2.3.0",
"on-finished": "~2.3.0",
"qs": "6.5.2",
"raw-body": "2.3.3",
"type-is": "1.6.16"
"type-is": "~1.6.16"
}
},
"bytes": {
......@@ -163,7 +163,7 @@
"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz",
"integrity": "sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==",
"requires": {
"delayed-stream": "1.0.0"
"delayed-stream": "~1.0.0"
}
},
"component-bind": {
......@@ -186,7 +186,7 @@
"resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.15.tgz",
"integrity": "sha512-4aE67DL33dSW9gw4CI2H/yTxqHLNcxp0yS6jB+4h+wr3e43+1z7vm0HU9qXOH8j+qjKuL8+UtkOxYQSMq60Ylw==",
"requires": {
"mime-db": "1.37.0"
"mime-db": ">= 1.36.0 < 2"
}
},
"compression": {
......@@ -194,13 +194,13 @@
"resolved": "https://registry.npmjs.org/compression/-/compression-1.7.3.tgz",
"integrity": "sha512-HSjyBG5N1Nnz7tF2+O7A9XUhyjru71/fwgNb7oIsEVHR0WShfs2tIS/EySLgiTe98aOK18YDlMXpzjCXY/n9mg==",
"requires": {
"accepts": "1.3.5",
"accepts": "~1.3.5",
"bytes": "3.0.0",
"compressible": "2.0.15",
"compressible": "~2.0.14",
"debug": "2.6.9",
"on-headers": "1.0.1",
"on-headers": "~1.0.1",
"safe-buffer": "5.1.2",
"vary": "1.1.2"
"vary": "~1.1.2"
}
},
"content-disposition": {
......@@ -247,7 +247,7 @@
"resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
"integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
"requires": {
"assert-plus": "1.0.0"
"assert-plus": "^1.0.0"
}
},
"dasherize": {
......@@ -298,8 +298,8 @@
"resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
"integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
"requires": {
"jsbn": "0.1.1",
"safer-buffer": "2.1.2"
"jsbn": "~0.1.0",
"safer-buffer": "^2.1.0"
}
},
"ee-first": {
......@@ -318,16 +318,16 @@
"integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k="
},
"engine.io": {
"version": "3.3.1",
"resolved": "https://registry.npmjs.org/engine.io/-/engine.io-3.3.1.tgz",
"integrity": "sha512-p0njqQo5QWVxJauKcnp5IO+LBeE5JD1tAf+UxPU8ASEUHSpsSSfYR+kVb8XGGH8AEDUa1Dk5jCvPQShNBL5BdQ==",
"version": "3.2.1",
"resolved": "https://registry.npmjs.org/engine.io/-/engine.io-3.2.1.tgz",
"integrity": "sha512-+VlKzHzMhaU+GsCIg4AoXF1UdDFjHHwMmMKqMJNDNLlUlejz58FCy4LBqB2YVJskHGYl06BatYWKP2TVdVXE5w==",
"requires": {
"accepts": "1.3.5",
"accepts": "~1.3.4",
"base64id": "1.0.0",
"cookie": "0.3.1",
"debug": "3.1.0",
"engine.io-parser": "2.1.3",
"ws": "6.1.2"
"debug": "~3.1.0",
"engine.io-parser": "~2.1.0",
"ws": "~3.3.1"
},
"dependencies": {
"debug": {
......@@ -341,20 +341,20 @@
}
},
"engine.io-client": {
"version": "3.3.1",
"resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.3.1.tgz",
"integrity": "sha512-q66JBFuQcy7CSlfAz9L3jH+v7DTT3i6ZEadYcVj2pOs8/0uJHLxKX3WBkGTvULJMdz0tUCyJag0aKT/dpXL9BQ==",
"version": "3.2.1",
"resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.2.1.tgz",
"integrity": "sha512-y5AbkytWeM4jQr7m/koQLc5AxpRKC1hEVUb/s1FUAWEJq5AzJJ4NLvzuKPuxtDi5Mq755WuDvZ6Iv2rXj4PTzw==",
"requires": {
"component-emitter": "1.2.1",
"component-inherit": "0.0.3",
"debug": "3.1.0",
"engine.io-parser": "2.1.3",
"debug": "~3.1.0",
"engine.io-parser": "~2.1.1",
"has-cors": "1.1.0",
"indexof": "0.0.1",
"parseqs": "0.0.5",
"parseuri": "0.0.5",
"ws": "6.1.2",
"xmlhttprequest-ssl": "1.5.5",
"ws": "~3.3.1",
"xmlhttprequest-ssl": "~1.5.4",
"yeast": "0.1.2"
},
"dependencies": {
......@@ -374,10 +374,10 @@
"integrity": "sha512-6HXPre2O4Houl7c4g7Ic/XzPnHBvaEmN90vtRO9uLmwtRqQmTOw0QMevL1TOfL2Cpu1VzsaTmMotQgMdkzGkVA==",
"requires": {
"after": "0.8.2",
"arraybuffer.slice": "0.0.7",
"arraybuffer.slice": "~0.0.7",
"base64-arraybuffer": "0.1.5",
"blob": "0.0.5",
"has-binary2": "1.0.3"
"has-binary2": "~1.0.2"
}
},
"escape-html": {
......@@ -400,36 +400,36 @@
"resolved": "https://registry.npmjs.org/express/-/express-4.16.4.tgz",
"integrity": "sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg==",
"requires": {
"accepts": "1.3.5",
"accepts": "~1.3.5",
"array-flatten": "1.1.1",
"body-parser": "1.18.3",
"content-disposition": "0.5.2",
"content-type": "1.0.4",
"content-type": "~1.0.4",
"cookie": "0.3.1",
"cookie-signature": "1.0.6",
"debug": "2.6.9",
"depd": "1.1.2",
"encodeurl": "1.0.2",
"escape-html": "1.0.3",
"etag": "1.8.1",
"depd": "~1.1.2",
"encodeurl": "~1.0.2",
"escape-html": "~1.0.3",
"etag": "~1.8.1",
"finalhandler": "1.1.1",
"fresh": "0.5.2",
"merge-descriptors": "1.0.1",
"methods": "1.1.2",
"on-finished": "2.3.0",
"parseurl": "1.3.2",
"methods": "~1.1.2",
"on-finished": "~2.3.0",
"parseurl": "~1.3.2",
"path-to-regexp": "0.1.7",
"proxy-addr": "2.0.4",
"proxy-addr": "~2.0.4",
"qs": "6.5.2",
"range-parser": "1.2.0",
"range-parser": "~1.2.0",
"safe-buffer": "5.1.2",
"send": "0.16.2",
"serve-static": "1.13.2",
"setprototypeof": "1.1.0",
"statuses": "1.4.0",
"type-is": "1.6.16",
"statuses": "~1.4.0",
"type-is": "~1.6.16",
"utils-merge": "1.0.1",
"vary": "1.1.2"
"vary": "~1.1.2"
},
"dependencies": {
"statuses": {
......@@ -470,12 +470,12 @@
"integrity": "sha512-Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==",
"requires": {
"debug": "2.6.9",
"encodeurl": "1.0.2",
"escape-html": "1.0.3",
"on-finished": "2.3.0",
"parseurl": "1.3.2",
"statuses": "1.4.0",
"unpipe": "1.0.0"
"encodeurl": "~1.0.2",
"escape-html": "~1.0.3",
"on-finished": "~2.3.0",
"parseurl": "~1.3.2",
"statuses": "~1.4.0",
"unpipe": "~1.0.0"
},
"dependencies": {
"statuses": {
......@@ -495,9 +495,9 @@
"resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
"integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
"requires": {
"asynckit": "0.4.0",
"combined-stream": "1.0.7",
"mime-types": "2.1.21"
"asynckit": "^0.4.0",
"combined-stream": "^1.0.6",
"mime-types": "^2.1.12"
}
},
"forwarded": {
......@@ -520,7 +520,7 @@
"resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
"integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
"requires": {
"assert-plus": "1.0.0"
"assert-plus": "^1.0.0"
}
},
"har-schema": {
......@@ -533,8 +533,8 @@
"resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
"integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
"requires": {
"ajv": "6.6.1",
"har-schema": "2.0.0"
"ajv": "^6.5.5",
"har-schema": "^2.0.0"
}
},
"has-binary2": {
......@@ -607,10 +607,10 @@
"resolved": "http://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
"integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
"requires": {
"depd": "1.1.2",
"depd": "~1.1.2",
"inherits": "2.0.3",
"setprototypeof": "1.1.0",
"statuses": "1.5.0"
"statuses": ">= 1.4.0 < 2"
}
},
"http-signature": {
......@@ -618,9 +618,9 @@
"resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
"integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
"requires": {
"assert-plus": "1.0.0",
"jsprim": "1.4.1",
"sshpk": "1.15.2"
"assert-plus": "^1.0.0",
"jsprim": "^1.2.2",
"sshpk": "^1.7.0"
}
},
"iconv-lite": {
......@@ -628,7 +628,7 @@
"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz",
"integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==",
"requires": {
"safer-buffer": "2.1.2"
"safer-buffer": ">= 2.1.2 < 3"
}
},
"ienoopen": {
......@@ -727,7 +727,7 @@
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.21.tgz",
"integrity": "sha512-3iL6DbwpyLzjR3xHSFNFeb9Nz/M8WDkX33t1GFQnFOllWk8pOrh/LSrB5OXlnlW5P9LH73X6loW/eogc+F5lJg==",
"requires": {
"mime-db": "1.37.0"
"mime-db": "~1.37.0"
}
},
"morgan": {
......@@ -735,11 +735,11 @@
"resolved": "https://registry.npmjs.org/morgan/-/morgan-1.9.1.tgz",
"integrity": "sha512-HQStPIV4y3afTiCYVxirakhlCfGkI161c76kKFca7Fk1JusM//Qeo1ej2XaMniiNeaZklMVrh3vTtIzpzwbpmA==",
"requires": {
"basic-auth": "2.0.1",
"basic-auth": "~2.0.0",
"debug": "2.6.9",
"depd": "1.1.2",
"on-finished": "2.3.0",
"on-headers": "1.0.1"
"depd": "~1.1.2",
"on-finished": "~2.3.0",
"on-headers": "~1.0.1"
}
},
"ms": {
......@@ -796,7 +796,7 @@
"resolved": "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz",
"integrity": "sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=",
"requires": {
"better-assert": "1.0.2"
"better-assert": "~1.0.0"
}
},
"parseuri": {
......@@ -804,7 +804,7 @@
"resolved": "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz",
"integrity": "sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=",
"requires": {
"better-assert": "1.0.2"
"better-assert": "~1.0.0"
}
},
"parseurl": {
......@@ -837,7 +837,7 @@
"resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.4.tgz",
"integrity": "sha512-5erio2h9jp5CHGwcybmxmVqHmnCBZeewlfJ0pex+UW7Qny7OOZXTtH56TGNyBizkgiOwhJtMKrVzDTeKcySZwA==",
"requires": {
"forwarded": "0.1.2",
"forwarded": "~0.1.2",
"ipaddr.js": "1.8.0"
}
},
......@@ -877,13 +877,13 @@
"resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
"requires": {
"core-util-is": "1.0.2",
"inherits": "2.0.3",
"isarray": "1.0.0",
"process-nextick-args": "2.0.0",
"safe-buffer": "5.1.2",
"string_decoder": "1.1.1",
"util-deprecate": "1.0.2"
"core-util-is": "~1.0.0",
"inherits": "~2.0.3",
"isarray": "~1.0.0",
"process-nextick-args": "~2.0.0",
"safe-buffer": "~5.1.1",
"string_decoder": "~1.1.1",
"util-deprecate": "~1.0.1"
},
"dependencies": {
"isarray": {
......@@ -903,26 +903,26 @@
"resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
"integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
"requires": {
"aws-sign2": "0.7.0",
"aws4": "1.8.0",
"caseless": "0.12.0",
"combined-stream": "1.0.7",
"extend": "3.0.2",
"forever-agent": "0.6.1",
"form-data": "2.3.3",
"har-validator": "5.1.3",
"http-signature": "1.2.0",
"is-typedarray": "1.0.0",
"isstream": "0.1.2",
"json-stringify-safe": "5.0.1",
"mime-types": "2.1.21",
"oauth-sign": "0.9.0",
"performance-now": "2.1.0",
"qs": "6.5.2",
"safe-buffer": "5.1.2",
"tough-cookie": "2.4.3",
"tunnel-agent": "0.6.0",
"uuid": "3.3.2"
"aws-sign2": "~0.7.0",
"aws4": "^1.8.0",
"caseless": "~0.12.0",
"combined-stream": "~1.0.6",
"extend": "~3.0.2",
"forever-agent": "~0.6.1",
"form-data": "~2.3.2",
"har-validator": "~5.1.0",
"http-signature": "~1.2.0",
"is-typedarray": "~1.0.0",
"isstream": "~0.1.2",
"json-stringify-safe": "~5.0.1",
"mime-types": "~2.1.19",
"oauth-sign": "~0.9.0",
"performance-now": "^2.1.0",
"qs": "~6.5.2",
"safe-buffer": "^5.1.2",
"tough-cookie": "~2.4.3",
"tunnel-agent": "^0.6.0",
"uuid": "^3.3.2"
}
},
"safe-buffer": {
......@@ -941,18 +941,18 @@
"integrity": "sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==",
"requires": {
"debug": "2.6.9",
"depd": "1.1.2",
"destroy": "1.0.4",
"encodeurl": "1.0.2",
"escape-html": "1.0.3",
"etag": "1.8.1",
"depd": "~1.1.2",
"destroy": "~1.0.4",
"encodeurl": "~1.0.2",
"escape-html": "~1.0.3",
"etag": "~1.8.1",
"fresh": "0.5.2",
"http-errors": "1.6.3",
"http-errors": "~1.6.2",
"mime": "1.4.1",
"ms": "2.0.0",
"on-finished": "2.3.0",
"range-parser": "1.2.0",
"statuses": "1.4.0"
"on-finished": "~2.3.0",
"range-parser": "~1.2.0",
"statuses": "~1.4.0"
},
"dependencies": {
"statuses": {
......@@ -967,9 +967,9 @@
"resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz",
"integrity": "sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==",
"requires": {
"encodeurl": "1.0.2",
"escape-html": "1.0.3",
"parseurl": "1.3.2",
"encodeurl": "~1.0.2",
"escape-html": "~1.0.3",
"parseurl": "~1.3.2",
"send": "0.16.2"
}
},
......@@ -979,30 +979,25 @@
"integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="
},
"socket.io": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/socket.io/-/socket.io-2.2.0.tgz",
"integrity": "sha512-wxXrIuZ8AILcn+f1B4ez4hJTPG24iNgxBBDaJfT6MsyOhVYiTXWexGoPkd87ktJG8kQEcL/NBvRi64+9k4Kc0w==",
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/socket.io/-/socket.io-2.1.1.tgz",
"integrity": "sha512-rORqq9c+7W0DAK3cleWNSyfv/qKXV99hV4tZe+gGLfBECw3XEhBy7x85F3wypA9688LKjtwO9pX9L33/xQI8yA==",
"requires": {
"debug": "4.1.0",
"engine.io": "3.3.1",
"has-binary2": "1.0.3",
"socket.io-adapter": "1.1.1",
"socket.io-client": "2.2.0",
"socket.io-parser": "3.3.0"
"debug": "~3.1.0",
"engine.io": "~3.2.0",
"has-binary2": "~1.0.2",
"socket.io-adapter": "~1.1.0",
"socket.io-client": "2.1.1",
"socket.io-parser": "~3.2.0"
},
"dependencies": {
"debug": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.0.tgz",
"integrity": "sha512-heNPJUJIqC+xB6ayLAMHaIrmN9HKa7aQO8MGqKpvCA+uJYVcvR6l5kgdrhRuwPFHU7P5/A1w0BjByPHwpfTDKg==",
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
"requires": {
"ms": "2.1.1"
"ms": "2.0.0"
}
},
"ms": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
}
}
},
......@@ -1012,23 +1007,23 @@
"integrity": "sha1-KoBeihTWNyEk3ZFZrUUC+MsH8Gs="
},
"socket.io-client": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.2.0.tgz",
"integrity": "sha512-56ZrkTDbdTLmBIyfFYesgOxsjcLnwAKoN4CiPyTVkMQj3zTUh0QAx3GbvIvLpFEOvQWu92yyWICxB0u7wkVbYA==",
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.1.1.tgz",
"integrity": "sha512-jxnFyhAuFxYfjqIgduQlhzqTcOEQSn+OHKVfAxWaNWa7ecP7xSNk2Dx/3UEsDcY7NcFafxvNvKPmmO7HTwTxGQ==",
"requires": {
"backo2": "1.0.2",
"base64-arraybuffer": "0.1.5",
"component-bind": "1.0.0",
"component-emitter": "1.2.1",
"debug": "3.1.0",
"engine.io-client": "3.3.1",
"has-binary2": "1.0.3",
"debug": "~3.1.0",
"engine.io-client": "~3.2.0",
"has-binary2": "~1.0.2",
"has-cors": "1.1.0",
"indexof": "0.0.1",
"object-component": "0.0.3",
"parseqs": "0.0.5",
"parseuri": "0.0.5",
"socket.io-parser": "3.3.0",
"socket.io-parser": "~3.2.0",
"to-array": "0.1.4"
},
"dependencies": {
......@@ -1043,12 +1038,12 @@
}
},
"socket.io-parser": {
"version": "3.3.0",
"resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.3.0.tgz",
"integrity": "sha512-hczmV6bDgdaEbVqhAeVMM/jfUfzuEZHsQg6eOmLgJht6G3mPKMxYm75w2+qhAQZ+4X+1+ATZ+QFKeOZD5riHng==",
"version": "3.2.0",
"resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.2.0.tgz",
"integrity": "sha512-FYiBx7rc/KORMJlgsXysflWx/RIvtqZbyGLlHZvjfmPTPeuD/I8MaW7cfFrj5tRltICJdgwflhfZ3NVVbVLFQA==",
"requires": {
"component-emitter": "1.2.1",
"debug": "3.1.0",
"debug": "~3.1.0",
"isarray": "2.0.1"
},
"dependencies": {
......@@ -1072,15 +1067,15 @@
"resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.15.2.tgz",
"integrity": "sha512-Ra/OXQtuh0/enyl4ETZAfTaeksa6BXks5ZcjpSUNrjBr0DvrJKX+1fsKDPpT9TBXgHAFsa4510aNVgI8g/+SzA==",
"requires": {
"asn1": "0.2.4",
"assert-plus": "1.0.0",
"bcrypt-pbkdf": "1.0.2",
"dashdash": "1.14.1",
"ecc-jsbn": "0.1.2",
"getpass": "0.1.7",
"jsbn": "0.1.1",
"safer-buffer": "2.1.2",
"tweetnacl": "0.14.5"
"asn1": "~0.2.3",
"assert-plus": "^1.0.0",
"bcrypt-pbkdf": "^1.0.0",
"dashdash": "^1.12.0",
"ecc-jsbn": "~0.1.1",
"getpass": "^0.1.1",
"jsbn": "~0.1.0",
"safer-buffer": "^2.0.2",
"tweetnacl": "~0.14.0"
}
},
"statuses": {
......@@ -1093,7 +1088,7 @@
"resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
"requires": {
"safe-buffer": "5.1.2"
"safe-buffer": "~5.1.0"
}
},
"to-array": {
......@@ -1106,8 +1101,8 @@
"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
"integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
"requires": {
"psl": "1.1.29",
"punycode": "1.4.1"
"psl": "^1.1.24",
"punycode": "^1.4.1"
},
"dependencies": {
"punycode": {
......@@ -1122,7 +1117,7 @@
"resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
"integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
"requires": {
"safe-buffer": "5.1.2"
"safe-buffer": "^5.0.1"
}
},
"tweetnacl": {
......@@ -1136,9 +1131,14 @@
"integrity": "sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==",
"requires": {
"media-typer": "0.3.0",
"mime-types": "2.1.21"
"mime-types": "~2.1.18"
}
},
"ultron": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz",
"integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og=="
},
"unpipe": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
......@@ -1149,7 +1149,7 @@
"resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
"integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
"requires": {
"punycode": "2.1.1"
"punycode": "^2.1.0"
}
},
"util-deprecate": {
......@@ -1177,17 +1177,19 @@
"resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
"integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
"requires": {
"assert-plus": "1.0.0",
"assert-plus": "^1.0.0",
"core-util-is": "1.0.2",
"extsprintf": "1.3.0"
"extsprintf": "^1.2.0"
}
},
"ws": {
"version": "6.1.2",
"resolved": "https://registry.npmjs.org/ws/-/ws-6.1.2.tgz",
"integrity": "sha512-rfUqzvz0WxmSXtJpPMX2EeASXabOrSMk1ruMOV3JBTBjo4ac2lDjGGsbQSyxj8Odhw5fBib8ZKEjDNvgouNKYw==",
"version": "3.3.3",
"resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz",
"integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==",
"requires": {
"async-limiter": "1.0.0"
"async-limiter": "~1.0.0",
"safe-buffer": "~5.1.0",
"ultron": "~1.1.0"
}
},
"x-xss-protection": {
......
......@@ -13,10 +13,13 @@
"debug": "~2.6.9",
"ejs": "~2.5.7",
"express": "~4.16.0",
"helmet": "^3.13.0",
"helmet": "^3.15.0",
"http-errors": "~1.6.2",
"morgan": "~1.9.0",
"iconv-lite": "^0.4.23",
"morgan": "^1.9.1",
"mysql": "^2.16.0",
"raw-body": "^2.3.3",
"referrer-policy": "^1.1.0",
"request": "^2.88.0",
"socket.io": "^2.1.1"
}
......