Showing
3 changed files
with
165 additions
and
79 deletions
| ... | @@ -9,7 +9,7 @@ | ... | @@ -9,7 +9,7 @@ |
| 9 | "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz", | 9 | "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz", |
| 10 | "integrity": "sha1-63d99gEXI6OxTopywIBcjoZ0a9I=", | 10 | "integrity": "sha1-63d99gEXI6OxTopywIBcjoZ0a9I=", |
| 11 | "requires": { | 11 | "requires": { |
| 12 | - "mime-types": "2.1.21", | 12 | + "mime-types": "~2.1.18", |
| 13 | "negotiator": "0.6.1" | 13 | "negotiator": "0.6.1" |
| 14 | } | 14 | } |
| 15 | }, | 15 | }, |
| ... | @@ -64,6 +64,11 @@ | ... | @@ -64,6 +64,11 @@ |
| 64 | "callsite": "1.0.0" | 64 | "callsite": "1.0.0" |
| 65 | } | 65 | } |
| 66 | }, | 66 | }, |
| 67 | + "bignumber.js": { | ||
| 68 | + "version": "4.1.0", | ||
| 69 | + "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-4.1.0.tgz", | ||
| 70 | + "integrity": "sha512-eJzYkFYy9L4JzXsbymsFn3p54D+llV27oTQ+ziJG7WFRheJcNZilgVXMG0LoZtlQSKBsJdWtLFqOD0u+U0jZKA==" | ||
| 71 | + }, | ||
| 67 | "blob": { | 72 | "blob": { |
| 68 | "version": "0.0.5", | 73 | "version": "0.0.5", |
| 69 | "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.5.tgz", | 74 | "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.5.tgz", |
| ... | @@ -75,15 +80,15 @@ | ... | @@ -75,15 +80,15 @@ |
| 75 | "integrity": "sha1-WykhmP/dVTs6DyDe0FkrlWlVyLQ=", | 80 | "integrity": "sha1-WykhmP/dVTs6DyDe0FkrlWlVyLQ=", |
| 76 | "requires": { | 81 | "requires": { |
| 77 | "bytes": "3.0.0", | 82 | "bytes": "3.0.0", |
| 78 | - "content-type": "1.0.4", | 83 | + "content-type": "~1.0.4", |
| 79 | "debug": "2.6.9", | 84 | "debug": "2.6.9", |
| 80 | - "depd": "1.1.2", | 85 | + "depd": "~1.1.2", |
| 81 | - "http-errors": "1.6.3", | 86 | + "http-errors": "~1.6.3", |
| 82 | "iconv-lite": "0.4.23", | 87 | "iconv-lite": "0.4.23", |
| 83 | - "on-finished": "2.3.0", | 88 | + "on-finished": "~2.3.0", |
| 84 | "qs": "6.5.2", | 89 | "qs": "6.5.2", |
| 85 | "raw-body": "2.3.3", | 90 | "raw-body": "2.3.3", |
| 86 | - "type-is": "1.6.16" | 91 | + "type-is": "~1.6.16" |
| 87 | } | 92 | } |
| 88 | }, | 93 | }, |
| 89 | "bytes": { | 94 | "bytes": { |
| ... | @@ -121,7 +126,7 @@ | ... | @@ -121,7 +126,7 @@ |
| 121 | "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.15.tgz", | 126 | "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.15.tgz", |
| 122 | "integrity": "sha512-4aE67DL33dSW9gw4CI2H/yTxqHLNcxp0yS6jB+4h+wr3e43+1z7vm0HU9qXOH8j+qjKuL8+UtkOxYQSMq60Ylw==", | 127 | "integrity": "sha512-4aE67DL33dSW9gw4CI2H/yTxqHLNcxp0yS6jB+4h+wr3e43+1z7vm0HU9qXOH8j+qjKuL8+UtkOxYQSMq60Ylw==", |
| 123 | "requires": { | 128 | "requires": { |
| 124 | - "mime-db": "1.37.0" | 129 | + "mime-db": ">= 1.36.0 < 2" |
| 125 | } | 130 | } |
| 126 | }, | 131 | }, |
| 127 | "compression": { | 132 | "compression": { |
| ... | @@ -129,13 +134,13 @@ | ... | @@ -129,13 +134,13 @@ |
| 129 | "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.3.tgz", | 134 | "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.3.tgz", |
| 130 | "integrity": "sha512-HSjyBG5N1Nnz7tF2+O7A9XUhyjru71/fwgNb7oIsEVHR0WShfs2tIS/EySLgiTe98aOK18YDlMXpzjCXY/n9mg==", | 135 | "integrity": "sha512-HSjyBG5N1Nnz7tF2+O7A9XUhyjru71/fwgNb7oIsEVHR0WShfs2tIS/EySLgiTe98aOK18YDlMXpzjCXY/n9mg==", |
| 131 | "requires": { | 136 | "requires": { |
| 132 | - "accepts": "1.3.5", | 137 | + "accepts": "~1.3.5", |
| 133 | "bytes": "3.0.0", | 138 | "bytes": "3.0.0", |
| 134 | - "compressible": "2.0.15", | 139 | + "compressible": "~2.0.14", |
| 135 | "debug": "2.6.9", | 140 | "debug": "2.6.9", |
| 136 | - "on-headers": "1.0.1", | 141 | + "on-headers": "~1.0.1", |
| 137 | "safe-buffer": "5.1.2", | 142 | "safe-buffer": "5.1.2", |
| 138 | - "vary": "1.1.2" | 143 | + "vary": "~1.1.2" |
| 139 | } | 144 | } |
| 140 | }, | 145 | }, |
| 141 | "content-disposition": { | 146 | "content-disposition": { |
| ... | @@ -172,6 +177,11 @@ | ... | @@ -172,6 +177,11 @@ |
| 172 | "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", | 177 | "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", |
| 173 | "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=" | 178 | "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=" |
| 174 | }, | 179 | }, |
| 180 | + "core-util-is": { | ||
| 181 | + "version": "1.0.2", | ||
| 182 | + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", | ||
| 183 | + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" | ||
| 184 | + }, | ||
| 175 | "dasherize": { | 185 | "dasherize": { |
| 176 | "version": "2.0.0", | 186 | "version": "2.0.0", |
| 177 | "resolved": "https://registry.npmjs.org/dasherize/-/dasherize-2.0.0.tgz", | 187 | "resolved": "https://registry.npmjs.org/dasherize/-/dasherize-2.0.0.tgz", |
| ... | @@ -225,12 +235,12 @@ | ... | @@ -225,12 +235,12 @@ |
| 225 | "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-3.3.1.tgz", | 235 | "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-3.3.1.tgz", |
| 226 | "integrity": "sha512-p0njqQo5QWVxJauKcnp5IO+LBeE5JD1tAf+UxPU8ASEUHSpsSSfYR+kVb8XGGH8AEDUa1Dk5jCvPQShNBL5BdQ==", | 236 | "integrity": "sha512-p0njqQo5QWVxJauKcnp5IO+LBeE5JD1tAf+UxPU8ASEUHSpsSSfYR+kVb8XGGH8AEDUa1Dk5jCvPQShNBL5BdQ==", |
| 227 | "requires": { | 237 | "requires": { |
| 228 | - "accepts": "1.3.5", | 238 | + "accepts": "~1.3.4", |
| 229 | "base64id": "1.0.0", | 239 | "base64id": "1.0.0", |
| 230 | "cookie": "0.3.1", | 240 | "cookie": "0.3.1", |
| 231 | - "debug": "3.1.0", | 241 | + "debug": "~3.1.0", |
| 232 | - "engine.io-parser": "2.1.3", | 242 | + "engine.io-parser": "~2.1.0", |
| 233 | - "ws": "6.1.2" | 243 | + "ws": "~6.1.0" |
| 234 | }, | 244 | }, |
| 235 | "dependencies": { | 245 | "dependencies": { |
| 236 | "debug": { | 246 | "debug": { |
| ... | @@ -250,14 +260,14 @@ | ... | @@ -250,14 +260,14 @@ |
| 250 | "requires": { | 260 | "requires": { |
| 251 | "component-emitter": "1.2.1", | 261 | "component-emitter": "1.2.1", |
| 252 | "component-inherit": "0.0.3", | 262 | "component-inherit": "0.0.3", |
| 253 | - "debug": "3.1.0", | 263 | + "debug": "~3.1.0", |
| 254 | - "engine.io-parser": "2.1.3", | 264 | + "engine.io-parser": "~2.1.1", |
| 255 | "has-cors": "1.1.0", | 265 | "has-cors": "1.1.0", |
| 256 | "indexof": "0.0.1", | 266 | "indexof": "0.0.1", |
| 257 | "parseqs": "0.0.5", | 267 | "parseqs": "0.0.5", |
| 258 | "parseuri": "0.0.5", | 268 | "parseuri": "0.0.5", |
| 259 | - "ws": "6.1.2", | 269 | + "ws": "~6.1.0", |
| 260 | - "xmlhttprequest-ssl": "1.5.5", | 270 | + "xmlhttprequest-ssl": "~1.5.4", |
| 261 | "yeast": "0.1.2" | 271 | "yeast": "0.1.2" |
| 262 | }, | 272 | }, |
| 263 | "dependencies": { | 273 | "dependencies": { |
| ... | @@ -277,10 +287,10 @@ | ... | @@ -277,10 +287,10 @@ |
| 277 | "integrity": "sha512-6HXPre2O4Houl7c4g7Ic/XzPnHBvaEmN90vtRO9uLmwtRqQmTOw0QMevL1TOfL2Cpu1VzsaTmMotQgMdkzGkVA==", | 287 | "integrity": "sha512-6HXPre2O4Houl7c4g7Ic/XzPnHBvaEmN90vtRO9uLmwtRqQmTOw0QMevL1TOfL2Cpu1VzsaTmMotQgMdkzGkVA==", |
| 278 | "requires": { | 288 | "requires": { |
| 279 | "after": "0.8.2", | 289 | "after": "0.8.2", |
| 280 | - "arraybuffer.slice": "0.0.7", | 290 | + "arraybuffer.slice": "~0.0.7", |
| 281 | "base64-arraybuffer": "0.1.5", | 291 | "base64-arraybuffer": "0.1.5", |
| 282 | "blob": "0.0.5", | 292 | "blob": "0.0.5", |
| 283 | - "has-binary2": "1.0.3" | 293 | + "has-binary2": "~1.0.2" |
| 284 | } | 294 | } |
| 285 | }, | 295 | }, |
| 286 | "escape-html": { | 296 | "escape-html": { |
| ... | @@ -303,36 +313,36 @@ | ... | @@ -303,36 +313,36 @@ |
| 303 | "resolved": "https://registry.npmjs.org/express/-/express-4.16.4.tgz", | 313 | "resolved": "https://registry.npmjs.org/express/-/express-4.16.4.tgz", |
| 304 | "integrity": "sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg==", | 314 | "integrity": "sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg==", |
| 305 | "requires": { | 315 | "requires": { |
| 306 | - "accepts": "1.3.5", | 316 | + "accepts": "~1.3.5", |
| 307 | "array-flatten": "1.1.1", | 317 | "array-flatten": "1.1.1", |
| 308 | "body-parser": "1.18.3", | 318 | "body-parser": "1.18.3", |
| 309 | "content-disposition": "0.5.2", | 319 | "content-disposition": "0.5.2", |
| 310 | - "content-type": "1.0.4", | 320 | + "content-type": "~1.0.4", |
| 311 | "cookie": "0.3.1", | 321 | "cookie": "0.3.1", |
| 312 | "cookie-signature": "1.0.6", | 322 | "cookie-signature": "1.0.6", |
| 313 | "debug": "2.6.9", | 323 | "debug": "2.6.9", |
| 314 | - "depd": "1.1.2", | 324 | + "depd": "~1.1.2", |
| 315 | - "encodeurl": "1.0.2", | 325 | + "encodeurl": "~1.0.2", |
| 316 | - "escape-html": "1.0.3", | 326 | + "escape-html": "~1.0.3", |
| 317 | - "etag": "1.8.1", | 327 | + "etag": "~1.8.1", |
| 318 | "finalhandler": "1.1.1", | 328 | "finalhandler": "1.1.1", |
| 319 | "fresh": "0.5.2", | 329 | "fresh": "0.5.2", |
| 320 | "merge-descriptors": "1.0.1", | 330 | "merge-descriptors": "1.0.1", |
| 321 | - "methods": "1.1.2", | 331 | + "methods": "~1.1.2", |
| 322 | - "on-finished": "2.3.0", | 332 | + "on-finished": "~2.3.0", |
| 323 | - "parseurl": "1.3.2", | 333 | + "parseurl": "~1.3.2", |
| 324 | "path-to-regexp": "0.1.7", | 334 | "path-to-regexp": "0.1.7", |
| 325 | - "proxy-addr": "2.0.4", | 335 | + "proxy-addr": "~2.0.4", |
| 326 | "qs": "6.5.2", | 336 | "qs": "6.5.2", |
| 327 | - "range-parser": "1.2.0", | 337 | + "range-parser": "~1.2.0", |
| 328 | "safe-buffer": "5.1.2", | 338 | "safe-buffer": "5.1.2", |
| 329 | "send": "0.16.2", | 339 | "send": "0.16.2", |
| 330 | "serve-static": "1.13.2", | 340 | "serve-static": "1.13.2", |
| 331 | "setprototypeof": "1.1.0", | 341 | "setprototypeof": "1.1.0", |
| 332 | - "statuses": "1.4.0", | 342 | + "statuses": "~1.4.0", |
| 333 | - "type-is": "1.6.16", | 343 | + "type-is": "~1.6.16", |
| 334 | "utils-merge": "1.0.1", | 344 | "utils-merge": "1.0.1", |
| 335 | - "vary": "1.1.2" | 345 | + "vary": "~1.1.2" |
| 336 | }, | 346 | }, |
| 337 | "dependencies": { | 347 | "dependencies": { |
| 338 | "statuses": { | 348 | "statuses": { |
| ... | @@ -353,12 +363,12 @@ | ... | @@ -353,12 +363,12 @@ |
| 353 | "integrity": "sha512-Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==", | 363 | "integrity": "sha512-Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==", |
| 354 | "requires": { | 364 | "requires": { |
| 355 | "debug": "2.6.9", | 365 | "debug": "2.6.9", |
| 356 | - "encodeurl": "1.0.2", | 366 | + "encodeurl": "~1.0.2", |
| 357 | - "escape-html": "1.0.3", | 367 | + "escape-html": "~1.0.3", |
| 358 | - "on-finished": "2.3.0", | 368 | + "on-finished": "~2.3.0", |
| 359 | - "parseurl": "1.3.2", | 369 | + "parseurl": "~1.3.2", |
| 360 | - "statuses": "1.4.0", | 370 | + "statuses": "~1.4.0", |
| 361 | - "unpipe": "1.0.0" | 371 | + "unpipe": "~1.0.0" |
| 362 | }, | 372 | }, |
| 363 | "dependencies": { | 373 | "dependencies": { |
| 364 | "statuses": { | 374 | "statuses": { |
| ... | @@ -453,10 +463,10 @@ | ... | @@ -453,10 +463,10 @@ |
| 453 | "resolved": "http://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz", | 463 | "resolved": "http://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz", |
| 454 | "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=", | 464 | "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=", |
| 455 | "requires": { | 465 | "requires": { |
| 456 | - "depd": "1.1.2", | 466 | + "depd": "~1.1.2", |
| 457 | "inherits": "2.0.3", | 467 | "inherits": "2.0.3", |
| 458 | "setprototypeof": "1.1.0", | 468 | "setprototypeof": "1.1.0", |
| 459 | - "statuses": "1.5.0" | 469 | + "statuses": ">= 1.4.0 < 2" |
| 460 | } | 470 | } |
| 461 | }, | 471 | }, |
| 462 | "iconv-lite": { | 472 | "iconv-lite": { |
| ... | @@ -464,7 +474,7 @@ | ... | @@ -464,7 +474,7 @@ |
| 464 | "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz", | 474 | "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz", |
| 465 | "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==", | 475 | "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==", |
| 466 | "requires": { | 476 | "requires": { |
| 467 | - "safer-buffer": "2.1.2" | 477 | + "safer-buffer": ">= 2.1.2 < 3" |
| 468 | } | 478 | } |
| 469 | }, | 479 | }, |
| 470 | "ienoopen": { | 480 | "ienoopen": { |
| ... | @@ -522,7 +532,7 @@ | ... | @@ -522,7 +532,7 @@ |
| 522 | "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.21.tgz", | 532 | "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.21.tgz", |
| 523 | "integrity": "sha512-3iL6DbwpyLzjR3xHSFNFeb9Nz/M8WDkX33t1GFQnFOllWk8pOrh/LSrB5OXlnlW5P9LH73X6loW/eogc+F5lJg==", | 533 | "integrity": "sha512-3iL6DbwpyLzjR3xHSFNFeb9Nz/M8WDkX33t1GFQnFOllWk8pOrh/LSrB5OXlnlW5P9LH73X6loW/eogc+F5lJg==", |
| 524 | "requires": { | 534 | "requires": { |
| 525 | - "mime-db": "1.37.0" | 535 | + "mime-db": "~1.37.0" |
| 526 | } | 536 | } |
| 527 | }, | 537 | }, |
| 528 | "morgan": { | 538 | "morgan": { |
| ... | @@ -530,11 +540,11 @@ | ... | @@ -530,11 +540,11 @@ |
| 530 | "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.9.1.tgz", | 540 | "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.9.1.tgz", |
| 531 | "integrity": "sha512-HQStPIV4y3afTiCYVxirakhlCfGkI161c76kKFca7Fk1JusM//Qeo1ej2XaMniiNeaZklMVrh3vTtIzpzwbpmA==", | 541 | "integrity": "sha512-HQStPIV4y3afTiCYVxirakhlCfGkI161c76kKFca7Fk1JusM//Qeo1ej2XaMniiNeaZklMVrh3vTtIzpzwbpmA==", |
| 532 | "requires": { | 542 | "requires": { |
| 533 | - "basic-auth": "2.0.1", | 543 | + "basic-auth": "~2.0.0", |
| 534 | "debug": "2.6.9", | 544 | "debug": "2.6.9", |
| 535 | - "depd": "1.1.2", | 545 | + "depd": "~1.1.2", |
| 536 | - "on-finished": "2.3.0", | 546 | + "on-finished": "~2.3.0", |
| 537 | - "on-headers": "1.0.1" | 547 | + "on-headers": "~1.0.1" |
| 538 | } | 548 | } |
| 539 | }, | 549 | }, |
| 540 | "ms": { | 550 | "ms": { |
| ... | @@ -542,6 +552,17 @@ | ... | @@ -542,6 +552,17 @@ |
| 542 | "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", | 552 | "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", |
| 543 | "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" | 553 | "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" |
| 544 | }, | 554 | }, |
| 555 | + "mysql": { | ||
| 556 | + "version": "2.16.0", | ||
| 557 | + "resolved": "https://registry.npmjs.org/mysql/-/mysql-2.16.0.tgz", | ||
| 558 | + "integrity": "sha512-dPbN2LHonQp7D5ja5DJXNbCLe/HRdu+f3v61aguzNRQIrmZLOeRoymBYyeThrR6ug+FqzDL95Gc9maqZUJS+Gw==", | ||
| 559 | + "requires": { | ||
| 560 | + "bignumber.js": "4.1.0", | ||
| 561 | + "readable-stream": "2.3.6", | ||
| 562 | + "safe-buffer": "5.1.2", | ||
| 563 | + "sqlstring": "2.3.1" | ||
| 564 | + } | ||
| 565 | + }, | ||
| 545 | "negotiator": { | 566 | "negotiator": { |
| 546 | "version": "0.6.1", | 567 | "version": "0.6.1", |
| 547 | "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz", | 568 | "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz", |
| ... | @@ -575,7 +596,7 @@ | ... | @@ -575,7 +596,7 @@ |
| 575 | "resolved": "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz", | 596 | "resolved": "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz", |
| 576 | "integrity": "sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=", | 597 | "integrity": "sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=", |
| 577 | "requires": { | 598 | "requires": { |
| 578 | - "better-assert": "1.0.2" | 599 | + "better-assert": "~1.0.0" |
| 579 | } | 600 | } |
| 580 | }, | 601 | }, |
| 581 | "parseuri": { | 602 | "parseuri": { |
| ... | @@ -583,7 +604,7 @@ | ... | @@ -583,7 +604,7 @@ |
| 583 | "resolved": "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz", | 604 | "resolved": "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz", |
| 584 | "integrity": "sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=", | 605 | "integrity": "sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=", |
| 585 | "requires": { | 606 | "requires": { |
| 586 | - "better-assert": "1.0.2" | 607 | + "better-assert": "~1.0.0" |
| 587 | } | 608 | } |
| 588 | }, | 609 | }, |
| 589 | "parseurl": { | 610 | "parseurl": { |
| ... | @@ -601,12 +622,17 @@ | ... | @@ -601,12 +622,17 @@ |
| 601 | "resolved": "https://registry.npmjs.org/platform/-/platform-1.3.5.tgz", | 622 | "resolved": "https://registry.npmjs.org/platform/-/platform-1.3.5.tgz", |
| 602 | "integrity": "sha512-TuvHS8AOIZNAlE77WUDiR4rySV/VMptyMfcfeoMgs4P8apaZM3JrnbzBiixKUv+XR6i+BXrQh8WAnjaSPFO65Q==" | 623 | "integrity": "sha512-TuvHS8AOIZNAlE77WUDiR4rySV/VMptyMfcfeoMgs4P8apaZM3JrnbzBiixKUv+XR6i+BXrQh8WAnjaSPFO65Q==" |
| 603 | }, | 624 | }, |
| 625 | + "process-nextick-args": { | ||
| 626 | + "version": "2.0.0", | ||
| 627 | + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz", | ||
| 628 | + "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==" | ||
| 629 | + }, | ||
| 604 | "proxy-addr": { | 630 | "proxy-addr": { |
| 605 | "version": "2.0.4", | 631 | "version": "2.0.4", |
| 606 | "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.4.tgz", | 632 | "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.4.tgz", |
| 607 | "integrity": "sha512-5erio2h9jp5CHGwcybmxmVqHmnCBZeewlfJ0pex+UW7Qny7OOZXTtH56TGNyBizkgiOwhJtMKrVzDTeKcySZwA==", | 633 | "integrity": "sha512-5erio2h9jp5CHGwcybmxmVqHmnCBZeewlfJ0pex+UW7Qny7OOZXTtH56TGNyBizkgiOwhJtMKrVzDTeKcySZwA==", |
| 608 | "requires": { | 634 | "requires": { |
| 609 | - "forwarded": "0.1.2", | 635 | + "forwarded": "~0.1.2", |
| 610 | "ipaddr.js": "1.8.0" | 636 | "ipaddr.js": "1.8.0" |
| 611 | } | 637 | } |
| 612 | }, | 638 | }, |
| ... | @@ -631,6 +657,27 @@ | ... | @@ -631,6 +657,27 @@ |
| 631 | "unpipe": "1.0.0" | 657 | "unpipe": "1.0.0" |
| 632 | } | 658 | } |
| 633 | }, | 659 | }, |
| 660 | + "readable-stream": { | ||
| 661 | + "version": "2.3.6", | ||
| 662 | + "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", | ||
| 663 | + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", | ||
| 664 | + "requires": { | ||
| 665 | + "core-util-is": "~1.0.0", | ||
| 666 | + "inherits": "~2.0.3", | ||
| 667 | + "isarray": "~1.0.0", | ||
| 668 | + "process-nextick-args": "~2.0.0", | ||
| 669 | + "safe-buffer": "~5.1.1", | ||
| 670 | + "string_decoder": "~1.1.1", | ||
| 671 | + "util-deprecate": "~1.0.1" | ||
| 672 | + }, | ||
| 673 | + "dependencies": { | ||
| 674 | + "isarray": { | ||
| 675 | + "version": "1.0.0", | ||
| 676 | + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", | ||
| 677 | + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" | ||
| 678 | + } | ||
| 679 | + } | ||
| 680 | + }, | ||
| 634 | "referrer-policy": { | 681 | "referrer-policy": { |
| 635 | "version": "1.1.0", | 682 | "version": "1.1.0", |
| 636 | "resolved": "https://registry.npmjs.org/referrer-policy/-/referrer-policy-1.1.0.tgz", | 683 | "resolved": "https://registry.npmjs.org/referrer-policy/-/referrer-policy-1.1.0.tgz", |
| ... | @@ -652,18 +699,18 @@ | ... | @@ -652,18 +699,18 @@ |
| 652 | "integrity": "sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==", | 699 | "integrity": "sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==", |
| 653 | "requires": { | 700 | "requires": { |
| 654 | "debug": "2.6.9", | 701 | "debug": "2.6.9", |
| 655 | - "depd": "1.1.2", | 702 | + "depd": "~1.1.2", |
| 656 | - "destroy": "1.0.4", | 703 | + "destroy": "~1.0.4", |
| 657 | - "encodeurl": "1.0.2", | 704 | + "encodeurl": "~1.0.2", |
| 658 | - "escape-html": "1.0.3", | 705 | + "escape-html": "~1.0.3", |
| 659 | - "etag": "1.8.1", | 706 | + "etag": "~1.8.1", |
| 660 | "fresh": "0.5.2", | 707 | "fresh": "0.5.2", |
| 661 | - "http-errors": "1.6.3", | 708 | + "http-errors": "~1.6.2", |
| 662 | "mime": "1.4.1", | 709 | "mime": "1.4.1", |
| 663 | "ms": "2.0.0", | 710 | "ms": "2.0.0", |
| 664 | - "on-finished": "2.3.0", | 711 | + "on-finished": "~2.3.0", |
| 665 | - "range-parser": "1.2.0", | 712 | + "range-parser": "~1.2.0", |
| 666 | - "statuses": "1.4.0" | 713 | + "statuses": "~1.4.0" |
| 667 | }, | 714 | }, |
| 668 | "dependencies": { | 715 | "dependencies": { |
| 669 | "statuses": { | 716 | "statuses": { |
| ... | @@ -678,9 +725,9 @@ | ... | @@ -678,9 +725,9 @@ |
| 678 | "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz", | 725 | "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz", |
| 679 | "integrity": "sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==", | 726 | "integrity": "sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==", |
| 680 | "requires": { | 727 | "requires": { |
| 681 | - "encodeurl": "1.0.2", | 728 | + "encodeurl": "~1.0.2", |
| 682 | - "escape-html": "1.0.3", | 729 | + "escape-html": "~1.0.3", |
| 683 | - "parseurl": "1.3.2", | 730 | + "parseurl": "~1.3.2", |
| 684 | "send": "0.16.2" | 731 | "send": "0.16.2" |
| 685 | } | 732 | } |
| 686 | }, | 733 | }, |
| ... | @@ -694,12 +741,12 @@ | ... | @@ -694,12 +741,12 @@ |
| 694 | "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-2.2.0.tgz", | 741 | "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-2.2.0.tgz", |
| 695 | "integrity": "sha512-wxXrIuZ8AILcn+f1B4ez4hJTPG24iNgxBBDaJfT6MsyOhVYiTXWexGoPkd87ktJG8kQEcL/NBvRi64+9k4Kc0w==", | 742 | "integrity": "sha512-wxXrIuZ8AILcn+f1B4ez4hJTPG24iNgxBBDaJfT6MsyOhVYiTXWexGoPkd87ktJG8kQEcL/NBvRi64+9k4Kc0w==", |
| 696 | "requires": { | 743 | "requires": { |
| 697 | - "debug": "4.1.0", | 744 | + "debug": "~4.1.0", |
| 698 | - "engine.io": "3.3.1", | 745 | + "engine.io": "~3.3.1", |
| 699 | - "has-binary2": "1.0.3", | 746 | + "has-binary2": "~1.0.2", |
| 700 | - "socket.io-adapter": "1.1.1", | 747 | + "socket.io-adapter": "~1.1.0", |
| 701 | "socket.io-client": "2.2.0", | 748 | "socket.io-client": "2.2.0", |
| 702 | - "socket.io-parser": "3.3.0" | 749 | + "socket.io-parser": "~3.3.0" |
| 703 | }, | 750 | }, |
| 704 | "dependencies": { | 751 | "dependencies": { |
| 705 | "debug": { | 752 | "debug": { |
| ... | @@ -707,7 +754,7 @@ | ... | @@ -707,7 +754,7 @@ |
| 707 | "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.0.tgz", | 754 | "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.0.tgz", |
| 708 | "integrity": "sha512-heNPJUJIqC+xB6ayLAMHaIrmN9HKa7aQO8MGqKpvCA+uJYVcvR6l5kgdrhRuwPFHU7P5/A1w0BjByPHwpfTDKg==", | 755 | "integrity": "sha512-heNPJUJIqC+xB6ayLAMHaIrmN9HKa7aQO8MGqKpvCA+uJYVcvR6l5kgdrhRuwPFHU7P5/A1w0BjByPHwpfTDKg==", |
| 709 | "requires": { | 756 | "requires": { |
| 710 | - "ms": "2.1.1" | 757 | + "ms": "^2.1.1" |
| 711 | } | 758 | } |
| 712 | }, | 759 | }, |
| 713 | "ms": { | 760 | "ms": { |
| ... | @@ -731,15 +778,15 @@ | ... | @@ -731,15 +778,15 @@ |
| 731 | "base64-arraybuffer": "0.1.5", | 778 | "base64-arraybuffer": "0.1.5", |
| 732 | "component-bind": "1.0.0", | 779 | "component-bind": "1.0.0", |
| 733 | "component-emitter": "1.2.1", | 780 | "component-emitter": "1.2.1", |
| 734 | - "debug": "3.1.0", | 781 | + "debug": "~3.1.0", |
| 735 | - "engine.io-client": "3.3.1", | 782 | + "engine.io-client": "~3.3.1", |
| 736 | - "has-binary2": "1.0.3", | 783 | + "has-binary2": "~1.0.2", |
| 737 | "has-cors": "1.1.0", | 784 | "has-cors": "1.1.0", |
| 738 | "indexof": "0.0.1", | 785 | "indexof": "0.0.1", |
| 739 | "object-component": "0.0.3", | 786 | "object-component": "0.0.3", |
| 740 | "parseqs": "0.0.5", | 787 | "parseqs": "0.0.5", |
| 741 | "parseuri": "0.0.5", | 788 | "parseuri": "0.0.5", |
| 742 | - "socket.io-parser": "3.3.0", | 789 | + "socket.io-parser": "~3.3.0", |
| 743 | "to-array": "0.1.4" | 790 | "to-array": "0.1.4" |
| 744 | }, | 791 | }, |
| 745 | "dependencies": { | 792 | "dependencies": { |
| ... | @@ -759,7 +806,7 @@ | ... | @@ -759,7 +806,7 @@ |
| 759 | "integrity": "sha512-hczmV6bDgdaEbVqhAeVMM/jfUfzuEZHsQg6eOmLgJht6G3mPKMxYm75w2+qhAQZ+4X+1+ATZ+QFKeOZD5riHng==", | 806 | "integrity": "sha512-hczmV6bDgdaEbVqhAeVMM/jfUfzuEZHsQg6eOmLgJht6G3mPKMxYm75w2+qhAQZ+4X+1+ATZ+QFKeOZD5riHng==", |
| 760 | "requires": { | 807 | "requires": { |
| 761 | "component-emitter": "1.2.1", | 808 | "component-emitter": "1.2.1", |
| 762 | - "debug": "3.1.0", | 809 | + "debug": "~3.1.0", |
| 763 | "isarray": "2.0.1" | 810 | "isarray": "2.0.1" |
| 764 | }, | 811 | }, |
| 765 | "dependencies": { | 812 | "dependencies": { |
| ... | @@ -773,11 +820,24 @@ | ... | @@ -773,11 +820,24 @@ |
| 773 | } | 820 | } |
| 774 | } | 821 | } |
| 775 | }, | 822 | }, |
| 823 | + "sqlstring": { | ||
| 824 | + "version": "2.3.1", | ||
| 825 | + "resolved": "https://registry.npmjs.org/sqlstring/-/sqlstring-2.3.1.tgz", | ||
| 826 | + "integrity": "sha1-R1OT/56RR5rqYtyvDKPRSYOn+0A=" | ||
| 827 | + }, | ||
| 776 | "statuses": { | 828 | "statuses": { |
| 777 | "version": "1.5.0", | 829 | "version": "1.5.0", |
| 778 | "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", | 830 | "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", |
| 779 | "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=" | 831 | "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=" |
| 780 | }, | 832 | }, |
| 833 | + "string_decoder": { | ||
| 834 | + "version": "1.1.1", | ||
| 835 | + "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", | ||
| 836 | + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", | ||
| 837 | + "requires": { | ||
| 838 | + "safe-buffer": "~5.1.0" | ||
| 839 | + } | ||
| 840 | + }, | ||
| 781 | "to-array": { | 841 | "to-array": { |
| 782 | "version": "0.1.4", | 842 | "version": "0.1.4", |
| 783 | "resolved": "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz", | 843 | "resolved": "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz", |
| ... | @@ -789,7 +849,7 @@ | ... | @@ -789,7 +849,7 @@ |
| 789 | "integrity": "sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==", | 849 | "integrity": "sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==", |
| 790 | "requires": { | 850 | "requires": { |
| 791 | "media-typer": "0.3.0", | 851 | "media-typer": "0.3.0", |
| 792 | - "mime-types": "2.1.21" | 852 | + "mime-types": "~2.1.18" |
| 793 | } | 853 | } |
| 794 | }, | 854 | }, |
| 795 | "unpipe": { | 855 | "unpipe": { |
| ... | @@ -797,6 +857,11 @@ | ... | @@ -797,6 +857,11 @@ |
| 797 | "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", | 857 | "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", |
| 798 | "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=" | 858 | "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=" |
| 799 | }, | 859 | }, |
| 860 | + "util-deprecate": { | ||
| 861 | + "version": "1.0.2", | ||
| 862 | + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", | ||
| 863 | + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" | ||
| 864 | + }, | ||
| 800 | "utils-merge": { | 865 | "utils-merge": { |
| 801 | "version": "1.0.1", | 866 | "version": "1.0.1", |
| 802 | "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", | 867 | "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", |
| ... | @@ -812,7 +877,7 @@ | ... | @@ -812,7 +877,7 @@ |
| 812 | "resolved": "https://registry.npmjs.org/ws/-/ws-6.1.2.tgz", | 877 | "resolved": "https://registry.npmjs.org/ws/-/ws-6.1.2.tgz", |
| 813 | "integrity": "sha512-rfUqzvz0WxmSXtJpPMX2EeASXabOrSMk1ruMOV3JBTBjo4ac2lDjGGsbQSyxj8Odhw5fBib8ZKEjDNvgouNKYw==", | 878 | "integrity": "sha512-rfUqzvz0WxmSXtJpPMX2EeASXabOrSMk1ruMOV3JBTBjo4ac2lDjGGsbQSyxj8Odhw5fBib8ZKEjDNvgouNKYw==", |
| 814 | "requires": { | 879 | "requires": { |
| 815 | - "async-limiter": "1.0.0" | 880 | + "async-limiter": "~1.0.0" |
| 816 | } | 881 | } |
| 817 | }, | 882 | }, |
| 818 | "x-xss-protection": { | 883 | "x-xss-protection": { | ... | ... |
| ... | @@ -12,9 +12,10 @@ | ... | @@ -12,9 +12,10 @@ |
| 12 | "debug": "~2.6.9", | 12 | "debug": "~2.6.9", |
| 13 | "ejs": "~2.5.7", | 13 | "ejs": "~2.5.7", |
| 14 | "express": "~4.16.0", | 14 | "express": "~4.16.0", |
| 15 | + "helmet": "^3.13.0", | ||
| 15 | "http-errors": "~1.6.2", | 16 | "http-errors": "~1.6.2", |
| 16 | "morgan": "~1.9.0", | 17 | "morgan": "~1.9.0", |
| 17 | - "helmet": "^3.13.0", | 18 | + "mysql": "^2.16.0", |
| 18 | "socket.io": "^2.1.1" | 19 | "socket.io": "^2.1.1" |
| 19 | } | 20 | } |
| 20 | } | 21 | } | ... | ... |
| 1 | var express = require('express'); | 1 | var express = require('express'); |
| 2 | var router = express.Router(); | 2 | var router = express.Router(); |
| 3 | +var mysql = require('mysql'); | ||
| 4 | + | ||
| 5 | +var connection = mysql.createConnection({ | ||
| 6 | + host : 'ryulth.com', | ||
| 7 | + user : 'kkonzi', | ||
| 8 | + password : 'kkonzi1234', | ||
| 9 | + database : 'kkonzi_test' | ||
| 10 | +}); | ||
| 3 | 11 | ||
| 4 | /* GET home page. */ | 12 | /* GET home page. */ |
| 5 | router.get('/', function(req, res, next) { | 13 | router.get('/', function(req, res, next) { |
| 6 | - res.render('index', { title: 'Express' }); | 14 | + // mysql 세션 연결 |
| 15 | + connection.connect(); | ||
| 16 | + // connection.query('SELECT * FROM '); | ||
| 17 | + | ||
| 18 | + // 자외선지수, 불쾌지수, 열지수, 체감 온도, 바람속도, 현재기온, 하늘 상태, 강우량, 태풍, 낙뢰 | ||
| 19 | + var uvr, discomfort, heat, sensibleTem, windSpeed, presentTem, skyState, rainfall, typhoon, lightning; | ||
| 20 | + // 사망 확률 | ||
| 21 | + var deathProb; | ||
| 22 | + | ||
| 23 | + deathProb = uvr + discomfort + heat + sensibleTem + windSpeed + presentTem + skyState + rainfall + typhoon + lightning; | ||
| 24 | + res.render('index', {title: 'Express'}); | ||
| 25 | + | ||
| 26 | + connecttion.end(); | ||
| 7 | }); | 27 | }); |
| 8 | 28 | ||
| 9 | module.exports = router; | 29 | module.exports = router; | ... | ... |
-
Please register or login to post a comment